Merge 1d5a53d into 014f60e

CHANGELOG.md

@@ -2,11 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+### [2.0.1] 2021.06.23
+#### Changed
+* Fixes an issue that was preventing the transformation of Object type fields
+
 ### [2.0.0] 2021.06.18
 #### Added
 * Increase the jdk version to 15
 * Enables the [Java Record](https://blogs.oracle.com/javamagazine/records-come-to-java) transformation
 
+### [1.7.7] 2021.06.23
+#### Changed
+* Fixes an issue that was preventing the transformation of Object type fields
+
 ### [1.7.6] 2021.01.11
 #### Added
 * Provides new module `bull-bom` that includes all the project modules

bull-bean-transformer/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.hotels.beans</groupId>
         <artifactId>bean-utils-library-parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
 
     <dependencies>

bull-bean-transformer/src/main/java/com/hotels/beans/transformer/TransformerImpl.java

@@ -56,13 +56,18 @@ public class TransformerImpl extends AbstractBeanTransformer {
      * {@inheritDoc}
      */
     @Override
+    @SuppressWarnings("unchecked")
     protected final <T, K> K transform(final T sourceObj, final Class<? extends K> targetClass, final String breadcrumb) {
         final K k;
-        final Optional<Class<?>> builderClass = getBuilderClass(targetClass);
-        if (builderClass.isPresent()) {
-            k = injectThroughBuilder(sourceObj, targetClass, builderClass.get(), breadcrumb);
+        if (targetClass.equals(Object.class)) {
+            k = (K) sourceObj;
         } else {
-            k = injectValues(sourceObj, targetClass, breadcrumb);
+            final Optional<Class<?>> builderClass = getBuilderClass(targetClass);
+            if (builderClass.isPresent()) {
+                k = injectThroughBuilder(sourceObj, targetClass, builderClass.get(), breadcrumb);
+            } else {
+                k = injectValues(sourceObj, targetClass, breadcrumb);
+            }
         }
         if (settings.isValidationEnabled()) {
             validator.validate(k);
@@ -176,7 +181,7 @@ private <T, K> K injectValues(final T sourceObj, final Class<K> targetClass, fin
      * @throws InvalidBeanException {@link InvalidBeanException} if the target object is not compliant with the requirements
      */
     protected <T, K> K handleInjectionException(final T sourceObj, final Class<K> targetClass, final Constructor constructor, final String breadcrumb,
-        final Object[] constructorArgs, final boolean forceConstructorInjection, final Exception e) {
+                                                final Object[] constructorArgs, final boolean forceConstructorInjection, final Exception e) {
         String errorMsg;
         if (!classUtils.areParameterNamesAvailable(constructor)) {
             if (!forceConstructorInjection) {
@@ -447,8 +452,8 @@ private <T, K> Object getFieldValue(final T sourceObj, final String sourceFieldN
      */
     @SuppressWarnings("unchecked")
     private Object getTransformedValue(final FieldTransformer transformerFunction, final Object fieldValue,
-        final Class<?> sourceObjectClass, final String sourceFieldName, final Field field,
-        final boolean isDestinationFieldPrimitiveType, final String breadcrumb) {
+                                       final Class<?> sourceObjectClass, final String sourceFieldName, final Field field,
+                                       final boolean isDestinationFieldPrimitiveType, final String breadcrumb) {
         Object transformedValue = fieldValue;
         if (settings.isPrimitiveTypeConversionEnabled() && isDestinationFieldPrimitiveType) {
             transformedValue = applyPrimitiveTypeConversion(sourceObjectClass, sourceFieldName, field, breadcrumb, transformedValue);
@@ -546,7 +551,7 @@ private FieldTransformer getTransformerFunction(final Field field, final String
      */
     @SuppressWarnings("unchecked")
     private Object applyPrimitiveTypeConversion(final Class<?> sourceObjectClass, final String sourceFieldName,
-        final Field field, final String fieldTransformerKey, final Object fieldValue) {
+                                                final Field field, final String fieldTransformerKey, final Object fieldValue) {
         Object transformedValue = fieldValue;
         FieldTransformer primitiveTypeTransformer = getPrimitiveTypeTransformer(sourceObjectClass, sourceFieldName, field, fieldTransformerKey);
         if (nonNull(primitiveTypeTransformer)) {
@@ -564,7 +569,7 @@ private Object applyPrimitiveTypeConversion(final Class<?> sourceObjectClass, fi
      * @return the default type transformer function
      */
     private FieldTransformer getPrimitiveTypeTransformer(final Class<?> sourceObjectClass, final String sourceFieldName,
-        final Field field, final String fieldTransformerKey) {
+                                                         final Field field, final String fieldTransformerKey) {
         String cacheKey = TRANSFORMER_FUNCTION_CACHE_PREFIX + "-" + field.getDeclaringClass().getName() + "-" + fieldTransformerKey + "-" + field.getName();
         return cacheManager.getFromCache(cacheKey, FieldTransformer.class)
                 .orElseGet(() -> {

bull-bom/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.hotels.beans</groupId>
         <artifactId>bean-utils-library-parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
 
     <dependencies>

bull-common/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.hotels.beans</groupId>
         <artifactId>bean-utils-library-parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
 
     <dependencies>

bull-converter/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.hotels.beans</groupId>
         <artifactId>bean-utils-library-parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
 
     <dependencies>

bull-map-transformer/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <artifactId>bean-utils-library-parent</artifactId>
         <groupId>com.hotels.beans</groupId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
 
     <dependencies>

bull-map-transformer/src/test/java/com/hotels/map/transformer/MapTransformerTest.java

@@ -1,9 +1,12 @@
 /**
  * Copyright (C) 2019-2021 Expedia, Inc.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

bull-report/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>bean-utils-library-parent</artifactId>
         <groupId>com.hotels.beans</groupId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
 
     <properties>

pom.xml

@@ -21,7 +21,7 @@
     <groupId>com.hotels.beans</groupId>
     <artifactId>bean-utils-library-parent</artifactId>
     <url>https://github.com/HotelsDotCom/bull</url>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <inceptionYear>2019</inceptionYear>
     <description>