FORGE-1402 Rewrote the REST generator to use a custom UICommand.

This ensures that the JPA entities are not prompted for twice, and also that the REST resources generated by the wizards support the application/json media type.
forge · Mar 25, 2014 · 26f8053 · 26f8053
1 parent d06d45c
commit 26f8053
Show file tree

Hide file tree

Showing 3 changed files with 224 additions and 2 deletions.
diff --git a/src/main/java/org/jboss/forge/addon/angularjs/AngularScaffoldProvider.java b/src/main/java/org/jboss/forge/addon/angularjs/AngularScaffoldProvider.java
@@ -24,7 +24,6 @@
 import org.jboss.forge.addon.javaee.jpa.JPAFacet;
 import org.jboss.forge.addon.javaee.jpa.ui.setup.JPASetupWizard;
 import org.jboss.forge.addon.javaee.rest.RestFacet;
-import org.jboss.forge.addon.javaee.rest.ui.RestEndpointFromEntityCommand;
 import org.jboss.forge.addon.javaee.rest.ui.setup.RestSetupWizard;
 import org.jboss.forge.addon.javaee.servlet.ServletFacet;
 import org.jboss.forge.addon.javaee.servlet.ServletFacet_3_0;
@@ -278,7 +277,7 @@ public NavigationResult getGenerationFlow(Project project)
    {
       NavigationResultBuilder builder = NavigationResultBuilder.create();
       builder.add(ScaffoldableEntitySelectionWizard.class);
-      builder.add(RestEndpointFromEntityCommand.class);
+      builder.add(JSONRestResourceFromEntityCommand.class);
       return builder.build();
    }
 

