-
Notifications
You must be signed in to change notification settings - Fork 162
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #518 from agoncal/FORGE-2078
FORGE-2078: Being able to create a new CDI decorator
- Loading branch information
Showing
3 changed files
with
207 additions
and
1 deletion.
There are no files selected for viewing
105 changes: 105 additions & 0 deletions
105
javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/ui/NewDecoratorCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /** | ||
| * 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.javaee.cdi.ui; | ||
|
|
||
| import javax.decorator.Decorator; | ||
| import javax.decorator.Delegate; | ||
| import javax.inject.Inject; | ||
| 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.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.FieldSource; | ||
| import org.jboss.forge.roaster.model.source.JavaClassSource; | ||
|
|
||
| /** | ||
| * Creates a new CDI Decorator | ||
| * | ||
| * @author <a href="antonio.goncalves@gmail.com">Antonio Goncalves</a> | ||
| */ | ||
| public class NewDecoratorCommand extends AbstractJavaSourceCommand<JavaClassSource> implements | ||
| PrerequisiteCommandsProvider | ||
| { | ||
| @Inject | ||
| @WithAttributes(label = "Interface to delegate", required = true) | ||
| private UIInput<String> delegate; | ||
|
|
||
| @Override | ||
| 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")); | ||
| } | ||
|
|
||
| @Override | ||
| public void initializeUI(UIBuilder builder) throws Exception | ||
| { | ||
| super.initializeUI(builder); | ||
| builder.add(delegate); | ||
| } | ||
|
|
||
| @Override | ||
| public JavaClassSource decorateSource(UIExecutionContext context, Project project, | ||
| JavaClassSource decorator) throws Exception | ||
| { | ||
| decorator.setAbstract(true).addInterface(delegate.getValue()).addAnnotation(Decorator.class); | ||
| // Fields | ||
| FieldSource<?> field = decorator.addField().setPrivate().setName("delegate").setType(delegate.getValue()); | ||
| field.addAnnotation(Inject.class); | ||
| field.addAnnotation(Delegate.class); | ||
|
|
||
| return decorator; | ||
| } | ||
|
|
||
| @Override | ||
| protected boolean isProjectRequired() | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| protected String getType() | ||
| { | ||
| return "CDI Decorator"; | ||
| } | ||
|
|
||
| @Override | ||
| protected Class<JavaClassSource> 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(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/ui/NewDecoratorCommandTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /** | ||
| * 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.javaee.cdi.ui; | ||
|
|
||
| import static org.hamcrest.CoreMatchers.instanceOf; | ||
| import static org.hamcrest.CoreMatchers.is; | ||
| import static org.hamcrest.CoreMatchers.not; | ||
|
|
||
| import java.lang.annotation.Inherited; | ||
|
|
||
| import javax.decorator.Decorator; | ||
| import javax.inject.Inject; | ||
|
|
||
| import org.jboss.arquillian.container.test.api.Deployment; | ||
| import org.jboss.arquillian.junit.Arquillian; | ||
| import org.jboss.forge.addon.javaee.ProjectHelper; | ||
| 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.ui.controller.CommandController; | ||
| import org.jboss.forge.addon.ui.result.Failed; | ||
| import org.jboss.forge.addon.ui.result.Result; | ||
| import org.jboss.forge.addon.ui.test.UITestHarness; | ||
| import org.jboss.forge.arquillian.AddonDependency; | ||
| import org.jboss.forge.arquillian.Dependencies; | ||
| import org.jboss.forge.arquillian.archive.ForgeArchive; | ||
| import org.jboss.forge.furnace.repositories.AddonDependencyEntry; | ||
| import org.jboss.forge.roaster.model.JavaClass; | ||
| import org.jboss.shrinkwrap.api.ShrinkWrap; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| /** | ||
| * | ||
| * @author <a href="antonio.goncalves@gmail.com">Antonio Goncalves</a> | ||
| */ | ||
| @RunWith(Arquillian.class) | ||
| public class NewDecoratorCommandTest | ||
| { | ||
| @Deployment | ||
| @Dependencies({ | ||
| @AddonDependency(name = "org.jboss.forge.addon:ui"), | ||
| @AddonDependency(name = "org.jboss.forge.addon:ui-test-harness"), | ||
| @AddonDependency(name = "org.jboss.forge.addon:javaee"), | ||
| @AddonDependency(name = "org.jboss.forge.addon:maven") | ||
| }) | ||
| public static ForgeArchive getDeployment() | ||
| { | ||
| return ShrinkWrap | ||
| .create(ForgeArchive.class) | ||
| .addClass(ProjectHelper.class) | ||
| .addBeansXML | ||
| .addAsAddonDependencies( | ||
| AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"), | ||
| AddonDependencyEntry.create("org.jboss.forge.addon:projects"), | ||
| AddonDependencyEntry.create("org.jboss.forge.addon:javaee"), | ||
| AddonDependencyEntry.create("org.jboss.forge.addon:maven"), | ||
| AddonDependencyEntry.create("org.jboss.forge.addon:ui"), | ||
| AddonDependencyEntry.create("org.jboss.forge.addon:ui-test-harness") | ||
| ); | ||
| } | ||
|
|
||
| @Inject | ||
| private UITestHarness testHarness; | ||
|
|
||
| @Inject | ||
| private ProjectHelper projectHelper; | ||
|
|
||
| @Test | ||
| public void testCreateNewDecorat() throws Exception | ||
| { | ||
| Project project = projectHelper.createJavaLibraryProject(); | ||
| projectHelper.installCDI_1_0(project); | ||
| CommandController controller = testHarness.createCommandController(NewDecoratorCommand.class, | ||
| project.getRoot()); | ||
| controller.initialize(); | ||
| controller.setValueFor("named", "MyDecorator"); | ||
| controller.setValueFor("targetPackage", "org.jboss.forge.test"); | ||
| controller.setValueFor("delegate", "java.io.Serializable"); | ||
| 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.MyDecorator"); | ||
| Assert.assertNotNull(javaResource); | ||
| Assert.assertThat(javaResource.getJavaType(), is(instanceOf(JavaClass.class))); | ||
| JavaClass<?> ann = javaResource.getJavaType(); | ||
| Assert.assertTrue(ann.hasAnnotation(Decorator.class)); | ||
| Assert.assertTrue(ann.isAbstract()); | ||
| Assert.assertTrue(ann.hasField("delegate")); | ||
| Assert.assertFalse(ann.hasAnnotation(Inherited.class)); | ||
| } | ||
| } |