FORGE-2316: Added missing facets in the JavaEE stack facets

forge · Jan 13, 2016 · a03f03d · a03f03d
1 parent 440daa5
commit a03f03d
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 12 deletions.
diff --git a/javaee/api/src/main/java/org/jboss/forge/addon/javaee/facets/JavaEE6Facet.java b/javaee/api/src/main/java/org/jboss/forge/addon/javaee/facets/JavaEE6Facet.java
@@ -10,8 +10,14 @@
 import static org.jboss.forge.addon.projects.stacks.StackBuilder.stack;
 
 import org.jboss.forge.addon.javaee.cdi.CDIFacet_1_0;
+import org.jboss.forge.addon.javaee.ejb.EJBFacet_3_1;
+import org.jboss.forge.addon.javaee.faces.FacesFacet_2_0;
+import org.jboss.forge.addon.javaee.jms.JMSFacet_1_1;
 import org.jboss.forge.addon.javaee.jpa.JPAFacet_2_0;
+import org.jboss.forge.addon.javaee.jta.JTAFacet_1_1;
 import org.jboss.forge.addon.javaee.rest.RestFacet_1_1;
+import org.jboss.forge.addon.javaee.servlet.ServletFacet_3_0;
+import org.jboss.forge.addon.javaee.validation.ValidationFacet;
 import org.jboss.forge.addon.projects.stacks.Stack;
 import org.jboss.forge.addon.projects.stacks.StackFacet;
 
@@ -27,7 +33,12 @@ public interface JavaEE6Facet extends JavaEESpecFacet
     */
    public static final Stack STACK = stack("Java EE 6")
             .includes(CDIFacet_1_0.class)
+            .includes(EJBFacet_3_1.class)
+            .includes(FacesFacet_2_0.class)
+            .includes(JMSFacet_1_1.class)
             .includes(JPAFacet_2_0.class)
-            .includes(RestFacet_1_1.class);
-
+            .includes(JTAFacet_1_1.class)
+            .includes(RestFacet_1_1.class)
+            .includes(ServletFacet_3_0.class)
+            .includes(ValidationFacet.class);
 }
diff --git a/javaee/api/src/main/java/org/jboss/forge/addon/javaee/facets/JavaEE7Facet.java b/javaee/api/src/main/java/org/jboss/forge/addon/javaee/facets/JavaEE7Facet.java
@@ -10,8 +10,15 @@
 import static org.jboss.forge.addon.projects.stacks.StackBuilder.stack;
 
 import org.jboss.forge.addon.javaee.cdi.CDIFacet_1_1;
+import org.jboss.forge.addon.javaee.ejb.EJBFacet_3_2;
+import org.jboss.forge.addon.javaee.faces.FacesFacet_2_2;
+import org.jboss.forge.addon.javaee.jms.JMSFacet_2_0;
 import org.jboss.forge.addon.javaee.jpa.JPAFacet_2_1;
+import org.jboss.forge.addon.javaee.jta.JTAFacet_1_2;
 import org.jboss.forge.addon.javaee.rest.RestFacet_2_0;
+import org.jboss.forge.addon.javaee.servlet.ServletFacet_3_1;
+import org.jboss.forge.addon.javaee.validation.ValidationFacet;
+import org.jboss.forge.addon.javaee.websocket.WebSocketFacet;
 import org.jboss.forge.addon.projects.stacks.Stack;
 import org.jboss.forge.addon.projects.stacks.StackFacet;
 
@@ -27,7 +34,14 @@ public interface JavaEE7Facet extends JavaEESpecFacet
     */
    public static final Stack STACK = stack("Java EE 7")
             .includes(CDIFacet_1_1.class)
+            .includes(EJBFacet_3_2.class)
+            .includes(FacesFacet_2_2.class)
+            .includes(JMSFacet_2_0.class)
             .includes(JPAFacet_2_1.class)
-            .includes(RestFacet_2_0.class);
+            .includes(JTAFacet_1_2.class)
+            .includes(RestFacet_2_0.class)
+            .includes(ServletFacet_3_1.class)
+            .includes(ValidationFacet.class)
+            .includes(WebSocketFacet.class);
 
 }
diff --git a/...e/impl/src/main/java/org/jboss/forge/addon/javaee/servlet/ui/ServletNewFilterCommand.java b/...e/impl/src/main/java/org/jboss/forge/addon/javaee/servlet/ui/ServletNewFilterCommand.java
@@ -17,7 +17,9 @@
 import javax.servlet.ServletResponse;
 import javax.servlet.annotation.WebFilter;
 
