Johannes/java-commons
Johannes
/
java-commons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(serialize-generator): Discard annotations in Date/String adapter
ci/woodpecker/push/woodpecker Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2024-04-20 20:47:10 +02:00
parent 5fad1d053d
commit 5c183a79de
Signed by: Johannes
GPG Key ID: E76429612C2929F4
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/CollectionAdapter.java
View File

@ -44,11 +44,11 @@ public class CollectionAdapter extends Adapter<CollectionAdapter.Hydrated> {
if (typeArguments.size() == 0) { if (typeArguments.size() == 0) {
type = null; type = null;
} else { } else {
componentType = typeArguments.get(0); componentType = typeArguments.getFirst();
String ts = TypeHelper.asDeclaredType(typeUtils.erasure(type)).asElement().toString(); String ts = TypeHelper.asDeclaredType(typeUtils.erasure(type)).asElement().toString();
for (Map.Entry<Class<?>, List<Class<?>>> entry : SUPPORTED.entrySet()) { for (Map.Entry<Class<?>, List<Class<?>>> entry : SUPPORTED.entrySet()) {
if (entry.getKey().getCanonicalName().equals(ts)) { if (entry.getKey().getCanonicalName().equals(ts)) {
implType = TypeName.get(entry.getValue().get(0)); implType = TypeName.get(entry.getValue().getFirst());
return; return;
} }
for (Class<?> klazz : entry.getValue()) { for (Class<?> klazz : entry.getValue()) {

3
commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/DateAdapter.java
View File

@ -2,6 +2,7 @@ package io.gitlab.jfronny.commons.serialize.generator.adapter.impl;
import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.CodeBlock;
import com.squareup.javapoet.MethodSpec; 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.Cl;
import io.gitlab.jfronny.commons.serialize.generator.adapter.Adapter; 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 { public class Hydrated extends Adapter<Hydrated>.Hydrated {
@Override @Override
public boolean applies() { public boolean applies() {
return type.toString().equals(Date.class.getCanonicalName()); return TypeName.get(type).withoutAnnotations().toString().equals(Date.class.getCanonicalName());
} }
@Override @Override

3
commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/StringAdapter.java
View File

@ -1,5 +1,6 @@
package io.gitlab.jfronny.commons.serialize.generator.adapter.impl; package io.gitlab.jfronny.commons.serialize.generator.adapter.impl;
import com.squareup.javapoet.TypeName;
import io.gitlab.jfronny.commons.serialize.generator.adapter.Adapter; import io.gitlab.jfronny.commons.serialize.generator.adapter.Adapter;
public class StringAdapter extends Adapter<StringAdapter.Hydrated> { 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 { public class Hydrated extends Adapter<Hydrated>.Hydrated {
@Override @Override
public boolean applies() { public boolean applies() {
return type.toString().equals(String.class.getCanonicalName()); return TypeName.get(type).withoutAnnotations().toString().equals(String.class.getCanonicalName());
} }
@Override @Override