Let AnnotationHelper respect targetVersion

this should avoid the problem of using the wrong annotation when building on jdk 11 but targetting java 8
joelittlejohn · Feb 2, 2023 · 59bad72 · 59bad72
1 parent 284c1e8
commit 59bad72
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/EnumRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/EnumRule.java
@@ -151,7 +151,7 @@ public JType apply(String nodeName, JsonNode node, JsonNode parent, JClassContai
         EnumDefinition enumDefinition = buildEnumDefinition(nodeName, node, backingType);
 
         if(ruleFactory.getGenerationConfig() != null && ruleFactory.getGenerationConfig().isIncludeGeneratedAnnotation()) {
-            AnnotationHelper.addGeneratedAnnotation(_enum);
+            AnnotationHelper.addGeneratedAnnotation(ruleFactory.getGenerationConfig(), _enum);
         }
 
         JFieldVar valueField = addConstructorAndFields(enumDefinition, _enum);

diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/ObjectRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/ObjectRule.java
@@ -133,7 +133,7 @@ public JType apply(String nodeName, JsonNode node, JsonNode parent, JPackage _pa
         }
 
         if (ruleFactory.getGenerationConfig().isIncludeGeneratedAnnotation()) {
-        	AnnotationHelper.addGeneratedAnnotation(jclass);
+        	AnnotationHelper.addGeneratedAnnotation(ruleFactory.getGenerationConfig(), jclass);
         }
         if (ruleFactory.getGenerationConfig().isIncludeToString()) {
             addToString(jclass);

diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/util/AnnotationHelper.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/util/AnnotationHelper.java
@@ -16,6 +16,9 @@
 
 package org.jsonschema2pojo.util;
 
+import org.jsonschema2pojo.GenerationConfig;
+import org.jsonschema2pojo.util.LanguageFeatures;
+
 import com.sun.codemodel.JAnnotationUse;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JDefinedClass;
@@ -36,13 +39,14 @@ private static boolean tryToAnnotate(JDefinedClass jclass, String annotationClas
         } catch (ClassNotFoundException e) {
             return false;
         }
-
     }
 
-    public static void addGeneratedAnnotation(JDefinedClass jclass) {
-        if (!tryToAnnotate(jclass, JAVA_9_GENERATED)) {
-            tryToAnnotate(jclass, JAVA_8_GENERATED);
+    public static void addGeneratedAnnotation(GeneratorConfig config, JDefinedClass jclass) {
+        if (LanguageFeatures.canUseJava9(config)) {
+            if (tryToAnnotate(jclass, JAVA_9_GENERATED)) {
+                return;
+            }
         }
+        tryToAnnotate(jclass, JAVA_8_GENERATED);
     }
-
 }
diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/util/LanguageFeatures.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/util/LanguageFeatures.java
@@ -24,6 +24,7 @@
 
 public class LanguageFeatures {
 
+    private static final Collection<String> LESS_THAN_9 = asList("1.1", "1.2", "1.3", "1.4", "1.5", "5", "1.6", "6", "1.7", "7", "1.8", "8");
     private static final Collection<String> LESS_THAN_8 = asList("1.1", "1.2", "1.3", "1.4", "1.5", "5", "1.6", "6", "1.7", "7");
     private static final Collection<String> LESS_THAN_7 = asList("1.1", "1.2", "1.3", "1.4", "1.5", "5", "1.6", "6");
 
@@ -34,4 +35,8 @@ public static boolean canUseJava7(GenerationConfig config) {
     public static boolean canUseJava8(GenerationConfig config) {
         return !LESS_THAN_8.contains(config.getTargetVersion());
     }
+
+    public static boolean canUseJava9(GenerationConfig config) {
+        return !LESS_THAN_9.contains(config.getTargetVersion());
+    }
 }