feat(impl):[#370] fix pmd

eclipse-tractusx · Jan 31, 2024 · d9fc950 · d9fc950
1 parent b3915c0
commit d9fc950
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java
@@ -49,6 +49,7 @@
 import org.eclipse.tractusx.irs.services.validation.SchemaNotFoundException;
 import org.eclipse.tractusx.irs.services.validation.ValidationResult;
 import org.eclipse.tractusx.irs.util.JsonUtil;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.web.client.RestClientException;
 
 /**
@@ -122,13 +123,13 @@ private List<Submodel> getSubmodels(final SubmodelDescriptor submodelDescriptor,
                 final org.eclipse.tractusx.irs.edc.client.model.SubmodelDescriptor submodel = requestSubmodel(
                         submodelFacade, connectorEndpointsService, endpoint, bpn);
                 final String submodelRawPayload = submodel.getPayload();
-                final String cid = auditContractNegotiation ? submodel.getCid() : null;
+                final String contractAgreementId = getContractAgreementId(auditContractNegotiation, submodel);
 
                 final ValidationResult validationResult = jsonValidatorService.validate(jsonSchema, submodelRawPayload);
 
                 if (validationResult.isValid()) {
                     submodels.add(Submodel.from(submodelDescriptor.getId(), submodelDescriptor.getAspectType(),
-                            cid, jsonUtil.fromString(submodelRawPayload, Map.class)));
+                            contractAgreementId, jsonUtil.fromString(submodelRawPayload, Map.class)));
                 } else {
                     final String errors = String.join(", ", validationResult.getValidationErrors());
                     itemContainerBuilder.tombstone(Tombstone.from(itemId, endpoint.getProtocolInformation().getHref(),
@@ -156,4 +157,10 @@ private List<Submodel> getSubmodels(final SubmodelDescriptor submodelDescriptor,
         return submodels;
     }
 
+    @Nullable
+    private String getContractAgreementId(final boolean auditContractNegotiation,
+            final org.eclipse.tractusx.irs.edc.client.model.SubmodelDescriptor submodel) {
+        return auditContractNegotiation ? submodel.getCid() : null;
+    }
+
 }