WINDUP-707 - Fixed properties file to layer on top instead of referen…

…ce the underlying file. Fixed import statement in Variables. Set Manifest and Properties to generate source.

config/api/src/main/java/org/jboss/windup/config/Variables.java

@@ -11,7 +11,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.Map;;
+import java.util.Map;
 import java.util.List;
 import java.util.ArrayList;
 

rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/model/PropertiesModel.java

@@ -6,6 +6,7 @@
 
 import org.jboss.windup.graph.model.WindupVertexFrame;
 import org.jboss.windup.graph.model.resource.FileModel;
+import org.jboss.windup.graph.model.resource.SourceFileModel;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.blueprints.Vertex;
@@ -21,23 +22,10 @@
  * 
  */
 @TypeValue(PropertiesModel.TYPE)
-public interface PropertiesModel extends WindupVertexFrame
+public interface PropertiesModel extends FileModel, SourceFileModel
 {
-    public static final String PROPERTIES_FILE_RESOURCE = "w:windupPropertiesModelToPropertiesFile";
     public static final String TYPE = "PropertiesModel";
 
-    /**
-     * Gets the {@link FileModel} that contains these @{link {@link Properties}
-     */
-    @Adjacency(label = PROPERTIES_FILE_RESOURCE, direction = Direction.OUT)
-    public FileModel getFileResource();
-
-    /**
-     * Sets the {@link FileModel} that contains these @{link {@link Properties}
-     */
-    @Adjacency(label = PROPERTIES_FILE_RESOURCE, direction = Direction.OUT)
-    public void setFileResource(FileModel resource);
-
     /**
      * Gets the contents of the file as a {@link Properties} object.
      */
@@ -48,7 +36,7 @@ abstract class Impl implements PropertiesModel, JavaHandlerContext<Vertex>
     {
         public Properties getProperties() throws IOException
         {
-            try (InputStream is = getFileResource().asInputStream())
+            try (InputStream is = this.asInputStream())
             {
                 Properties props = new Properties();
                 props.load(is);

rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/scan/provider/DiscoverArchiveManifestFilesRuleProvider.java

@@ -69,6 +69,7 @@ public void perform(GraphRewrite event, EvaluationContext context, ArchiveModel
 
         JarManifestModel jarManifest = jarManifestService.addTypeToModel(manifestFile);
         jarManifest.setArchive(payload);
+        jarManifest.setGenerateSourceReport(true);
 
         try (InputStream is = manifestFile.asInputStream())
         {

rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/scan/provider/DiscoverPropertiesFilesRuleProvider.java

@@ -51,8 +51,8 @@ public void perform(GraphRewrite event, EvaluationContext context, FileModel pay
         ExecutionStatistics.get().begin("DiscoverPropertiesFilesRuleProvider.perform");
         GraphService<PropertiesModel> service = new GraphService<>(event.getGraphContext(), PropertiesModel.class);
         TechnologyTagService technologyTagService = new TechnologyTagService(event.getGraphContext());
-        PropertiesModel properties = service.create();
-        properties.setFileResource(payload);
+        PropertiesModel properties = service.addTypeToModel(payload);
+        properties.setGenerateSourceReport(true);
 
         GraphService.addTypeToModel(event.getGraphContext(), payload, SourceFileModel.class);