Merge pull request #126 from commercetools/refactor_objectmapper

Author: jenschude

commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/MiddlewareTest.java

@@ -19,7 +19,6 @@
 import io.vrap.rmf.base.client.error.NotFoundException;
 import io.vrap.rmf.base.client.http.RetryMiddleware;
 import io.vrap.rmf.base.client.oauth2.ClientCredentials;
-import io.vrap.rmf.base.client.oauth2.ClientCredentialsTokenSupplier;
 
 import org.assertj.core.api.Assertions;
 import org.assertj.core.util.Lists;
@@ -61,7 +60,7 @@ public void testUnauthorizedToken() throws ExecutionException, InterruptedExcept
                 .build();
 
         VrapHttpClient httpClient = HttpClientSupplier.of().get();
-        ApiHttpClient client = ClientFactory.create(ServiceRegion.GCP_EUROPE_WEST1.getApiUrl(), new VrapHttpClient() {
+        ApiHttpClient client = ClientBuilder.of(new VrapHttpClient() {
             private boolean firstCall = true;
 
             @Override
@@ -73,8 +72,10 @@ public CompletableFuture<ApiHttpResponse<byte[]>> execute(ApiHttpRequest request
                 }
                 return httpClient.execute(request);
             }
-        }, new ClientCredentialsTokenSupplier(credentials.getClientId(), credentials.getClientSecret(),
-            credentials.getScopes(), ServiceRegion.GCP_EUROPE_WEST1.getOAuthTokenUrl(), HttpClientSupplier.of().get()));
+        })
+                .defaultClient(ServiceRegion.GCP_EUROPE_WEST1.getApiUrl())
+                .withClientCredentials(credentials, ServiceRegion.GCP_EUROPE_WEST1.getOAuthTokenUrl(), httpClient)
+                .build();
 
         final ApiHttpRequest request = new ApiHttpRequest(ApiHttpMethod.GET,
             URI.create("/" + CommercetoolsTestUtils.getProjectKey() + "/"), new ApiHttpHeaders(), null);

commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/custom_object/CustomObjectFixtures.java

@@ -8,8 +8,7 @@
 import com.commercetools.api.models.custom_object.CustomObjectDraft;
 import com.commercetools.api.models.custom_object.CustomObjectDraftBuilder;
 import commercetools.utils.CommercetoolsTestUtils;
-
-import io.vrap.rmf.base.client.utils.json.JsonUtils;
+import commercetools.utils.ValueObject;
 
 import org.junit.Assert;
 
