Merge pull request #3 from mservicetech/develop

GavinChenYan · web-flow · commit 2dcfc4ed499a · 2019-09-10T09:08:39.000-04:00
Develop
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.mservicetech.client.mapping</groupId>
-    <artifactId>client-json-value</artifactId>
+    <artifactId>client-json-mapping</artifactId>
     <version>1.00</version>
 
     <distributionManagement>
diff --git a/src/main/java/com/mservicetech/client/mapping/AnnotationBaseMapperImpl.java b/src/main/java/com/mservicetech/client/mapping/AnnotationBaseMapperImpl.java
@@ -1,29 +1,16 @@
 package com.mservicetech.client.mapping;
 
 import com.google.gson.*;
-import com.mservicetech.client.mapping.adapter.LocalDateAdapter;
-import com.mservicetech.client.mapping.adapter.LocalDateTimeAdapter;
-import org.yaml.snakeyaml.Yaml;
+import com.mservicetech.client.mapping.annotation.MappingCollection;
+import com.mservicetech.client.mapping.annotation.MappingElement;
+import com.mservicetech.client.mapping.annotation.MappingObject;
+
+
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+
 import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 
 public class AnnotationBaseMapperImpl extends  BaseMapperImpl implements ClientJsonMapper {
@@ -53,9 +40,9 @@ protected  <T> T mapResult(final JsonObject root, final Class<T> clazz){
 			MappingElement mappingElement;
 			MappingObject mappingObject;
 			MappingCollection mappingCollection;
-			String path = null;
+			String path ;
 			CustomConverter customConverter;
-			Class<?> instantation;
+			Class<?> instance;
 		//	Object value;
 			for (Field field : clazz.getDeclaredFields()) {
 		        field.setAccessible(true);
@@ -78,8 +65,8 @@ protected  <T> T mapResult(final JsonObject root, final Class<T> clazz){
 		        		}
 		        	}
 		        	if (!mappingElement.customConverter().isEmpty()) {
-		        		instantation = Class.forName(mappingElement.customConverter());
-		        		customConverter = (CustomConverter) instantation.newInstance();
+						instance = Class.forName(mappingElement.customConverter());
+		        		customConverter = (CustomConverter) instance.newInstance();
 		        		
 		        		value = customConverter.convert(root, field, path, mappingElement.dependingOn(), value, object);
 		        	}
@@ -95,8 +82,8 @@ protected  <T> T mapResult(final JsonObject root, final Class<T> clazz){
 		        		value = mapResult(root.getAsJsonObject(path), field.getType());
 		        	}
 		        	if (!mappingObject.customConverter().isEmpty()) {
-		        		instantation = Class.forName(mappingObject.customConverter());
-		        		customConverter = (CustomConverter) instantation.newInstance();
+						instance = Class.forName(mappingObject.customConverter());
+		        		customConverter = (CustomConverter) instance.newInstance();
 		        		value = customConverter.convert(root, field, path, mappingObject.dependingOn(), value, object);
 		        	}
 		        } else if (field.isAnnotationPresent(MappingCollection.class)) {
@@ -123,8 +110,8 @@ protected  <T> T mapResult(final JsonObject root, final Class<T> clazz){
 		        	}
 		            
 		        	if (!mappingCollection.customConverter().isEmpty()) {
-		        		instantation = Class.forName(mappingCollection.customConverter());
-		        		customConverter = (CustomConverter) instantation.newInstance();
+						instance = Class.forName(mappingCollection.customConverter());
+		        		customConverter = (CustomConverter) instance.newInstance();
 		        		value = customConverter.convert(root, field, path, mappingCollection.dependingOn(), value, object);
 		        	}
 		        }
diff --git a/src/main/java/com/mservicetech/client/mapping/BaseMapperImpl.java b/src/main/java/com/mservicetech/client/mapping/BaseMapperImpl.java
@@ -3,6 +3,7 @@
 import com.google.gson.*;
 import com.mservicetech.client.mapping.adapter.LocalDateAdapter;
 import com.mservicetech.client.mapping.adapter.LocalDateTimeAdapter;
+import com.mservicetech.client.mapping.annotation.MappingSerializable;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.File;
diff --git a/src/main/java/com/mservicetech/client/mapping/ConfigBaseMapperImpl.java b/src/main/java/com/mservicetech/client/mapping/ConfigBaseMapperImpl.java
@@ -22,7 +22,7 @@
 public class ConfigBaseMapperImpl extends  BaseMapperImpl implements ClientJsonMapper {
 
 	/** This is used when annotations are not available to hold field details. */
-	private Map<String, Map<String, Map<String, String>>> fieldMappings = null;
+	private Map<String, Map<String, Map<String, String>>> fieldMappings ;
 
 
 	public ConfigBaseMapperImpl(String mappingFilesFolderName) {
@@ -58,7 +58,7 @@ public void setMappingFiles(final List<String> serializableFieldsMappings) {
 		try {
 			if (serializableFieldsMappings != null && !serializableFieldsMappings.isEmpty()) {
 				final Yaml yaml = new Yaml();
-				Map<String, Map<String, Map<String, String>>> mappings = null;
+				Map<String, Map<String, Map<String, String>>> mappings;
 				for (String path : serializableFieldsMappings) {
 					resourceAsStream = new FileInputStream(path);
 					mappings = yaml.load(resourceAsStream);
diff --git a/src/main/java/com/mservicetech/client/mapping/annotation/MappingCollection.java b/src/main/java/com/mservicetech/client/mapping/annotation/MappingCollection.java
@@ -1,4 +1,4 @@
-package com.mservicetech.client.mapping;
+package com.mservicetech.client.mapping.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/mservicetech/client/mapping/annotation/MappingElement.java b/src/main/java/com/mservicetech/client/mapping/annotation/MappingElement.java
@@ -1,4 +1,4 @@
-package com.mservicetech.client.mapping;
+package com.mservicetech.client.mapping.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -13,14 +13,14 @@
 @Target(ElementType.FIELD)
 public @interface MappingElement {
 	/** Look for this element hierarchy to extract the values. */
-	public String scanPath() default "";
+	 String scanPath() default "";
 	
 	/** The values of the element is depends on this element. To get this work you have to implement CustomConverter. */
-	public String dependingOn() default "";
+	 String dependingOn() default "";
 	
 	/** Directly execute custom converter implementation. This is used when the current value is not considered. */
-	public boolean forceCustomConverter() default false;
+	 boolean forceCustomConverter() default false;
 	
 	/** Custom converter implementation. */
-	public String customConverter() default "";
+	 String customConverter() default "";
 }
diff --git a/src/main/java/com/mservicetech/client/mapping/annotation/MappingObject.java b/src/main/java/com/mservicetech/client/mapping/annotation/MappingObject.java
@@ -1,4 +1,4 @@
-package com.mservicetech.client.mapping;
+package com.mservicetech.client.mapping.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/mservicetech/client/mapping/annotation/MappingSerializable.java b/src/main/java/com/mservicetech/client/mapping/annotation/MappingSerializable.java
@@ -1,4 +1,4 @@
-package com.mservicetech.client.mapping;
+package com.mservicetech.client.mapping.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/mservicetech/client/mapping/config/FieldMappingConfig.java b/src/main/java/com/mservicetech/client/mapping/config/FieldMappingConfig.java
@@ -0,0 +1,41 @@
+package com.mservicetech.client.mapping.config;
+
+public class FieldMappingConfig {
+
+    private String type;
+    private String dependingOn;
+    private boolean forceCustomConverter;
+    private String customConverter;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getDependingOn() {
+        return dependingOn;
+    }
+
+    public void setDependingOn(String dependingOn) {
+        this.dependingOn = dependingOn;
+    }
+
+    public boolean isForceCustomConverter() {
+        return forceCustomConverter;
+    }
+
+    public void setForceCustomConverter(boolean forceCustomConverter) {
+        this.forceCustomConverter = forceCustomConverter;
+    }
+
+    public String getCustomConverter() {
+        return customConverter;
+    }
+
+    public void setCustomConverter(String customConverter) {
+        this.customConverter = customConverter;
+    }
+}
diff --git a/src/test/java/com/mservicetech/client/mapping/ClientJsonMapperMappingFilesTest.java b/src/test/java/com/mservicetech/client/mapping/ClientJsonMapperMappingFilesTest.java
@@ -59,29 +59,29 @@ public class ClientJsonMapperMappingFilesTest {
         "    ]";
         
 	@Test
-	public void mappingFilesTest() throws Exception {
-		Model value = (Model) clientJsonMapperImpl.fromString(json, Model.class, null);
+	public void mappingFilesTest()  {
+		Model value =  clientJsonMapperImpl.fromString(json, Model.class, null);
 	    assertEquals(value.getAge(), 30);
 	    assertTrue(value.getType() == Type.Data);
 	    assertTrue(value.getInfo().size() > 0);
 	}
 
 	@Test
-	public void fromJsonObjectTest() throws Exception {
+	public void fromJsonObjectTest()  {
 		final JsonParser parser = new JsonParser();
 		final JsonObject root = (JsonObject) parser.parse(json);
 
-		Model value = (Model) clientJsonMapperImpl.fromJsonObject(root, Model.class, null);
+		Model value =  clientJsonMapperImpl.fromJsonObject(root, Model.class, null);
 	    assertEquals(value.getAge(), 30);
 	    assertTrue(value.getUsers().size() != 0);
 	    assertTrue(value.getIntList().size() != 0);
 
-	    Data data = (Data) clientJsonMapperImpl.fromJsonObject(root, Data.class, "dataInfo.info.data");
+	    Data data =  clientJsonMapperImpl.fromJsonObject(root, Data.class, "dataInfo.info.data");
 	    assertEquals(data.getAge(), 30);
 	}
 
 	@Test
-	public void listFromStringTest() throws Exception {
+	public void listFromStringTest()  {
 		List<?> users =  clientJsonMapperImpl.listFromString(json, User.class, "f4");
 	    assertTrue(users.size() > 0);
 	    
@@ -90,7 +90,7 @@ public void listFromStringTest() throws Exception {
 	}
 	
 	@Test
-	public void loadMappingFilesError() throws Exception {
+	public void loadMappingFilesError()  {
 		try {
 			final ClientJsonMapper clientJsonMapperImpl = new ConfigBaseMapperImpl("src/test/resources/clientFieldMappingsError");
 			fail();
diff --git a/src/test/java/com/mservicetech/client/mapping/ClientValueJsonMapperTest.java b/src/test/java/com/mservicetech/client/mapping/ClientValueJsonMapperTest.java
@@ -38,8 +38,8 @@ public class ClientValueJsonMapperTest {
             "}";
 	
 	@Test
-	public void fromStringTest() throws Exception {
-		MyModel value = (MyModel) mappingJsonMapper.fromString(json, MyModel.class, null);
+	public void fromStringTest(){
+		MyModel value =  mappingJsonMapper.fromString(json, MyModel.class, null);
 	    assertEquals(value.getAge(), 30);
 	    assertTrue(value.getIntArray().length != 0);
 	    assertTrue(value.getUserArray().length != 0);
@@ -51,22 +51,22 @@ public void fromStringTest() throws Exception {
 	}
 	
 	@Test
-	public void fromJsonObjectTest() throws Exception {
+	public void fromJsonObjectTest()  {
 		final JsonParser parser = new JsonParser();
 		final JsonObject root = (JsonObject) parser.parse(json);
 		
-		MyModel value = (MyModel) mappingJsonMapper.fromJsonObject(root, MyModel.class, null);
+		MyModel value =  mappingJsonMapper.fromJsonObject(root, MyModel.class, null);
 	    assertEquals(value.getAge(), 30);
 	    assertTrue(value.getIntArray().length != 0);
 	    assertTrue(value.getUserArray().length != 0);
 	    assertTrue(value.getInfo().size() != 0);
 	    
-	    Data data = (Data) mappingJsonMapper.fromJsonObject(root, Data.class, "dataInfo.info.data");
+	    Data data =  mappingJsonMapper.fromJsonObject(root, Data.class, "dataInfo.info.data");
 	    assertEquals(data.getAge(), 30);
 	}
 
 	@Test
-	public void fromStringErrorTest() throws Exception {
+	public void fromStringErrorTest()  {
 		try {
 			mappingJsonMapper.fromString(json, Data.class, "dataInfo.info1");
 			fail();
@@ -77,7 +77,7 @@ public void fromStringErrorTest() throws Exception {
 	}
 	
 	@Test
-	public void fromJsonObjectErrorTest() throws Exception {
+	public void fromJsonObjectErrorTest()  {
 		try {
 			final JsonParser parser = new JsonParser();
 			final JsonObject root = (JsonObject) parser.parse(json);
diff --git a/src/test/java/com/mservicetech/client/mapping/Data.java b/src/test/java/com/mservicetech/client/mapping/Data.java
@@ -1,5 +1,8 @@
 package com.mservicetech.client.mapping;
 
+import com.mservicetech.client.mapping.annotation.MappingElement;
+import com.mservicetech.client.mapping.annotation.MappingSerializable;
+
 @MappingSerializable
 public class Data {
 
diff --git a/src/test/java/com/mservicetech/client/mapping/Model.java b/src/test/java/com/mservicetech/client/mapping/Model.java
@@ -1,6 +1,7 @@
 package com.mservicetech.client.mapping;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.mservicetech.client.mapping.annotation.MappingSerializable;
 
 import java.time.LocalDate;
 import java.util.List;
diff --git a/src/test/java/com/mservicetech/client/mapping/MyModel.java b/src/test/java/com/mservicetech/client/mapping/MyModel.java
@@ -1,6 +1,10 @@
 package com.mservicetech.client.mapping;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.mservicetech.client.mapping.annotation.MappingCollection;
+import com.mservicetech.client.mapping.annotation.MappingElement;
+import com.mservicetech.client.mapping.annotation.MappingObject;
+import com.mservicetech.client.mapping.annotation.MappingSerializable;
 
 import java.time.LocalDate;
 import java.util.List;
diff --git a/src/test/java/com/mservicetech/client/mapping/TypeCustomConverter.java b/src/test/java/com/mservicetech/client/mapping/TypeCustomConverter.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.mservicetech.client.mapping.annotation.MappingSerializable;
 
 import java.lang.reflect.Field;
 
diff --git a/src/test/java/com/mservicetech/client/mapping/User.java b/src/test/java/com/mservicetech/client/mapping/User.java
@@ -1,5 +1,8 @@
 package com.mservicetech.client.mapping;
 
+import com.mservicetech.client.mapping.annotation.MappingElement;
+import com.mservicetech.client.mapping.annotation.MappingSerializable;
+
 @MappingSerializable
 public class User {
 	@MappingElement

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.mservicetech.client.mapping;`
	`1`	`+package com.mservicetech.client.mapping.annotation;`
`2`	`2`
`3`	`3`	`import java.lang.annotation.ElementType;`
`4`	`4`	`import java.lang.annotation.Retention;`