Fixes #14 - DockerfileResource.verify() throws NPE.

forge · Jul 1, 2015 · 5c6d428 · 5c6d428
1 parent 19d2b82
commit 5c6d428
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/src/main/java/org/jboss/forge/addon/docker/resource/DockerFileResourceImpl.java b/src/main/java/org/jboss/forge/addon/docker/resource/DockerFileResourceImpl.java
@@ -37,12 +37,12 @@ protected List<Resource<?>> doListResources()
    @Override
    public DockerfileValidationResult verify()
    {
-      return new DockerfileValidationImpl().verify(this);
+      return new DockerfileValidationImpl(getResourceFactory()).verify(this);
    }
 
    public DockerfileValidationResult verify(Resource<?> ruleFile)
    {
-      return new DockerfileValidationImpl().verify(this, ruleFile);
+      return new DockerfileValidationImpl(getResourceFactory()).verify(this, ruleFile);
    }
 
    @Override

diff --git a/src/main/java/org/jboss/forge/addon/docker/ui/DockerfileVerifyCommandImpl.java b/src/main/java/org/jboss/forge/addon/docker/ui/DockerfileVerifyCommandImpl.java
@@ -3,7 +3,6 @@
 import javax.inject.Inject;
 
 import org.jboss.forge.addon.docker.resource.DockerFileResource;
-import org.jboss.forge.addon.docker.validation.DockerfileValidationImpl;
 import org.jboss.forge.addon.docker.validation.DockerfileValidationResult;
 import org.jboss.forge.addon.resource.FileResource;
 import org.jboss.forge.addon.ui.command.AbstractUICommand;
@@ -42,9 +41,6 @@ public UICommandMetadata getMetadata(UIContext context)
                .category(Categories.create("Docker"));
    }
 
-   @Inject
-   DockerfileValidationImpl imp;
-
    @Override
    public Result execute(UIExecutionContext context) throws Exception
    {
@@ -60,10 +56,10 @@ public Result execute(UIExecutionContext context) throws Exception
          return Results.fail("Rulefile not found");
 
       if (rulefile.getValue() == null)
-         result = imp.verify(dockerfile.getValue());
+         result = dockerfile.getValue().verify();
 
       else
-         result = imp.verify(dockerfile.getValue(), rulefile.getValue());
+         result = dockerfile.getValue().verify(rulefile.getValue());
 
       return Results.success("Lint Results: \n" + result.toString());
    }

diff --git a/src/main/java/org/jboss/forge/addon/docker/validation/DockerfileValidationImpl.java b/src/main/java/org/jboss/forge/addon/docker/validation/DockerfileValidationImpl.java
@@ -11,8 +11,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.inject.Inject;
-
 import org.jboss.forge.addon.docker.resource.DockerFileResource;
 import org.jboss.forge.addon.resource.FileResource;
 import org.jboss.forge.addon.resource.Resource;
@@ -24,14 +22,13 @@ public class DockerfileValidationImpl
    // TODO add support for JavaScript regexes.
    // TODO add support for case insensitive regexes.
 
-   @Inject
    private ResourceFactory resourceFactory;
 
    private FileResource<?> baseRuleFile = null;
 
-   public DockerfileValidationImpl()
+   public DockerfileValidationImpl(ResourceFactory resourceFactory)
    {
-
+      this.resourceFactory = resourceFactory;
    }
 
    @SuppressWarnings("unchecked")

diff --git a/src/test/java/org/jboss/forge/addon/docker/validation/DockerfileValidationImplTest.java b/src/test/java/org/jboss/forge/addon/docker/validation/DockerfileValidationImplTest.java
@@ -37,9 +37,6 @@ public static AddonArchive getDeployment()
    @Inject
    ResourceFactory resourceFactory;
 
-   @Inject
-   DockerfileValidationImpl dockerfileValidationImpl;
-
    @Test
    public void testDockerfileValidation() throws Exception
    {
@@ -59,7 +56,7 @@ public void testDockerfileValidation() throws Exception
       Assert.assertTrue(ruleFile.exists());
       ruleFile.setContents(getClass().getResource("default_rules.yaml").openStream());
 
-      DockerfileValidationResult dockerfileValidationResult = dockerfileValidationImpl.verify(dockerfileResource,
+      DockerfileValidationResult dockerfileValidationResult = dockerfileResource.verify(
                ruleFile);
 
       Assert.assertEquals(dockerfileValidationResult.getErrors(), 0);
@@ -83,7 +80,7 @@ public void testDockerfileValidationWithNoRuleFile() throws Exception
       Assert.assertTrue(dockerfileResource.exists());
       dockerfileResource.setContents(getClass().getResource("Dockerfile").openStream());
 
-      DockerfileValidationResult dockerfileValidationResult = dockerfileValidationImpl.verify(dockerfileResource);
+      DockerfileValidationResult dockerfileValidationResult = dockerfileResource.verify();
 
       Assert.assertEquals(dockerfileValidationResult.getErrors(), 0);
       Assert.assertEquals(dockerfileValidationResult.getWarn(), 0);
@@ -92,8 +89,5 @@ public void testDockerfileValidationWithNoRuleFile() throws Exception
       Assert.assertEquals(
                dockerfileValidationResult.toString(),
                "Validation Results\nErrors: 0\nWarn: 0\nInfo: 0\n");
-
-      //This should work ideally
-      dockerfileResource.verify();
    }
 }