Merge branch 'development'

# Conflicts:
#	src/main/java/com/github/jonpereiradev/diffobjects/builder/DiffQueryBuilderImpl.java
#	src/test/java/com/github/jonpereiradev/diffobjects/builder/DiffBuilderTest.java
#	src/test/java/com/github/jonpereiradev/diffobjects/strategy/BaseStrategyTest.java

Author: Jonathan Pereira

README.md

@@ -1,13 +1,14 @@
 # Diff Objects
 
-This project helps you to build functionalities that needs to show the differences between two objects.
+This project helps you to build functionalities that needs to show the differences between two objects. You can use 
+this project in two ways:
 
-You can use this project in two ways, using annotations or a Builder to map the properties of the object that will be
-checked for difference.
+- using the annotations @DiffMappings, @DiffMapping and @DiffProperty;
+- using the DiffBuilder to map the properties of a class;
 
 ## DiffBuilder
 
-The DiffBuilder provide an API to map an object without the use of annotations:
+The DiffBuilder provides an API to map an object without the use of annotations:
 
 **Example**
 
@@ -44,12 +45,11 @@ public class Main {
         u1.getEmails().add(new Email("user@gmail.com", true));
         u2.getEmails().add(new Email("user@gmail.com", false));
         
-        DiffConfiguration configuration = DiffBuilder.map(User.class)
-            .mapper()
-            .mappingAll()
-            .mapper()
+        DiffConfiguration configuration = DiffBuilder
+            .map(User.class)
+            .mapping("login")
+            .mapping("password")
             .mapping("emails", "description")
-            .instance()
             .configuration();
         
         List<DiffResult> diffs = DiffObjects.diff(u1, u2, configuration);
@@ -69,9 +69,9 @@ public class Main {
 
 The annotations provided by the diff objects are:
 
-- DiffMapping - to map a method of the object;
-- DiffMappings - to map multiple properties of an object relationship;
-- DiffProperty - to add properties that will be on the diff result for access;
+- __DiffMappings:__ to map multiple properties of an object relationship;
+- __DiffMapping:__ to map a method of an object;
+- __DiffProperty:__ to add properties that will be on the diff result for access;
 
 **Example**
 
@@ -181,4 +181,4 @@ public class Main {
 ## Future implementations
 
 - Enable only different object for diff result;
-- Collection with value working with navigate properties like "emails.principal.description";
+- Collection with value working with nested fields (Ex: "emails.principal.description");

src/main/java/com/github/jonpereiradev/diffobjects/DiffObjects.java

@@ -3,7 +3,7 @@
 
 import com.github.jonpereiradev.diffobjects.builder.DiffConfiguration;
 import com.github.jonpereiradev.diffobjects.strategy.DiffMetadata;
-import com.github.jonpereiradev.diffobjects.strategy.DiffReflections;
+import com.github.jonpereiradev.diffobjects.builder.DiffReflections;
 import com.github.jonpereiradev.diffobjects.strategy.DiffStrategy;
 import java.util.ArrayList;
 

src/main/java/com/github/jonpereiradev/diffobjects/builder/DiffBuilder.java

@@ -4,6 +4,7 @@
 import com.github.jonpereiradev.diffobjects.DiffException;
 import com.github.jonpereiradev.diffobjects.strategy.DiffMetadata;
 
+import java.lang.reflect.Field;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -13,20 +14,19 @@
  * Responsible to map a class and fields to be able to generate diffs.
  *
  * @author Jonathan Pereira
- * @since 1.0
- *
  * @see DiffInstanceBuilder
  * @see DiffMappingBuilder
  * @see DiffConfiguration
+ * @since 1.0
  */
 public final class DiffBuilder implements DiffInstanceBuilder {
 
+    private final Class<?> classMap;
     private final Map<String, DiffMetadata> metadatas;
-    private final DiffMappingBuilder diffMappingBuilder;
 
     private DiffBuilder(Class<?> classMap) {
+        this.classMap = classMap;
         this.metadatas = new LinkedHashMap<>();
-        this.diffMappingBuilder = new DiffMappingBuilderImpl(classMap, metadatas, this);
     }
 
     /**
@@ -35,45 +35,58 @@ private DiffBuilder(Class<?> classMap) {
      * @param clazz the class that will be registry to make diffs.
      * @return the diff instance instance.
      */
-    public static DiffInstanceBuilder map(Class<?> clazz) {
+    public static DiffBuilder map(Class<?> clazz) {
         Objects.requireNonNull(clazz, "Class is required.");
         return new DiffBuilder(clazz);
     }
 
     /**
-     * Gets the mapping instance to registry the fields used in the diff.
+     * Maps all the field of a class.
      *
-     * @return a mapping instance instance.
+     * @return the instance instance responsible for this mapping.
      */
     @Override
-    public DiffMappingBuilder mapper() {
-        return diffMappingBuilder;
+    public DiffMappingAllBuilder mappingAll() {
+        Class<?> clazz = classMap;
+
+        while (clazz != null && !clazz.equals(Object.class)) {
+            for (Field parentField : clazz.getDeclaredFields()) {
+                if (!metadatas.containsKey(parentField.getName())) {
+                    mapping(parentField.getName());
+                }
+            }
+
+            clazz = clazz.getSuperclass();
+        }
+
+        return new DiffMappingAllBuilderImpl(metadatas);
     }
 
     /**
-     * Finds a mapping in the builder to make operations.
+     * Maps the getter of the field for the class.
      *
-     * @param field the name of the field mapped in the builder.
-     * @return the instance of this mapping.
+     * @param field name of the field that will me used to find the getter method.
+     * @return the instance of this mapping instance.
      */
     @Override
-    public DiffQueryBuilder query(String field) {
-        DiffMetadata diffMetadata = metadatas.get(field);
-
-        if (diffMetadata == null) {
-            throw new DiffException("No field \"" + field + "\" mapped in builder. You need to map the field before query.");
-        }
-
-        return new DiffQueryBuilderImpl(diffMetadata, this);
+    public DiffQueryMappingBuilder mapping(String field) {
+        return new DiffMappingBuilderImpl(classMap, metadatas).mapping(field);
     }
 
     /**
-     * Gets the configuration instance to get the configuration generated by this instance instance.
+     * Maps the getter of the field for the class with the value property to allow deep diff.
      *
-     * @return a configuration instance instance.
+     * @param field name of the field that will me used to find the getter method.
+     * @param value the nested property of the object to make the diff.
+     * @return the instance of this mapping instance.
+     * @throws DiffException throw if the field doesn't have a public no args method for the field.
      */
     @Override
-    public DiffConfiguration configuration() {
-        return new DiffConfigurationImpl(metadatas);
+    public DiffQueryMappingBuilder mapping(String field, String value) {
+        return new DiffMappingBuilderImpl(classMap, metadatas).mapping(field, value);
+    }
+
+    Map<String, DiffMetadata> getMetadatas() {
+        return metadatas;
     }
 }

src/main/java/com/github/jonpereiradev/diffobjects/builder/DiffConfiguration.java

@@ -10,11 +10,10 @@
  * Responsible for generate the configuration of the instance.
  *
  * @author Jonathan Pereira
- * @since 1.0
- *
  * @see DiffBuilder
  * @see DiffInstanceBuilder
  * @see DiffMappingBuilder
+ * @since 1.0
  */
 public interface DiffConfiguration {
 

src/main/java/com/github/jonpereiradev/diffobjects/builder/DiffConfigurationImpl.java

@@ -14,11 +14,10 @@
  * Responsible for generate the configuration of the instance.
  *
  * @author Jonathan Pereira
- * @since 1.0
- *
  * @see DiffBuilder
  * @see DiffInstanceBuilder
  * @see DiffMappingBuilder
+ * @since 1.0
  */
 final class DiffConfigurationImpl implements DiffConfiguration {
 

src/main/java/com/github/jonpereiradev/diffobjects/builder/DiffInstanceBuilder.java

@@ -5,34 +5,35 @@
  * Builder with the methods of a instance instance.
  *
  * @author Jonathan Pereira
- * @since 1.0
- *
  * @see DiffBuilder
  * @see DiffMappingBuilder
  * @see DiffConfiguration
+ * @since 1.0
  */
 public interface DiffInstanceBuilder {
 
     /**
-     * Gets the mapping instance to registry the fields used in the diff.
+     * Maps all the field of a class.
      *
-     * @return a mapping instance instance.
+     * @return the instance responsible for this mapping.
      */
-    DiffMappingBuilder mapper();
+    DiffMappingAllBuilder mappingAll();
 
     /**
-     * Gets the object responsible for query mappings for change.
+     * Maps the getter of the field for the class.
      *
-     * @param field the name of the field mapped in the builder.
-     * @return the instance of the builder.
+     * @param field name of the field that will me used to find the getter method.
+     * @return the instance of this mapping.
      */
-    DiffQueryBuilder query(String field);
+    DiffQueryMappingBuilder mapping(String field);
 
     /**
-     * Gets the configuration instance to get the configuration generated by this instance instance.
+     * Maps the getter of the field for the class with the value property to allow deep diff.
      *
-     * @return a configuration instance instance.
+     * @param field name of the field that will me used to find the getter method.
+     * @param value the nested property of the object to make the diff.
+     * @return the instance of this mapping.
      */
-    DiffConfiguration configuration();
+    DiffQueryMappingBuilder mapping(String field, String value);
 
 }

src/main/java/com/github/jonpereiradev/diffobjects/builder/DiffMappingAllBuilder.java

@@ -0,0 +1,30 @@
+package com.github.jonpereiradev.diffobjects.builder;
+
+
+/**
+ * Builder responsible for mapping the fields of a class to create a configuration of diff.
+ *
+ * @author Jonathan Pereira
+ * @see DiffBuilder
+ * @see DiffInstanceBuilder
+ * @see DiffConfiguration
+ * @since 1.0
+ */
+public interface DiffMappingAllBuilder {
+
+    /**
+     * Gets the object responsible for query mappings for change.
+     *
+     * @param field the name of the field mapped in the builder.
+     * @return the instance of the builder.
+     */
+    DiffQueryBuilder query(String field);
+
+    /**
+     * Gets the configuration instance to get the configuration generated by this instance instance.
+     *
+     * @return a configuration instance instance.
+     */
+    DiffConfiguration configuration();
+
+}

src/main/java/com/github/jonpereiradev/diffobjects/builder/DiffMappingAllBuilderImpl.java

@@ -0,0 +1,46 @@
+package com.github.jonpereiradev.diffobjects.builder;
+
+
+import com.github.jonpereiradev.diffobjects.strategy.DiffMetadata;
+
+import java.util.Map;
+
+
+/**
+ * Responsible to map a class and fields to be able to generate diffs.
+ *
+ * @author Jonathan Pereira
+ * @see DiffInstanceBuilder
+ * @see DiffMappingBuilder
+ * @see DiffConfiguration
+ * @since 1.0
+ */
+final class DiffMappingAllBuilderImpl implements DiffMappingAllBuilder {
+
+    private final Map<String, DiffMetadata> metadatas;
+
+    DiffMappingAllBuilderImpl(Map<String, DiffMetadata> metadatas) {
+        this.metadatas = metadatas;
+    }
+
+    /**
+     * Finds a mapping in the builder to make operations.
+     *
+     * @param field the name of the field mapped in the builder.
+     * @return the instance of this mapping.
+     */
+    @Override
+    public DiffQueryBuilder query(String field) {
+        return new DiffQueryBuilderImpl(field, metadatas, this);
+    }
+
+    /**
+     * Gets the configuration instance to get the configuration generated by this instance instance.
+     *
+     * @return a configuration instance instance.
+     */
+    @Override
+    public DiffConfiguration configuration() {
+        return new DiffConfigurationImpl(metadatas);
+    }
+}

src/main/java/com/github/jonpereiradev/diffobjects/builder/DiffMappingBuilder.java

@@ -5,54 +5,35 @@
  * Builder responsible for mapping the fields of a class to create a configuration of diff.
  *
  * @author Jonathan Pereira
- * @since 1.0
- *
  * @see DiffBuilder
  * @see DiffInstanceBuilder
  * @see DiffConfiguration
+ * @since 1.0
  */
 public interface DiffMappingBuilder {
 
-    /**
-     * Returns to the instance to allow the fluent interface.
-     *
-     * @return the instance responsible for this mapping.
-     */
-    DiffInstanceBuilder instance();
-
-    /**
-     * Maps all the field of a class.
-     *
-     * @return the instance responsible for this mapping.
-     */
-    DiffInstanceBuilder mappingAll();
-
     /**
      * Maps the getter of the field for the class.
      *
      * @param field name of the field that will me used to find the getter method.
-     *
      * @return the instance of this mapping.
      */
-    DiffQueryBuilder mapping(String field);
+    DiffQueryMappingBuilder mapping(String field);
 
     /**
-     * Maps the getter of the field for the class with the value property to allow deep diff.
+     * Maps the getter of the field for the class with the nestedField property to allow deep diff.
      *
      * @param field name of the field that will me used to find the getter method.
-     * @param value the nested property of the object to make the diff.
-     *
+     * @param nestedField the nested property of the object to make the diff.
      * @return the instance of this mapping.
      */
-    DiffQueryBuilder mapping(String field, String value);
+    DiffQueryMappingBuilder mapping(String field, String nestedField);
 
     /**
-     * Remove a mapping of the field for the class.
-     *
-     * @param field name of the field that will me used to remove.
+     * Gets the configuration instance to get the configuration generated by this instance instance.
      *
-     * @return the instance of this mapping.
+     * @return a configuration instance instance.
      */
-    DiffMappingBuilder unmapping(String field);
+    DiffConfiguration configuration();
 
 }