Add Rule Logger

.gitattributes

@@ -0,0 +1,6 @@
+
+# Batch Scripts should always be using Windows line endings.
+*.bat text eol=crlf
+
+# Shell Scripts should always be using Linux line endings.
+*.sh text eol=lf

.travis.yml

@@ -1,7 +1,18 @@
 language: java
-script: "mvn verify"
-jdk:
-  - openjdk8
+os: linux
+
+jdk: openjdk8
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+  - rm -fr $HOME/.gradle/caches/*/scripts/
+
 cache:
   directories:
     - "$HOME/.m2"
+    - "$HOME/.gradle/caches/"
+    - "$HOME/.gradle/wrapper/"
+
+script:
+  - mvn verify

jsonschema2pojo-ant/src/main/java/org/jsonschema2pojo/ant/AntRuleLogger.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright © 2010-2017 Nokia
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jsonschema2pojo.ant;
+
+import org.apache.tools.ant.Project;
+import org.jsonschema2pojo.AbstractRuleLogger;
+
+public class AntRuleLogger extends AbstractRuleLogger {
+
+  private static final String LEVEL_PREFIX = "[";
+  private static final String LEVEL_SUFFIX = "] ";
+  private static final String DEBUG_LEVEL_PREFIX = LEVEL_PREFIX + "DEBUG" + LEVEL_SUFFIX;
+  private static final String ERROR_LEVEL_PREFIX = LEVEL_PREFIX + "ERROR" + LEVEL_SUFFIX;
+  private static final String INFO_LEVEL_PREFIX = LEVEL_PREFIX + "INFO" + LEVEL_SUFFIX;
+  private static final String TRACE_LEVEL_PREFIX = LEVEL_PREFIX + "TRACE" + LEVEL_SUFFIX;
+  private static final String WARN_LEVEL_PREFIX = LEVEL_PREFIX + "WARN" + LEVEL_SUFFIX;
+
+  private final Jsonschema2PojoTask task;
+
+  public AntRuleLogger(Jsonschema2PojoTask jsonschema2PojoTask) {
+    this.task = jsonschema2PojoTask;
+  }
+
+  @Override
+  public boolean isDebugEnabled() {
+    return true;
+  }
+
+  @Override
+  public boolean isErrorEnabled() {
+    return true;
+  }
+
+  @Override
+  public boolean isInfoEnabled() {
+    return true;
+  }
+
+  @Override
+  public boolean isTraceEnabled() {
+    return true;
+  }
+
+  @Override
+  public boolean isWarnEnabled() {
+    return true;
+  }
+
+  protected void doDebug(String msg) {
+    log(msg, Project.MSG_DEBUG, DEBUG_LEVEL_PREFIX);
+  }
+
+  protected void doError(String msg) {
+    log(msg, Project.MSG_ERR, ERROR_LEVEL_PREFIX);
+  }
+
+  protected void doInfo(String msg) {
+    log(msg, Project.MSG_INFO, INFO_LEVEL_PREFIX);
+  }
+
+  protected void doTrace(String msg) {
+    log(msg, Project.MSG_VERBOSE, TRACE_LEVEL_PREFIX);
+  }
+
+  protected void doWarn(String msg) {
+    log(msg, Project.MSG_WARN, WARN_LEVEL_PREFIX);
+  }
+
+  private void log(String msg, int level, String levelPrefix) {
+    if (task != null && task.getProject() != null) {
+      task.getProject().log(msg, level);
+    } else {
+      System.err.println(levelPrefix + msg);
+    }
+  }
+}

jsonschema2pojo-ant/src/main/java/org/jsonschema2pojo/ant/Jsonschema2PojoTask.java

@@ -48,6 +48,7 @@
 import org.jsonschema2pojo.Jsonschema2Pojo;
 import org.jsonschema2pojo.Language;
 import org.jsonschema2pojo.NoopAnnotator;
+import org.jsonschema2pojo.RuleLogger;
 import org.jsonschema2pojo.SourceSortOrder;
 import org.jsonschema2pojo.SourceType;
 import org.jsonschema2pojo.URLProtocol;
@@ -242,8 +243,10 @@ public void execute() throws BuildException {
         ClassLoader extendedClassloader = buildExtendedClassloader();
         Thread.currentThread().setContextClassLoader(extendedClassloader);
 
+        RuleLogger ruleLogger = new AntRuleLogger(this);
+
         try {
-            Jsonschema2Pojo.generate(this);
+            Jsonschema2Pojo.generate(this, ruleLogger);
         } catch (IOException e) {
             throw new BuildException("Error generating classes from JSON Schema file(s) " + source, e);
         }

jsonschema2pojo-cli/pom.xml

@@ -50,8 +50,8 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <classpathPrefix>./</classpathPrefix>
                             <addClasspath>true</addClasspath>
+                            <classpathPrefix>./</classpathPrefix>
                             <mainClass>org.jsonschema2pojo.cli.Jsonschema2PojoCLI</mainClass>
                         </manifest>
                     </archive>
@@ -61,9 +61,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <version>3.1.1</version>
-                <configuration>
-                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                </configuration>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -72,6 +69,7 @@
                         </goals>
                         <configuration>
                             <includeScope>runtime</includeScope>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -111,14 +109,17 @@
             <artifactId>jsonschema2pojo-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>com.beust</groupId>
             <artifactId>jcommander</artifactId>
         </dependency>
+
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -132,5 +133,4 @@
             <artifactId>mockito-all</artifactId>
         </dependency>
     </dependencies>
-
 </project>

jsonschema2pojo-cli/src/main/java/org/jsonschema2pojo/cli/Arguments.java

@@ -36,6 +36,8 @@
 import org.jsonschema2pojo.NoopAnnotator;
 import org.jsonschema2pojo.SourceSortOrder;
 import org.jsonschema2pojo.SourceType;
+import org.jsonschema2pojo.cli.CommandLineLogger.LogLevel;
+import org.jsonschema2pojo.cli.CommandLineLogger.LogLevelValidator;
 import org.jsonschema2pojo.rules.RuleFactory;
 
 import com.beust.jcommander.JCommander;
@@ -239,11 +241,16 @@ public class Arguments implements GenerationConfig {
 
     @Parameter(names = { "-ftm", "--format-type-mapping" }, description = "Mapping from format identifier to type: <format>:<fully.qualified.Type>.", variableArity = true)
     private List<String> formatTypeMapping = new ArrayList<>();
-
+
+    @Parameter(names = { "-log" }, description = "Configure log level. Defaults to info. Available options are: off, error, warn, info, debug, trace", validateWith = LogLevelValidator.class )
+    private String logLevel = CommandLineLogger.DEFAULT_LOG_LEVEL;
+
+    @Parameter(names = {"--print-log-levels"}, description = "Prints available log levels and exit.")
+    private boolean printLogLevels = false;
+
     private static final int EXIT_OKAY = 0;
     private static final int EXIT_ERROR = 1;
 
-
     /**
      * Parses command line arguments and populates this command line instance.
      * <p>
@@ -302,6 +309,10 @@ public boolean isIncludeTypeInfo()
         return includeTypeInfo;
     }
 
+    public String getLogLevel() {
+        return logLevel;
+    }
+
     @Override
     public boolean isUseInnerClassBuilders() {
         return useInnerClassBuilders;
@@ -468,6 +479,10 @@ public boolean isConstructorsRequiredPropertiesOnly() {
         return constructorsRequiredPropertiesOnly;
     }
 
+    public boolean isPrintLogLevels() {
+        return printLogLevels;
+    }
+
     @Override
     public boolean isIncludeRequiredPropertiesConstructor() { return includeRequiredPropertiesConstructor; }