@@ -31,7 +30,7 @@ public static CustomObject createCustomObject() {
         CustomObjectDraft customObjectDraft = CustomObjectDraftBuilder.of()
                 .container("a")
                 .key(CommercetoolsTestUtils.randomKey())
-                .value(JsonUtils.getConfiguredObjectMapper().createObjectNode().put("value", "val"))
+                .value((ValueObject) () -> "val")
                 .build();
 
         CustomObject customObject = CommercetoolsTestUtils.getProjectRoot()

commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/custom_object/CustomObjectIntegrationTests.java

@@ -8,6 +8,7 @@
 import com.commercetools.api.models.custom_object.CustomObjectDraftBuilder;
 import com.commercetools.api.models.custom_object.CustomObjectPagedQueryResponse;
 import commercetools.utils.CommercetoolsTestUtils;
+import commercetools.utils.ValueObject;
 
 import io.vrap.rmf.base.client.utils.json.JsonUtils;
 
@@ -46,7 +47,7 @@ public void update() {
             CustomObjectDraft customObjectDraft = CustomObjectDraftBuilder.of()
                     .key(customObject.getKey())
                     .container(customObject.getContainer())
-                    .value(JsonUtils.getConfiguredObjectMapper().createObjectNode().put("value", "val"))
+                    .value((ValueObject) () -> "foo")
                     .build();
 
             CustomObject updatedCustomObject = CommercetoolsTestUtils.getProjectRoot()
@@ -56,7 +57,29 @@ public void update() {
                     .getBody();
 
             Assert.assertNotNull(updatedCustomObject);
-            Assert.assertEquals(((Map<String, Object>) updatedCustomObject.getValue()).get("value"), "val");
+            Assert.assertEquals(((Map<String, Object>) updatedCustomObject.getValue()).get("value"), "foo");
+
+            return updatedCustomObject;
+        });
+    }
+
+    @Test
+    public void updateWithJsonNode() {
+        CustomObjectFixtures.withUpdateableCustomObject(customObject -> {
+            CustomObjectDraft customObjectDraft = CustomObjectDraftBuilder.of()
+                    .key(customObject.getKey())
+                    .container(customObject.getContainer())
+                    .value(JsonUtils.getConfiguredObjectMapper().createObjectNode().put("value", "foo"))
+                    .build();
+
+            CustomObject updatedCustomObject = CommercetoolsTestUtils.getProjectRoot()
+                    .customObjects()
+                    .post(customObjectDraft)
+                    .executeBlocking()
+                    .getBody();
+
+            Assert.assertNotNull(updatedCustomObject);
+            Assert.assertEquals(((Map<String, Object>) updatedCustomObject.getValue()).get("value"), "foo");
 
             return updatedCustomObject;
         });

commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/me/MyCartsIntegrationTests.java

@@ -12,10 +12,7 @@
 import com.commercetools.api.models.me.MyCartDraftBuilder;
 import commercetools.utils.CommercetoolsTestUtils;
 
-import io.vrap.rmf.base.client.ApiHttpClient;
-import io.vrap.rmf.base.client.ClientFactory;
-import io.vrap.rmf.base.client.HttpClientSupplier;
-import io.vrap.rmf.base.client.VrapHttpClient;
+import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.oauth2.AnonymousSessionTokenSupplier;
 import io.vrap.rmf.base.client.oauth2.StaticTokenSupplier;
 
@@ -35,8 +32,10 @@ public void signInWithAnonymousCartWithNewActiveCart() throws ExecutionException
         final StaticTokenSupplier staticTokenSupplier = new StaticTokenSupplier(
             anonymousSessionTokenSupplier.getToken().get());
 
-        final ApiHttpClient apiAnonymousHttpClient = ClientFactory
-                .create("https://api.europe-west1.gcp.commercetools.com/", vrapHttpClient, staticTokenSupplier);
+        final ApiHttpClient apiAnonymousHttpClient = ClientBuilder.of(vrapHttpClient)
+                .withApiBaseUrl("https://api.europe-west1.gcp.commercetools.com/")
+                .withTokenSupplier(staticTokenSupplier)
+                .build();
         ApiRoot apiAnonymousRoot = ApiFactory.create(() -> apiAnonymousHttpClient);
 
         MyCartDraft anonymousMyCartDraft = MyCartDraftBuilder.of().currency("EUR").country("DE").build();

commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/misc/ModelSerializationTest.java

@@ -15,27 +15,27 @@
 import com.commercetools.api.models.category.*;
 import com.commercetools.api.models.common.*;
 import com.commercetools.api.models.type.*;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 
 import io.vrap.rmf.base.client.utils.json.JsonUtils;
 
+import org.json.JSONException;
 import org.junit.Assert;
 import org.junit.Test;
+import org.skyscreamer.jsonassert.JSONAssert;
 
 public class ModelSerializationTest {
 
     @Test
-    public void serializeCategoryDraftToJson() {
+    public void serializeCategoryDraftToJson() throws IOException, JSONException {
         LocalizedString localizedString = new LocalizedStringImpl();
         localizedString.setValue("test-key", "test-value");
         String key = "test-key";
         String id = "test-id";
         String testString = "test-string";
 
         Map<String, Object> fieldContainerValues = new HashMap<>();
-        fieldContainerValues.put(key, JsonUtils.getConfiguredObjectMapper().createObjectNode().put("val", testString));
+        fieldContainerValues.put(key, testString);
         FieldContainer fieldContainer = FieldContainerBuilder.of().values(fieldContainerValues).build();
 
         AssetDraft assetDraft = AssetDraftBuilder.of()
@@ -71,26 +71,11 @@ public void serializeCategoryDraftToJson() {
                 .slug(localizedString)
                 .build();
 
-        JsonElement categoryDraftJson = null;
-        try {
-            categoryDraftJson = JsonParser.parseString(JsonUtils.toJsonString(categoryDraft));
-        }
-        catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            final URL url = Thread.currentThread()
-                    .getContextClassLoader()
-                    .getResource("json_examples/category-draft-example.json");
-            JsonElement categoryDraftExample = JsonParser
-                    .parseString(new String(Files.readAllBytes(Paths.get(url.getPath()))));
-            Assert.assertEquals(categoryDraftExample, categoryDraftJson);
-        }
-        catch (IOException e) {
-            e.printStackTrace();
-            Assert.fail(e.getMessage());
-        }
+        final URL url = Thread.currentThread()
+                .getContextClassLoader()
+                .getResource("json_examples/category-draft-example.json");
+        JSONAssert.assertEquals(new String(Files.readAllBytes(Paths.get(url.getPath()))),
+            JsonUtils.toJsonString(categoryDraft), true);
     }
 
     @Test

commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/utils/ValueObject.java

@@ -0,0 +1,6 @@
+
+package commercetools.utils;
+
+public interface ValueObject {
+    String getValue();
+}

commercetools/commercetools-sdk-java-api/src/integrationTest/resources/json_examples/category-draft-example.json

@@ -17,9 +17,7 @@
       ],
       "custom": {
         "fields": {
-          "test-key": {
-            "val": "test-string"
-          }
+          "test-key": "test-string"
         },
         "type": {
           "key": "string type",
@@ -45,9 +43,7 @@
   "orderHint": "test-string",
   "custom": {
     "fields": {
-      "test-key": {
-        "val": "test-string"
-      }
+      "test-key": "test-string"
     },
     "type": {
       "key": "string type",

commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/client/ApiInternalLoggerFactory.java

@@ -3,13 +3,13 @@
 
 import io.vrap.rmf.base.client.ApiHttpMethod;
 import io.vrap.rmf.base.client.ApiHttpRequest;
-import io.vrap.rmf.base.client.ClientFactory;
+import io.vrap.rmf.base.client.ClientBuilder;
 import io.vrap.rmf.base.client.http.InternalLogger;
 
 public class ApiInternalLoggerFactory {
 
     public static InternalLogger get(final ApiHttpRequest httpRequest, final String topic) {
-        return InternalLogger.getLogger(ClientFactory.COMMERCETOOLS + "." + getPathElement(httpRequest) + "." + topic
+        return InternalLogger.getLogger(ClientBuilder.COMMERCETOOLS + "." + getPathElement(httpRequest) + "." + topic
                 + (topic.equals("request") ? "." + requestOrCommandScopeSegment(httpRequest) : ""));
     }
 

commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/defaultconfig/ApiFactory.java

@@ -9,14 +9,10 @@
 
 import com.commercetools.api.client.*;
 
-import io.vrap.rmf.base.client.ApiHttpClient;
-import io.vrap.rmf.base.client.ClientFactory;
-import io.vrap.rmf.base.client.HttpClientSupplier;
-import io.vrap.rmf.base.client.VrapHttpClient;
+import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.http.CorrelationIdProvider;
 import io.vrap.rmf.base.client.http.Middleware;
 import io.vrap.rmf.base.client.oauth2.ClientCredentials;
-import io.vrap.rmf.base.client.oauth2.ClientCredentialsTokenSupplier;
 
 public class ApiFactory {
 
@@ -155,19 +151,25 @@ public static ApiHttpClient defaultClient(final VrapHttpClient httpClient, final
     public static ApiHttpClient defaultClient(final Supplier<VrapHttpClient> httpClientSupplier,
             final ClientCredentials credentials, final String tokenEndpoint, final String apiEndpoint,
             final List<Middleware> middlewares, @Nullable final CorrelationIdProvider correlationIdProvider) {
-        return ClientFactory.create(apiEndpoint, httpClientSupplier.get(),
-            new ClientCredentialsTokenSupplier(credentials.getClientId(), credentials.getClientSecret(),
-                credentials.getScopes(), tokenEndpoint, httpClientSupplier.get()),
-            ApiInternalLoggerFactory::get, middlewares, correlationIdProvider);
+        return ClientBuilder.of(httpClientSupplier.get())
+                .defaultClient(apiEndpoint)
+                .withClientCredentials(credentials, tokenEndpoint)
+                .withInternalLoggerFactory(ApiInternalLoggerFactory::get)
+                .addCorrelationIdProvider(correlationIdProvider)
+                .addMiddlewares(middlewares)
+                .build();
     }
 
     public static ApiHttpClient defaultClient(final Supplier<VrapHttpClient> httpClientSupplier,
             final ClientCredentials credentials, final String tokenEndpoint, final String apiEndpoint,
             final Supplier<String> userAgentSupplier, final List<Middleware> middlewares,
             @Nullable final CorrelationIdProvider correlationIdProvider) {
-        return ClientFactory.create(apiEndpoint, httpClientSupplier.get(),
-            new ClientCredentialsTokenSupplier(credentials.getClientId(), credentials.getClientSecret(),
-                credentials.getScopes(), tokenEndpoint, httpClientSupplier.get()),
-            ApiInternalLoggerFactory::get, userAgentSupplier, middlewares, correlationIdProvider);
+        return ClientBuilder.of(httpClientSupplier.get())
+                .defaultClient(apiEndpoint, credentials, tokenEndpoint)
+                .withInternalLoggerFactory(ApiInternalLoggerFactory::get)
+                .withUserAgentSupplier(userAgentSupplier)
+                .addCorrelationIdProvider(correlationIdProvider)
+                .addMiddlewares(middlewares)
+                .build();
     }
 }

commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/ApiModule.java

@@ -1,17 +1,27 @@
 
 package com.commercetools.api.json;
 
+import java.util.Optional;
+
 import com.commercetools.api.models.product.AttributeImpl;
 import com.commercetools.api.models.review.Review;
 import com.commercetools.api.models.type.FieldContainerImpl;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
+import io.vrap.rmf.base.client.utils.json.modules.ModuleOptions;
+
 public class ApiModule extends SimpleModule {
     private static final long serialVersionUID = 0L;
 
-    public ApiModule() {
-        addDeserializer(AttributeImpl.class, new AtrributeDeserializer());
-        addDeserializer(FieldContainerImpl.class, new CustomFieldDeserializer());
+    public ApiModule(ModuleOptions options) {
+        boolean attributeAsDateString = Boolean.parseBoolean(
+            Optional.ofNullable(options.getOption(ApiModuleOptions.DESERIALIZE_DATE_ATTRIBUTE_AS_STRING))
+                    .orElse(System.getProperty(ApiModuleOptions.DESERIALIZE_DATE_ATTRIBUTE_AS_STRING)));
+        boolean customFieldAsDateString = Boolean
+                .parseBoolean(Optional.ofNullable(options.getOption(ApiModuleOptions.DESERIALIZE_DATE_FIELD_AS_STRING))
+                        .orElse(System.getProperty(ApiModuleOptions.DESERIALIZE_DATE_FIELD_AS_STRING)));
+        addDeserializer(AttributeImpl.class, new AtrributeDeserializer(attributeAsDateString));
+        addDeserializer(FieldContainerImpl.class, new CustomFieldDeserializer(customFieldAsDateString));
         setMixInAnnotation(Review.class, ReviewMixin.class);
     }
 }