Refactored DockerFileResource.verify(Resource<?>).

forge · Jun 10, 2015 · 3a7f27f · 3a7f27f
1 parent b78718f
commit 3a7f27f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 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
@@ -2,6 +2,7 @@
 
 import org.jboss.forge.addon.docker.validation.DockerfileValidationResult;
 import org.jboss.forge.addon.resource.FileResource;
+import org.jboss.forge.addon.resource.Resource;
 import org.jboss.shrinkwrap.descriptor.api.docker.DockerDescriptor;
 
 /**
@@ -13,7 +14,8 @@
 public interface DockerFileResource extends FileResource<DockerFileResource>
 {
    /**
-    * Return the {@link DockerfileValidationResult} validating the underlying Dockerfile against a set of preset base rules.
+    * Return the {@link DockerfileValidationResult} validating the underlying Dockerfile against a set of preset base
+    * rules.
     * 
     * @return The result of validation containing errors, warnings and info.
     */
@@ -22,10 +24,10 @@ public interface DockerFileResource extends FileResource<DockerFileResource>
    /**
     * Return the {@link DockerfileValidationResult} validating the underlying Dockerfile against the given rule file.
     * 
-    * @param ruleFile The {@link FileResource} which is the abstraction for YAML rule file used to lint against.
+    * @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(FileResource<?> ruleFile);
+   DockerfileValidationResult verify(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
@@ -7,7 +7,6 @@
 import org.jboss.forge.addon.docker.validation.DockerfileValidationImpl;
 import org.jboss.forge.addon.docker.validation.DockerfileValidationResult;
 import org.jboss.forge.addon.resource.AbstractFileResource;
-import org.jboss.forge.addon.resource.FileResource;
 import org.jboss.forge.addon.resource.Resource;
 import org.jboss.forge.addon.resource.ResourceFactory;
 import org.jboss.shrinkwrap.descriptor.api.DescriptorImporter;
@@ -41,7 +40,7 @@ public DockerfileValidationResult verify()
       return new DockerfileValidationImpl().verify(this);
    }
 
-   public DockerfileValidationResult verify(FileResource<?> ruleFile)
+   public DockerfileValidationResult verify(Resource<?> ruleFile)
    {
       return new DockerfileValidationImpl().verify(this, ruleFile);
    }

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
@@ -15,6 +15,7 @@
 
 import org.jboss.forge.addon.docker.resource.DockerFileResource;
 import org.jboss.forge.addon.resource.FileResource;
+import org.jboss.forge.addon.resource.Resource;
 import org.jboss.forge.addon.resource.ResourceFactory;
 import org.yaml.snakeyaml.Yaml;
 
@@ -63,7 +64,7 @@ public DockerfileValidationResult verify(DockerFileResource dockerfile)
       return verify(dockerfile, null);
    }
 
-   public DockerfileValidationResult verify(DockerFileResource dockerfile, FileResource<?> ruleFile)
+   public DockerfileValidationResult verify(DockerFileResource dockerfile, Resource<?> ruleFile)
 
    {
       if (baseRuleFile == null)