Fix imports

windup · Jun 21, 2014 · bde7301 · bde7301
1 parent 68c40ee
commit bde7301
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 38 deletions.
diff --git a/config/tests/pom.xml b/config/tests/pom.xml
@@ -11,6 +11,7 @@
     <name>Windup Engine - Config Tests</name>
 
     <dependencies>
+        <!-- Project deps -->
         <dependency>
             <groupId>org.jboss.windup.config</groupId>
             <artifactId>windup-config</artifactId>
@@ -29,7 +30,8 @@
             <scope>provided</scope>
             <version>${project.version}</version>
         </dependency>
-
+
+        <!-- Rules -->
         <dependency>
             <groupId>org.jboss.windup.rules.apps</groupId>
             <artifactId>rules-java</artifactId>
@@ -38,6 +40,7 @@
             <scope>test</scope>
         </dependency>
 
+
         <dependency>
             <groupId>org.jboss.forge.furnace.container</groupId>
             <artifactId>cdi</artifactId>

diff --git a/config/tests/src/test/java/org/jboss/windup/config/MavenExampleConfigurationProvider.java b/config/tests/src/test/java/org/jboss/windup/config/MavenExampleConfigurationProvider.java
@@ -6,7 +6,6 @@
  */
 package org.jboss.windup.config;
 
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import org.jboss.windup.config.graphsearch.GraphSearchConditionBuilder;
@@ -15,8 +14,8 @@
 import org.jboss.windup.config.operation.ruleelement.TypeOperation;
 import org.jboss.windup.config.selectables.SelectionFactory;
 import org.jboss.windup.graph.GraphContext;
-import org.jboss.windup.graph.model.meta.xml.MavenFacetModel;
 import org.jboss.windup.graph.model.meta.xml.XmlMetaFacetModel;
+import org.jboss.windup.rules.apps.maven.model.MavenFacetModel;
 import org.ocpsoft.rewrite.config.Configuration;
 import org.ocpsoft.rewrite.config.ConfigurationBuilder;
 import org.ocpsoft.rewrite.context.EvaluationContext;
@@ -43,12 +42,12 @@ public Configuration getConfiguration(GraphContext context)
         // Add the MavenFacetModel type to all XmlMetaFacetModel vertices.
         .addRule()
         .when(
-                GraphSearchConditionBuilder.create("xmlModels").ofType(XmlMetaFacetModel.class)
+            GraphSearchConditionBuilder.create("xmlModels").ofType(XmlMetaFacetModel.class)
         )
         .perform(
             Iteration.over(XmlMetaFacetModel.class, "xmlModels").var("xml")
                 .perform(
-                        TypeOperation.addType("xml", MavenFacetModel.class)
+                    TypeOperation.addType("xml", MavenFacetModel.class)
                 )
             .endIteration()
         )

diff --git a/config/tests/src/test/java/org/jboss/windup/config/selectables/SelectionFactoryTest.java b/config/tests/src/test/java/org/jboss/windup/config/selectables/SelectionFactoryTest.java
@@ -18,9 +18,9 @@
 import org.jboss.windup.graph.GraphApiCompositeClassLoaderProvider;
 import org.jboss.windup.graph.GraphContext;
 import org.jboss.windup.graph.GraphContextImpl;
-import org.jboss.windup.graph.model.meta.xml.MavenFacetModel;
 import org.jboss.windup.graph.typedgraph.GraphTypeRegistry;
 import org.jboss.windup.rules.apps.java.scan.model.JavaClassModel;
+import org.jboss.windup.rules.apps.maven.model.MavenFacetModel;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,19 +37,19 @@ public class SelectionFactoryTest
 
     @Deployment
     @Dependencies({
-                @AddonDependency(name = "org.jboss.windup.config:windup-config"),
-                @AddonDependency(name = "org.jboss.windup.rules.apps:rules-java"),
-                @AddonDependency(name = "org.jboss.forge.furnace.container:cdi")
+        @AddonDependency(name = "org.jboss.windup.config:windup-config"),
+        @AddonDependency(name = "org.jboss.windup.rules.apps:rules-java"),
+        @AddonDependency(name = "org.jboss.forge.furnace.container:cdi")
     })
     public static ForgeArchive getDeployment()
     {
         final ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
-                    .addBeansXML()
-                    .addAsAddonDependencies(
-                                AddonDependencyEntry.create("org.jboss.windup.config:windup-config"),
-                                AddonDependencyEntry.create("org.jboss.windup.rules.apps:rules-java"),
-                                AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi")
-                    );
+            .addBeansXML()
+            .addAsAddonDependencies(
+                AddonDependencyEntry.create("org.jboss.windup.config:windup-config"),
+                AddonDependencyEntry.create("org.jboss.windup.rules.apps:rules-java"),
+                AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi")
+            );
         return archive;
     }
 
