Fixed UIInput and Converter producer type discovery, moved resource t…

…ests to proper module
forge · Jan 25, 2013 · 1aeda24 · 1aeda24
1 parent aeea68b
commit 1aeda24
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 28 deletions.
diff --git a/convert/impl/src/main/java/org/jboss/forge/convert/impl/cdi/ConverterProducer.java b/convert/impl/src/main/java/org/jboss/forge/convert/impl/cdi/ConverterProducer.java
@@ -22,7 +22,7 @@ public class ConverterProducer
    @SuppressWarnings("unchecked")
    public <S, T> Converter<S, T> produceConverter(InjectionPoint injectionPoint, ConverterFactory registry)
    {
-      Type type = injectionPoint.getAnnotated().getTypeClosure().iterator().next();
+      Type type = injectionPoint.getAnnotated().getBaseType();
       if (type instanceof ParameterizedType)
       {
          Type[] typeArguments = ((ParameterizedType) type).getActualTypeArguments();

diff --git a/...t/resource/FileResourceGeneratorTest.java → ...e/resource/FileResourceGeneratorTest.java b/...t/resource/FileResourceGeneratorTest.java → ...e/resource/FileResourceGeneratorTest.java
@@ -1,4 +1,4 @@
-package org.jboss.forge.test.resource;
+package test.org.jboss.forge.resource;
 
 import java.io.File;
 import java.util.UUID;
@@ -31,15 +31,17 @@
 public class FileResourceGeneratorTest
 {
    @Deployment
-   @Dependencies(@Addon(name = "org.jboss.forge:facets", version = "2.0.0-SNAPSHOT"))
+   @Dependencies({
+            @Addon(name = "org.jboss.forge:facets", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT") })
    public static ForgeArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
-               .addPackages(true, ResourceFactory.class.getPackage())
+      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
                .addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
                .addAsAddonDependencies(
-                        AddonDependency.create(AddonId.from("org.jboss.forge:facets", "2.0.0-SNAPSHOT")));
+                        AddonDependency.create(AddonId.from("org.jboss.forge:facets", "2.0.0-SNAPSHOT")),
+                        AddonDependency.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT"))
+               );
 
       return archive;
    }

diff --git a/...rge/test/resource/MockStringResource.java → ...ss/forge/resource/MockStringResource.java b/...rge/test/resource/MockStringResource.java → ...ss/forge/resource/MockStringResource.java
@@ -1,4 +1,4 @@
-package org.jboss.forge.test.resource;
+package test.org.jboss.forge.resource;
 
 import java.util.List;
 

diff --git a/...resource/MockStringResourceGenerator.java → ...resource/MockStringResourceGenerator.java b/...resource/MockStringResourceGenerator.java → ...resource/MockStringResourceGenerator.java
@@ -1,4 +1,4 @@
-package org.jboss.forge.test.resource;
+package test.org.jboss.forge.resource;
 
 import org.jboss.forge.container.services.Exported;
 import org.jboss.forge.resource.Resource;

diff --git a/.../resource/ResourceGeneratorAddonTest.java → .../resource/ResourceGeneratorAddonTest.java b/.../resource/ResourceGeneratorAddonTest.java → .../resource/ResourceGeneratorAddonTest.java
@@ -1,4 +1,4 @@
-package org.jboss.forge.test.resource;
+package test.org.jboss.forge.resource;
 
 import javax.inject.Inject;
 
@@ -24,26 +24,15 @@
 public class ResourceGeneratorAddonTest
 {
    @Deployment(order = 1)
+   @Dependencies({ @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT") })
    public static ForgeArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
-               .addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
-               .addAsAddonDependencies(
-                        AddonDependency.create(AddonId.from("resources", "1"), false, false),
-                        AddonDependency.create(AddonId.from("mockstring", "1"), false, false));
-
-      return archive;
-   }
-
-   @Deployment(testable = false, name = "resources,1", order = 2)
-   @Dependencies(@Addon(name = "org.jboss.forge:facets", version = "2.0.0-SNAPSHOT"))
-   public static ForgeArchive getResourcesDeployment()
-   {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
-               .addPackages(true, ResourceFactory.class.getPackage())
+      ForgeArchive archive = ShrinkWrap
+               .create(ForgeArchive.class)
                .addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
                .addAsAddonDependencies(
-                        AddonDependency.create(AddonId.from("org.jboss.forge:facets", "2.0.0-SNAPSHOT"), true, false));
+                        AddonDependency.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT")),
+                        AddonDependency.create(AddonId.from("mockstring", "1")));
 
       return archive;
    }
@@ -55,7 +44,8 @@ public static ForgeArchive getAddonDeployment()
                .addClasses(MockStringResource.class, MockStringResourceGenerator.class)
                .addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
                .addAsAddonDependencies(
-                        AddonDependency.create(AddonId.from("resources", "1"), false, false));
+                        AddonDependency.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT"))
+               );
 
       return archive;
    }

diff --git a/ui/impl/src/main/java/org/jboss/forge/ui/impl/UIInputProducer.java b/ui/impl/src/main/java/org/jboss/forge/ui/impl/UIInputProducer.java
@@ -34,7 +34,7 @@ public class UIInputProducer
    public <T> UIInput<T> produceInput(InjectionPoint injectionPoint)
    {
       String name = injectionPoint.getMember().getName();
-      Type type = injectionPoint.getAnnotated().getTypeClosure().iterator().next();
+      Type type = injectionPoint.getAnnotated().getBaseType();
       if (type instanceof ParameterizedType)
       {
          Type[] typeArguments = ((ParameterizedType) type).getActualTypeArguments();