Merge pull request #131 from gastaldi/FORGE-523

FORGE-523: Check if java extension if passed to custom command
forge · Apr 3, 2012 · a75c80a · a75c80a
2 parents ebbdb1d + 05827fb
commit a75c80a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jpa/FieldPlugin.java b/javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jpa/FieldPlugin.java
@@ -104,7 +104,9 @@ public void newCustomField(
       try
       {
          JavaClass entity = getJavaClass();
-         addFieldTo(entity, type, fieldName, Column.class);
+         String javaType = (type.toLowerCase().endsWith(".java")) ? type.substring(0, type.length() - 5) : type;
+
+         addFieldTo(entity, javaType, fieldName, Column.class);
       }
       catch (FileNotFoundException e)
       {

diff --git a/javaee-impl/src/test/java/org/jboss/forge/spec/jpa/NewFieldPluginTest.java b/javaee-impl/src/test/java/org/jboss/forge/spec/jpa/NewFieldPluginTest.java
@@ -90,6 +90,24 @@ public void testNewCustomField() throws Exception
       assertFalse(javaClass.hasSyntaxErrors());
    }
 
+   @Test
+   public void testNewCustomFieldJavaExtension() throws Exception
+   {
+      Project project = getProject();
+      JavaClass javaClass = generateEntity(project);
+
+      getShell().execute(
+               ConstraintInspector.getName(FieldPlugin.class)
+                        + " custom --named gamesPlayed --type org.jboss.CustomType.java");
+
+      javaClass = (JavaClass) project.getFacet(JavaSourceFacet.class).getJavaResource(javaClass).getJavaSource();
+      assertTrue(javaClass.hasField("gamesPlayed"));
+      assertEquals("CustomType", javaClass.getField("gamesPlayed").getType());
+      assertTrue(javaClass.hasImport("org.jboss.CustomType"));
+      assertFalse(javaClass.hasSyntaxErrors());
+   }
+
+
    @Test
    public void testNewTemporalField() throws Exception
    {