Merge branch 'RED-6575' into 'master'
RED-6575- Failed report generation after upload KMS Certificate Closes RED-6575 See merge request redactmanager/persistence-service!36
This commit is contained in:
commit
17412ee828
@ -43,7 +43,7 @@ public class DigitalSignatureInternalController implements DigitalSignatureResou
|
|||||||
@Override
|
@Override
|
||||||
public DigitalSignatureKms getDigitalSignatureKms() {
|
public DigitalSignatureKms getDigitalSignatureKms() {
|
||||||
|
|
||||||
return convert(digitalSignatureKmsService.getDigitalSignature(), DigitalSignatureKms.class);
|
return digitalSignatureKmsService.convert(digitalSignatureKmsService.getDigitalSignature());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -92,6 +92,18 @@ public class DigitalSignatureKmsService {
|
|||||||
digitalSignatureTypeService.deleteDigitalSignatureType();
|
digitalSignatureTypeService.deleteDigitalSignatureType();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public DigitalSignatureKms convert(DigitalSignatureKmsEntity digitalSignatureKmsEntity) {
|
||||||
|
|
||||||
|
return DigitalSignatureKms.builder()
|
||||||
|
.certificate(new String(digitalSignatureKmsEntity.getCertificate()))
|
||||||
|
.kmsAccessKey(digitalSignatureKmsEntity.getKmsAccessKey())
|
||||||
|
.kmsKeyId(digitalSignatureKmsEntity.getKmsKeyId())
|
||||||
|
.kmsRegion(digitalSignatureKmsEntity.getKmsRegion())
|
||||||
|
.kmsSecretKey(digitalSignatureKmsEntity.getKmsSecretKey())
|
||||||
|
.kmsServiceEndpoint(digitalSignatureKmsEntity.getKmsServiceEndpoint())
|
||||||
|
.certificateName(digitalSignatureKmsEntity.getCertificateName())
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
private DigitalSignatureKmsEntity convert(DigitalSignatureKms digitalSignatureKms) {
|
private DigitalSignatureKmsEntity convert(DigitalSignatureKms digitalSignatureKms) {
|
||||||
|
|
||||||
@ -106,4 +118,6 @@ public class DigitalSignatureKmsService {
|
|||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user