@@ -89,8 +89,8 @@ public void testInvalidTypeGet()
         {
             Assert.assertNotNull(e.getMessage());
             Assert.assertTrue(
-                        e.getMessage()
-                                    .contains("Variable \"classModel1\" does not implement expected interface \"org.jboss.windup.graph.model.meta.xml.MavenFacetModel\", actual implemented interfaces are"));
+                e.getMessage()
+                    .contains("Variable \"classModel1\" does not implement expected interface \"org.jboss.windup.graph.model.meta.xml.MavenFacetModel\", actual implemented interfaces are"));
         }
     }
 }
diff --git a/rules/app/java-ee/pom.xml b/rules/app/java-ee/pom.xml
@@ -47,6 +47,15 @@
             <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>
             <groupId>org.jboss.forge.furnace.container</groupId>

diff --git a/.../app/java-ee/src/main/java/org/jboss/windup/rules/apps/ejb/model/EjbEntityFacetModel.java b/.../app/java-ee/src/main/java/org/jboss/windup/rules/apps/ejb/model/EjbEntityFacetModel.java
@@ -4,14 +4,13 @@
 import com.tinkerpop.frames.Adjacency;
 import com.tinkerpop.frames.Property;
 import com.tinkerpop.frames.modules.typedgraph.TypeValue;
