Fix NPE

Author: pnatashap

qulice-checkstyle/src/main/java/com/qulice/checkstyle/DiamondOperatorCheck.java

@@ -189,7 +189,7 @@ private static DetailAST secondChild(final DetailAST node) {
      * @return True if node contains angle brackets only
      */
     private static boolean isDiamondOperatorUsed(final DetailAST node) {
-        return node.getChildCount() == 2
+        return node != null && node.getChildCount() == 2
             && node.getFirstChild().getType() == TokenTypes.GENERIC_START
             && node.getLastChild().getType() == TokenTypes.GENERIC_END;
     }

qulice-maven-plugin/src/main/java/com/qulice/maven/AbstractQuliceMojo.java

@@ -106,6 +106,13 @@ public abstract class AbstractQuliceMojo extends AbstractMojo
     )
     private final Collection<String> asserts = new LinkedList<>();
 
+    /**
+     * The source encoding.
+     *
+     * @parameter expression="${project.build.sourceEncoding}" required="true"
+     */
+    private String charset;
+
     /**
      * Set Maven Project (used mostly for unit testing).
      * @param proj The project to set
@@ -148,6 +155,14 @@ public final void setExcludes(final Collection<String> exprs) {
         this.excludes.addAll(exprs);
     }
 
+    /**
+     * Set source code encoding.
+     * @param encoding Source code encoding
+     */
+    public void setEncoding(final String encoding) {
+        this.charset = encoding;
+    }
+
     @Override
     public final void contextualize(final Context ctx) {
         this.environment.setContext(ctx);
@@ -167,6 +182,7 @@ public final void execute() throws MojoFailureException {
         );
         this.environment.setExcludes(this.excludes);
         this.environment.setAsser(this.asserts);
+        this.environment.setEncoding(this.charset);
         final long start = System.nanoTime();
         this.doExecute();
         Logger.info(

qulice-maven-plugin/src/main/java/com/qulice/maven/DefaultMavenEnvironment.java

@@ -97,6 +97,11 @@ public final class DefaultMavenEnvironment implements MavenEnvironment {
      */
     private final Collection<String> asser = new LinkedList<>();
 
+    /**
+     * Source code encoding charset.
+     */
+    private String charset = "UTF-8";
+
     @Override
     public String param(final String name, final String value) {
         String ret = this.iproperties.getProperty(name);
@@ -293,16 +298,19 @@ public void setAsser(final Collection<String> ass) {
         this.asser.addAll(ass);
     }
 
+    public void setEncoding(final String encoding) {
+        this.charset = encoding;
+    }
+
     /**
      * Get source files encoding.
      * @return Charset of the source files
      */
     public Charset encoding() {
-        String charset = this.iproject.getProperties().getProperty("project.build.sourceEncoding");
-        if (charset == null) {
-            charset = "UTF-8";
+        if (this.charset == null || this.charset.isEmpty()) {
+            this.charset = "UTF-8";
         }
-        return Charset.forName(charset);
+        return Charset.forName(this.charset);
     }
 
     /**

qulice-maven-plugin/src/test/java/com/qulice/maven/DefaultMavenEnvironmentTest.java

@@ -31,6 +31,7 @@
 package com.qulice.maven;
 
 import com.google.common.collect.ImmutableList;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import org.apache.maven.project.MavenProject;
 import org.hamcrest.MatcherAssert;
@@ -152,12 +153,12 @@ void producesEmptyExcludesWhenNoMatches() {
      * Default source files encoding should be UFT-8.
      */
     @Test
-    void defaultEncodingIsUTF8() {
+    void defaultEncodingIsUtf() {
         final DefaultMavenEnvironment env = new DefaultMavenEnvironment();
         MatcherAssert.assertThat(
             "Default encoding should be UTF-8",
             env.encoding(),
-            Matchers.is("UTF-8")
+            Matchers.is(StandardCharsets.UTF_8)
         );
     }
 }