Renamed DockerfileValidationImpl to DockerfileLinter.Fixes #9.

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

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/src/main/java/org/jboss/forge/addon/docker/resource/DockerFileResource.java b/src/main/java/org/jboss/forge/addon/docker/resource/DockerFileResource.java
@@ -19,15 +19,15 @@ public interface DockerFileResource extends FileResource<DockerFileResource>
     * 
     * @return The result of validation containing errors, warnings and info.
     */
-   DockerfileValidationResult verify();
+   DockerfileValidationResult lint();
 
    /**
     * Return the {@link DockerfileValidationResult} validating the underlying Dockerfile against the given rule file.
     * 
     * @param ruleFile The {@link Resource} which is the abstraction for YAML rule file used to lint against.
     * @return The result of validation containing errors, warnings and info.
     */
-   DockerfileValidationResult verify(Resource<?> ruleFile);
+   DockerfileValidationResult lint(Resource<?> ruleFile);
 
    /**
     * Return the {@link DockerDescriptor} representing the underlying Dockerfile.

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
@@ -4,7 +4,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jboss.forge.addon.docker.validation.DockerfileValidationImpl;
+import org.jboss.forge.addon.docker.validation.DockerfileLinter;
 import org.jboss.forge.addon.docker.validation.DockerfileValidationResult;
 import org.jboss.forge.addon.resource.AbstractFileResource;
 import org.jboss.forge.addon.resource.Resource;
@@ -35,14 +35,14 @@ protected List<Resource<?>> doListResources()
    }
 
    @Override
-   public DockerfileValidationResult verify()
+   public DockerfileValidationResult lint()
    {
-      return new DockerfileValidationImpl(getResourceFactory()).verify(this);
+      return new DockerfileLinter(getResourceFactory()).lint(this);
    }
 
-   public DockerfileValidationResult verify(Resource<?> ruleFile)
+   public DockerfileValidationResult lint(Resource<?> ruleFile)
    {
-      return new DockerfileValidationImpl(getResourceFactory()).verify(this, ruleFile);
+      return new DockerfileLinter(getResourceFactory()).lint(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
@@ -56,10 +56,10 @@ public Result execute(UIExecutionContext context) throws Exception
          return Results.fail("Rulefile not found");
 
       if (rulefile.getValue() == null)
-         result = dockerfile.getValue().verify();
+         result = dockerfile.getValue().lint();
 
       else
-         result = dockerfile.getValue().verify(rulefile.getValue());
+         result = dockerfile.getValue().lint(rulefile.getValue());
 
       return Results.success("Lint Results: \n" + result.toString());
    }

diff --git a/.../validation/DockerfileValidationImpl.java → ...n/docker/validation/DockerfileLinter.java b/.../validation/DockerfileValidationImpl.java → ...n/docker/validation/DockerfileLinter.java
@@ -17,7 +17,7 @@
 import org.jboss.forge.addon.resource.ResourceFactory;
 import org.yaml.snakeyaml.Yaml;
 
-public class DockerfileValidationImpl
+public class DockerfileLinter
 {
    // TODO add support for JavaScript regexes.
    // TODO add support for case insensitive regexes.
@@ -26,7 +26,7 @@ public class DockerfileValidationImpl
 
    private FileResource<?> baseRuleFile = null;
 
-   public DockerfileValidationImpl(ResourceFactory resourceFactory)
+   public DockerfileLinter(ResourceFactory resourceFactory)
    {
       this.resourceFactory = resourceFactory;
    }
@@ -56,12 +56,12 @@ public FileResource<?> getBaseRules()
       return fileResource;
    }
 
-   public DockerfileValidationResult verify(DockerFileResource dockerfile)
+   public DockerfileValidationResult lint(DockerFileResource dockerfile)
    {
-      return verify(dockerfile, null);
+      return lint(dockerfile, null);
    }
 
-   public DockerfileValidationResult verify(DockerFileResource dockerfile, Resource<?> ruleFile)
+   public DockerfileValidationResult lint(DockerFileResource dockerfile, Resource<?> ruleFile)
 
    {
       if (baseRuleFile == null)

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
@@ -56,7 +56,7 @@ public void testDockerfileValidation() throws Exception
       Assert.assertTrue(ruleFile.exists());
       ruleFile.setContents(getClass().getResource("default_rules.yaml").openStream());
 
-      DockerfileValidationResult dockerfileValidationResult = dockerfileResource.verify(
+      DockerfileValidationResult dockerfileValidationResult = dockerfileResource.lint(
                ruleFile);
 
       Assert.assertEquals(dockerfileValidationResult.getErrors(), 0);
@@ -80,7 +80,7 @@ public void testDockerfileValidationWithNoRuleFile() throws Exception
       Assert.assertTrue(dockerfileResource.exists());
       dockerfileResource.setContents(getClass().getResource("Dockerfile").openStream());
 
-      DockerfileValidationResult dockerfileValidationResult = dockerfileResource.verify();
+      DockerfileValidationResult dockerfileValidationResult = dockerfileResource.lint();
 
       Assert.assertEquals(dockerfileValidationResult.getErrors(), 0);
       Assert.assertEquals(dockerfileValidationResult.getWarn(), 0);