Merge pull request #107 from jsight/WINDUP-103

Added report model fields
windup · Jul 1, 2014 · a70a8f6 · a70a8f6
2 parents 94ef65c + f26638d
commit a70a8f6
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 16 deletions.
diff --git a/reporting/api/src/main/java/org/jboss/windup/reporting/meta/ApplicationReportModel.java b/reporting/api/src/main/java/org/jboss/windup/reporting/meta/ApplicationReportModel.java
@@ -10,37 +10,31 @@ public interface ApplicationReportModel extends ReportModel
 {
     @Property("applicationName")
     public String getApplicationName();
-    
+
     @Property("applicationName")
     public void setApplicationName(String applicationName);
-    
+
     @Property("applicationVersion")
     public String getApplicationVersion();
-    
+
     @Property("applicationVersion")
     public String setApplicationVersion(String applicationVersion);
-    
+
     @Property("applicationCreator")
     public String getApplicationCreator();
-    
+
     @Property("applicationCreator")
     public String setApplicationCreator(String applicationCreator);
-    
+
     /**
-     * Application notes allow custom text to be added 
+     * Application notes allow custom text to be added
      * 
      * @return
      */
-    @Adjacency(label="applicationNote", direction=Direction.OUT)
+    @Adjacency(label = "applicationNote", direction = Direction.OUT)
     public Iterable<String> getApplicationNotes();
-    
-    @Adjacency(label="applicationNote", direction=Direction.OUT)
+
+    @Adjacency(label = "applicationNote", direction = Direction.OUT)
     public void addApplicationNote(String applicationNote);
-
-    @Adjacency(label="childReport", direction=Direction.OUT)
-    public Iterable<ReportModel> getChildReports();
-
-    @Adjacency(label="childReport", direction=Direction.OUT)
-    public void addChildReport(final ReportModel reportResource);
 
 }
diff --git a/reporting/api/src/main/java/org/jboss/windup/reporting/meta/ReportModel.java b/reporting/api/src/main/java/org/jboss/windup/reporting/meta/ReportModel.java
@@ -1,6 +1,7 @@
 package org.jboss.windup.reporting.meta;
 
 import org.jboss.windup.graph.model.WindupVertexFrame;
+import org.jboss.windup.graph.model.resource.ResourceModel;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.frames.Adjacency;
@@ -43,6 +44,18 @@ public interface ReportModel extends WindupVertexFrame
     @Property("templateType")
     public TemplateType getTemplateType();
 
+    /**
+     * Refers to the original source file (eg, the original .java file or original .xml file) represented by this report
+     * entry.
+     * 
+     * @param resourceModel
+     */
+    @Property("sourceFileResource")
+    public void setSourceFileResource(ResourceModel resourceModel);
+
+    @Property("sourceFileResource")
+    public ResourceModel getSourceFileResource();
+
     /**
      * The parent report... this could be the root (index) or another level of summary report.
      * 
@@ -64,4 +77,15 @@ public interface ReportModel extends WindupVertexFrame
 
     @Adjacency(label = "relatedResource", direction = Direction.OUT)
     public Iterable<WindupVertexFrame> getRelatedResources();
+
+    /**
+     * Provides a list of child reports referenced by this report
+     * 
+     * @return
+     */
+    @Adjacency(label = "childReport", direction = Direction.OUT)
+    public Iterable<ReportModel> getChildReports();
+
+    @Adjacency(label = "childReport", direction = Direction.OUT)
+    public void addChildReport(final ReportModel reportResource);
 }