-import org.jboss.windup.graph.renderer.Label;
+import org.jboss.windup.reporting.renderer.api.Label;
 import org.jboss.windup.rules.apps.java.scan.model.JavaClassMetaModel;
 import org.jboss.windup.rules.apps.java.scan.model.JavaClassModel;
 
 @TypeValue("EJBEntityFacet")
 public interface EjbEntityFacetModel extends JavaClassMetaModel
 {
-
     @Label
     @Property("ejbEntityName")
     public String getEjbEntityName();

diff --git a/...java-ee/src/main/java/org/jboss/windup/rules/apps/ejb/model/EjbSessionBeanFacetModel.java b/...java-ee/src/main/java/org/jboss/windup/rules/apps/ejb/model/EjbSessionBeanFacetModel.java
@@ -4,7 +4,7 @@
 import com.tinkerpop.frames.Adjacency;
 import com.tinkerpop.frames.Property;
 import com.tinkerpop.frames.modules.typedgraph.TypeValue;
-import org.jboss.windup.graph.renderer.Label;
+import org.jboss.windup.reporting.renderer.api.Label;
 import org.jboss.windup.rules.apps.java.scan.model.JavaClassMetaModel;
 import org.jboss.windup.rules.apps.java.scan.model.JavaClassModel;
 

diff --git a/...a-ee/src/main/java/org/jboss/windup/rules/apps/ejb/model/MessageDrivenBeanFacetModel.java b/...a-ee/src/main/java/org/jboss/windup/rules/apps/ejb/model/MessageDrivenBeanFacetModel.java
@@ -1,7 +1,7 @@
 package org.jboss.windup.rules.apps.ejb.model;
 
 import org.jboss.windup.rules.apps.java.scan.model.JavaClassMetaModel;
-import org.jboss.windup.graph.renderer.Label;
+import org.jboss.windup.reporting.renderer.api.Label;
 
 import com.tinkerpop.frames.Property;
 import com.tinkerpop.frames.modules.typedgraph.TypeValue;

diff --git a/...app/java-ee/src/main/java/org/jboss/windup/rules/apps/ejb/model/SpringBeanFacetModel.java b/...app/java-ee/src/main/java/org/jboss/windup/rules/apps/ejb/model/SpringBeanFacetModel.java
@@ -2,7 +2,7 @@
 
 import org.jboss.windup.rules.apps.java.scan.model.JavaClassMetaModel;
 import org.jboss.windup.rules.apps.ejb.model.meta.xml.SpringConfigurationFacetModel;
-import org.jboss.windup.graph.renderer.Label;
+import org.jboss.windup.reporting.renderer.api.Label;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.frames.Adjacency;

diff --git a/.../main/java/org/jboss/windup/rules/apps/ejb/model/meta/xml/EjbConfigurationFacetModel.java b/.../main/java/org/jboss/windup/rules/apps/ejb/model/meta/xml/EjbConfigurationFacetModel.java
@@ -3,7 +3,7 @@
 import org.jboss.windup.rules.apps.ejb.model.EjbEntityFacetModel;
 import org.jboss.windup.rules.apps.ejb.model.EjbSessionBeanFacetModel;
 import org.jboss.windup.rules.apps.ejb.model.MessageDrivenBeanFacetModel;
-import org.jboss.windup.graph.renderer.Label;
+import org.jboss.windup.reporting.renderer.api.Label;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.frames.Adjacency;

diff --git a/...java/org/jboss/windup/rules/apps/ejb/model/meta/xml/HibernateConfigurationFacetModel.java b/...java/org/jboss/windup/rules/apps/ejb/model/meta/xml/HibernateConfigurationFacetModel.java
@@ -1,7 +1,7 @@
 package org.jboss.windup.rules.apps.ejb.model.meta.xml;
 
 import org.jboss.windup.rules.apps.ejb.model.HibernateSessionFactoryModel;
-import org.jboss.windup.graph.renderer.Label;
+import org.jboss.windup.reporting.renderer.api.Label;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.frames.Adjacency;

diff --git a/.../main/java/org/jboss/windup/rules/apps/ejb/model/meta/xml/HibernateMappingFacetModel.java b/.../main/java/org/jboss/windup/rules/apps/ejb/model/meta/xml/HibernateMappingFacetModel.java
@@ -2,7 +2,7 @@
 
 import org.jboss.windup.rules.apps.ejb.model.HibernateSessionFactoryModel;
 import org.jboss.windup.rules.apps.ejb.model.HibernateEntityModel;
-import org.jboss.windup.graph.renderer.Label;
+import org.jboss.windup.reporting.renderer.api.Label;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.frames.Adjacency;

diff --git a/...in/java/org/jboss/windup/rules/apps/ejb/model/meta/xml/IBatisConfigurationFacetModel.java b/...in/java/org/jboss/windup/rules/apps/ejb/model/meta/xml/IBatisConfigurationFacetModel.java
@@ -1,7 +1,7 @@
 package org.jboss.windup.rules.apps.ejb.model.meta.xml;
 
 import org.jboss.windup.rules.apps.ejb.model.IBatisEntityFacetModel;
-import org.jboss.windup.graph.renderer.Label;
+import org.jboss.windup.reporting.renderer.api.Label;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.frames.Adjacency;

diff --git a/.../main/java/org/jboss/windup/rules/apps/ejb/model/meta/xml/JPAConfigurationFacetModel.java b/.../main/java/org/jboss/windup/rules/apps/ejb/model/meta/xml/JPAConfigurationFacetModel.java
@@ -1,7 +1,7 @@
 package org.jboss.windup.rules.apps.ejb.model.meta.xml;
 
 import org.jboss.windup.rules.apps.ejb.model.JPAEntityFacetModel;
-import org.jboss.windup.graph.renderer.Label;
+import org.jboss.windup.reporting.renderer.api.Label;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.frames.Adjacency;

diff --git a/...in/java/org/jboss/windup/rules/apps/ejb/model/meta/xml/SpringConfigurationFacetModel.java b/...in/java/org/jboss/windup/rules/apps/ejb/model/meta/xml/SpringConfigurationFacetModel.java
@@ -1,7 +1,7 @@
 package org.jboss.windup.rules.apps.ejb.model.meta.xml;
 
 import org.jboss.windup.rules.apps.ejb.model.SpringBeanFacetModel;
-import org.jboss.windup.graph.renderer.Label;
+import org.jboss.windup.reporting.renderer.api.Label;
 
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.frames.Adjacency;

diff --git a/rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/basic/RegexModel.java b/rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/basic/RegexModel.java
@@ -1,9 +1,9 @@
 package org.jboss.windup.rules.apps.java.basic;
 
-import org.jboss.windup.graph.renderer.Label;
 import com.tinkerpop.frames.Property;
 import com.tinkerpop.frames.modules.typedgraph.TypeValue;
 import org.jboss.windup.graph.model.WindupVertexFrame;
+import org.jboss.windup.reporting.renderer.api.Label;
 
 
 @TypeValue("Regex")

diff --git a/rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/scan/model/JavaClassModel.java b/rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/scan/model/JavaClassModel.java
@@ -1,10 +1,7 @@
 package org.jboss.windup.rules.apps.java.scan.model;
 
 import org.jboss.windup.graph.model.resource.FileModel;
-import org.jboss.windup.rules.apps.java.scan.model.JavaMethodModel;
 import org.jboss.windup.graph.model.resource.ResourceModel;
-import org.jboss.windup.graph.renderer.Label;
-
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.frames.Adjacency;
 import com.tinkerpop.frames.Property;
@@ -13,6 +10,8 @@
 import com.tinkerpop.frames.modules.typedgraph.TypeValue;
 import org.jboss.windup.graph.model.ArchiveModel;
 import org.jboss.windup.graph.model.WindupVertexFrame;
+import org.jboss.windup.reporting.renderer.api.Label;
+
 
 // TODO:  WINDUP-85 - Introduce JavaFileModel
 @TypeValue("JavaClassResource")

diff --git a/rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/scan/model/JavaFileModel.java b/rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/scan/model/JavaFileModel.java
@@ -3,7 +3,8 @@
 import com.tinkerpop.frames.Property;
 import com.tinkerpop.frames.modules.typedgraph.TypeValue;
 import org.jboss.windup.graph.model.resource.FileModel;
-import org.jboss.windup.graph.renderer.Label;
+import org.jboss.windup.reporting.renderer.api.Label;
+
 
 /**
  *  This is good for searches for Java files, which will be frequent.

diff --git a/...s/app/java/src/main/java/org/jboss/windup/rules/apps/java/scan/model/JavaMethodModel.java b/...s/app/java/src/main/java/org/jboss/windup/rules/apps/java/scan/model/JavaMethodModel.java
@@ -1,14 +1,14 @@
 package org.jboss.windup.rules.apps.java.scan.model;
 
-import org.jboss.windup.graph.renderer.Label;
-
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.frames.Adjacency;
 import com.tinkerpop.frames.Property;
 import com.tinkerpop.frames.annotations.gremlin.GremlinGroovy;
 import com.tinkerpop.frames.annotations.gremlin.GremlinParam;
 import com.tinkerpop.frames.modules.typedgraph.TypeValue;
 import org.jboss.windup.graph.model.resource.ResourceModel;
+import org.jboss.windup.reporting.renderer.api.Label;
+
 
 @TypeValue("JavaMethod")
 public interface JavaMethodModel extends ResourceModel

diff --git a/...pp/java/src/main/java/org/jboss/windup/rules/apps/java/scan/model/JavaParameterModel.java b/...pp/java/src/main/java/org/jboss/windup/rules/apps/java/scan/model/JavaParameterModel.java
@@ -1,12 +1,12 @@
 package org.jboss.windup.rules.apps.java.scan.model;
 
 import org.jboss.windup.graph.model.WindupVertexFrame;
-import org.jboss.windup.graph.renderer.Label;
-
 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.reporting.renderer.api.Label;
+
 
 @TypeValue("JavaParameter")
 public interface JavaParameterModel extends WindupVertexFrame

diff --git a/...s-eap-recognition/src/main/java/org/jboss/windup/addons/recog/as7/JBossAS7ServerType.java b/...s-eap-recognition/src/main/java/org/jboss/windup/addons/recog/as7/JBossAS7ServerType.java
@@ -38,7 +38,7 @@ public boolean isPresentInDir( File homeDir ) {
     }
 
 
-    @Override
+    @Override @SuppressWarnings("deprecation")
     public String format( VersionRange versionRange ) {
         StringBuilder sb = new StringBuilder("JBoss ");