DSL-JSON v2.0.2

Bugfix for List analysis with annotations.
Fixing binder validation.

README.md

@@ -67,7 +67,7 @@ To use annotation processor it is sufficient to just reference the library:
     <dependency>
       <groupId>com.dslplatform</groupId>
       <artifactId>dsl-json</artifactId>
-      <version>2.0.1</version>
+      <version>2.0.2</version>
     </dependency>
 
 For use in Android, Gradle can be configured with:
@@ -79,8 +79,8 @@ For use in Android, Gradle can be configured with:
       }
     }
     dependencies {
-      compile 'com.dslplatform:dsl-json:2.0.1'
-      annotationProcessor 'com.dslplatform:dsl-json:2.0.1'
+      compile 'com.dslplatform:dsl-json:2.0.2'
+      annotationProcessor 'com.dslplatform:dsl-json:2.0.2'
       provided 'javax.json.bind:javax.json.bind-api:1.0'
     }
 
@@ -319,7 +319,7 @@ To avoid some Java/Scala conversion issues it's best to use Scala specific API v
 
 For SBT dependency can be added as:
 
-    libraryDependencies += "com.dslplatform" %% "dsl-json-scala" % "2.0.1"
+    libraryDependencies += "com.dslplatform" %% "dsl-json-scala" % "2.0.2"
 
 ### Kotlin support
 
@@ -330,8 +330,8 @@ When used with Gradle, configuration can be done via:
       kotlin("kapt") version "1.8.0"
     }
     dependencies {
-      implementation("com.dslplatform:dsl-json:2.0.1")
-      kapt("com.dslplatform:dsl-json:2.0.1")
+      implementation("com.dslplatform:dsl-json:2.0.2")
+      kapt("com.dslplatform:dsl-json:2.0.2")
     }
 
 ## FAQ

examples/ArrayFormat/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.dslplatform</groupId>
 	<artifactId>array-format-example</artifactId>
-	<version>2.0.1</version>
+	<version>2.0.2</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.dslplatform</groupId>

examples/AutoValue/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.dslplatform</groupId>
 	<artifactId>autovalue-example</artifactId>
-	<version>2.0.1</version>
+	<version>2.0.2</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.dslplatform</groupId>

examples/Jackson/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.dslplatform</groupId>
 	<artifactId>jackson-example</artifactId>
-	<version>2.0.1</version>
+	<version>2.0.2</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.dslplatform</groupId>

examples/Jsonb/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.dslplatform</groupId>
 	<artifactId>jsonb-example</artifactId>
-	<version>2.0.1</version>
+	<version>2.0.2</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.dslplatform</groupId>

examples/Kotlin/build.gradle.kts

@@ -7,16 +7,16 @@ plugins {
 }
 
 group = "kotlin-dsl-json"
-version = "2.0.1-SNAPSHOT"
+version = "2.0.2-SNAPSHOT"
 
 repositories {
     mavenCentral()
     mavenLocal()
 }
 
 dependencies {
-    implementation("com.dslplatform:dsl-json:2.0.1")
-    kapt("com.dslplatform:dsl-json:2.0.1")
+    implementation("com.dslplatform:dsl-json:2.0.2")
+    kapt("com.dslplatform:dsl-json:2.0.2")
 }
 
 tasks.withType<KotlinCompile>() {

examples/Lombok/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.dslplatform</groupId>
 	<artifactId>lombok-example</artifactId>
-	<version>2.0.1</version>
+	<version>2.0.2</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.dslplatform</groupId>

examples/MavenJava/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.dslplatform</groupId>
 	<artifactId>maven-java-example</artifactId>
-	<version>2.0.1</version>
+	<version>2.0.2</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.dslplatform</groupId>

examples/Polymorphism/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.dslplatform</groupId>
 	<artifactId>polymorphic-example</artifactId>
-	<version>2.0.1</version>
+	<version>2.0.2</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.dslplatform</groupId>

examples/Reflection/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.dslplatform</groupId>
 	<artifactId>reflection-example</artifactId>
-	<version>2.0.1</version>
+	<version>2.0.2</version>
 	<dependencies>
 		<dependency>
 			<groupId>com.dslplatform</groupId>

examples/Scala/build.sbt

@@ -1,10 +1,10 @@
 name := "DSL-JSON Scala example"
-version := "2.0.1"
+version := "2.0.2"
 organization := "com.dslplatform.json.example"
 scalaVersion := "2.13.11"
 
 ThisBuild / useCoursier := false
 resolvers += Resolver.mavenLocal
 
-libraryDependencies += "com.dslplatform" %% "dsl-json-scala" % "2.0.1"
+libraryDependencies += "com.dslplatform" %% "dsl-json-scala" % "2.0.2"
 libraryDependencies += "javax.json.bind" % "javax.json.bind-api" % "1.0"

examples/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.dslplatform</groupId>
     <artifactId>json-examples</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
     <packaging>pom</packaging>
     <url>https://github.com/ngs-doo/dsl-json</url>
 

library/src/main/java/com/dslplatform/json/processor/Analysis.java

@@ -867,8 +867,9 @@ private ConverterInfo validateConverter(TypeElement converter, TypeMirror type)
 					"Specified converter: '" + converter.getQualifiedName() + "' has invalid type for write method. It must be of type: 'void write(com.dslplatform.json.JsonWriter, " + javaType + ")'. " + additionalDescription,
 					converter,
 					getAnnotation(converter, converterType));
