[jboss-cvs] JBossAS SVN: r111845 - trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb.

[jboss-cvs-commits at lists.jboss.org]

Author: jharting
Date: 2011-07-26 08:14:08 -0400 (Tue, 26 Jul 2011)
New Revision: 111845

Modified:
   trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjbProvider.java
   trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/SingletonProvider.java
Log:
minor fixes to make the tests pass on JBoss AS 7.

Modified: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjbProvider.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjbProvider.java	2011-07-26 10:33:19 UTC (rev 111844)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/BeanClassLocalViewEjbProvider.java	2011-07-26 12:14:08 UTC (rev 111845)
@@ -2,6 +2,7 @@
 
 import javax.ejb.EJB;
 import javax.ejb.Local;
+import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.inject.Inject;
 import javax.ws.rs.Produces;
@@ -17,7 +18,8 @@
 @Provider
 @Produces("text/plain")
 @Stateless
- at Local({ BeanClassLocalViewEjbProvider.class, ExceptionMapper.class })
+ at LocalBean
+ at Local(ExceptionMapper.class)
 public class BeanClassLocalViewEjbProvider implements ExceptionMapper<NullPointerException> {
 
     @Inject

Modified: trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/SingletonProvider.java
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/SingletonProvider.java	2011-07-26 10:33:19 UTC (rev 111844)
+++ trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/SingletonProvider.java	2011-07-26 12:14:08 UTC (rev 111845)
@@ -2,6 +2,7 @@
 
 import javax.ejb.EJB;
 import javax.ejb.Local;
+import javax.ejb.LocalBean;
 import javax.ejb.Singleton;
 import javax.inject.Inject;
 import javax.ws.rs.Produces;
@@ -15,52 +16,48 @@
 import org.jboss.resteasy.cdi.test.Cat;
 
 @Singleton
- at Local({SingletonProvider.class, ExceptionMapper.class})
+ at LocalBean
+ at Local(ExceptionMapper.class)
 @Produces("text/plain")
 @Provider
-public class SingletonProvider implements ExceptionMapper<InstantiationException>
-{
-   @Inject
-   private Cat cat;
-   @EJB
-   private InjectedStatelessEjbLocal statelessEjb;
-   private Cat constructorCat;
-   private Cat initializerCat;
-   @Context
-   private Providers providers;
-   
-   public SingletonProvider()
-   {
-   }
+public class SingletonProvider implements ExceptionMapper<InstantiationException> {
+    @Inject
+    private Cat cat;
+    @EJB
+    private InjectedStatelessEjbLocal statelessEjb;
+    private Cat constructorCat;
+    private Cat initializerCat;
+    @Context
+    private Providers providers;
 
-   @Inject
-   public SingletonProvider(Cat cat)
-   {
-      constructorCat = cat;
-   }
-   
-   @Inject
-   public void init(Cat cat)
-   {
-      initializerCat = cat;
-   }
-   
-   public Response toResponse(InstantiationException exception)
-   {
-      StringBuilder builder = new StringBuilder();
-      builder.append("CDI field injection: ");
-      builder.append(cat != null);
-      builder.append("\nCDI constructor injection: ");
-      builder.append(constructorCat != null);
-      builder.append("\nCDI initializer injection: ");
-      builder.append(initializerCat != null);
-      builder.append("\nEJB injection: ");
-      builder.append(statelessEjb != null);
-      builder.append("\nJAX-RS field injection: ");
-      builder.append(providers != null);
-      builder.append("\nProvider toString(): ");
-      builder.append(toString());
-      
-      return Response.status(Status.OK).entity(builder.toString()).build();
-   }
+    public SingletonProvider() {
+    }
+
+    @Inject
+    public SingletonProvider(Cat cat) {
+        constructorCat = cat;
+    }
+
+    @Inject
+    public void init(Cat cat) {
+        initializerCat = cat;
+    }
+
+    public Response toResponse(InstantiationException exception) {
+        StringBuilder builder = new StringBuilder();
+        builder.append("CDI field injection: ");
+        builder.append(cat != null);
+        builder.append("\nCDI constructor injection: ");
+        builder.append(constructorCat != null);
+        builder.append("\nCDI initializer injection: ");
+        builder.append(initializerCat != null);
+        builder.append("\nEJB injection: ");
+        builder.append(statelessEjb != null);
+        builder.append("\nJAX-RS field injection: ");
+        builder.append(providers != null);
+        builder.append("\nProvider toString(): ");
+        builder.append(toString());
+
+        return Response.status(Status.OK).entity(builder.toString()).build();
+    }
 }