Rename FileResourceModel to just FileModel - it's used very often and…

… FileModel is clear enough.
windup · Jun 12, 2014 · 1759f7e · 1759f7e
1 parent d7c2a05
commit 1759f7e
Show file tree

Hide file tree

Showing 22 changed files with 146 additions and 99 deletions.
diff --git a/...src/main/java/org/jboss/windup/config/operation/iteration/ProcyonDecompilerOperation.java b/...src/main/java/org/jboss/windup/config/operation/iteration/ProcyonDecompilerOperation.java
@@ -14,7 +14,7 @@
 import org.jboss.windup.decompiler.procyon.ProcyonDecompiler;
 import org.jboss.windup.util.exception.WindupException;
 import org.jboss.windup.graph.model.ArchiveModel;
-import org.jboss.windup.graph.model.resource.FileResourceModel;
+import org.jboss.windup.graph.model.resource.FileModel;
 import org.jboss.windup.graph.model.resource.JavaClassModel;
 import org.jboss.windup.graph.service.GraphService;
 import org.ocpsoft.rewrite.context.EvaluationContext;
@@ -33,7 +33,7 @@ public void perform(final GraphRewrite event, final EvaluationContext context, f
         if (payload.getUnzippedDirectory() != null)
         {
             Decompiler decompiler = new ProcyonDecompiler(new ProcyonConfiguration().setIncludeNested(false));
-            String archivePath = ((FileResourceModel) payload).getFilePath();
+            String archivePath = ((FileModel) payload).getFilePath();
             File archive = new File(archivePath);
             File outputDir = new File(payload.getUnzippedDirectory().getFilePath());
 
@@ -42,27 +42,27 @@ public void perform(final GraphRewrite event, final EvaluationContext context, f
                 DecompilationResult result = decompiler.decompileArchive(archive, outputDir);
                 Set<String> decompiledOutputFileSet = result.getDecompiledOutputFiles();
 
-                GraphService<FileResourceModel> fileService = new GraphService<>(event.getGraphContext(),
-                            FileResourceModel.class);
+                GraphService<FileModel> fileService = new GraphService<>(event.getGraphContext(),
+                            FileModel.class);
                 for (String decompiledOutputFile : decompiledOutputFileSet)
                 {
-                    FileResourceModel decompiledFileModel = fileService.getByUniqueProperty(
-                                FileResourceModel.PROPERTY_FILE_PATH, decompiledOutputFile);
+                    FileModel decompiledFileModel = fileService.getByUniqueProperty(
+                                FileModel.PROPERTY_FILE_PATH, decompiledOutputFile);
 
                     if (decompiledOutputFile.endsWith(".java"))
                     {
                         if (decompiledFileModel == null)
                         {
                             decompiledFileModel = event.getGraphContext().getFramed()
-                                        .addVertex(null, FileResourceModel.class);
+                                        .addVertex(null, FileModel.class);
                             decompiledFileModel.setFilePath(decompiledOutputFile);
                         }
 
                         Path classFilepath = Paths.get(decompiledOutputFile.substring(0,
                                     decompiledOutputFile.length() - 5)
                                     + ".class");
-                        FileResourceModel classFileModel = fileService.getByUniqueProperty(
-                                    FileResourceModel.PROPERTY_FILE_PATH, classFilepath);
+                        FileModel classFileModel = fileService.getByUniqueProperty(
+                                    FileModel.PROPERTY_FILE_PATH, classFilepath);
                         if (classFileModel != null && classFileModel instanceof JavaClassModel)
                         {
                             JavaClassModel classModel = (JavaClassModel) classFileModel;

diff --git a/...in/java/org/jboss/windup/config/operation/ruleelement/AddArchiveReferenceInformation.java b/...in/java/org/jboss/windup/config/operation/ruleelement/AddArchiveReferenceInformation.java
@@ -6,14 +6,14 @@
 import org.jboss.windup.graph.GraphUtil;
 import org.jboss.windup.graph.model.ApplicationReferenceModel;
 import org.jboss.windup.graph.model.ArchiveModel;
-import org.jboss.windup.graph.model.resource.FileResourceModel;
+import org.jboss.windup.graph.model.resource.FileModel;
 import org.ocpsoft.rewrite.context.EvaluationContext;
 
-public class AddArchiveReferenceInformation extends AbstractIterationOperator<FileResourceModel>
+public class AddArchiveReferenceInformation extends AbstractIterationOperator<FileModel>
 {
     public AddArchiveReferenceInformation(String variableName)
     {
-        super(FileResourceModel.class, variableName);
+        super(FileModel.class, variableName);
     }
 
     public static AddArchiveReferenceInformation addReferenceInformation(String variableName)
@@ -22,7 +22,7 @@ public static AddArchiveReferenceInformation addReferenceInformation(String vari
     }
 
     @Override
-    public void perform(GraphRewrite event, EvaluationContext context, FileResourceModel fileResourceModel)
+    public void perform(GraphRewrite event, EvaluationContext context, FileModel fileResourceModel)
     {
         File file = new File(fileResourceModel.getFilePath());
         ArchiveModel archiveResourceModel = GraphUtil.addTypeToModel(event.getGraphContext(),

diff --git a/...api/src/main/java/org/jboss/windup/config/operation/ruleelement/AddClassFileMetadata.java b/...api/src/main/java/org/jboss/windup/config/operation/ruleelement/AddClassFileMetadata.java
@@ -7,20 +7,20 @@
 import org.jboss.windup.config.GraphRewrite;
 import org.jboss.windup.util.exception.WindupException;
 import org.jboss.windup.graph.GraphUtil;
-import org.jboss.windup.graph.model.resource.FileResourceModel;
+import org.jboss.windup.graph.model.resource.FileModel;
 import org.jboss.windup.graph.model.resource.JavaClassModel;
 import org.ocpsoft.rewrite.context.EvaluationContext;
 
-public class AddClassFileMetadata extends AbstractIterationOperator<FileResourceModel>
+public class AddClassFileMetadata extends AbstractIterationOperator<FileModel>
 {
 
     public AddClassFileMetadata(String variableName)
     {
-        super(FileResourceModel.class, variableName);
+        super(FileModel.class, variableName);
     }
 
     @Override
-    public void perform(GraphRewrite event, EvaluationContext context, FileResourceModel payload)
+    public void perform(GraphRewrite event, EvaluationContext context, FileModel payload)
     {
         try
         {

diff --git a/.../main/java/org/jboss/windup/config/operation/ruleelement/RecurseDirectoryAndAddFiles.java b/.../main/java/org/jboss/windup/config/operation/ruleelement/RecurseDirectoryAndAddFiles.java
@@ -8,14 +8,14 @@
 import org.apache.commons.io.filefilter.TrueFileFilter;
 import org.jboss.windup.config.GraphRewrite;
 import org.jboss.windup.graph.GraphContext;
-import org.jboss.windup.graph.model.resource.FileResourceModel;
+import org.jboss.windup.graph.model.resource.FileModel;
 import org.ocpsoft.rewrite.context.EvaluationContext;
 
-public class RecurseDirectoryAndAddFiles extends AbstractIterationOperator<FileResourceModel>
+public class RecurseDirectoryAndAddFiles extends AbstractIterationOperator<FileModel>
 {
     public RecurseDirectoryAndAddFiles(String variableName)
     {
-        super(FileResourceModel.class, variableName);
+        super(FileModel.class, variableName);
     }
 
     public static RecurseDirectoryAndAddFiles add(String variableName)
@@ -24,12 +24,12 @@ public static RecurseDirectoryAndAddFiles add(String variableName)
     }
 
     @Override
-    public void perform(GraphRewrite event, EvaluationContext context, FileResourceModel resourceModel)
+    public void perform(GraphRewrite event, EvaluationContext context, FileModel resourceModel)
     {
         visitFile(event.getGraphContext(), resourceModel);
     }
 
-    private void visitFile(GraphContext ctx, FileResourceModel file)
+    private void visitFile(GraphContext ctx, FileModel file)
     {
         String filePath = file.getFilePath();
         File fileReference = new File(filePath);
@@ -39,7 +39,7 @@ private void visitFile(GraphContext ctx, FileResourceModel file)
             Collection<File> found = FileUtils.listFiles(fileReference, FileFileFilter.FILE, TrueFileFilter.INSTANCE);
             for (File reference : found)
             {
-                FileResourceModel subFile = ctx.getFramed().addVertex(null, FileResourceModel.class);
+                FileModel subFile = ctx.getFramed().addVertex(null, FileModel.class);
                 subFile.setFilePath(reference.getAbsolutePath());
                 visitFile(ctx, subFile);
             }

diff --git a/...ain/java/org/jboss/windup/config/operation/ruleelement/UnzipArchiveToTemporaryFolder.java b/...ain/java/org/jboss/windup/config/operation/ruleelement/UnzipArchiveToTemporaryFolder.java
@@ -13,7 +13,7 @@
 import org.jboss.windup.graph.GraphUtil;
 import org.jboss.windup.graph.model.ApplicationReferenceModel;
 import org.jboss.windup.graph.model.ArchiveModel;
-import org.jboss.windup.graph.model.resource.FileResourceModel;
+import org.jboss.windup.graph.model.resource.FileModel;
 import org.jboss.windup.util.ZipUtil;
 import org.jboss.windup.util.exception.WindupException;
 import org.ocpsoft.rewrite.context.EvaluationContext;
@@ -39,9 +39,9 @@ public static UnzipArchiveToTemporaryFolder unzip(String variableName)
     @Override
     public void perform(GraphRewrite event, EvaluationContext context, ArchiveModel payload)
     {
-        if (payload instanceof FileResourceModel)
+        if (payload instanceof FileModel)
         {
-            FileResourceModel fileResourceModel = (FileResourceModel) payload;
+            FileModel fileResourceModel = (FileModel) payload;
             File zipFile = fileResourceModel.asFile();
 
             if (!zipFile.isFile())
@@ -110,8 +110,8 @@ private void unzipToTempDirectory(final GraphRewrite event, final Path tempFolde
         // add a folder reference for this application
         ApplicationReferenceModel appRefModel = archiveModel.getApplicationReferenceModel();
 
-        FileResourceModel newFileModel = event.getGraphContext().getFramed()
-                    .addVertex(null, FileResourceModel.class);
+        FileModel newFileModel = event.getGraphContext().getFramed()
+                    .addVertex(null, FileModel.class);
         newFileModel.setFilePath(appArchiveFolder.toAbsolutePath().toString());
         // mark the path to the archive
         archiveModel.setUnzippedDirectory(newFileModel);
@@ -129,8 +129,8 @@ private void unzipToTempDirectory(final GraphRewrite event, final Path tempFolde
                 @Override
                 public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException
                 {
-                    FileResourceModel childFile = event.getGraphContext().getFramed()
-                                .addVertex(null, FileResourceModel.class);
+                    FileModel childFile = event.getGraphContext().getFramed()
+                                .addVertex(null, FileModel.class);
                     childFile.setFilePath(file.toAbsolutePath().toString());
                     archiveModel.addContainedFileModel(childFile);
 

diff --git a/graph/api/src/main/java/org/jboss/windup/graph/dao/FileResourceDao.java b/graph/api/src/main/java/org/jboss/windup/graph/dao/FileResourceDao.java
@@ -1,8 +1,8 @@
 package org.jboss.windup.graph.dao;
 
-import org.jboss.windup.graph.model.resource.FileResourceModel;
+import org.jboss.windup.graph.model.resource.FileModel;
 
-public interface FileResourceDao extends BaseDao<FileResourceModel> {
-	public FileResourceModel createByFilePath(String filePath);
-	public Iterable<FileResourceModel> findArchiveEntryWithExtension(String ... values);
+public interface FileResourceDao extends BaseDao<FileModel> {
+	public FileModel createByFilePath(String filePath);
+	public Iterable<FileModel> findArchiveEntryWithExtension(String ... values);
 }
diff --git a/graph/api/src/main/java/org/jboss/windup/graph/dao/SourceReportDao.java b/graph/api/src/main/java/org/jboss/windup/graph/dao/SourceReportDao.java
@@ -1,12 +1,12 @@
 package org.jboss.windup.graph.dao;
 
 import org.jboss.windup.graph.model.meta.report.SourceReportModel;
-import org.jboss.windup.graph.model.resource.FileResourceModel;
+import org.jboss.windup.graph.model.resource.FileModel;
 import org.jboss.windup.graph.model.resource.ResourceModel;
 
 public interface SourceReportDao extends BaseDao<SourceReportModel>
 {
     public boolean hasSourceReport(ResourceModel resource);
 
-    public FileResourceModel getResourceReport(ResourceModel resource);
+    public FileModel getResourceReport(ResourceModel resource);
 }
diff --git a/graph/api/src/main/java/org/jboss/windup/graph/model/ApplicationReferenceModel.java b/graph/api/src/main/java/org/jboss/windup/graph/model/ApplicationReferenceModel.java
@@ -1,6 +1,6 @@
 package org.jboss.windup.graph.model;
 
-import org.jboss.windup.graph.model.resource.FileResourceModel;
+import org.jboss.windup.graph.model.resource.FileModel;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.frames.Adjacency;
@@ -17,8 +17,8 @@ public interface ApplicationReferenceModel extends WindupVertexFrame
     public ArchiveModel getArchive();
 
     @Adjacency(label = "directory", direction = Direction.OUT)
-    public FileResourceModel getFileResourceModel();
+    public FileModel getFileResourceModel();
 
     @Adjacency(label = "directory", direction = Direction.OUT)
-    public FileResourceModel setFileResourceModel(FileResourceModel model);
+    public FileModel setFileResourceModel(FileModel model);
 }
diff --git a/graph/api/src/main/java/org/jboss/windup/graph/model/ArchiveModel.java b/graph/api/src/main/java/org/jboss/windup/graph/model/ArchiveModel.java
@@ -1,6 +1,6 @@
 package org.jboss.windup.graph.model;
 
-import org.jboss.windup.graph.model.resource.FileResourceModel;
+import org.jboss.windup.graph.model.resource.FileModel;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.frames.Adjacency;
@@ -35,20 +35,20 @@ public interface ArchiveModel extends WindupVertexFrame
     public ApplicationReferenceModel getApplicationReferenceModel();
 
     @Adjacency(label = "unzippedDirectory", direction = Direction.OUT)
-    public void setUnzippedDirectory(FileResourceModel fileResourceModel);
+    public void setUnzippedDirectory(FileModel fileResourceModel);
 
     @Adjacency(label = "unzippedDirectory", direction = Direction.OUT)
-    public FileResourceModel getUnzippedDirectory();
+    public FileModel getUnzippedDirectory();
 
     @Adjacency(label = "archiveFiles", direction = Direction.OUT)
-    public Iterable<FileResourceModel> getContainedFileModels();
+    public Iterable<FileModel> getContainedFileModels();
 
     @Adjacency(label = "archiveFiles", direction = Direction.OUT)
-    public void addContainedFileModel(FileResourceModel archiveFile);
+    public void addContainedFileModel(FileModel archiveFile);
 
     @Adjacency(label = "decompiledFiles", direction = Direction.OUT)
-    public Iterable<FileResourceModel> getDecompiledFileModels();
+    public Iterable<FileModel> getDecompiledFileModels();
 
     @Adjacency(label = "decompiledFiles", direction = Direction.OUT)
-    public void addDecompiledFileModel(FileResourceModel archiveFile);
+    public void addDecompiledFileModel(FileModel archiveFile);
 }
diff --git a/graph/api/src/main/java/org/jboss/windup/graph/model/JarManifestModel.java b/graph/api/src/main/java/org/jboss/windup/graph/model/JarManifestModel.java
@@ -5,7 +5,7 @@
 import java.util.Set;
 
 import org.jboss.windup.graph.model.resource.ArchiveEntryResourceModel;
-import org.jboss.windup.graph.model.resource.FileResourceModel;
+import org.jboss.windup.graph.model.resource.FileModel;
 import org.jboss.windup.graph.model.resource.JarArchiveModel;
 import org.jboss.windup.graph.model.resource.ResourceModel;
 
@@ -63,9 +63,9 @@ public InputStream asInputStream() throws RuntimeException
                     ArchiveEntryResourceModel resource = frame(underlyingResource.asVertex(), ArchiveEntryResourceModel.class);
                     return resource.asInputStream();
                 }
-                else if (underlyingResource instanceof FileResourceModel)
+                else if (underlyingResource instanceof FileModel)
                 {
-                    FileResourceModel resource = frame(underlyingResource.asVertex(), FileResourceModel.class);
+                    FileModel resource = frame(underlyingResource.asVertex(), FileModel.class);
                     return resource.asInputStream();
                 }
 
@@ -88,9 +88,9 @@ public File asFile() throws RuntimeException
                     ArchiveEntryResourceModel resource = frame(underlyingResource.asVertex(), ArchiveEntryResourceModel.class);
                     return resource.asFile();
                 }
-                else if (underlyingResource instanceof FileResourceModel)
+                else if (underlyingResource instanceof FileModel)
                 {
-                    FileResourceModel resource = frame(underlyingResource.asVertex(), FileResourceModel.class);
+                    FileModel resource = frame(underlyingResource.asVertex(), FileModel.class);
                     return resource.asFile();
                 }
                 return this.getResource().asFile();

diff --git a/graph/api/src/main/java/org/jboss/windup/graph/model/PropertiesModel.java b/graph/api/src/main/java/org/jboss/windup/graph/model/PropertiesModel.java
@@ -5,7 +5,7 @@
 import java.util.Set;
 
 import org.jboss.windup.graph.model.resource.ArchiveEntryResourceModel;
-import org.jboss.windup.graph.model.resource.FileResourceModel;
+import org.jboss.windup.graph.model.resource.FileModel;
 import org.jboss.windup.graph.model.resource.ResourceModel;
 
 import com.tinkerpop.blueprints.Direction;
@@ -20,10 +20,10 @@
 public interface PropertiesModel extends WindupVertexFrame
 {
     @Adjacency(label = "propertiesFileResource", direction = Direction.IN)
-    public FileResourceModel getFileResource();
+    public FileModel getFileResource();
 
     @Adjacency(label = "propertiesFileResource", direction = Direction.IN)
-    public void setFileResource(FileResourceModel resource);
+    public void setFileResource(FileModel resource);
 
     @JavaHandler
     public String getProperty(String property);
@@ -55,9 +55,9 @@ public InputStream asInputStream() throws RuntimeException
                                 ArchiveEntryResourceModel.class);
                     return resource.asInputStream();
                 }
-                else if (underlyingResource instanceof FileResourceModel)
+                else if (underlyingResource instanceof FileModel)
                 {
-                    FileResourceModel resource = frame(underlyingResource.asVertex(), FileResourceModel.class);
+                    FileModel resource = frame(underlyingResource.asVertex(), FileModel.class);
                     return resource.asInputStream();
                 }
 
@@ -81,9 +81,9 @@ public File asFile() throws RuntimeException
                                 ArchiveEntryResourceModel.class);
                     return resource.asFile();
                 }
-                else if (underlyingResource instanceof FileResourceModel)
+                else if (underlyingResource instanceof FileModel)
                 {
-                    FileResourceModel resource = frame(underlyingResource.asVertex(), FileResourceModel.class);
+                    FileModel resource = frame(underlyingResource.asVertex(), FileModel.class);
                     return resource.asFile();
                 }
                 return this.getFileResource().asFile();

diff --git a/graph/api/src/main/java/org/jboss/windup/graph/model/meta/report/SourceReportModel.java b/graph/api/src/main/java/org/jboss/windup/graph/model/meta/report/SourceReportModel.java
@@ -1,6 +1,6 @@
 package org.jboss.windup.graph.model.meta.report;
 
-import org.jboss.windup.graph.model.resource.FileResourceModel;
+import org.jboss.windup.graph.model.resource.FileModel;
 import org.jboss.windup.graph.model.resource.ResourceModel;
 
 import com.tinkerpop.blueprints.Direction;
@@ -17,8 +17,8 @@ public interface SourceReportModel extends ResourceModel {
     public void setResource(ResourceModel resource);
 
     @Adjacency(label="reportFile", direction=Direction.OUT)
-    public FileResourceModel getReportFile();
+    public FileModel getReportFile();
 
     @Adjacency(label="reportFile", direction=Direction.OUT)
-    public void setReportFile(FileResourceModel report);
+    public void setReportFile(FileModel report);
 }
diff --git a/...aph/model/resource/FileResourceModel.java → ...indup/graph/model/resource/FileModel.java b/...aph/model/resource/FileResourceModel.java → ...indup/graph/model/resource/FileModel.java
@@ -15,7 +15,7 @@
 import com.tinkerpop.frames.modules.typedgraph.TypeValue;
 
 @TypeValue("FileResource")
-public interface FileResourceModel extends ResourceModel
+public interface FileModel extends ResourceModel
 {
 
     public static final String PROPERTY_FILE_PATH = "filePath";
@@ -60,7 +60,7 @@ public interface FileResourceModel extends ResourceModel
     @JavaHandler
     public InputStream asInputStream() throws RuntimeException;
 
-    abstract class Impl implements FileResourceModel, ResourceModel, JavaHandlerContext<Vertex>
+    abstract class Impl implements FileModel, ResourceModel, JavaHandlerContext<Vertex>
     {
 
         public void setFilePath(String filePath)