diff --git a/src/main/java/org/jboss/forge/addon/angularjs/JSONRestResourceFromEntityCommand.java b/src/main/java/org/jboss/forge/addon/angularjs/JSONRestResourceFromEntityCommand.java
@@ -0,0 +1,217 @@
+/**
+ * Copyright 2014 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Eclipse Public License version 1.0, available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.jboss.forge.addon.angularjs;
+
+import org.jboss.forge.addon.convert.Converter;
+import org.jboss.forge.addon.javaee.ejb.EJBFacet;
+import org.jboss.forge.addon.javaee.ejb.ui.EJBSetupWizard;
+import org.jboss.forge.addon.javaee.jpa.JPAFacet;
+import org.jboss.forge.addon.javaee.jpa.ui.setup.JPASetupWizard;
+import org.jboss.forge.addon.javaee.rest.RestFacet;
+import org.jboss.forge.addon.javaee.rest.generation.RestResourceGenerator;
+import org.jboss.forge.addon.javaee.rest.generator.RestGenerationContextImpl;
+import org.jboss.forge.addon.javaee.rest.generator.impl.EntityBasedResourceGenerator;
+import org.jboss.forge.addon.javaee.rest.ui.setup.RestSetupWizard;
+import org.jboss.forge.addon.javaee.ui.AbstractJavaEECommand;
+import org.jboss.forge.addon.parser.java.facets.JavaSourceFacet;
+import org.jboss.forge.addon.parser.java.resources.JavaResource;
+import org.jboss.forge.addon.projects.Project;
+import org.jboss.forge.addon.resource.Resource;
+import org.jboss.forge.addon.scaffold.spi.ResourceCollection;
+import org.jboss.forge.addon.text.Inflector;
+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.input.UISelectOne;
+import org.jboss.forge.addon.ui.metadata.UICommandMetadata;
+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.result.navigation.NavigationResultBuilder;
+import org.jboss.forge.addon.ui.util.Categories;
+import org.jboss.forge.addon.ui.util.Metadata;
+import org.jboss.forge.parser.java.JavaClass;
+import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceCommonDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceUnitCommon;
+
+import javax.inject.Inject;
+import javax.ws.rs.core.MediaType;
+import java.util.*;
+
+/**
+ * Created by vineet on 3/25/14.
+ */
+public class JSONRestResourceFromEntityCommand extends AbstractJavaEECommand implements PrerequisiteCommandsProvider
+{
+
+   @Inject
+   @WithAttributes(label = "Generator", required = true)
+   private UISelectOne<RestResourceGenerator> generator;
+
+   @Inject
+   @WithAttributes(label = "Persistence Unit", required = true)
+   private UISelectOne<String> persistenceUnit;
+
+   @Inject
+   @WithAttributes(label = "Target Package Name", required = true, type = InputType.JAVA_PACKAGE_PICKER)
+   private UIInput<String> packageName;
+
+   @Inject
+   @WithAttributes(label = "Overwrite existing classes?", enabled = false, defaultValue = "false")
+   private UIInput<Boolean> overwrite;
+
+   @Inject
+   private EntityBasedResourceGenerator defaultResourceGenerator;
+
+   @Inject
+   private Inflector inflector;
+
+   private List<JavaClass> targets;
+
+    @Override
+    public UICommandMetadata getMetadata(UIContext context)
+    {
+        return Metadata.from(super.getMetadata(context), getClass()).name("REST: Generate Endpoints From Entities")
+                .description("Generate REST endpoints from JPA entities")
+                .category(Categories.create(super.getMetadata(context).getCategory(), "JAX-RS"));
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @Override
+    public void initializeUI(UIBuilder builder) throws Exception
+    {
+        UIContext context = builder.getUIContext();
+        Project project = getSelectedProject(context);
+        JPAFacet<PersistenceCommonDescriptor> persistenceFacet = project.getFacet(JPAFacet.class);
+        JavaSourceFacet javaSourceFacet = project.getFacet(JavaSourceFacet.class);
+        List<String> persistenceUnits = new ArrayList<>();
+        List<PersistenceUnitCommon> allUnits = persistenceFacet.getConfig().getAllPersistenceUnit();
+        for (PersistenceUnitCommon persistenceUnit : allUnits)
+        {
+            persistenceUnits.add(persistenceUnit.getName());
+        }
+        if (!persistenceUnits.isEmpty())
+        {
+            persistenceUnit.setValueChoices(persistenceUnits).setDefaultValue(persistenceUnits.get(0));
+        }
+
+        // TODO: May detect where @Path resources are located
+        packageName.setDefaultValue(javaSourceFacet.getBasePackage() + ".rest");
+
+        generator.setDefaultValue(defaultResourceGenerator);
+        if (context.getProvider().isGUI())
+        {
+            generator.setItemLabelConverter(new Converter<RestResourceGenerator, String>()
+            {
+                @Override
+                public String convert(RestResourceGenerator source)
+                {
+                    return source == null ? null : source.getDescription();
+                }
+            });
+        }
+        else
+        {
+            generator.setItemLabelConverter(new Converter<RestResourceGenerator, String>()
+            {
+                @Override
+                public String convert(RestResourceGenerator source)
+                {
+                    return source == null ? null : source.getName();
+                }
+            });
+        }
+        builder.add(generator)
+                .add(packageName)
+                .add(persistenceUnit)
+                .add(overwrite);
+    }
+
+    @Override
+    public Result execute(final UIExecutionContext context) throws Exception
+    {
+        UIContext uiContext = context.getUIContext();
+        ResourceCollection resourceCollection = (ResourceCollection) uiContext.getAttributeMap().get(ResourceCollection.class);
+
+        targets = new ArrayList<>();
+        for (Resource<?> resource : resourceCollection.getResources()) {
+            JavaResource javaResource = (JavaResource) resource;
+            JavaClass javaClass = (JavaClass) javaResource.getJavaSource();
+            targets.add(javaClass);
+        }
+
+        RestGenerationContextImpl generationContext = createContextFor(uiContext);
+        Set<JavaClass> endpoints = generateEndpoints(generationContext);
+        Project project = generationContext.getProject();
+        JavaSourceFacet javaSourceFacet = project.getFacet(JavaSourceFacet.class);
+        List<JavaResource> selection = new ArrayList<>();
+
+        for (JavaClass javaClass : endpoints)
+        {
+            selection.add(javaSourceFacet.saveJavaSource(javaClass));
+        }
+        uiContext.setSelection(selection);
+        return Results.success("Endpoint created");
+    }
+
+    private Set<JavaClass> generateEndpoints(RestGenerationContextImpl generationContext) throws Exception
+    {
+        RestResourceGenerator selectedGenerator = generator.getValue();
+        Set<JavaClass> classes = new HashSet<>();
+        for (JavaClass target : targets)
+        {
+            generationContext.setEntity(target);
+            List<JavaClass> artifacts = selectedGenerator.generateFrom(generationContext);
+            classes.addAll(artifacts);
+        }
+        return classes;
+    }
+
+    @Override
+    protected boolean isProjectRequired()
+    {
+        return true;
+    }
+
+    private RestGenerationContextImpl createContextFor(final UIContext context)
+    {
+        RestGenerationContextImpl generationContext = new RestGenerationContextImpl();
+        generationContext.setProject(getSelectedProject(context));
+        generationContext.setContentType(MediaType.APPLICATION_JSON);
+        generationContext.setPersistenceUnitName(persistenceUnit.getValue());
+        generationContext.setTargetPackageName(packageName.getValue());
+        generationContext.setInflector(inflector);
+        return generationContext;
+    }
+
+    @Override
+    public NavigationResult getPrerequisiteCommands(UIContext context)
+    {
+        NavigationResultBuilder builder = NavigationResultBuilder.create();
+        Project project = getSelectedProject(context);
+        if (project != null)
+        {
+            if (!project.hasFacet(RestFacet.class))
+            {
+                builder.add(RestSetupWizard.class);
+            }
+            if (!project.hasFacet(JPAFacet.class))
+            {
+                builder.add(JPASetupWizard.class);
+            }
+            if (!project.hasFacet(EJBFacet.class))
+            {
+                builder.add(EJBSetupWizard.class);
+            }
+        }
+        return builder.build();
+    }
+}
diff --git a/src/main/java/org/jboss/forge/addon/angularjs/ScaffoldableEntitySelectionWizard.java b/src/main/java/org/jboss/forge/addon/angularjs/ScaffoldableEntitySelectionWizard.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright 2014 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Eclipse Public License version 1.0, available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.jboss.forge.addon.angularjs;
 
 import java.util.Map;