From 841a1b55f4f77e4d095ad64d5d1d3b8001c069d1 Mon Sep 17 00:00:00 2001 From: Jan-Willem Harmannij Date: Sat, 24 Feb 2024 17:51:15 +0100 Subject: [PATCH] Remove date from `@Generated` annotation and use the same name everywhere --- .../jwharm/javagi/generators/AliasGenerator.java | 2 +- .../jwharm/javagi/generators/BitfieldGenerator.java | 2 +- .../jwharm/javagi/generators/ClassGenerator.java | 2 +- .../jwharm/javagi/generators/ClosureGenerator.java | 2 +- .../javagi/generators/EnumerationGenerator.java | 2 +- .../jwharm/javagi/generators/InterfaceGenerator.java | 2 +- .../jwharm/javagi/generators/NamespaceGenerator.java | 2 +- .../jwharm/javagi/generators/RecordGenerator.java | 2 +- .../jwharm/javagi/generators/UnionGenerator.java | 2 +- .../javagi/util/GeneratedAnnotationBuilder.java | 12 ++---------- 10 files changed, 11 insertions(+), 19 deletions(-) diff --git a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/AliasGenerator.java b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/AliasGenerator.java index 412cf459..33f25779 100644 --- a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/AliasGenerator.java +++ b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/AliasGenerator.java @@ -48,7 +48,7 @@ public AliasGenerator(Alias alias) { public TypeSpec generate() { TypeSpec.Builder builder = TypeSpec.classBuilder(alias.typeName()); - builder.addAnnotation(GeneratedAnnotationBuilder.generate(getClass())); + builder.addAnnotation(GeneratedAnnotationBuilder.generate()); // Alias for an alias for a primitive type if (target instanceof Alias other && other.type().isPrimitive()) diff --git a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/BitfieldGenerator.java b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/BitfieldGenerator.java index 1bc9ee2f..a9d0d783 100644 --- a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/BitfieldGenerator.java +++ b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/BitfieldGenerator.java @@ -44,7 +44,7 @@ public BitfieldGenerator(Bitfield bf) { super(bf); this.bf = bf; this.builder = TypeSpec.classBuilder(bf.typeName()); - this.builder.addAnnotation(GeneratedAnnotationBuilder.generate(getClass())); + this.builder.addAnnotation(GeneratedAnnotationBuilder.generate()); } public TypeSpec generate() { diff --git a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/ClassGenerator.java b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/ClassGenerator.java index 79a92e33..a89607af 100644 --- a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/ClassGenerator.java +++ b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/ClassGenerator.java @@ -38,7 +38,7 @@ public ClassGenerator(Class cls) { super(cls); this.cls = cls; this.builder = TypeSpec.classBuilder(cls.typeName()); - this.builder.addAnnotation(GeneratedAnnotationBuilder.generate(getClass())); + this.builder.addAnnotation(GeneratedAnnotationBuilder.generate()); } public TypeSpec generate() { diff --git a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/ClosureGenerator.java b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/ClosureGenerator.java index a6e53943..353ca636 100644 --- a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/ClosureGenerator.java +++ b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/ClosureGenerator.java @@ -66,7 +66,7 @@ TypeSpec generateFunctionalInterface() { builder.addAnnotation(Deprecated.class); if (closure instanceof Callback cb && cb.parent() instanceof Namespace) - builder.addAnnotation(GeneratedAnnotationBuilder.generate(getClass())); + builder.addAnnotation(GeneratedAnnotationBuilder.generate()); return builder.build(); } diff --git a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/EnumerationGenerator.java b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/EnumerationGenerator.java index 73d0d374..2952e90a 100644 --- a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/EnumerationGenerator.java +++ b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/EnumerationGenerator.java @@ -48,7 +48,7 @@ public EnumerationGenerator(Enumeration en) { super(en); this.en = en; this.builder = TypeSpec.enumBuilder(en.typeName()); - this.builder.addAnnotation(GeneratedAnnotationBuilder.generate(getClass())); + this.builder.addAnnotation(GeneratedAnnotationBuilder.generate()); } public TypeSpec generate() { diff --git a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/InterfaceGenerator.java b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/InterfaceGenerator.java index a971c71f..f90d897e 100644 --- a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/InterfaceGenerator.java +++ b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/InterfaceGenerator.java @@ -36,7 +36,7 @@ public InterfaceGenerator(Interface inf) { super(inf); this.inf = inf; this.builder = TypeSpec.interfaceBuilder(inf.typeName()); - this.builder.addAnnotation(GeneratedAnnotationBuilder.generate(getClass())); + this.builder.addAnnotation(GeneratedAnnotationBuilder.generate()); } public TypeSpec generate() { diff --git a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/NamespaceGenerator.java b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/NamespaceGenerator.java index d76f2a67..40ddeff4 100644 --- a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/NamespaceGenerator.java +++ b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/NamespaceGenerator.java @@ -38,7 +38,7 @@ public class NamespaceGenerator { public NamespaceGenerator(Namespace ns) { this.ns = ns; this.builder = TypeSpec.classBuilder(ns.typeName()); - this.builder.addAnnotation(GeneratedAnnotationBuilder.generate(getClass())); + this.builder.addAnnotation(GeneratedAnnotationBuilder.generate()); } public TypeSpec generateGlobalsClass() { diff --git a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/RecordGenerator.java b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/RecordGenerator.java index ad5d655a..b99b68c7 100644 --- a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/RecordGenerator.java +++ b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/RecordGenerator.java @@ -48,7 +48,7 @@ public RecordGenerator(Record rec) { this.builder = TypeSpec.classBuilder(rec.typeName()); if (outerClass == null) - this.builder.addAnnotation(GeneratedAnnotationBuilder.generate(getClass())); + this.builder.addAnnotation(GeneratedAnnotationBuilder.generate()); } public TypeSpec generate() { diff --git a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/UnionGenerator.java b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/UnionGenerator.java index f986c236..966f3233 100644 --- a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/UnionGenerator.java +++ b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/UnionGenerator.java @@ -36,7 +36,7 @@ public UnionGenerator(Union union) { super(union); this.union = union; this.builder = TypeSpec.classBuilder(union.typeName()); - this.builder.addAnnotation(GeneratedAnnotationBuilder.generate(getClass())); + this.builder.addAnnotation(GeneratedAnnotationBuilder.generate()); } public TypeSpec generate() { diff --git a/buildSrc/src/main/java/io/github/jwharm/javagi/util/GeneratedAnnotationBuilder.java b/buildSrc/src/main/java/io/github/jwharm/javagi/util/GeneratedAnnotationBuilder.java index 90d02cf8..f4339a06 100644 --- a/buildSrc/src/main/java/io/github/jwharm/javagi/util/GeneratedAnnotationBuilder.java +++ b/buildSrc/src/main/java/io/github/jwharm/javagi/util/GeneratedAnnotationBuilder.java @@ -22,20 +22,12 @@ import com.squareup.javapoet.AnnotationSpec; import javax.annotation.processing.Generated; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.TimeZone; public class GeneratedAnnotationBuilder { - public static AnnotationSpec generate(Class generator) { - DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); - df.setTimeZone(TimeZone.getTimeZone("UTC")); - + public static AnnotationSpec generate() { var generatedAnnotation = AnnotationSpec.builder(Generated.class) - .addMember("value", "$S", generator.getName()); -// .addMember("date", "$S", df.format(new Date())); + .addMember("value", "$S", "io.github.jwharm.JavaGI"); return generatedAnnotation.build(); }