Improve support for is standard with constructors and factories

If exact name is used, map it as-is, otherwise use nice name. This might not be ideal as it will not work out of the box in languages which use is name in the ctor instead of expected name, but it seems more consistent.
ngs-doo · Jan 4, 2023 · be9f8f1 · be9f8f1
1 parent fabeaa2
commit be9f8f1
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 2 deletions.
diff --git a/library/src/main/java/com/dslplatform/json/processor/Analysis.java b/library/src/main/java/com/dslplatform/json/processor/Analysis.java
@@ -1978,7 +1978,8 @@ private Map<String, AccessElements> getBeanProperties(
 								method,
 								annotation);
 					} else if (!getters.containsKey(property)) {
-						getters.put(property, method);
+						String nameToUse = arguments.containsKey(name) ? name : property;
+						getters.put(nameToUse, method);
 					}
 				} else if (name.startsWith("get")
 						&& method.getParameters().size() == 0

diff --git a/processor/src/test/java/com/dslplatform/json/models/ImmutableClassWithGetter.java b/processor/src/test/java/com/dslplatform/json/models/ImmutableClassWithGetter.java
@@ -11,9 +11,12 @@ public class ImmutableClassWithGetter {
 	public final String getE() { return e; }
 	private final List<Integer> list;
 	public final List<Integer> getList() { return list; }
+	private final boolean isLocked;
+	public final boolean isLocked() { return isLocked; }
 
-	public ImmutableClassWithGetter(String e, List<Integer> list) {
+	public ImmutableClassWithGetter(String e, List<Integer> list, boolean isLocked) {
 		this.e = e;
 		this.list = list;
+		this.isLocked = isLocked;
 	}
 }
diff --git a/tests-java8/src/test/java/com/dslplatform/json/IsBooleanGetterTest.java b/tests-java8/src/test/java/com/dslplatform/json/IsBooleanGetterTest.java
@@ -3,6 +3,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
@@ -43,4 +44,52 @@ public void isBooleanGetterUsedForSerialization() throws IOException {
         Assert.assertEquals("{\"immutablePrimitive\":true,\"mutablePrimitive\":true}", os.toString("UTF-8"));
     }
 
+    @CompiledJson
+    public static final class WithIs {
+        private final boolean isLocked;
+        private final String token;
+        private final boolean isJustLocked;
+        private final boolean isAnnotation;
+
+        public WithIs(boolean isLocked, String token, boolean justLocked, boolean isAnnotation) {
+            this.isLocked = isLocked;
+            this.token = token;
+            this.isJustLocked = justLocked;
+            this.isAnnotation = isAnnotation;
+        }
+
+        public final boolean isLocked() {
+            return isLocked;
+        }
+
+        public final String getToken() {
+            return token;
+        }
+
+        public final boolean isJustLocked() {
+            return isJustLocked;
+        }
+
+        @JsonAttribute(name = "annotation")
+        public final boolean isAnnotation() {
+            return isAnnotation;
+        }
+    }
+
+    @Test
+    public void isAndConstructor() throws IOException {
+        WithIs wi = new WithIs(true, "abc", true, true);
+
+        DslJson<Object> dslJson = new DslJson<>();
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        dslJson.serialize(wi, os);
+        Assert.assertEquals("{\"isLocked\":true,\"token\":\"abc\",\"justLocked\":true,\"annotation\":true}", os.toString("UTF-8"));
+
+        ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
+        WithIs result = dslJson.deserialize(WithIs.class, is);
+        Assert.assertTrue(result.isLocked());
+        Assert.assertEquals("abc", result.getToken());
+        Assert.assertTrue(result.isJustLocked());
+        Assert.assertTrue(result.isAnnotation());
+    }
 }
diff --git a/tests-kotlin/src/main/kotlin/com/dslplatform/json/WithIs.kt b/tests-kotlin/src/main/kotlin/com/dslplatform/json/WithIs.kt
@@ -0,0 +1,8 @@
+package com.dslplatform.json
+
+@CompiledJson
+data class WithIs(
+    val isLocked: Boolean,
+    val id: String? = null,
+    val token: String? = null,
+)
diff --git a/tests-kotlin/src/test/java/com/dslplatform/json/BasicStuffTest.java b/tests-kotlin/src/test/java/com/dslplatform/json/BasicStuffTest.java
@@ -67,4 +67,20 @@ public void classCanBeEmpty() throws IOException {
         EmptyClass deser = (EmptyClass) dslJson.deserialize(EmptyClass.class, input);
         Assert.assertNotNull(deser);
     }
+
+    @Test
+    public void isNamingWithoutDefault() throws IOException {
+        final DslJson dslJson = new DslJson(Settings.basicSetup());
+
+        WithIs wi = new WithIs(true, null, null);
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        dslJson.serialize(wi, output);
+
+        Assert.assertEquals("{\"isLocked\":true,\"id\":null,\"token\":null}", output.toString("UTF-8"));
+
+        ByteArrayInputStream input = new ByteArrayInputStream(output.toByteArray());
+        WithIs deser = (WithIs) dslJson.deserialize(WithIs.class, input);
+        Assert.assertNotNull(deser);
+        Assert.assertTrue(deser.isLocked());
+    }
 }