2.0.0.build snapshot (#6)

* Changes for #3

* Changes to handle API changes due to Spring Boot upgrade as per issue -
#4

* Unit test updated check for fix as per issue - #5

Author: rohitnarayanan

build.gradle

@@ -9,17 +9,15 @@ apply from: "https://raw.githubusercontent.com/rohitnarayanan/gradle-scripts/mas
  */
 dependencies {
 	implementation("org.slf4j:slf4j-api")
+	implementation("org.yaml:snakeyaml")
 
 	implementation("com.fasterxml.jackson.core:jackson-databind")
 	implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-properties")
 	implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
 	implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
-	implementation("org.yaml:snakeyaml")
 
 	implementation("javax.servlet:javax.servlet-api")
 	implementation("javax.xml.bind:jaxb-api")
-	//compile('javax.activation:javax.activation-api:1.1')
-	//implementation("org.glassfish.jaxb:jaxb-runtime")
 
 	testImplementation ("org.springframework.boot:spring-boot-starter-test") {
 		exclude group: "junit" 

gradle.properties

@@ -1,2 +1,2 @@
 group=accelerate
-version=1.0.0.RELEASE
+archiveVersion=2.0.0.BUILD-SNAPSHOT

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew

@@ -11,8 +11,6 @@
 import com.fasterxml.jackson.annotation.JsonFilter;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -95,12 +93,8 @@ public static <T extends ObjectMapper> T configureMapper(T aMapper) {
 		// Write settings
 		aMapper.setDefaultPropertyInclusion(Include.NON_NULL);
 		aMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
-		aMapper.configure(JsonGenerator.Feature.ESCAPE_NON_ASCII, true);
 		aMapper.configure(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS, false);
 
-		// Read settings
-		aMapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true);
-
 		return aMapper;
 	}
 

src/main/java/accelerate/commons/util/JacksonUtils.java

@@ -161,7 +161,8 @@ void testToJSONSelectFields() {
 	 */
 	@Test
 	void testToXMLSelectFields() {
-		assertTrue(true, "https://github.com/FasterXML/jackson-dataformat-xml/issues/351");
+		assertThat(JacksonUtils.toXMLSelectFields(testBean, BEAN_ID_FIELD)).doesNotContain(BEAN_NAME_FIELD)
+				.contains(BEAN_ID_FIELD + "=\"");
 	}
 
 	/**