latest chenges

* latest code
* latest commons version
* travis config

.travis.yml

@@ -0,0 +1,23 @@
+language: java
+jdk:
+  - openjdk8
+  - openjdk11
+before_install:
+  - chmod +x ./gradlew
+script:
+  - ./gradlew check javadoc --stacktrace
+  - ./gradlew jacocoTestReport
+before_deploy:
+  - ./gradlew generateLicenseReport
+  - ./gradlew javadoc
+  - echo $SIGNING_KEY_SECRING_BASE64 | base64 --decode > ./signing.key.secring
+  - export SIGNING_KEY_PATH=./signing.key.secring
+deploy:
+  - provider: script
+    skip_cleanup: true
+    script: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -DDEPLOYMENT=true
+    on:
+      tags: true
+      jdk: openjdk11
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

build.gradle

@@ -28,8 +28,6 @@ apply plugin: 'biz.aQute.bnd.builder' // OSGi
 
 group = project['POM.groupId']
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-
 repositories {
     if (project['CERN_VM']) {
         maven { url 'http://artifactory.cern.ch/ds-jcenter' }
@@ -40,7 +38,7 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'org.ossgang', name: 'ossgang-commons', version: '0.29.0'
+    implementation group: 'org.ossgang', name: 'ossgang-commons', version: '0.30.0'
     implementation group: 'com.google.code.gson', name:'gson', version: '2.9.1'
 
     testCompile group: 'junit', name: 'junit', version: '4.12'

gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((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" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+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" "$@"

src/main/java/org/ossgang/gson/adapters/MapbackedGsonAdapter.java

@@ -24,7 +24,7 @@
  */
 public class MapbackedGsonAdapter<T> extends TypeAdapter<T> {
 
-    public static final TypeAdapterFactory FACTORY = new MapbackedsGsonAdapterFactory();
+    public static final TypeAdapterFactory FACTORY = new MapbackedGsonAdapterFactory();
 
     private final Gson context;
     private final Class<T> backedInterface;

src/main/java/org/ossgang/gson/adapters/MapbackedsGsonAdapterFactory.java → src/main/java/org/ossgang/gson/adapters/MapbackedGsonAdapterFactory.java

@@ -10,7 +10,13 @@
 import java.lang.reflect.Type;
 import java.util.Optional;
 
-public class MapbackedsGsonAdapterFactory implements TypeAdapterFactory {
+/**
+ * A adapter factory for gson, that creates an adapter, in case the passed in type is an interface that is annotated
+ * with the @{@link Mapbacked} annotation. To use the mapbacked objects, this annotation is mandatory, otherwise there
+ * is no means to detect from the class only, if the adapter can be applied or not.
+ */
+/* package visibility, as it is only used from the static field of Mapbacked json adapter.*/
+class MapbackedGsonAdapterFactory implements TypeAdapterFactory {
 
     @Override
     public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {

src/test/java/org/ossgang/gson/CollectionMapbackedTest.java

@@ -0,0 +1,52 @@
+package org.ossgang.gson;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.assertj.core.api.Assertions;
+import org.junit.Before;
+import org.junit.Test;
+import org.ossgang.commons.mapbackeds.Mapbacked;
+import org.ossgang.commons.mapbackeds.Mapbackeds;
+import org.ossgang.gson.adapters.MapbackedGsonAdapter;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class CollectionMapbackedTest {
+
+    private static final String MISTER_X_STRG = "{\"name\":\"misterX\",\"favoriteNumbers\":[5,7,13],\"factors\":[0.5,0.3,0.2,0.1]}";
+    public static final String CONTAINER_STRG = "{\"person\":" + MISTER_X_STRG + "}";
+    private static final Person MISTER_X = Mapbackeds.builder(Person.class)//
+            .field(Person::name, "misterX")//
+            .field(Person::favoriteNumbers, Arrays.asList(5, 7, 13))//
+            .field(Person::factors, Arrays.asList(0.5, 0.3, 0.2, 0.1)) //
+            .build();
+
+    private Gson gson;
+
+    @Before
+    public void setUp() {
+        this.gson = new GsonBuilder().registerTypeAdapterFactory(MapbackedGsonAdapter.FACTORY).create();
+    }
+
+    @Test
+    public void toJsonWorks() {
+        String s = gson.toJson(MISTER_X);
+        Assertions.assertThat(s).isEqualTo(MISTER_X_STRG);
+    }
+
+    @Test
+    public void fromJsonWorks() {
+        Person p = gson.fromJson(MISTER_X_STRG, Person.class);
+        Assertions.assertThat(p).isEqualTo(MISTER_X);
+    }
+
+    @Mapbacked
+    private interface Person {
+        String name();
+
+        List<Integer> favoriteNumbers();
+
+        List<Double> factors();
+    }
+}

src/test/java/org/ossgang/gson/FromToJsonTest.java

@@ -70,7 +70,7 @@ public void tryTypeResolve() {
     }
 
     @Mapbacked
-    public interface Person {
+    private interface Person {
         String name();
 
         int yearOfBirth();