fix(TransferProcessApi): fix transfomer for TransferProcessDto (#3122)

* fix(TransferProcessApi): fix transfomer for TransferProcessDto * fix(TransferProcessApi): fix test * fix(TransferProcessApi): consistent replace CallbackAddressDto with CallbackAddress
eclipse-edc · May 30, 2023 · e2e84ce · e2e84ce
1 parent 62d2ae9
commit e2e84ce
Show file tree

Hide file tree

Showing 26 changed files with 78 additions and 425 deletions.
diff --git a/extensions/common/api/api-core/src/main/java/org/eclipse/edc/api/ApiCoreExtension.java b/extensions/common/api/api-core/src/main/java/org/eclipse/edc/api/ApiCoreExtension.java
@@ -15,7 +15,6 @@
 package org.eclipse.edc.api;
 
 import jakarta.json.Json;
-import org.eclipse.edc.api.transformer.CallbackAddressDtoToCallbackAddressTransformer;
 import org.eclipse.edc.api.transformer.CriterionDtoToCriterionTransformer;
 import org.eclipse.edc.api.transformer.CriterionToCriterionDtoTransformer;
 import org.eclipse.edc.api.transformer.DataAddressDtoToDataAddressTransformer;
@@ -24,7 +23,7 @@
 import org.eclipse.edc.api.transformer.JsonObjectFromCriterionDtoTransformer;
 import org.eclipse.edc.api.transformer.JsonObjectFromDataAddressDtoTransformer;
 import org.eclipse.edc.api.transformer.JsonObjectFromIdResponseDtoTransformer;
-import org.eclipse.edc.api.transformer.JsonObjectToCallbackAddressDtoTransformer;
+import org.eclipse.edc.api.transformer.JsonObjectToCallbackAddressTransformer;
 import org.eclipse.edc.api.transformer.JsonObjectToCriterionDtoTransformer;
 import org.eclipse.edc.api.transformer.QuerySpecDtoToQuerySpecTransformer;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
@@ -59,7 +58,6 @@ public void initialize(ServiceExtensionContext context) {
         transformerRegistry.register(new QuerySpecDtoToQuerySpecTransformer());
         transformerRegistry.register(new CriterionToCriterionDtoTransformer());
         transformerRegistry.register(new CriterionDtoToCriterionTransformer());
-        transformerRegistry.register(new CallbackAddressDtoToCallbackAddressTransformer());
         transformerRegistry.register(new DataAddressDtoToDataAddressTransformer());
         transformerRegistry.register(new DataAddressToDataAddressDtoTransformer());
 
@@ -71,7 +69,7 @@ public void initialize(ServiceExtensionContext context) {
         transformerRegistry.register(new JsonObjectFromDataAddressDtoTransformer(jsonFactory));
         transformerRegistry.register(new JsonObjectFromIdResponseDtoTransformer(jsonFactory));
 
-        transformerRegistry.register(new JsonObjectToCallbackAddressDtoTransformer());
+        transformerRegistry.register(new JsonObjectToCallbackAddressTransformer());
         transformerRegistry.register(new JsonObjectToCriterionDtoTransformer());
     }
 }
diff --git a/...sions/common/api/api-core/src/main/java/org/eclipse/edc/api/model/CallbackAddressDto.java b/...sions/common/api/api-core/src/main/java/org/eclipse/edc/api/model/CallbackAddressDto.java
diff --git a/.../java/org/eclipse/edc/api/transformer/CallbackAddressDtoToCallbackAddressTransformer.java b/.../java/org/eclipse/edc/api/transformer/CallbackAddressDtoToCallbackAddressTransformer.java
diff --git a/...bjectToCallbackAddressDtoTransformer.java → ...onObjectToCallbackAddressTransformer.java b/...bjectToCallbackAddressDtoTransformer.java → ...onObjectToCallbackAddressTransformer.java
@@ -16,8 +16,8 @@
 
 import jakarta.json.JsonObject;
 import jakarta.json.JsonValue;
-import org.eclipse.edc.api.model.CallbackAddressDto;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;
+import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
 import org.eclipse.edc.transform.spi.TransformerContext;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -30,22 +30,22 @@
 import static org.eclipse.edc.spi.types.domain.callback.CallbackAddress.IS_TRANSACTIONAL;
 import static org.eclipse.edc.spi.types.domain.callback.CallbackAddress.URI;
 
-public class JsonObjectToCallbackAddressDtoTransformer extends AbstractJsonLdTransformer<JsonObject, CallbackAddressDto> {
+public class JsonObjectToCallbackAddressTransformer extends AbstractJsonLdTransformer<JsonObject, CallbackAddress> {
 
-    public JsonObjectToCallbackAddressDtoTransformer() {
-        super(JsonObject.class, CallbackAddressDto.class);
+    public JsonObjectToCallbackAddressTransformer() {
+        super(JsonObject.class, CallbackAddress.class);
     }
 
     @Override
-    public @Nullable CallbackAddressDto transform(@NotNull JsonObject jsonObject, @NotNull TransformerContext context) {
-        var builder = CallbackAddressDto.Builder.newInstance();
+    public @Nullable CallbackAddress transform(@NotNull JsonObject jsonObject, @NotNull TransformerContext context) {
+        var builder = CallbackAddress.Builder.newInstance();
 
         visitProperties(jsonObject, (key, value) -> setProperties(key, value, builder, context));
 
         return builder.build();
     }
 
-    private void setProperties(String key, JsonValue value, CallbackAddressDto.Builder builder, TransformerContext context) {
+    private void setProperties(String key, JsonValue value, CallbackAddress.Builder builder, TransformerContext context) {
         switch (key) {
             case IS_TRANSACTIONAL:
                 builder.transactional(transformBoolean(value, context));

diff --git a/...s/common/api/api-core/src/test/java/org/eclipse/edc/api/model/CallbackAddressDtoTest.java b/...s/common/api/api-core/src/test/java/org/eclipse/edc/api/model/CallbackAddressDtoTest.java
diff --git a/...pi/api-core/src/test/java/org/eclipse/edc/api/model/CallbackAddressDtoValidationTest.java b/...pi/api-core/src/test/java/org/eclipse/edc/api/model/CallbackAddressDtoValidationTest.java
diff --git a/...a/org/eclipse/edc/api/transformer/CallbackAddressDtoToCallbackAddressTransformerTest.java b/...a/org/eclipse/edc/api/transformer/CallbackAddressDtoToCallbackAddressTransformerTest.java