Merge branch 'release/1.0.1'

DominoKit · Nov 9, 2023 · 6255afa · 6255afa
2 parents ae0b154 + fb795a0
commit 6255afa
Show file tree

Hide file tree

Showing 31 changed files with 387 additions and 53 deletions.
diff --git a/.mvn/maven.config b/.mvn/maven.config
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
diff --git a/domino-jackson-processor/pom.xml b/domino-jackson-processor/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.dominokit</groupId>
         <artifactId>domino-jackson-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>domino-jackson-processor</artifactId>
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>31.1-jre</version>
+                <version>32.0.1-jre</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>

diff --git a/...kson-processor/src/main/java/org/dominokit/jackson/processor/AbstractMapperGenerator.java b/...kson-processor/src/main/java/org/dominokit/jackson/processor/AbstractMapperGenerator.java
@@ -60,29 +60,36 @@ public void generate(Element element) throws IOException {
     Name beanName = typeUtils.asElement(beanType).getSimpleName();
 
     generateJsonMappers(beanType);
+    if (!GeneratedMappersRegistry.INSTANCE.hasTypeToken(getCategory(), beanType)) {
+      GeneratedMappersRegistry.INSTANCE.addTypeToken(getCategory(), beanType);
 
-    TypeSpec.Builder builder =
-        TypeSpec.classBuilder(className)
-            .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
-            .superclass(abstractObjectMapper(element))
-            .addField(
-                FieldSpec.builder(ClassName.bestGuess(className), "INSTANCE")
-                    .addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
-                    .initializer(
-                        CodeBlock.builder().add("new $T()", ClassName.bestGuess(className)).build())
-                    .build())
-            .addMethod(makeConstructor(beanName))
-            .addMethods(getMapperMethods(element, beanType));
+      TypeSpec.Builder builder =
+          TypeSpec.classBuilder(className)
+              .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
+              .superclass(abstractObjectMapper(element))
+              .addField(
+                  FieldSpec.builder(ClassName.bestGuess(className), "INSTANCE")
+                      .addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
+                      .initializer(
+                          CodeBlock.builder()
+                              .add("new $T()", ClassName.bestGuess(className))
+                              .build())
+                      .build())
+              .addMethod(makeConstructor(beanName))
+              .addMethods(getMapperMethods(element, beanType));
 
-    if (useInterface(element)) {
-      builder.addSuperinterface(TypeName.get(element.asType()));
-    }
+      if (useInterface(element)) {
+        builder.addSuperinterface(TypeName.get(element.asType()));
+      }
 
-    TypeSpec classSpec = builder.build();
+      TypeSpec classSpec = builder.build();
 
-    JavaFile.builder(packageName, classSpec).build().writeTo(filer);
+      JavaFile.builder(packageName, classSpec).build().writeTo(filer);
+    }
   }
 
