Maven: Check for null before iterating over components

speedment · Jun 13, 2016 · 85dd5ac · 85dd5ac
1 parent 0b8b6e4
commit 85dd5ac
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/maven-plugin/src/main/java/com/speedment/maven/AbstractSpeedmentMojo.java b/maven-plugin/src/main/java/com/speedment/maven/AbstractSpeedmentMojo.java
@@ -36,7 +36,7 @@ abstract class AbstractSpeedmentMojo extends AbstractMojo {
     private final SpeedmentBuilder<?, ?> builder;
 
     protected abstract File configLocation();
-    protected abstract Class<Component>[] components();
+    protected abstract Class<? extends Component>[] components();
     protected abstract String launchMessage();
     protected abstract void execute(Speedment speedment) 
         throws MojoExecutionException, MojoFailureException;
@@ -79,8 +79,11 @@ protected final boolean hasConfigFile() {
         result.with(CodeGenerationComponentImpl.class);
         result.with(UserInterfaceComponentImpl.class);
 
-        for (final Class<Component> component : components()) {
+        final Class<? extends Component>[] components = components();
-            result.with(component);
+        if (components != null) {
+            for (final Class<? extends Component> component : components()) {
+                result.with(component);
+            }
         }
 
         return result;

diff --git a/maven-plugin/src/main/java/com/speedment/maven/GenerateMojo.java b/maven-plugin/src/main/java/com/speedment/maven/GenerateMojo.java
@@ -37,7 +37,7 @@
 public final class GenerateMojo extends AbstractSpeedmentMojo {
 
     @Parameter
-    private Class<Component>[] components;
+    private Class<? extends Component>[] components;
 
     @Parameter(defaultValue = DEFAULT_CONFIG_LOCATION)
     private File configFile;
@@ -63,7 +63,7 @@ public void execute(Speedment speedment) throws MojoExecutionException, MojoFail
     }
 
     @Override
-    protected Class<Component>[] components() {
+    protected Class<? extends Component>[] components() {
         return components;
     }
 

diff --git a/maven-plugin/src/main/java/com/speedment/maven/ToolMojo.java b/maven-plugin/src/main/java/com/speedment/maven/ToolMojo.java
@@ -38,7 +38,7 @@
 public final class ToolMojo extends AbstractSpeedmentMojo {
 
     @Parameter
-    private Class<Component>[] components;
+    private Class<? extends Component>[] components;
 
     @Parameter(defaultValue = DEFAULT_CONFIG_LOCATION)
     private File configFile;
@@ -56,7 +56,7 @@ public void execute(Speedment speedment) throws MojoExecutionException, MojoFail
     }
 
     @Override
-    protected Class<Component>[] components() {
+    protected Class<? extends Component>[] components() {
         return components;
     }