feat(edc-client): refactoring after review

catenax-ng · May 6, 2024 · 787324e · 787324e
1 parent a98cbe1
commit 787324e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/EdcCallbackController.java b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/EdcCallbackController.java
@@ -35,8 +35,8 @@
 import org.eclipse.tractusx.irs.edc.client.exceptions.EdcClientException;
 import org.eclipse.tractusx.irs.edc.client.model.edr.DataAddress;
 import org.eclipse.tractusx.irs.edc.client.model.edr.EndpointDataReferenceCallback;
-import org.eclipse.tractusx.irs.edc.client.model.edr.Payload;
 import org.eclipse.tractusx.irs.edc.client.model.edr.Properties;
+import org.eclipse.tractusx.irs.edc.client.model.edr.TransferProcessCallbackPayload;
 import org.eclipse.tractusx.irs.edc.client.util.Masker;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -81,7 +81,8 @@ private static EndpointDataReference mapToEndpointDataReference(final String end
         try {
             final EndpointDataReferenceCallback endpointDataReferenceCallback = StringMapper.mapFromString(
                     endpointDataReference, EndpointDataReferenceCallback.class);
-            final Payload payload = Optional.ofNullable(endpointDataReferenceCallback.getPayload()).orElseThrow();
+            final TransferProcessCallbackPayload payload = Optional.ofNullable(
+                    endpointDataReferenceCallback.getPayload()).orElseThrow();
             final DataAddress dataAddress = Optional.ofNullable(payload.dataAddress()).orElseThrow();
             final Properties properties = Optional.ofNullable(dataAddress.properties()).orElseThrow();
 

diff --git a/...ain/java/org/eclipse/tractusx/irs/edc/client/model/edr/EndpointDataReferenceCallback.java b/...ain/java/org/eclipse/tractusx/irs/edc/client/model/edr/EndpointDataReferenceCallback.java
@@ -35,7 +35,7 @@ public class EndpointDataReferenceCallback {
     private String callbackId;
     @JsonProperty("at")
     private long createdAt;
-    private Payload payload;
+    private TransferProcessCallbackPayload payload;
     private String type;
 }
 
diff --git a/...usx/irs/edc/client/model/edr/Payload.java → ...l/edr/TransferProcessCallbackPayload.java b/...usx/irs/edc/client/model/edr/Payload.java → ...l/edr/TransferProcessCallbackPayload.java
@@ -36,10 +36,10 @@
  */
 @Builder
 @Jacksonized
-public record Payload(String transferProcessId,
-                      List<CallbackAddress> callbackAddresses,
-                      String assetId,
-                      String type,
-                      String contractId,
-                      DataAddress dataAddress) {
+public record TransferProcessCallbackPayload(String transferProcessId,
+                                             List<CallbackAddress> callbackAddresses,
+                                             String assetId,
+                                             String type,
+                                             String contractId,
+                                             DataAddress dataAddress) {
 }
diff --git a/...-client/src/main/java/org/eclipse/tractusx/irs/edc/client/transformer/EdcTransformer.java b/...-client/src/main/java/org/eclipse/tractusx/irs/edc/client/transformer/EdcTransformer.java
@@ -65,6 +65,7 @@
 import org.eclipse.edc.protocol.dsp.negotiation.transform.from.JsonObjectFromContractNegotiationTransformer;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.spi.types.domain.asset.Asset;
+import org.eclipse.edc.transform.spi.TransformerContext;
 import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
 import org.eclipse.tractusx.irs.edc.client.model.ContractOfferDescription;
 import org.eclipse.tractusx.irs.edc.client.model.NegotiationRequest;
@@ -85,7 +86,7 @@ public class EdcTransformer {
     private final JsonObjectFromContractOfferDescriptionTransformer jsonObjectFromContractOfferDescriptionTransformer;
     private final JsonObjectFromCatalogRequestTransformer jsonObjectFromCatalogRequestTransformer;
     private final TitaniumJsonLd titaniumJsonLd;
-    private final TransformerContextImpl transformerContext;
+    private final TransformerContext transformerContext;
     private final JsonObjectFromAssetTransformer jsonObjectFromAssetTransformer;
     private final JsonObjectToIrsPolicyTransformer jsonObjectToIrsPolicyTransformer;