Removed warnings

forge · Jul 14, 2014 · e8127aa · e8127aa
1 parent 434dac6
commit e8127aa
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 25 deletions.
diff --git a/javaee/api/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceOperations.java b/javaee/api/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceOperations.java
@@ -44,7 +44,7 @@ public interface PersistenceOperations
     * @param unitName Name of the Persistence Unit
     * @param project Project in which the JPA is being looked for
     */
-   @SuppressWarnings({ "rawtypes", "unchecked" })
+   @SuppressWarnings({ "rawtypes" })
    public PersistenceUnitCommon getExistingPersistenceUnit(Project project, String unitName);
 
    /**

diff --git a/...src/main/java/org/jboss/forge/addon/scaffold/faces/ScaffoldableEntitySelectionWizard.java b/...src/main/java/org/jboss/forge/addon/scaffold/faces/ScaffoldableEntitySelectionWizard.java
@@ -29,7 +29,6 @@
 import org.jboss.forge.addon.ui.metadata.WithAttributes;
 import org.jboss.forge.addon.ui.result.NavigationResult;
 import org.jboss.forge.addon.ui.result.Result;
-import org.jboss.forge.addon.ui.result.Results;
 import org.jboss.forge.addon.ui.util.Metadata;
 import org.jboss.forge.addon.ui.wizard.UIWizardStep;
 import org.jboss.forge.roaster.model.source.FieldSource;

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceOperationsImpl.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceOperationsImpl.java
@@ -143,7 +143,6 @@ public JavaResource newEntity(DirectoryResource target, String entityName, Strin
       return newEntity(target, entityName, entityPackage, idStrategy, null);
    }
 
-   @SuppressWarnings("unchecked")
    private JavaClassSource createJavaEmbeddableClass(String entityName, String entityPackage)
    {
       JavaClassSource javaClass = Roaster.create(JavaClassSource.class)

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/NewFieldWizard.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/NewFieldWizard.java
@@ -30,7 +30,6 @@
 
 import org.jboss.forge.addon.convert.Converter;
 import org.jboss.forge.addon.javaee.jpa.JPAFacet;
-import org.jboss.forge.addon.javaee.jpa.JPAFieldOperations;
 import org.jboss.forge.addon.javaee.jpa.ui.setup.JPASetupWizard;
 import org.jboss.forge.addon.javaee.ui.AbstractJavaEECommand;
 import org.jboss.forge.addon.parser.java.beans.FieldOperations;
@@ -115,9 +114,6 @@ public class NewFieldWizard extends AbstractJavaEECommand implements UIWizard, P
    @WithAttributes(name = "transient", shortName = 't', label = "Is Transient?", description = "Creates a field with @Transient", defaultValue = "false")
    private UIInput<Boolean> transientField;
 
-   @Inject
-   private JPAFieldOperations fieldOperations;
-
    @Inject
    private FieldOperations beanOperations;
 
@@ -215,25 +211,30 @@ public Iterable<RelationshipType> call() throws Exception
                      String simpleName = javaSource.getName();
                      if (qualifiedName.equals(type.getValue()) || simpleName.equals(type.getValue()))
                      {
-                        if(javaSource.hasAnnotation(Embeddable.class)) {
+                        if (javaSource.hasAnnotation(Embeddable.class))
+                        {
                            options.add(RelationshipType.EMBEDDED);
-                        } else  {
+                        }
+                        else
+                        {
                            options.add(RelationshipType.BASIC);
                            options.add(RelationshipType.ONE_TO_MANY);
                            options.add(RelationshipType.ONE_TO_ONE);
                            options.add(RelationshipType.MANY_TO_MANY);
                            options.add(RelationshipType.MANY_TO_ONE);
                         }
-                        
+
                      }
                   }
                   catch (FileNotFoundException ignored)
                   {
                   }
                }
             }
-            if(options.isEmpty()) {
-               for(RelationshipType type : RelationshipType.values()) {
+            if (options.isEmpty())
+            {
+               for (RelationshipType type : RelationshipType.values())
+               {
                   options.add(type);
                }
             }

diff --git a/...impl/src/main/java/org/jboss/forge/addon/javaee/rest/generator/ResourceGeneratorUtil.java b/...impl/src/main/java/org/jboss/forge/addon/javaee/rest/generator/ResourceGeneratorUtil.java
@@ -283,7 +283,7 @@ public static String getContentType(List<String> contentType)
        if(contentType.size() > 1)
        {
            contentTypeBuilder.append("{");
-           for(Iterator iter = contentType.iterator();  iter.hasNext();)
+           for(Iterator<String> iter = contentType.iterator();  iter.hasNext();)
            {
                contentTypeBuilder.append('"').append(iter.next()).append('"');
                if(iter.hasNext())

diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/NewEmbeddableCommandTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/NewEmbeddableCommandTest.java
@@ -10,19 +10,15 @@
 
 import javax.inject.Inject;
 import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.addon.javaee.ProjectHelper;
 import org.jboss.forge.addon.javaee.jpa.ui.NewEmbeddableCommand;
-import org.jboss.forge.addon.javaee.validation.ui.ValidationNewGroupCommand;
 import org.jboss.forge.addon.parser.java.facets.JavaSourceFacet;
 import org.jboss.forge.addon.parser.java.resources.JavaResource;
 import org.jboss.forge.addon.parser.java.resources.JavaResourceVisitor;
 import org.jboss.forge.addon.projects.Project;
-import org.jboss.forge.addon.projects.facets.MetadataFacet;
 import org.jboss.forge.addon.resource.visit.VisitContext;
 import org.jboss.forge.addon.ui.controller.CommandController;
 import org.jboss.forge.addon.ui.result.Failed;
@@ -33,7 +29,6 @@
 import org.jboss.forge.arquillian.archive.ForgeArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.forge.roaster.model.JavaClass;
-import org.jboss.forge.roaster.model.JavaInterface;
 import org.jboss.forge.roaster.model.JavaType;
 import org.jboss.forge.roaster.model.source.JavaClassSource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -74,7 +69,6 @@ public static ForgeArchive getDeployment()
    @Inject
    private ProjectHelper projectHelper;
 
-   @SuppressWarnings("unchecked")
    @Test
    public void testCreateEmbeddable() throws Exception
    {
@@ -87,10 +81,10 @@ public void testCreateEmbeddable() throws Exception
       Assert.assertTrue(controller.canExecute());
       Result result = controller.execute();
       Assert.assertThat(result, is(not(instanceOf(Failed.class))));
-      
+
       JavaSourceFacet facet = project.getFacet(JavaSourceFacet.class);
-      
-      final List<JavaClass> embeddables = new ArrayList<JavaClass>();
+
+      final List<JavaClass<?>> embeddables = new ArrayList<>();
       facet.visitJavaSources(new JavaResourceVisitor()
       {
          @Override
@@ -110,12 +104,11 @@ public void visit(VisitContext context, JavaResource resource)
             }
          }
       });
-
-      List<JavaClass<?>> allEntities = project.getFacet(JPAFacet.class).getAllEntities();
+
       Assert.assertEquals(1, embeddables.size());
       JavaClass<?> embeddableEntity = embeddables.get(0);
       Assert.assertTrue(embeddableEntity.hasAnnotation(Embeddable.class));
       Assert.assertTrue(embeddableEntity.getName().equals("MyEmbeddable"));
    }
-   
+
 }