-		} else if (legacyDeclaration && jsonBinderField != null && !("com.dslplatform.json.JsonReader.BindObject<" + fullName + ">").equals(jsonBinderField.asType().toString())
-						|| jsonBinderMethod != null && !("com.dslplatform.json.JsonReader.BindObject<" + fullName + ">").equals(jsonBinderMethod.getReturnType().toString())) {
+		} else if (legacyDeclaration &&
+				(jsonBinderField != null && !("com.dslplatform.json.JsonReader.BindObject<" + fullName + ">").equals(jsonBinderField.asType().toString())
+						|| jsonBinderMethod != null && !("com.dslplatform.json.JsonReader.BindObject<" + fullName + ">").equals(jsonBinderMethod.getReturnType().toString())) ) {
 			hasError = true;
 			messager.printMessage(
 					Diagnostic.Kind.ERROR,

tests-java8/src/test/java/com/dslplatform/json/BinderTest.java

@@ -65,4 +65,19 @@ public void readWorks() throws IOException {
 		Assert.assertEquals("abc", wc.a);
 		Assert.assertEquals("value", wc.b.value);
 	}
+
+	@Test
+	public void nestedBindWorks() throws IOException {
+		byte[] input = "{\"firstname\":\"me\", \"surname\":\"for-real\",\"age\":42}".getBytes(StandardCharsets.UTF_8);
+		MutablePerson wc = dslJson.deserialize(MutablePerson.class, input, input.length);
+		Assert.assertEquals("me", wc.firstname.value());
+		Assert.assertEquals("for-real", wc.surname.value());
+		Assert.assertEquals(42, wc.age);
+		JsonWriter writer = dslJson.newWriter();
+		dslJson.serialize(writer, wc);
+		String output = writer.toString();
+		Assert.assertTrue(output.contains("\"firstname\":\"me\""));
+		Assert.assertTrue(output.contains("\"surname\":\"for-real\""));
+		Assert.assertTrue(output.contains("\"age\":42"));
+	}
 }

tests-java8/src/test/java/com/dslplatform/json/MutablePerson.java

@@ -0,0 +1,39 @@
+package com.dslplatform.json;
+
+import java.io.IOException;
+
+@CompiledJson
+public class MutablePerson {
+
+	public static class Name {
+		private String value;
+		public String value() { return value; }
+		public static Name create(String value) {
+			Name fn = new Name();
+			fn.value = value;
+			return fn;
+		}
+
+		//When creating wrapper classes, we can "abuse" them and make them "locally mutable"
+		//so when deserializing instance we can just change the values instead of allocate even more objects
+		@JsonConverter(target = Name.class)
+		public static class NameConverter {
+			public static void write(JsonWriter writer, Name instance) {
+				writer.writeString(instance.value);
+			}
+			public static Name read(JsonReader reader) throws IOException {
+				return Name.create(reader.readString());
+			}
+
+			public static Name bind(JsonReader reader, Name instance) throws IOException {
+				if (instance == null) instance = new Name();
+				instance.value = reader.readString();
+				return instance;
+			}
+		}
+	}
+
+	public Name firstname;
+	public Name surname;
+	public int age;
+}