Xml config split to an extension, stage 04

windup · Jun 21, 2014 · 68a3680 · 68a3680
1 parent 9aa87a5
commit 68a3680
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 41 deletions.
diff --git a/graph/api/src/main/java/org/jboss/windup/graph/dao/MavenFacetDao.java b/graph/api/src/main/java/org/jboss/windup/graph/dao/MavenFacetDao.java
@@ -1,6 +1,6 @@
 package org.jboss.windup.graph.dao;
 
-import org.jboss.windup.graph.model.meta.xml.MavenFacetModel;
+import org.jboss.windup.rules.apps.maven.model.MavenFacetModel;
 import org.jboss.windup.graph.model.resource.XmlResourceModel;
 
 public interface MavenFacetDao extends BaseDao<MavenFacetModel> {

diff --git a/graph/api/src/main/java/org/jboss/windup/graph/dao/WebConfigurationDao.java b/graph/api/src/main/java/org/jboss/windup/graph/dao/WebConfigurationDao.java
@@ -1,6 +1,6 @@
 package org.jboss.windup.graph.dao;
 
-import org.jboss.windup.graph.model.meta.xml.WebConfigurationFacetModel;
+import org.jboss.windup.rules.apps.web.model.WebConfigurationFacetModel;
 import org.jboss.windup.graph.model.resource.XmlResourceModel;
 
 public interface WebConfigurationDao extends BaseDao<WebConfigurationFacetModel> {

diff --git a/graph/impl/src/main/java/org/jboss/windup/graph/dao/impl/MavenFacetDaoImpl.java b/graph/impl/src/main/java/org/jboss/windup/graph/dao/impl/MavenFacetDaoImpl.java
@@ -5,7 +5,7 @@
 import javax.inject.Singleton;
 
 import org.jboss.windup.graph.dao.MavenFacetDao;
-import org.jboss.windup.graph.model.meta.xml.MavenFacetModel;
+import org.jboss.windup.rules.apps.maven.model.MavenFacetModel;
 import org.jboss.windup.graph.model.resource.XmlResourceModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/graph/impl/src/main/java/org/jboss/windup/graph/dao/impl/WebConfigurationDaoImpl.java b/graph/impl/src/main/java/org/jboss/windup/graph/dao/impl/WebConfigurationDaoImpl.java
@@ -5,7 +5,7 @@
 import javax.inject.Singleton;
 
 import org.jboss.windup.graph.dao.WebConfigurationDao;
-import org.jboss.windup.graph.model.meta.xml.WebConfigurationFacetModel;
+import org.jboss.windup.rules.apps.web.model.WebConfigurationFacetModel;
 import org.jboss.windup.graph.model.resource.XmlResourceModel;
 
 import com.thinkaurelius.titan.core.attribute.Text;

diff --git a/reporting/impl/pom.xml b/reporting/impl/pom.xml
@@ -43,7 +43,11 @@
             <groupId>org.openrdf.sesame</groupId>
             <artifactId>sesame-sail-api</artifactId>
             <version>2.7.10</version>
-            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>com.tinkerpop.blueprints</groupId>
+            <artifactId>blueprints-graph-sail</artifactId>
+            <version>2.5.0</version>
         </dependency>
     </dependencies>
 

diff --git a/reporting/impl/src/main/java/org/jboss/windup/reporting/renderer/GraphRDFRendererImpl.java b/reporting/impl/src/main/java/org/jboss/windup/reporting/renderer/GraphRDFRendererImpl.java
@@ -1,13 +1,13 @@
 package org.jboss.windup.reporting.renderer;
 
+import com.tinkerpop.blueprints.Graph;
+import com.tinkerpop.blueprints.oupls.sail.pg.PropertyGraphSail;
 import info.aduna.iteration.CloseableIteration;
-
 import java.io.File;
 import java.io.FileOutputStream;
-
 import javax.inject.Inject;
-
 import org.jboss.windup.graph.GraphContext;
+import org.jboss.windup.reporting.renderer.api.GraphRDFRenderer;
 import org.openrdf.model.Namespace;
 import org.openrdf.model.Statement;
 import org.openrdf.rio.RDFFormat;
@@ -19,8 +19,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.tinkerpop.blueprints.Graph;
-import com.tinkerpop.blueprints.oupls.sail.pg.PropertyGraphSail;
 
 public class GraphRDFRendererImpl implements GraphRDFRenderer
 {
@@ -43,52 +41,39 @@ public void renderRDF(File outputFile)
             writer.startRDF();
 
             SailConnection sc = null;
-            try
-            {
+            try {
                 sc = sail.getConnection();
                 CloseableIteration<? extends Namespace, SailException> n = sc.getNamespaces();
-                try
-                {
-                    while (n.hasNext())
-                    {
+                try {
+                    while (n.hasNext()) {
                         Namespace ns = n.next();
                         writer.handleNamespace(ns.getPrefix(), ns.getName());
                     }
                 }
-                finally
-                {
+                finally {
                     n.close();
                 }
 
                 CloseableIteration<? extends Statement, SailException> i = sc.getStatements(null, null, null, false);
-                try
-                {
-                    while (i.hasNext())
-                    {
+                try {
+                    while (i.hasNext()) {
                         Statement stmt = i.next();
                         if (stmt.getSubject() != null && stmt.getPredicate() != null && stmt.getObject() != null)
-                        {
                             writer.handleStatement(stmt);
-                        }
                     }
                 }
-                finally
-                {
+                finally {
                     i.close();
                 }
             }
-            finally
-            {
+            finally {
                 if (sc != null)
-                {
                     sc.close();
-                }
             }
 
             writer.endRDF();
         }
-        catch (Exception e)
-        {
+        catch (Exception e) {
             throw new RuntimeException(e);
         }
     }

diff --git a/.../meta/xml/WebConfigurationFacetModel.java → ...web/model/WebConfigurationFacetModel.java b/.../meta/xml/WebConfigurationFacetModel.java → ...web/model/WebConfigurationFacetModel.java
@@ -1,9 +1,10 @@
-package org.jboss.windup.graph.model.meta.xml;
+package org.jboss.windup.rules.apps.web.model;
 
 import org.jboss.windup.reporting.renderer.api.Label;
-
 import com.tinkerpop.frames.Property;
 import com.tinkerpop.frames.modules.typedgraph.TypeValue;
+import org.jboss.windup.graph.model.meta.xml.XmlMetaFacetModel;
+
 
 @TypeValue("WebFacet")
 public interface WebConfigurationFacetModel extends XmlMetaFacetModel

diff --git a/rules/app/java/pom.xml b/rules/app/java/pom.xml
@@ -45,6 +45,14 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.windup.reporting</groupId>
+            <artifactId>windup-reporting</artifactId>
+            <version>${project.version}</version>
+            <classifier>forge-addon</classifier>
+            <scope>provided</scope>
+        </dependency>
+
 
 
         <dependency>

diff --git a/...graph/model/meta/xml/MavenFacetModel.java → ...les/apps/maven/model/MavenFacetModel.java b/...graph/model/meta/xml/MavenFacetModel.java → ...les/apps/maven/model/MavenFacetModel.java
@@ -1,11 +1,12 @@
-package org.jboss.windup.graph.model.meta.xml;
-
-import org.jboss.windup.reporting.renderer.api.Label;
+package org.jboss.windup.rules.apps.maven.model;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.frames.Adjacency;
 import com.tinkerpop.frames.Property;
 import com.tinkerpop.frames.modules.typedgraph.TypeValue;
+import org.jboss.windup.graph.model.meta.xml.XmlMetaFacetModel;
+import org.jboss.windup.reporting.renderer.api.Label;
+
 
 @TypeValue("MavenFacet")
 public interface MavenFacetModel extends XmlMetaFacetModel {

diff --git a/rules/pom.xml b/rules/pom.xml
@@ -25,8 +25,4 @@
         -->
     </modules>
 
-    <dependencies>
-
-    </dependencies>
-
 </project>