From 5c183a79de390fb1ef18de55f69ec0cea6d5c5e8 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Sat, 20 Apr 2024 20:47:10 +0200
Subject: [PATCH] fix(serialize-generator): Discard annotations in Date/String
 adapter

---
 .../serialize/generator/adapter/impl/CollectionAdapter.java   | 4 ++--
 .../commons/serialize/generator/adapter/impl/DateAdapter.java | 3 ++-
 .../serialize/generator/adapter/impl/StringAdapter.java       | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/CollectionAdapter.java b/commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/CollectionAdapter.java
index d346e70..572f0c4 100644
--- a/commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/CollectionAdapter.java
+++ b/commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/CollectionAdapter.java
@@ -44,11 +44,11 @@ public class CollectionAdapter extends Adapter<CollectionAdapter.Hydrated> {
             if (typeArguments.size() == 0) {
                 type = null;
             } else {
-                componentType = typeArguments.get(0);
+                componentType = typeArguments.getFirst();
                 String ts = TypeHelper.asDeclaredType(typeUtils.erasure(type)).asElement().toString();
                 for (Map.Entry<Class<?>, List<Class<?>>> entry : SUPPORTED.entrySet()) {
                     if (entry.getKey().getCanonicalName().equals(ts)) {
-                        implType = TypeName.get(entry.getValue().get(0));
+                        implType = TypeName.get(entry.getValue().getFirst());
                         return;
                     }
                     for (Class<?> klazz : entry.getValue()) {
diff --git a/commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/DateAdapter.java b/commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/DateAdapter.java
index f83315c..d0c3b7b 100644
--- a/commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/DateAdapter.java
+++ b/commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/DateAdapter.java
@@ -2,6 +2,7 @@ package io.gitlab.jfronny.commons.serialize.generator.adapter.impl;
 
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.TypeName;
 import io.gitlab.jfronny.commons.serialize.generator.Cl;
 import io.gitlab.jfronny.commons.serialize.generator.adapter.Adapter;
 
@@ -19,7 +20,7 @@ public class DateAdapter extends Adapter<DateAdapter.Hydrated> {
     public class Hydrated extends Adapter<Hydrated>.Hydrated {
         @Override
         public boolean applies() {
-            return type.toString().equals(Date.class.getCanonicalName());
+            return TypeName.get(type).withoutAnnotations().toString().equals(Date.class.getCanonicalName());
         }
 
         @Override
diff --git a/commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/StringAdapter.java b/commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/StringAdapter.java
index 8dab23b..8dfeb13 100644
--- a/commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/StringAdapter.java
+++ b/commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/StringAdapter.java
@@ -1,5 +1,6 @@
 package io.gitlab.jfronny.commons.serialize.generator.adapter.impl;
 
+import com.squareup.javapoet.TypeName;
 import io.gitlab.jfronny.commons.serialize.generator.adapter.Adapter;
 
 public class StringAdapter extends Adapter<StringAdapter.Hydrated> {
@@ -11,7 +12,7 @@ public class StringAdapter extends Adapter<StringAdapter.Hydrated> {
     public class Hydrated extends Adapter<Hydrated>.Hydrated {
         @Override
         public boolean applies() {
-            return type.toString().equals(String.class.getCanonicalName());
+            return TypeName.get(type).withoutAnnotations().toString().equals(String.class.getCanonicalName());
         }
 
         @Override