diff --git a/javaee/api/src/main/java/org/jboss/forge/addon/javaee/JavaEEFacet.java b/javaee/api/src/main/java/org/jboss/forge/addon/javaee/JavaEEFacet.java
index d0cc81ebf7..c203b4a505 100644
--- a/javaee/api/src/main/java/org/jboss/forge/addon/javaee/JavaEEFacet.java
+++ b/javaee/api/src/main/java/org/jboss/forge/addon/javaee/JavaEEFacet.java
@@ -20,6 +20,7 @@ public interface JavaEEFacet extends ProjectFacet
{
public static final String DEFAULT_ENTITY_PACKAGE = "model";
public static final String DEFAULT_CONSTRAINT_PACKAGE = "constraints";
+ public static final String DEFAULT_CDI_PACKAGE = "beans";
/**
* Return the {@link Version} of the specification for which this facet represents.
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/AbstractCDICommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/AbstractCDICommand.java
new file mode 100644
index 0000000000..f731c830d1
--- /dev/null
+++ b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/AbstractCDICommand.java
@@ -0,0 +1,62 @@
+package org.jboss.forge.addon.javaee.cdi.ui;
+
+import static org.jboss.forge.addon.javaee.JavaEEFacet.DEFAULT_CDI_PACKAGE;
+import static org.jboss.forge.addon.javaee.JavaEEFacet.DEFAULT_CONSTRAINT_PACKAGE;
+
+import org.jboss.forge.addon.javaee.JavaEEFacet;
+import org.jboss.forge.addon.javaee.cdi.CDIFacet;
+import org.jboss.forge.addon.javaee.validation.ValidationFacet;
+import org.jboss.forge.addon.javaee.validation.ui.ValidationProviderSetupCommand;
+import org.jboss.forge.addon.parser.java.facets.JavaSourceFacet;
+import org.jboss.forge.addon.parser.java.ui.AbstractJavaSourceCommand;
+import org.jboss.forge.addon.projects.Project;
+import org.jboss.forge.addon.ui.command.PrerequisiteCommandsProvider;
+import org.jboss.forge.addon.ui.context.UIContext;
+import org.jboss.forge.addon.ui.result.NavigationResult;
+import org.jboss.forge.addon.ui.result.navigation.NavigationResultBuilder;
+import org.jboss.forge.addon.ui.util.Categories;
+import org.jboss.forge.addon.ui.util.Metadata;
+import org.jboss.forge.roaster.model.source.JavaSource;
+
+/**
+ * @author Antonio Goncalves
+ */
+public abstract class AbstractCDICommand> extends AbstractJavaSourceCommand
+ implements PrerequisiteCommandsProvider
+{
+
+ @Override
+ public Metadata getMetadata(UIContext context)
+ {
+ return Metadata.from(super.getMetadata(context), getClass())
+ .category(Categories.create(Categories.create("Java EE"), "CDI"));
+ }
+
+ @Override
+ protected boolean isProjectRequired()
+ {
+ return true;
+ }
+
+ @Override
+ protected String calculateDefaultPackage(UIContext context)
+ {
+ return getSelectedProject(context).getFacet(JavaSourceFacet.class).getBasePackage() + "."
+ + DEFAULT_CDI_PACKAGE;
+ }
+
+ @Override
+ public NavigationResult getPrerequisiteCommands(UIContext context)
+ {
+ NavigationResultBuilder builder = NavigationResultBuilder.create();
+ Project project = getSelectedProject(context);
+ if (project != null)
+ {
+ if (!project.hasFacet(CDIFacet.class))
+ {
+ builder.add(CDISetupCommand.class);
+ }
+ }
+ return builder.build();
+ }
+}
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/BeansCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDIBeansCommand.java
similarity index 99%
rename from javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/BeansCommand.java
rename to javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDIBeansCommand.java
index 136003298e..54f5b8a81b 100644
--- a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/BeansCommand.java
+++ b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDIBeansCommand.java
@@ -29,7 +29,7 @@
*
* @author George Gastaldi
*/
-public class BeansCommand
+public class CDIBeansCommand
{
@Inject
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewBeanCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewBeanCommand.java
similarity index 74%
rename from javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewBeanCommand.java
rename to javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewBeanCommand.java
index 447c2d15c7..50498e05e9 100644
--- a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewBeanCommand.java
+++ b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewBeanCommand.java
@@ -13,10 +13,7 @@
import javax.inject.Inject;
import javax.inject.Named;
-import org.jboss.forge.addon.javaee.cdi.CDIFacet;
-import org.jboss.forge.addon.parser.java.ui.AbstractJavaSourceCommand;
import org.jboss.forge.addon.projects.Project;
-import org.jboss.forge.addon.ui.command.PrerequisiteCommandsProvider;
import org.jboss.forge.addon.ui.context.UIBuilder;
import org.jboss.forge.addon.ui.context.UIContext;
import org.jboss.forge.addon.ui.context.UIExecutionContext;
@@ -24,9 +21,6 @@
import org.jboss.forge.addon.ui.input.UIInput;
import org.jboss.forge.addon.ui.input.UISelectOne;
import org.jboss.forge.addon.ui.metadata.WithAttributes;
-import org.jboss.forge.addon.ui.result.NavigationResult;
-import org.jboss.forge.addon.ui.result.navigation.NavigationResultBuilder;
-import org.jboss.forge.addon.ui.util.Categories;
import org.jboss.forge.addon.ui.util.Metadata;
import org.jboss.forge.roaster.model.source.JavaClassSource;
@@ -36,8 +30,7 @@
* @author George Gastaldi
* @author Lincoln Baxter, III
*/
-public class NewBeanCommand extends AbstractJavaSourceCommand implements
- PrerequisiteCommandsProvider
+public class CDINewBeanCommand extends AbstractCDICommand
{
@Inject
@WithAttributes(label = "Scope", defaultValue = "DEPENDENT")
@@ -64,8 +57,19 @@ public Metadata getMetadata(UIContext context)
{
return Metadata.from(super.getMetadata(context), getClass())
.name("CDI: New Bean")
- .description("Creates a new CDI Managed bean")
- .category(Categories.create(super.getMetadata(context).getCategory(), "CDI"));
+ .description("Creates a new CDI Managed bean");
+ }
+
+ @Override
+ protected String getType()
+ {
+ return "CDI Bean";
+ }
+
+ @Override
+ protected Class getSourceType()
+ {
+ return JavaClassSource.class;
}
@Override
@@ -111,37 +115,4 @@ else if (BeanScope.DEPENDENT != scopedValue)
}
return source;
}
-
- @Override
- protected boolean isProjectRequired()
- {
- return true;
- }
-
- @Override
- protected String getType()
- {
- return "CDI Bean";
- }
-
- @Override
- protected Class getSourceType()
- {
- return JavaClassSource.class;
- }
-
- @Override
- public NavigationResult getPrerequisiteCommands(UIContext context)
- {
- NavigationResultBuilder builder = NavigationResultBuilder.create();
- Project project = getSelectedProject(context);
- if (project != null)
- {
- if (!project.hasFacet(CDIFacet.class))
- {
- builder.add(CDISetupCommand.class);
- }
- }
- return builder.build();
- }
}
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewConversationCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewConversationCommand.java
similarity index 99%
rename from javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewConversationCommand.java
rename to javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewConversationCommand.java
index a4d62e37b1..298a246387 100644
--- a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewConversationCommand.java
+++ b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewConversationCommand.java
@@ -37,7 +37,7 @@
*
* @author George Gastaldi
*/
-public class NewConversationCommand extends AbstractUICommand
+public class CDINewConversationCommand extends AbstractUICommand
{
@Inject
@WithAttributes(label = "Named", defaultValue = "")
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewDecoratorCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewDecoratorCommand.java
similarity index 70%
rename from javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewDecoratorCommand.java
rename to javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewDecoratorCommand.java
index 11a82cd481..331e85e48d 100644
--- a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewDecoratorCommand.java
+++ b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewDecoratorCommand.java
@@ -34,8 +34,7 @@
*
* @author Antonio Goncalves
*/
-public class NewDecoratorCommand extends AbstractJavaSourceCommand implements
- PrerequisiteCommandsProvider
+public class CDINewDecoratorCommand extends AbstractCDICommand
{
@Inject
@WithAttributes(label = "Interface to delegate", required = true)
@@ -46,10 +45,21 @@ public Metadata getMetadata(UIContext context)
{
return Metadata.from(super.getMetadata(context), getClass())
.name("CDI: New Decorator")
- .description("Creates a new CDI Decorator")
- .category(Categories.create(super.getMetadata(context).getCategory(), "CDI"));
+ .description("Creates a new CDI Decorator");
}
+ @Override
+ protected String getType()
+ {
+ return "CDI Decorator";
+ }
+
+ @Override
+ protected Class getSourceType()
+ {
+ return JavaClassSource.class;
+ }
+
@Override
public void initializeUI(UIBuilder builder) throws Exception
{
@@ -69,37 +79,4 @@ public JavaClassSource decorateSource(UIExecutionContext context, Project projec
return decorator;
}
-
- @Override
- protected boolean isProjectRequired()
- {
- return true;
- }
-
- @Override
- protected String getType()
- {
- return "CDI Decorator";
- }
-
- @Override
- protected Class getSourceType()
- {
- return JavaClassSource.class;
- }
-
- @Override
- public NavigationResult getPrerequisiteCommands(UIContext context)
- {
- NavigationResultBuilder builder = NavigationResultBuilder.create();
- Project project = getSelectedProject(context);
- if (project != null)
- {
- if (!project.hasFacet(CDIFacet.class))
- {
- builder.add(CDISetupCommand.class);
- }
- }
- return builder.build();
- }
}
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewInterceptorBindingCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorBindingCommand.java
similarity index 56%
rename from javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewInterceptorBindingCommand.java
rename to javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorBindingCommand.java
index 51282b2d3a..357094ce24 100644
--- a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewInterceptorBindingCommand.java
+++ b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorBindingCommand.java
@@ -15,22 +15,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Inject;
import javax.interceptor.InterceptorBinding;
-import org.jboss.forge.addon.javaee.cdi.CDIFacet;
-import org.jboss.forge.addon.parser.java.ui.AbstractJavaSourceCommand;
import org.jboss.forge.addon.projects.Project;
-import org.jboss.forge.addon.ui.command.PrerequisiteCommandsProvider;
-import org.jboss.forge.addon.ui.context.UIBuilder;
import org.jboss.forge.addon.ui.context.UIContext;
import org.jboss.forge.addon.ui.context.UIExecutionContext;
-import org.jboss.forge.addon.ui.hints.InputType;
-import org.jboss.forge.addon.ui.input.UIInput;
-import org.jboss.forge.addon.ui.metadata.WithAttributes;
-import org.jboss.forge.addon.ui.result.NavigationResult;
-import org.jboss.forge.addon.ui.result.navigation.NavigationResultBuilder;
-import org.jboss.forge.addon.ui.util.Categories;
import org.jboss.forge.addon.ui.util.Metadata;
import org.jboss.forge.roaster.model.source.JavaAnnotationSource;
@@ -39,39 +28,14 @@
*
* @author Antonio Goncalves
*/
-public class NewInterceptorBindingCommand extends AbstractJavaSourceCommand implements
- PrerequisiteCommandsProvider
+public class CDINewInterceptorBindingCommand extends AbstractCDICommand
{
@Override
public Metadata getMetadata(UIContext context)
{
return Metadata.from(super.getMetadata(context), getClass())
.name("CDI: New Interceptor Binding")
- .description("Creates a new CDI Interceptor Binding annotation")
- .category(Categories.create(super.getMetadata(context).getCategory(), "CDI"));
- }
-
- @Override
- public void initializeUI(UIBuilder builder) throws Exception
- {
- super.initializeUI(builder);
- }
-
- @Override
- public JavaAnnotationSource decorateSource(UIExecutionContext context, Project project,
- JavaAnnotationSource interceptorBinding) throws Exception
- {
- interceptorBinding.addAnnotation(InterceptorBinding.class);
- interceptorBinding.addAnnotation(Retention.class).setEnumValue(RUNTIME);
- interceptorBinding.addAnnotation(Target.class).setEnumValue(METHOD, TYPE);
- interceptorBinding.addAnnotation(Documented.class);
- return interceptorBinding;
- }
-
- @Override
- protected boolean isProjectRequired()
- {
- return true;
+ .description("Creates a new CDI Interceptor Binding annotation");
}
@Override
@@ -87,17 +51,13 @@ protected Class getSourceType()
}
@Override
- public NavigationResult getPrerequisiteCommands(UIContext context)
+ public JavaAnnotationSource decorateSource(UIExecutionContext context, Project project,
+ JavaAnnotationSource interceptorBinding) throws Exception
{
- NavigationResultBuilder builder = NavigationResultBuilder.create();
- Project project = getSelectedProject(context);
- if (project != null)
- {
- if (!project.hasFacet(CDIFacet.class))
- {
- builder.add(CDISetupCommand.class);
- }
- }
- return builder.build();
+ interceptorBinding.addAnnotation(InterceptorBinding.class);
+ interceptorBinding.addAnnotation(Retention.class).setEnumValue(RUNTIME);
+ interceptorBinding.addAnnotation(Target.class).setEnumValue(METHOD, TYPE);
+ interceptorBinding.addAnnotation(Documented.class);
+ return interceptorBinding;
}
}
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewInterceptorCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorCommand.java
similarity index 67%
rename from javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewInterceptorCommand.java
rename to javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorCommand.java
index b9b7f66ffb..062d6e09ee 100644
--- a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewInterceptorCommand.java
+++ b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorCommand.java
@@ -12,19 +12,12 @@
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
-import org.jboss.forge.addon.javaee.cdi.CDIFacet;
-import org.jboss.forge.addon.parser.java.ui.AbstractJavaSourceCommand;
import org.jboss.forge.addon.projects.Project;
-import org.jboss.forge.addon.ui.command.PrerequisiteCommandsProvider;
import org.jboss.forge.addon.ui.context.UIBuilder;
import org.jboss.forge.addon.ui.context.UIContext;
import org.jboss.forge.addon.ui.context.UIExecutionContext;
-import org.jboss.forge.addon.ui.hints.InputType;
import org.jboss.forge.addon.ui.input.UIInput;
import org.jboss.forge.addon.ui.metadata.WithAttributes;
-import org.jboss.forge.addon.ui.result.NavigationResult;
-import org.jboss.forge.addon.ui.result.navigation.NavigationResultBuilder;
-import org.jboss.forge.addon.ui.util.Categories;
import org.jboss.forge.addon.ui.util.Metadata;
import org.jboss.forge.roaster.model.source.JavaClassSource;
@@ -33,8 +26,7 @@
*
* @author Antonio Goncalves
*/
-public class NewInterceptorCommand extends AbstractJavaSourceCommand implements
- PrerequisiteCommandsProvider
+public class CDINewInterceptorCommand extends AbstractCDICommand
{
@Inject
@WithAttributes(label = "Interceptor Binding", required = true)
@@ -45,8 +37,7 @@ public Metadata getMetadata(UIContext context)
{
return Metadata.from(super.getMetadata(context), getClass())
.name("CDI: New Interceptor")
- .description("Creates a new CDI Interceptor")
- .category(Categories.create(super.getMetadata(context).getCategory(), "CDI"));
+ .description("Creates a new CDI Interceptor");
}
@Override
@@ -56,6 +47,18 @@ public void initializeUI(UIBuilder builder) throws Exception
builder.add(interceptorBinding);
}
+ @Override
+ protected String getType()
+ {
+ return "CDI Interceptor";
+ }
+
+ @Override
+ protected Class getSourceType()
+ {
+ return JavaClassSource.class;
+ }
+
@Override
public JavaClassSource decorateSource(UIExecutionContext context, Project project,
JavaClassSource interceptor) throws Exception
@@ -73,37 +76,4 @@ public JavaClassSource decorateSource(UIExecutionContext context, Project projec
" }").addAnnotation(AroundInvoke.class);
return interceptor;
}
-
- @Override
- protected boolean isProjectRequired()
- {
- return true;
- }
-
- @Override
- protected String getType()
- {
- return "CDI Interceptor";
- }
-
- @Override
- protected Class getSourceType()
- {
- return JavaClassSource.class;
- }
-
- @Override
- public NavigationResult getPrerequisiteCommands(UIContext context)
- {
- NavigationResultBuilder builder = NavigationResultBuilder.create();
- Project project = getSelectedProject(context);
- if (project != null)
- {
- if (!project.hasFacet(CDIFacet.class))
- {
- builder.add(CDISetupCommand.class);
- }
- }
- return builder.build();
- }
}
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewQualifierCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewQualifierCommand.java
similarity index 64%
rename from javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewQualifierCommand.java
rename to javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewQualifierCommand.java
index 975270da8d..170fb6eaf0 100644
--- a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewQualifierCommand.java
+++ b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewQualifierCommand.java
@@ -7,10 +7,7 @@
package org.jboss.forge.addon.javaee.cdi.ui;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
@@ -21,18 +18,12 @@
import javax.inject.Inject;
import javax.inject.Qualifier;
-import org.jboss.forge.addon.javaee.cdi.CDIFacet;
-import org.jboss.forge.addon.parser.java.ui.AbstractJavaSourceCommand;
import org.jboss.forge.addon.projects.Project;
-import org.jboss.forge.addon.ui.command.PrerequisiteCommandsProvider;
import org.jboss.forge.addon.ui.context.UIBuilder;
import org.jboss.forge.addon.ui.context.UIContext;
import org.jboss.forge.addon.ui.context.UIExecutionContext;
import org.jboss.forge.addon.ui.input.UIInput;
import org.jboss.forge.addon.ui.metadata.WithAttributes;
-import org.jboss.forge.addon.ui.result.NavigationResult;
-import org.jboss.forge.addon.ui.result.navigation.NavigationResultBuilder;
-import org.jboss.forge.addon.ui.util.Categories;
import org.jboss.forge.addon.ui.util.Metadata;
import org.jboss.forge.roaster.model.source.JavaAnnotationSource;
@@ -42,8 +33,7 @@
* @author George Gastaldi
* @author Lincoln Baxter, III
*/
-public class NewQualifierCommand extends AbstractJavaSourceCommand implements
- PrerequisiteCommandsProvider
+public class CDINewQualifierCommand extends AbstractCDICommand
{
@Inject
@WithAttributes(label = "Inherited")
@@ -54,8 +44,19 @@ public Metadata getMetadata(UIContext context)
{
return Metadata.from(super.getMetadata(context), getClass())
.name("CDI: New Qualifier")
- .description("Creates a new CDI Qualifier annotation")
- .category(Categories.create(super.getMetadata(context).getCategory(), "CDI"));
+ .description("Creates a new CDI Qualifier annotation");
+ }
+
+ @Override
+ protected String getType()
+ {
+ return "CDI Qualifier";
+ }
+
+ @Override
+ protected Class getSourceType()
+ {
+ return JavaAnnotationSource.class;
}
@Override
@@ -79,37 +80,4 @@ public JavaAnnotationSource decorateSource(UIExecutionContext context, Project p
qualifier.addAnnotation(Documented.class);
return qualifier;
}
-
- @Override
- protected boolean isProjectRequired()
- {
- return true;
- }
-
- @Override
- protected String getType()
- {
- return "CDI Qualifier";
- }
-
- @Override
- protected Class getSourceType()
- {
- return JavaAnnotationSource.class;
- }
-
- @Override
- public NavigationResult getPrerequisiteCommands(UIContext context)
- {
- NavigationResultBuilder builder = NavigationResultBuilder.create();
- Project project = getSelectedProject(context);
- if (project != null)
- {
- if (!project.hasFacet(CDIFacet.class))
- {
- builder.add(CDISetupCommand.class);
- }
- }
- return builder.build();
- }
}
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewScopeCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewScopeCommand.java
similarity index 71%
rename from javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewScopeCommand.java
rename to javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewScopeCommand.java
index 6f3ca89375..217cf7b468 100644
--- a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewScopeCommand.java
+++ b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewScopeCommand.java
@@ -7,9 +7,7 @@
package org.jboss.forge.addon.javaee.cdi.ui;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
@@ -20,19 +18,13 @@
import javax.inject.Inject;
import javax.inject.Scope;
-import org.jboss.forge.addon.javaee.cdi.CDIFacet;
-import org.jboss.forge.addon.parser.java.ui.AbstractJavaSourceCommand;
import org.jboss.forge.addon.projects.Project;
-import org.jboss.forge.addon.ui.command.PrerequisiteCommandsProvider;
import org.jboss.forge.addon.ui.context.UIBuilder;
import org.jboss.forge.addon.ui.context.UIContext;
import org.jboss.forge.addon.ui.context.UIExecutionContext;
import org.jboss.forge.addon.ui.context.UIValidationContext;
import org.jboss.forge.addon.ui.input.UIInput;
import org.jboss.forge.addon.ui.metadata.WithAttributes;
-import org.jboss.forge.addon.ui.result.NavigationResult;
-import org.jboss.forge.addon.ui.result.navigation.NavigationResultBuilder;
-import org.jboss.forge.addon.ui.util.Categories;
import org.jboss.forge.addon.ui.util.Metadata;
import org.jboss.forge.roaster.model.source.AnnotationSource;
import org.jboss.forge.roaster.model.source.JavaAnnotationSource;
@@ -43,12 +35,12 @@
* @author George Gastaldi
* @author Lincoln Baxter, III
*/
-public class NewScopeCommand extends AbstractJavaSourceCommand implements
- PrerequisiteCommandsProvider
+public class CDINewScopeCommand extends AbstractCDICommand
{
@Inject
@WithAttributes(label = "Pseudo Scope")
private UIInput pseudo;
+
@Inject
@WithAttributes(label = "Passivating")
private UIInput passivating;
@@ -58,8 +50,19 @@ public Metadata getMetadata(UIContext context)
{
return Metadata.from(super.getMetadata(context), getClass())
.name("CDI: New Scope")
- .description("Creates a new CDI Scope annotation")
- .category(Categories.create(super.getMetadata(context).getCategory(), "CDI"));
+ .description("Creates a new CDI Scope annotation");
+ }
+
+ @Override
+ protected String getType()
+ {
+ return "CDI Scope";
+ }
+
+ @Override
+ protected Class getSourceType()
+ {
+ return JavaAnnotationSource.class;
}
@Override
@@ -104,37 +107,4 @@ public JavaAnnotationSource decorateSource(UIExecutionContext context, Project p
scope.addAnnotation(Documented.class);
return scope;
}
-
- @Override
- protected boolean isProjectRequired()
- {
- return true;
- }
-
- @Override
- protected String getType()
- {
- return "CDI Scope";
- }
-
- @Override
- protected Class getSourceType()
- {
- return JavaAnnotationSource.class;
- }
-
- @Override
- public NavigationResult getPrerequisiteCommands(UIContext context)
- {
- NavigationResultBuilder builder = NavigationResultBuilder.create();
- Project project = getSelectedProject(context);
- if (project != null)
- {
- if (!project.hasFacet(CDIFacet.class))
- {
- builder.add(CDISetupCommand.class);
- }
- }
- return builder.build();
- }
}
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewStereotypeCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewStereotypeCommand.java
similarity index 69%
rename from javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewStereotypeCommand.java
rename to javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewStereotypeCommand.java
index 67d03b68df..aabfcc6022 100644
--- a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewStereotypeCommand.java
+++ b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewStereotypeCommand.java
@@ -7,16 +7,10 @@
package org.jboss.forge.addon.javaee.cdi.ui;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
import java.util.Arrays;
import java.util.Collection;
@@ -25,19 +19,13 @@
import javax.inject.Inject;
import javax.inject.Named;
-import org.jboss.forge.addon.javaee.cdi.CDIFacet;
-import org.jboss.forge.addon.parser.java.ui.AbstractJavaSourceCommand;
import org.jboss.forge.addon.projects.Project;
-import org.jboss.forge.addon.ui.command.PrerequisiteCommandsProvider;
import org.jboss.forge.addon.ui.context.UIBuilder;
import org.jboss.forge.addon.ui.context.UIContext;
import org.jboss.forge.addon.ui.context.UIExecutionContext;
import org.jboss.forge.addon.ui.input.UIInput;
import org.jboss.forge.addon.ui.input.UISelectMany;
import org.jboss.forge.addon.ui.metadata.WithAttributes;
-import org.jboss.forge.addon.ui.result.NavigationResult;
-import org.jboss.forge.addon.ui.result.navigation.NavigationResultBuilder;
-import org.jboss.forge.addon.ui.util.Categories;
import org.jboss.forge.addon.ui.util.Metadata;
import org.jboss.forge.furnace.util.Iterators;
import org.jboss.forge.roaster.model.source.JavaAnnotationSource;
@@ -48,8 +36,7 @@
* @author George Gastaldi
* @author Lincoln Baxter, III
*/
-public class NewStereotypeCommand extends AbstractJavaSourceCommand implements
- PrerequisiteCommandsProvider
+public class CDINewStereotypeCommand extends AbstractCDICommand
{
@Inject
@WithAttributes(label = "Inherited")
@@ -72,8 +59,19 @@ public Metadata getMetadata(UIContext context)
{
return Metadata.from(super.getMetadata(context), getClass())
.name("CDI: New Stereotype")
- .description("Creates a new CDI Stereotype annotation")
- .category(Categories.create(super.getMetadata(context).getCategory(), "CDI"));
+ .description("Creates a new CDI Stereotype annotation");
+ }
+
+ @Override
+ protected String getType()
+ {
+ return "CDI Stereotype";
+ }
+
+ @Override
+ protected Class getSourceType()
+ {
+ return JavaAnnotationSource.class;
}
@Override
@@ -108,37 +106,4 @@ public JavaAnnotationSource decorateSource(UIExecutionContext context, Project p
stereotype.addAnnotation(Documented.class);
return stereotype;
}
-
- @Override
- protected boolean isProjectRequired()
- {
- return true;
- }
-
- @Override
- protected String getType()
- {
- return "CDI Stereotype";
- }
-
- @Override
- protected Class getSourceType()
- {
- return JavaAnnotationSource.class;
- }
-
- @Override
- public NavigationResult getPrerequisiteCommands(UIContext context)
- {
- NavigationResultBuilder builder = NavigationResultBuilder.create();
- Project project = getSelectedProject(context);
- if (project != null)
- {
- if (!project.hasFacet(CDIFacet.class))
- {
- builder.add(CDISetupCommand.class);
- }
- }
- return builder.build();
- }
}
diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/BeansCommandsTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDIBeansCommandsTest.java
similarity index 99%
rename from javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/BeansCommandsTest.java
rename to javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDIBeansCommandsTest.java
index b74f740871..67b33cf9c5 100644
--- a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/BeansCommandsTest.java
+++ b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDIBeansCommandsTest.java
@@ -35,7 +35,7 @@
* @author George Gastaldi
*/
@RunWith(Arquillian.class)
-public class BeansCommandsTest
+public class CDIBeansCommandsTest
{
@Deployment
@AddonDeployments({
diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewBeanCommandTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewBeanCommandTest.java
similarity index 94%
rename from javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewBeanCommandTest.java
rename to javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewBeanCommandTest.java
index 1dc0fdb48f..a39377d673 100644
--- a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewBeanCommandTest.java
+++ b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewBeanCommandTest.java
@@ -8,6 +8,7 @@
package org.jboss.forge.addon.javaee.cdi.ui;
import static org.hamcrest.CoreMatchers.*;
+import static org.jboss.forge.addon.javaee.JavaEEFacet.DEFAULT_CDI_PACKAGE;
import static org.junit.Assert.*;
import java.util.concurrent.TimeUnit;
@@ -49,7 +50,7 @@
* @author George Gastaldi
*/
@RunWith(Arquillian.class)
-public class NewBeanCommandTest
+public class CDINewBeanCommandTest
{
@Deployment
@AddonDeployments({
@@ -97,15 +98,16 @@ public void setUp()
@Test
public void checkCommandMetadata() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewBeanCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewBeanCommand.class,
project.getRoot()))
{
controller.initialize();
// Checks the command metadata
- assertTrue(controller.getCommand() instanceof NewBeanCommand);
+ assertTrue(controller.getCommand() instanceof CDINewBeanCommand);
+ assertTrue(controller.getCommand() instanceof AbstractCDICommand);
UICommandMetadata metadata = controller.getMetadata();
assertEquals("CDI: New Bean", metadata.getName());
- assertEquals("Java", metadata.getCategory().getName());
+ assertEquals("Java EE", metadata.getCategory().getName());
assertEquals("CDI", metadata.getCategory().getSubCategory().getName());
assertEquals(8, controller.getInputs().size());
assertFalse("Project is created, shouldn't have targetLocation", controller.hasInput("targetLocation"));
@@ -117,7 +119,7 @@ public void checkCommandMetadata() throws Exception
assertTrue(controller.hasInput("qualifier"));
assertTrue(controller.hasInput("alternative"));
assertTrue(controller.hasInput("withNamed"));
- assertTrue(controller.getValueFor("targetPackage").toString().endsWith("unknown"));
+ assertTrue(controller.getValueFor("targetPackage").toString().endsWith(DEFAULT_CDI_PACKAGE));
}
}
@@ -134,7 +136,7 @@ public void checkCommandShell() throws Exception
@Test
public void testCreateNewBean() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewBeanCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewBeanCommand.class,
project.getRoot()))
{
controller.initialize();
@@ -159,7 +161,7 @@ public void testCreateNewBean() throws Exception
@Test
public void testCreateNewBeanWithAlternativeAndNamed() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewBeanCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewBeanCommand.class,
project.getRoot()))
{
controller.initialize();
@@ -186,7 +188,7 @@ public void testCreateNewBeanWithAlternativeAndNamed() throws Exception
@Test
public void testCreateNewBeanWithNoAlternativeAndNamed() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewBeanCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewBeanCommand.class,
project.getRoot()))
{
controller.initialize();
@@ -211,7 +213,7 @@ public void testCreateNewBeanWithNoAlternativeAndNamed() throws Exception
@Test
public void testCreateNewBeanWithQualifier() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewBeanCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewBeanCommand.class,
project.getRoot()))
{
controller.initialize();
@@ -240,7 +242,7 @@ public void testCreateNewBeanCustomScope() throws Exception
.setPackage("org.jboss.forge.test.scope");
ann.addAnnotation(NormalScope.class);
project.getFacet(JavaSourceFacet.class).saveJavaSource(ann);
- try (CommandController controller = uiTestHarness.createCommandController(NewBeanCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewBeanCommand.class,
project.getRoot()))
{
controller.initialize();
diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewDecoratorCommandTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewDecoratorCommandTest.java
similarity index 92%
rename from javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewDecoratorCommandTest.java
rename to javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewDecoratorCommandTest.java
index e94e26326c..96147bcc7e 100644
--- a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewDecoratorCommandTest.java
+++ b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewDecoratorCommandTest.java
@@ -8,6 +8,7 @@
package org.jboss.forge.addon.javaee.cdi.ui;
import static org.hamcrest.CoreMatchers.*;
+import static org.jboss.forge.addon.javaee.JavaEEFacet.DEFAULT_CDI_PACKAGE;
import static org.junit.Assert.*;
import java.lang.annotation.Inherited;
@@ -45,7 +46,7 @@
* @author Antonio Goncalves
*/
@RunWith(Arquillian.class)
-public class NewDecoratorCommandTest
+public class CDINewDecoratorCommandTest
{
@Deployment
@AddonDeployments({
@@ -93,15 +94,16 @@ public void setUp()
@Test
public void checkCommandMetadata() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewDecoratorCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewDecoratorCommand.class,
project.getRoot()))
{
controller.initialize();
// Checks the command metadata
- assertTrue(controller.getCommand() instanceof NewDecoratorCommand);
+ assertTrue(controller.getCommand() instanceof CDINewDecoratorCommand);
+ assertTrue(controller.getCommand() instanceof AbstractCDICommand);
UICommandMetadata metadata = controller.getMetadata();
assertEquals("CDI: New Decorator", metadata.getName());
- assertEquals("Java", metadata.getCategory().getName());
+ assertEquals("Java EE", metadata.getCategory().getName());
assertEquals("CDI", metadata.getCategory().getSubCategory().getName());
assertEquals(4, controller.getInputs().size());
assertFalse("Project is created, shouldn't have targetLocation", controller.hasInput("targetLocation"));
@@ -109,7 +111,7 @@ public void checkCommandMetadata() throws Exception
assertTrue(controller.hasInput("targetPackage"));
assertTrue(controller.hasInput("overwrite"));
assertTrue(controller.hasInput("delegate"));
- assertTrue(controller.getValueFor("targetPackage").toString().endsWith("unknown"));
+ assertTrue(controller.getValueFor("targetPackage").toString().endsWith(DEFAULT_CDI_PACKAGE));
}
}
@@ -128,7 +130,7 @@ public void checkCommandShell() throws Exception
@Test
public void testCreateNewDecorator() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewDecoratorCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewDecoratorCommand.class,
project.getRoot()))
{
controller.initialize();
diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewInterceptorBindingCommandTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorBindingCommandTest.java
similarity index 92%
rename from javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewInterceptorBindingCommandTest.java
rename to javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorBindingCommandTest.java
index 0dffe0c85d..3ba961644e 100644
--- a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewInterceptorBindingCommandTest.java
+++ b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorBindingCommandTest.java
@@ -8,6 +8,7 @@
package org.jboss.forge.addon.javaee.cdi.ui;
import static org.hamcrest.CoreMatchers.*;
+import static org.jboss.forge.addon.javaee.JavaEEFacet.DEFAULT_CDI_PACKAGE;
import static org.junit.Assert.*;
import java.lang.annotation.Inherited;
@@ -45,7 +46,7 @@
* @author Antonio Goncalves
*/
@RunWith(Arquillian.class)
-public class NewInterceptorBindingCommandTest
+public class CDINewInterceptorBindingCommandTest
{
@Deployment
@AddonDeployments({
@@ -93,22 +94,22 @@ public void setUp()
@Test
public void checkCommandMetadata() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewInterceptorBindingCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewInterceptorBindingCommand.class,
project.getRoot()))
{
controller.initialize();
// Checks the command metadata
- assertTrue(controller.getCommand() instanceof NewInterceptorBindingCommand);
+ assertTrue(controller.getCommand() instanceof CDINewInterceptorBindingCommand);
UICommandMetadata metadata = controller.getMetadata();
assertEquals("CDI: New Interceptor Binding", metadata.getName());
- assertEquals("Java", metadata.getCategory().getName());
+ assertEquals("Java EE", metadata.getCategory().getName());
assertEquals("CDI", metadata.getCategory().getSubCategory().getName());
assertEquals(3, controller.getInputs().size());
assertFalse("Project is created, shouldn't have targetLocation", controller.hasInput("targetLocation"));
assertTrue(controller.hasInput("named"));
assertTrue(controller.hasInput("targetPackage"));
assertTrue(controller.hasInput("overwrite"));
- assertTrue(controller.getValueFor("targetPackage").toString().endsWith("unknown"));
+ assertTrue(controller.getValueFor("targetPackage").toString().endsWith(DEFAULT_CDI_PACKAGE));
}
}
@@ -125,7 +126,7 @@ public void checkCommandShell() throws Exception
@Test
public void testCreateNewInterceptorBinding() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewInterceptorBindingCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewInterceptorBindingCommand.class,
project.getRoot()))
{
controller.initialize();
diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewInterceptorCommandTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorCommandTest.java
similarity index 93%
rename from javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewInterceptorCommandTest.java
rename to javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorCommandTest.java
index 79840bcde7..c18b428844 100644
--- a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewInterceptorCommandTest.java
+++ b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewInterceptorCommandTest.java
@@ -8,6 +8,7 @@
package org.jboss.forge.addon.javaee.cdi.ui;
import static org.hamcrest.CoreMatchers.*;
+import static org.jboss.forge.addon.javaee.JavaEEFacet.DEFAULT_CDI_PACKAGE;
import static org.junit.Assert.*;
import java.lang.annotation.Inherited;
@@ -47,7 +48,7 @@
* @author Antonio Goncalves
*/
@RunWith(Arquillian.class)
-public class NewInterceptorCommandTest
+public class CDINewInterceptorCommandTest
{
@Deployment
@AddonDeployments({
@@ -95,15 +96,15 @@ public void setUp()
@Test
public void checkCommandMetadata() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewInterceptorCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewInterceptorCommand.class,
project.getRoot()))
{
controller.initialize();
// Checks the command metadata
- assertTrue(controller.getCommand() instanceof NewInterceptorCommand);
+ assertTrue(controller.getCommand() instanceof CDINewInterceptorCommand);
UICommandMetadata metadata = controller.getMetadata();
assertEquals("CDI: New Interceptor", metadata.getName());
- assertEquals("Java", metadata.getCategory().getName());
+ assertEquals("Java EE", metadata.getCategory().getName());
assertEquals("CDI", metadata.getCategory().getSubCategory().getName());
assertEquals(4, controller.getInputs().size());
assertFalse("Project is created, shouldn't have targetLocation", controller.hasInput("targetLocation"));
@@ -111,7 +112,7 @@ public void checkCommandMetadata() throws Exception
assertTrue(controller.hasInput("targetPackage"));
assertTrue(controller.hasInput("overwrite"));
assertTrue(controller.hasInput("interceptorBinding"));
- assertTrue(controller.getValueFor("targetPackage").toString().endsWith("unknown"));
+ assertTrue(controller.getValueFor("targetPackage").toString().endsWith(DEFAULT_CDI_PACKAGE));
}
}
@@ -132,7 +133,7 @@ public void checkCommandShell() throws Exception
@Test
public void testCreateNewInterceptor() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewInterceptorCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewInterceptorCommand.class,
project.getRoot()))
{
controller.initialize();
diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewQualifierCommandTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewQualifierCommandTest.java
similarity index 93%
rename from javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewQualifierCommandTest.java
rename to javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewQualifierCommandTest.java
index 2331f74354..6ba399a5b9 100644
--- a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewQualifierCommandTest.java
+++ b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewQualifierCommandTest.java
@@ -8,6 +8,7 @@
package org.jboss.forge.addon.javaee.cdi.ui;
import static org.hamcrest.CoreMatchers.*;
+import static org.jboss.forge.addon.javaee.JavaEEFacet.DEFAULT_CDI_PACKAGE;
import static org.junit.Assert.*;
import java.lang.annotation.Inherited;
@@ -45,7 +46,7 @@
* @author George Gastaldi
*/
@RunWith(Arquillian.class)
-public class NewQualifierCommandTest
+public class CDINewQualifierCommandTest
{
@Deployment
@AddonDeployments({
@@ -93,15 +94,15 @@ public void setUp()
@Test
public void checkCommandMetadata() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewQualifierCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewQualifierCommand.class,
project.getRoot()))
{
controller.initialize();
// Checks the command metadata
- assertTrue(controller.getCommand() instanceof NewQualifierCommand);
+ assertTrue(controller.getCommand() instanceof CDINewQualifierCommand);
UICommandMetadata metadata = controller.getMetadata();
assertEquals("CDI: New Qualifier", metadata.getName());
- assertEquals("Java", metadata.getCategory().getName());
+ assertEquals("Java EE", metadata.getCategory().getName());
assertEquals("CDI", metadata.getCategory().getSubCategory().getName());
assertEquals(4, controller.getInputs().size());
assertFalse("Project is created, shouldn't have targetLocation", controller.hasInput("targetLocation"));
@@ -109,7 +110,7 @@ public void checkCommandMetadata() throws Exception
assertTrue(controller.hasInput("targetPackage"));
assertTrue(controller.hasInput("overwrite"));
assertTrue(controller.hasInput("inherited"));
- assertTrue(controller.getValueFor("targetPackage").toString().endsWith("unknown"));
+ assertTrue(controller.getValueFor("targetPackage").toString().endsWith(DEFAULT_CDI_PACKAGE));
}
}
@@ -126,7 +127,7 @@ public void checkCommandShell() throws Exception
@Test
public void testCreateNewQualifier() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewQualifierCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewQualifierCommand.class,
project.getRoot()))
{
controller.initialize();
@@ -150,7 +151,7 @@ public void testCreateNewQualifier() throws Exception
@Test
public void testCreateNewQualifierInherited() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewQualifierCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewQualifierCommand.class,
project.getRoot()))
{
controller.initialize();
diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewScopeCommandTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewScopeCommandTest.java
similarity index 94%
rename from javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewScopeCommandTest.java
rename to javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewScopeCommandTest.java
index ef38d8202a..d8e061830a 100644
--- a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewScopeCommandTest.java
+++ b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewScopeCommandTest.java
@@ -8,6 +8,7 @@
package org.jboss.forge.addon.javaee.cdi.ui;
import static org.hamcrest.CoreMatchers.*;
+import static org.jboss.forge.addon.javaee.JavaEEFacet.DEFAULT_CDI_PACKAGE;
import static org.junit.Assert.*;
import java.util.concurrent.TimeUnit;
@@ -45,7 +46,7 @@
* @author George Gastaldi
*/
@RunWith(Arquillian.class)
-public class NewScopeCommandTest
+public class CDINewScopeCommandTest
{
@Deployment
@AddonDeployments({
@@ -93,15 +94,15 @@ public void setUp()
@Test
public void checkCommandMetadata() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewScopeCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewScopeCommand.class,
project.getRoot()))
{
controller.initialize();
// Checks the command metadata
- assertTrue(controller.getCommand() instanceof NewScopeCommand);
+ assertTrue(controller.getCommand() instanceof CDINewScopeCommand);
UICommandMetadata metadata = controller.getMetadata();
assertEquals("CDI: New Scope", metadata.getName());
- assertEquals("Java", metadata.getCategory().getName());
+ assertEquals("Java EE", metadata.getCategory().getName());
assertEquals("CDI", metadata.getCategory().getSubCategory().getName());
assertEquals(5, controller.getInputs().size());
assertFalse("Project is created, shouldn't have targetLocation", controller.hasInput("targetLocation"));
@@ -110,7 +111,7 @@ public void checkCommandMetadata() throws Exception
assertTrue(controller.hasInput("overwrite"));
assertTrue(controller.hasInput("pseudo"));
assertTrue(controller.hasInput("passivating"));
- assertTrue(controller.getValueFor("targetPackage").toString().endsWith("unknown"));
+ assertTrue(controller.getValueFor("targetPackage").toString().endsWith(DEFAULT_CDI_PACKAGE));
}
}
@@ -127,7 +128,7 @@ public void checkCommandShell() throws Exception
@Test
public void testCreateNewScope() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewScopeCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewScopeCommand.class,
project.getRoot()))
{
controller.initialize();
@@ -151,7 +152,7 @@ public void testCreateNewScope() throws Exception
@Test
public void testCreateNewPassivatingScope() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewScopeCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewScopeCommand.class,
project.getRoot()))
{
controller.initialize();
@@ -177,7 +178,7 @@ public void testCreateNewPassivatingScope() throws Exception
@Test
public void testCreateNewPseudoScope() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewScopeCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewScopeCommand.class,
project.getRoot()))
{
controller.initialize();
diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewStereotypeCommandTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewStereotypeCommandTest.java
similarity index 94%
rename from javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewStereotypeCommandTest.java
rename to javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewStereotypeCommandTest.java
index 84e2e21088..53a7f52d18 100644
--- a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewStereotypeCommandTest.java
+++ b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/CDINewStereotypeCommandTest.java
@@ -8,6 +8,7 @@
package org.jboss.forge.addon.javaee.cdi.ui;
import static org.hamcrest.CoreMatchers.*;
+import static org.jboss.forge.addon.javaee.JavaEEFacet.DEFAULT_CDI_PACKAGE;
import static org.junit.Assert.*;
import java.lang.annotation.ElementType;
@@ -49,7 +50,7 @@
* @author George Gastaldi
*/
@RunWith(Arquillian.class)
-public class NewStereotypeCommandTest
+public class CDINewStereotypeCommandTest
{
@Deployment
@AddonDeployments({
@@ -97,15 +98,15 @@ public void setUp()
@Test
public void checkCommandMetadata() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewStereotypeCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewStereotypeCommand.class,
project.getRoot()))
{
controller.initialize();
// Checks the command metadata
- assertTrue(controller.getCommand() instanceof NewStereotypeCommand);
+ assertTrue(controller.getCommand() instanceof CDINewStereotypeCommand);
UICommandMetadata metadata = controller.getMetadata();
assertEquals("CDI: New Stereotype", metadata.getName());
- assertEquals("Java", metadata.getCategory().getName());
+ assertEquals("Java EE", metadata.getCategory().getName());
assertEquals("CDI", metadata.getCategory().getSubCategory().getName());
assertEquals(7, controller.getInputs().size());
assertFalse("Project is created, shouldn't have targetLocation", controller.hasInput("targetLocation"));
@@ -116,7 +117,7 @@ public void checkCommandMetadata() throws Exception
assertTrue(controller.hasInput("withNamed"));
assertTrue(controller.hasInput("inherited"));
assertTrue(controller.hasInput("targetTypes"));
- assertTrue(controller.getValueFor("targetPackage").toString().endsWith("unknown"));
+ assertTrue(controller.getValueFor("targetPackage").toString().endsWith(DEFAULT_CDI_PACKAGE));
}
}
@@ -133,7 +134,7 @@ public void checkCommandShell() throws Exception
@Test
public void testCreateNewStereotype() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewStereotypeCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewStereotypeCommand.class,
project.getRoot()))
{
controller.initialize();
@@ -160,7 +161,7 @@ public void testCreateNewStereotype() throws Exception
@Test
public void testCreateNewInheritedStereotype() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewStereotypeCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewStereotypeCommand.class,
project.getRoot()))
{
controller.initialize();
@@ -188,7 +189,7 @@ public void testCreateNewInheritedStereotype() throws Exception
@Test
public void testCreateNewNamedStereotype() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewStereotypeCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewStereotypeCommand.class,
project.getRoot()))
{
controller.initialize();
@@ -216,7 +217,7 @@ public void testCreateNewNamedStereotype() throws Exception
@Test
public void testCreateNewAlternativeStereotype() throws Exception
{
- try (CommandController controller = uiTestHarness.createCommandController(NewStereotypeCommand.class,
+ try (CommandController controller = uiTestHarness.createCommandController(CDINewStereotypeCommand.class,
project.getRoot()))
{
controller.initialize();