+import org.jboss.forge.addon.javaee.servlet.ServletFacet;
 import org.jboss.forge.addon.projects.Project;
+import org.jboss.forge.addon.projects.stacks.annotations.StackConstraint;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;
@@ -30,6 +32,7 @@
  *
  * @author <a href="mailto:antonio.goncalves@gmail.com">Antonio Goncalves</a>
  */
+@StackConstraint(ServletFacet.class)
 public class ServletNewFilterCommand extends AbstractServletNewCommand<JavaClassSource>
 {
 

diff --git a/.../impl/src/main/java/org/jboss/forge/addon/javaee/servlet/ui/ServletNewServletCommand.java b/.../impl/src/main/java/org/jboss/forge/addon/javaee/servlet/ui/ServletNewServletCommand.java
@@ -17,7 +17,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.jboss.forge.addon.javaee.servlet.ServletFacet;
 import org.jboss.forge.addon.projects.Project;
+import org.jboss.forge.addon.projects.stacks.annotations.StackConstraint;
 import org.jboss.forge.addon.text.Inflector;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
@@ -35,6 +37,7 @@
  *
  * @author <a href="mailto:antonio.goncalves@gmail.com">Antonio Goncalves</a>
  */
+@StackConstraint(ServletFacet.class)
 public class ServletNewServletCommand extends AbstractServletNewCommand<JavaClassSource>
 {
    @Inject
@@ -99,8 +102,9 @@ public JavaClassSource decorateSource(UIExecutionContext context, Project projec
          doGet.addParameter(HttpServletRequest.class, "request");
          doGet.addParameter(HttpServletResponse.class, "response");
          doGet.addThrows(ServletException.class).addThrows(IOException.class);
-         doGet.setBody("response.getWriter().println(\"Method " + method.getMethodName() + "\" invoked);").addAnnotation(
-                  Override.class);
+         doGet.setBody("response.getWriter().println(\"Method " + method.getMethodName() + "\" invoked);")
+                  .addAnnotation(
+                           Override.class);
       }
 
       return source;

diff --git a/...ee/impl/src/main/java/org/jboss/forge/addon/javaee/servlet/ui/ServletSetupWizardImpl.java b/...ee/impl/src/main/java/org/jboss/forge/addon/javaee/servlet/ui/ServletSetupWizardImpl.java
@@ -15,6 +15,7 @@
 import org.jboss.forge.addon.javaee.ui.AbstractJavaEECommand;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.facets.DependencyFacet;
+import org.jboss.forge.addon.projects.stacks.annotations.StackConstraint;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;
@@ -32,6 +33,7 @@
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
 @FacetConstraint(DependencyFacet.class)
+@StackConstraint(ServletFacet.class)
 public class ServletSetupWizardImpl extends AbstractJavaEECommand implements ServletSetupWizard
 {
 

diff --git a/...in/java/org/jboss/forge/addon/javaee/validation/ui/ValidationAddConstraintWizardImpl.java b/...in/java/org/jboss/forge/addon/javaee/validation/ui/ValidationAddConstraintWizardImpl.java
@@ -19,6 +19,7 @@
 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.stacks.annotations.StackConstraint;
 import org.jboss.forge.addon.resource.FileResource;
 import org.jboss.forge.addon.resource.visit.VisitContext;
 import org.jboss.forge.addon.ui.command.PrerequisiteCommandsProvider;
@@ -39,6 +40,7 @@
 import org.jboss.forge.addon.ui.util.Metadata;
 import org.jboss.forge.addon.ui.wizard.UIWizard;
 
+@StackConstraint(ValidationFacet.class)
 public class ValidationAddConstraintWizardImpl extends AbstractJavaEECommand implements UIWizard,
          PrerequisiteCommandsProvider, ValidationAddConstraintWizard
 {

diff --git a/...n/java/org/jboss/forge/addon/javaee/validation/ui/ValidationNewAnnotationCommandImpl.java b/...n/java/org/jboss/forge/addon/javaee/validation/ui/ValidationNewAnnotationCommandImpl.java
@@ -23,7 +23,9 @@
 import javax.validation.Payload;
 import javax.validation.ReportAsSingleViolation;
 
+import org.jboss.forge.addon.javaee.validation.ValidationFacet;
 import org.jboss.forge.addon.projects.Project;
+import org.jboss.forge.addon.projects.stacks.annotations.StackConstraint;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;
 import org.jboss.forge.addon.ui.util.Metadata;
@@ -34,6 +36,7 @@
  *
  * @author <a href="antonio.goncalves@gmail.com">Antonio Goncalves</a>
  */
+@StackConstraint(ValidationFacet.class)
 public class ValidationNewAnnotationCommandImpl extends AbstractValidationCommand<JavaAnnotationSource> implements
          ValidationNewAnnotationCommand
 {
@@ -60,7 +63,7 @@ protected Class<JavaAnnotationSource> getSourceType()
    @Override
    public JavaAnnotationSource decorateSource(UIExecutionContext context, Project project,
             JavaAnnotationSource constraint)
-            throws Exception
+                     throws Exception
    {
       // Constraint annotation header
       constraint.addAnnotation(Constraint.class).setLiteralValue("validatedBy", "{}");

diff --git a/...c/main/java/org/jboss/forge/addon/javaee/validation/ui/ValidationNewGroupCommandImpl.java b/...c/main/java/org/jboss/forge/addon/javaee/validation/ui/ValidationNewGroupCommandImpl.java
@@ -6,6 +6,8 @@
  */
 package org.jboss.forge.addon.javaee.validation.ui;
 
+import org.jboss.forge.addon.javaee.validation.ValidationFacet;
+import org.jboss.forge.addon.projects.stacks.annotations.StackConstraint;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.util.Metadata;
 import org.jboss.forge.roaster.model.source.JavaInterfaceSource;
@@ -14,6 +16,7 @@
  *
  * @author <a href="antonio.goncalves@gmail.com">Antonio Goncalves</a>
  */
+@StackConstraint(ValidationFacet.class)
 public class ValidationNewGroupCommandImpl extends AbstractValidationCommand<JavaInterfaceSource> implements
          ValidationNewGroupCommand
 {

diff --git a/...main/java/org/jboss/forge/addon/javaee/validation/ui/ValidationNewPayloadCommandImpl.java b/...main/java/org/jboss/forge/addon/javaee/validation/ui/ValidationNewPayloadCommandImpl.java
@@ -2,7 +2,9 @@
 
 import javax.validation.Payload;
 
+import org.jboss.forge.addon.javaee.validation.ValidationFacet;
 import org.jboss.forge.addon.projects.Project;
+import org.jboss.forge.addon.projects.stacks.annotations.StackConstraint;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;
 import org.jboss.forge.addon.ui.util.Metadata;
@@ -11,7 +13,9 @@
 /**
  * @author <a href="antonio.goncalves@gmail.com">Antonio Goncalves</a>
  */
-public class ValidationNewPayloadCommandImpl extends AbstractValidationCommand<JavaClassSource> implements ValidationNewPayloadCommand
+@StackConstraint(ValidationFacet.class)
+public class ValidationNewPayloadCommandImpl extends AbstractValidationCommand<JavaClassSource>
+         implements ValidationNewPayloadCommand
 {
    @Override
    public Metadata getMetadata(UIContext context)
@@ -33,9 +37,11 @@ protected Class<JavaClassSource> getSourceType()
       return JavaClassSource.class;
    }
 
-    @Override
-    public JavaClassSource decorateSource(UIExecutionContext context, Project project, JavaClassSource source) throws Exception {
-        source.addInterface(Payload.class);
-        return source;
-    }
+   @Override
+   public JavaClassSource decorateSource(UIExecutionContext context, Project project, JavaClassSource source)
+            throws Exception
+   {
+      source.addInterface(Payload.class);
+      return source;
+   }
 }
diff --git a/.../org/jboss/forge/addon/javaee/validation/ui/setup/ValidationProviderSetupCommandImpl.java b/.../org/jboss/forge/addon/javaee/validation/ui/setup/ValidationProviderSetupCommandImpl.java
@@ -12,10 +12,12 @@
 
 import org.jboss.forge.addon.convert.Converter;
 import org.jboss.forge.addon.javaee.ui.AbstractJavaEECommand;
+import org.jboss.forge.addon.javaee.validation.ValidationFacet;
 import org.jboss.forge.addon.javaee.validation.ValidationOperations;
 import org.jboss.forge.addon.javaee.validation.provider.ValidationProvider;
 import org.jboss.forge.addon.javaee.validation.providers.JavaEEValidatorProvider;
 import org.jboss.forge.addon.javaee.validation.ui.ValidationProviderSetupCommand;
+import org.jboss.forge.addon.projects.stacks.annotations.StackConstraint;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;
@@ -29,6 +31,7 @@
 import org.jboss.forge.addon.ui.util.Categories;
 import org.jboss.forge.addon.ui.util.Metadata;
 
+@StackConstraint(ValidationFacet.class)
 public class ValidationProviderSetupCommandImpl extends AbstractJavaEECommand implements ValidationProviderSetupCommand
 {
    @Inject