Improve Maven targetVersion default/auto-detection/logging

Author: joelittlejohn

jsonschema2pojo-gradle-plugin/README.md

@@ -56,7 +56,6 @@ dependencies {
   implementation 'joda-time:joda-time:2.2'
 }
 
-// Each configuration is set to the default value
 jsonSchema2Pojo {
 
   // Location of the JSON Schema file(s). This may refer to a single file or a directory of files.
@@ -292,8 +291,10 @@ jsonSchema2Pojo {
   // properties to exclude from generated toString
   toStringExcludes = ["someProperty"]
 
-  // What java source version to target with generated output (1.6, 1.8, 9, 11, etc)
-  targetVersion = "1.6"
+    // What Java version to target with generated source code (1.6, 1.8, 9, 11, etc).
+    // By default, the version will be taken from the Gradle Java plugin's 'sourceCompatibility',
+    // which (if unset) itself defaults to the current JVM version
+  targetVersion = "1.8"
 
   // deprecated, since we no longer use commons-lang for equals, hashCode, toString
   useCommonsLang3 = false

jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/util/TestableJsonschema2PojoMojo.java

@@ -16,18 +16,32 @@
 
 package org.jsonschema2pojo.integration.util;
 
+import org.jsonschema2pojo.maven.Jsonschema2PojoMojo;
+
 import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.Map.Entry;
-
-import org.jsonschema2pojo.maven.Jsonschema2PojoMojo;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugin.logging.SystemStreamLog;
 
 /**
  * A plugin mojo that allows the private property values usually only set by
  * Maven to be set programatically.
  */
 public class TestableJsonschema2PojoMojo extends Jsonschema2PojoMojo {
 
+    private static final Log LOGGER_NO_DEBUG = new SystemStreamLog() {
+        @Override
+        public void debug(CharSequence content) {
+        }
+        @Override
+        public void debug(Throwable error) {
+        }
+        @Override
+        public void debug(CharSequence content, Throwable error) {
+        }
+    };
+
     public TestableJsonschema2PojoMojo configure(Map<String, Object> configValues) {
 
         // this could be done with reflection, if the plugin used real annotations.
@@ -37,6 +51,8 @@ public TestableJsonschema2PojoMojo configure(Map<String, Object> configValues) {
             setPrivateField(value.getKey(), value.getValue());
         }
 
+        this.setLog(LOGGER_NO_DEBUG);
+
         return this;
     }
 

jsonschema2pojo-maven-plugin/src/main/java/org/jsonschema2pojo/maven/Jsonschema2PojoMojo.java

@@ -602,16 +602,26 @@ public class Jsonschema2PojoMojo extends AbstractMojo implements GenerationConfi
      * create public fields instead
      *
      */
-    @Parameter(property = "jsonschame2pojo.includeSetters", defaultValue = "true")
+    @Parameter(property = "jsonschema2pojo.includeSetters", defaultValue = "true")
     private boolean includeSetters = true;
 
     /**
-     * The target version for generated source files.
-     *
-     * @since 0.4.17
+     * The target version for generated source files, used whenever decisions are made
+     * about generating source code that may be incompatible with older JVMs. Acceptable values
+     * include e.g. 1.6, 1.8, 8, 9, 10, 11.
+     * <p/>
+     * If not set, the value of targetVersion is auto-detected. For auto-detection, the first
+     * value found in the following list will be used:
+     * <ol>
+     *     <li>maven.compiler.source property</li>
+     *     <li>maven.compiler.release property</li>
+     *     <li>maven-compiler-plugin 'source' configuration option</li>
+     *     <li>maven-compiler-plugin 'release' configuration option</li>
+     *     <li>the current JVM version</li>
+     * </ol>
      */
-    @Parameter(property = "jsonschema2pojo.targetJavaVersion", defaultValue = "${maven.compiler.target}")
-    private String targetVersion = "";
+    @Parameter(property = "jsonschema2pojo.targetVersion")
+    private String targetVersion;
 
     /**
      * Whether to include dynamic getters, setters, and builders or to omit
@@ -1125,11 +1135,13 @@ private void setTargetVersion() {
 
         if (project.getProperties() != null && project.getProperties().containsKey("maven.compiler.source")) {
             this.targetVersion = project.getProperties().get("maven.compiler.source").toString();
+            getLog().debug("Using maven.compiler.source to set targetVersion for generated sources (" + this.targetVersion + ")");
             return;
         }
 
         if (project.getProperties() != null && project.getProperties().containsKey("maven.compiler.release")) {
             this.targetVersion = project.getProperties().get("maven.compiler.release").toString();
+            getLog().debug("Using maven.compiler.release to set targetVersion for generated sources (" + this.targetVersion + ")");
             return;
         }
 
@@ -1138,18 +1150,21 @@ private void setTargetVersion() {
                 final Xpp3Dom compilerSourceConfig = ((Xpp3Dom) p.getConfiguration()).getChild("source");
                 if (compilerSourceConfig != null) {
                     this.targetVersion = compilerSourceConfig.getValue();
+                    getLog().debug("Using maven-compiler-plugin 'source' to set targetVersion for generated sources (" + this.targetVersion + ")");
                     return;
                 }
 
                 final Xpp3Dom compilerReleaseConfig = ((Xpp3Dom) p.getConfiguration()).getChild("release");
                 if (compilerReleaseConfig != null) {
                     this.targetVersion = compilerReleaseConfig.getValue();
+                    getLog().debug("Using maven-compiler-plugin 'release' to set targetVersion for generated sources (" + this.targetVersion + ")");
                     return;
                 }
             }
         }
 
         this.targetVersion = JavaVersion.parse(System.getProperty("java.version"));
+        getLog().debug("Using JVM to set targetVersion for generated sources (" + this.targetVersion + ")");
     }
 
     @Override