From d7e61e0fa4bdbf0455897cca458f4a321ef8d3be Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Wed, 28 Jun 2023 08:50:10 +0300 Subject: [PATCH] RED-6575- Failed report generation after upload KMS Certificate - add convert method for the certificate, entity uses byte[] and the model has the certificate as string --- .../DigitalSignatureInternalController.java | 2 +- .../service/DigitalSignatureKmsService.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-internal-api-impl-v1/src/main/java/com/iqser/red/service/persistence/v1/internal/api/controller/DigitalSignatureInternalController.java b/persistence-service-v1/persistence-service-internal-api-impl-v1/src/main/java/com/iqser/red/service/persistence/v1/internal/api/controller/DigitalSignatureInternalController.java index 29219acee..5cbafa265 100644 --- a/persistence-service-v1/persistence-service-internal-api-impl-v1/src/main/java/com/iqser/red/service/persistence/v1/internal/api/controller/DigitalSignatureInternalController.java +++ b/persistence-service-v1/persistence-service-internal-api-impl-v1/src/main/java/com/iqser/red/service/persistence/v1/internal/api/controller/DigitalSignatureInternalController.java @@ -43,7 +43,7 @@ public class DigitalSignatureInternalController implements DigitalSignatureResou @Override public DigitalSignatureKms getDigitalSignatureKms() { - return convert(digitalSignatureKmsService.getDigitalSignature(), DigitalSignatureKms.class); + return digitalSignatureKmsService.convert(digitalSignatureKmsService.getDigitalSignature()); } } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureKmsService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureKmsService.java index 4817709e7..4e448accf 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureKmsService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureKmsService.java @@ -92,6 +92,18 @@ public class DigitalSignatureKmsService { 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) { @@ -106,4 +118,6 @@ public class DigitalSignatureKmsService { .build(); } + + }