FORGE-2466: Allow usage of '~' in interceptorBinding parameter of cdi…

…-new-interceptor
forge · Sep 14, 2015 · 612856b · 612856b
1 parent 37d3807
commit 612856b
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorCommand.java
@@ -12,6 +12,7 @@
 import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;
 
+import org.jboss.forge.addon.parser.java.converters.PackageRootConverter;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
@@ -44,6 +45,7 @@ public Metadata getMetadata(UIContext context)
    public void initializeUI(UIBuilder builder) throws Exception
    {
       super.initializeUI(builder);
+      interceptorBinding.setValueConverter(new PackageRootConverter(getProjectFactory(), builder));
       builder.add(interceptorBinding);
    }
 
@@ -73,7 +75,8 @@ public JavaClassSource decorateSource(UIExecutionContext context, Project projec
                         "try {\n" +
                                  "            return ic.proceed();\n" +
                                  "        } finally {\n" +
-                                 "        }").addAnnotation(AroundInvoke.class);
+                                 "        }")
+               .addAnnotation(AroundInvoke.class);
       return interceptor;
    }
 }
diff --git a/...tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorCommandTest.java b/...tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorCommandTest.java
@@ -154,4 +154,43 @@ public void testCreateNewInterceptor() throws Exception
       Assert.assertTrue(interceptor.getMethods().get(0).hasAnnotation(AroundInvoke.class));
       Assert.assertFalse(interceptor.hasAnnotation(Inherited.class));
    }
+
+   @Test
+   public void testCreateNewInterceptorUsingPackageWildcard() throws Exception
+   {
+      try (CommandController controller = uiTestHarness.createCommandController(CDINewInterceptorBindingCommand.class,
+               project.getRoot()))
+      {
+         controller.initialize();
+         controller.setValueFor("named", "MyInterceptorBinding");
+         controller.setValueFor("targetPackage", "~.interceptors");
+         Assert.assertTrue(controller.isValid());
+         Assert.assertTrue(controller.canExecute());
+         Result result = controller.execute();
+         Assert.assertThat(result, is(not(instanceOf(Failed.class))));
+      }
+      try (CommandController controller = uiTestHarness.createCommandController(CDINewInterceptorCommand.class,
+               project.getRoot()))
+      {
+         controller.initialize();
+         controller.setValueFor("named", "MyInterceptor");
+         controller.setValueFor("targetPackage", "org.jboss.forge.test");
+         controller.setValueFor("interceptorBinding", "~.interceptors.MyInterceptorBinding");
+         Assert.assertTrue(controller.isValid());
+         Assert.assertTrue(controller.canExecute());
+         Result result = controller.execute();
+         Assert.assertThat(result, is(not(instanceOf(Failed.class))));
+      }
+
+      JavaSourceFacet facet = project.getFacet(JavaSourceFacet.class);
+      JavaResource javaResource = facet.getJavaResource("org.jboss.forge.test.MyInterceptor");
+      Assert.assertNotNull(javaResource);
+      Assert.assertThat(javaResource.getJavaType(), is(instanceOf(JavaClass.class)));
+      JavaClass<?> interceptor = javaResource.getJavaType();
+      Assert.assertTrue(interceptor.hasAnnotation(facet.getBasePackage() + ".interceptors.MyInterceptorBinding"));
+      Assert.assertTrue(interceptor.hasAnnotation(Interceptor.class));
+      Assert.assertTrue(interceptor.getMethods().get(0).hasAnnotation(AroundInvoke.class));
+      Assert.assertFalse(interceptor.hasAnnotation(Inherited.class));
+   }
+
 }