+  protected abstract GeneratedMappersRegistry.Category getCategory();
+
   protected static TypeMirror getElementType(Element element) {
     if (useInterface(element)) {
       TypeMirror objectReader =

diff --git a/...-jackson-processor/src/main/java/org/dominokit/jackson/processor/BeanMapperGenerator.java b/...-jackson-processor/src/main/java/org/dominokit/jackson/processor/BeanMapperGenerator.java
@@ -60,4 +60,9 @@ protected void generateSerializer(TypeMirror beanType) {
   protected void generateDeserializer(TypeMirror beanType) {
     new DeserializerGenerator().generate(beanType);
   }
+
+  @Override
+  protected GeneratedMappersRegistry.Category getCategory() {
+    return GeneratedMappersRegistry.Category.MAPPER;
+  }
 }
diff --git a/...-jackson-processor/src/main/java/org/dominokit/jackson/processor/BeanReaderGenerator.java b/...-jackson-processor/src/main/java/org/dominokit/jackson/processor/BeanReaderGenerator.java
@@ -46,4 +46,9 @@ protected Iterable<MethodSpec> getMapperMethods(Element element, TypeMirror bean
   protected void generateDeserializer(TypeMirror beanType) {
     new DeserializerGenerator().generate(beanType);
   }
+
+  @Override
+  protected GeneratedMappersRegistry.Category getCategory() {
+    return GeneratedMappersRegistry.Category.READER;
+  }
 }
diff --git a/...-jackson-processor/src/main/java/org/dominokit/jackson/processor/BeanWriterGenerator.java b/...-jackson-processor/src/main/java/org/dominokit/jackson/processor/BeanWriterGenerator.java
@@ -50,4 +50,9 @@ protected Iterable<MethodSpec> getMapperMethods(Element element, TypeMirror bean
   protected void generateSerializer(TypeMirror beanType) {
     new SerializerGenerator().generate(beanType);
   }
+
+  @Override
+  protected GeneratedMappersRegistry.Category getCategory() {
+    return GeneratedMappersRegistry.Category.WRITER;
+  }
 }
diff --git a/...ackson-processor/src/main/java/org/dominokit/jackson/processor/DeserializerGenerator.java b/...ackson-processor/src/main/java/org/dominokit/jackson/processor/DeserializerGenerator.java
@@ -45,7 +45,11 @@ public String generate(TypeMirror beanType) {
         MoreElements.getPackage(MoreTypes.asTypeElement(beanType)).getQualifiedName().toString();
     String deserializerName = Type.deserializerName(packageName, beanType);
 
-    if (!TypeRegistry.containsDeserializer(Type.stringifyTypeWithPackage(beanType))) {
+    if (!GeneratedMappersRegistry.INSTANCE.hasTypeToken(
+            GeneratedMappersRegistry.Category.DESERIALIZER, beanType)
+        && !TypeRegistry.containsDeserializer(Type.stringifyTypeWithPackage(beanType))) {
+      GeneratedMappersRegistry.INSTANCE.addTypeToken(
+          GeneratedMappersRegistry.Category.DESERIALIZER, beanType);
       try {
         generateSubTypesDeserializers(beanType);
         TypeRegistry.addInActiveGenDeserializer(beanType);
@@ -54,7 +58,8 @@ public String generate(TypeMirror beanType) {
             Type.stringifyTypeWithPackage(beanType), ClassName.bestGuess(deserializerName));
         TypeRegistry.removeInActiveGenDeserializer(beanType);
       } catch (IOException e) {
-        throw new DeserializerGenerator.DeserializerGenerationFailedException(beanType.toString());
+        throw new DeserializerGenerator.DeserializerGenerationFailedException(
+            beanType.toString(), e);
       }
     }
     return deserializerName;
@@ -70,6 +75,10 @@ private void generateSubTypesDeserializers(TypeMirror beanType) {
   private class DeserializerGenerationFailedException extends RuntimeException {
     private static final long serialVersionUID = 1L;
 
+    public DeserializerGenerationFailedException(String message, Throwable cause) {
+      super(message, cause);
+    }
+
     DeserializerGenerationFailedException(String type) {
       super(type);
     }

diff --git a/...son-processor/src/main/java/org/dominokit/jackson/processor/GeneratedMappersRegistry.java b/...son-processor/src/main/java/org/dominokit/jackson/processor/GeneratedMappersRegistry.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2019 Dominokit
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dominokit.jackson.processor;
+
+import com.google.auto.common.MoreTypes;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.lang.model.type.TypeMirror;
+
+public class GeneratedMappersRegistry {
+
+  public static final GeneratedMappersRegistry INSTANCE = new GeneratedMappersRegistry();
+  private final Map<Category, Set<GeneratedTypeToken>> typeTokens = new HashMap<>();
+
+  private GeneratedMappersRegistry() {}
+
+  public void addTypeToken(Category category, TypeMirror typeMirror) {
+    if (!typeTokens.containsKey(category)) {
+      typeTokens.put(category, new HashSet<>());
+    }
+    typeTokens.get(category).add(new GeneratedTypeToken(typeMirror));
+  }
+
+  public boolean hasTypeToken(Category category, TypeMirror typeMirror) {
+    if (typeTokens.containsKey(category)) {
+      return typeTokens.get(category).contains(new GeneratedTypeToken(typeMirror));
+    }
+    return false;
+
+    //    return false;
+  }
+
+  public enum Category {
+    MAPPER,
+    READER,
+    WRITER,
+    SERIALIZER,
+    DESERIALIZER
+  }
+
+  public static class GeneratedTypeToken {
+    TypeMirror typeMirror;
+
+    public GeneratedTypeToken(TypeMirror typeMirror) {
+      this.typeMirror = typeMirror;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+      GeneratedTypeToken that = (GeneratedTypeToken) o;
+      return MoreTypes.equivalence().equivalent(typeMirror, that.typeMirror);
+    }
+
+    @Override
+    public int hashCode() {
+      return typeMirror.hashCode();
+    }
+  }
+}
diff --git a/...ackson-processor/src/main/java/org/dominokit/jackson/processor/ObjectMapperProcessor.java b/...ackson-processor/src/main/java/org/dominokit/jackson/processor/ObjectMapperProcessor.java
@@ -29,7 +29,7 @@
 import org.dominokit.jackson.annotation.JSONWriter;
 
 /**
- * ObjectMapperProcessor class. a Delegate class to geneate different types of mappers for all
+ * ObjectMapperProcessor class. a Delegate class to generate different types of mappers for all
  * annotated types.
  */
 @AutoService(Processor.class)

diff --git a/...-jackson-processor/src/main/java/org/dominokit/jackson/processor/SerializerGenerator.java b/...-jackson-processor/src/main/java/org/dominokit/jackson/processor/SerializerGenerator.java
@@ -41,7 +41,11 @@ public String generate(TypeMirror beanType) {
     String packageName =
         MoreElements.getPackage(MoreTypes.asTypeElement(beanType)).getQualifiedName().toString();
     String serializerName = Type.serializerName(packageName, beanType);
-    if (!TypeRegistry.containsSerializer(Type.stringifyTypeWithPackage(beanType))) {
+    if (!GeneratedMappersRegistry.INSTANCE.hasTypeToken(
+            GeneratedMappersRegistry.Category.SERIALIZER, beanType)
+        && !TypeRegistry.containsSerializer(Type.stringifyTypeWithPackage(beanType))) {
+      GeneratedMappersRegistry.INSTANCE.addTypeToken(
+          GeneratedMappersRegistry.Category.SERIALIZER, beanType);
       try {
         generateSubTypeSerializers(beanType);
         TypeRegistry.addInActiveGenSerializer(beanType);

diff --git a/...or/src/main/java/org/dominokit/jackson/processor/deserialization/DeserializerBuilder.java b/...or/src/main/java/org/dominokit/jackson/processor/deserialization/DeserializerBuilder.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.squareup.javapoet.*;
+import java.beans.Introspector;
 import java.util.Optional;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.Modifier;
@@ -119,17 +120,15 @@ private MethodSpec buildParametersMethod() {
   }
 
   private AccessorInfo setterInfo(Element field) {
-    final String upperCaseFirstLetter = upperCaseFirstLetter(field.getSimpleName().toString());
-
     Optional<AccessorInfo> accessor =
         getAccessors(beanType).stream()
-            .filter(accessorInfo -> accessorInfo.getName().equals("set" + upperCaseFirstLetter))
+            .filter(accessorInfo -> accessorInfo.getName().startsWith("set"))
+            .filter(
+                accessorInfo ->
+                    Introspector.decapitalize(accessorInfo.getName().substring(3))
+                        .equals(field.getSimpleName().toString()))
             .findFirst();
 
     return accessor.orElseGet(() -> new AccessorInfo(field.getSimpleName().toString()));
   }
-
-  private String upperCaseFirstLetter(String name) {
-    return name.substring(0, 1).toUpperCase() + name.substring(1);
-  }
 }
diff --git a/...cessor/src/main/java/org/dominokit/jackson/processor/serialization/SerializerBuilder.java b/...cessor/src/main/java/org/dominokit/jackson/processor/serialization/SerializerBuilder.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.squareup.javapoet.*;
+import java.beans.Introspector;
 import java.util.Optional;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.Modifier;
@@ -160,17 +161,19 @@ private boolean hasTypeJsonInclude() {
   }
 
   AbstractJsonMapperGenerator.AccessorInfo getterInfo() {
-    final String upperCaseFirstLetter = upperCaseFirstLetter(field.getSimpleName().toString());
     String prefix = field.asType().getKind() == TypeKind.BOOLEAN ? "is" : "get";
     Optional<AbstractJsonMapperGenerator.AccessorInfo> accessor =
         getAccessors(beanType).stream()
-            .filter(accessorInfo -> accessorInfo.getName().equals(prefix + upperCaseFirstLetter))
+            .filter(
+                accessorInfo ->
+                    accessorInfo.getName().startsWith("is")
+                        || accessorInfo.getName().startsWith("get"))
+            .filter(
+                accessorInfo ->
+                    Introspector.decapitalize(accessorInfo.getName().substring(prefix.length()))
+                        .equals(field.getSimpleName().toString()))
             .findFirst();
     return accessor.orElseGet(
         () -> new AbstractJsonMapperGenerator.AccessorInfo(field.getSimpleName().toString()));
   }
-
-  private String upperCaseFirstLetter(String name) {
-    return name.substring(0, 1).toUpperCase() + name.substring(1);
-  }
 }
diff --git a/domino-jackson-processor/src/test/java/org/dominokit/jackson/processor/AccessorBean.java b/domino-jackson-processor/src/test/java/org/dominokit/jackson/processor/AccessorBean.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2019 Dominokit
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dominokit.jackson.processor;
+
+import org.dominokit.jackson.annotation.JSONMapper;
+
+/**
+ * To make sure some wierd accessors case works
+ *
+ * @see https://github.com/DominoKit/domino-jackson/issues/66
+ */
+@JSONMapper
+public class AccessorBean {
+  private int xY;
+
+  public int getxY() {
+    return xY;
+  }
+
+  public void setxY(int xY) {
+    this.xY = xY;
+  }
+}
diff --git a/domino-jackson-processor/src/test/java/org/dominokit/jackson/processor/recursive/A.java b/domino-jackson-processor/src/test/java/org/dominokit/jackson/processor/recursive/A.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2019 Dominokit
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dominokit.jackson.processor.recursive;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+import org.dominokit.jackson.annotation.JSONMapper;
+
+@JSONMapper
+@JsonTypeInfo(use = Id.NAME, include = As.PROPERTY, visible = true)
+@JsonSubTypes({
+  @Type(value = D.class, name = "dominokit.recursive.D"),
+  @Type(value = E.class, name = "dominokit.recursive.E"),
+  @Type(value = F.class, name = "dominokit.recursive.F")
+})
+public interface A {}