[jboss-cvs] JBossAS SVN: r105686 - in trunk/resteasy-int: test/scanned-war/src/main/java/org/jboss/resteasy/test and 1 other directories.

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

Author: bill.burke at jboss.com
Date: 2010-06-03 19:41:37 -0400 (Thu, 03 Jun 2010)
New Revision: 105686

Added:
   trunk/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyContextResolver.java
Modified:
   trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyScannerDeployer.java
   trunk/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyResource.java
   trunk/resteasy-int/test/scanned-war/src/test/java/org/jboss/resteasy/test/jboss/ScanningTest.java
Log:
Upgrade to scanning changes so this actually works now\
Fixed bug: RESTEASY-383

Modified: trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyScannerDeployer.java
===================================================================
--- trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyScannerDeployer.java	2010-06-03 23:23:23 UTC (rev 105685)
+++ trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyScannerDeployer.java	2010-06-03 23:41:37 UTC (rev 105686)
@@ -1,14 +1,5 @@
 package org.jboss.resteasy.integration.deployers;
 
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.ext.Provider;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
 import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
@@ -21,9 +12,18 @@
 import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
 import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrapClasses;
 import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters;
+import org.jboss.scanning.annotations.spi.AnnotationIndex;
 import org.jboss.scanning.annotations.spi.AnnotationRepository;
 import org.jboss.scanning.annotations.spi.Element;
 
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.ext.Provider;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 /**
  * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
@@ -195,7 +195,7 @@
 
       du.addAttachment(ResteasyDeploymentData.class, scanningData);
 
-      AnnotationRepository env = du.getAttachment(AnnotationRepository.class);
+      AnnotationRepository env = du.getAttachment(AnnotationIndex.class);
       if (env == null)
       {
          LOGGER.debug("Expecting AnnotationRepository class for scanning WAR for JAX-RS classes");
@@ -228,7 +228,7 @@
          for (Element e : providers)
          {
             if (e.getOwner().isInterface()) continue;
-            scanningData.getResources().add(e.getOwnerClassName());
+            scanningData.getProviders().add(e.getOwnerClassName());
          }
       }
    }

Added: trunk/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyContextResolver.java
===================================================================
--- trunk/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyContextResolver.java	                        (rev 0)
+++ trunk/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyContextResolver.java	2010-06-03 23:41:37 UTC (rev 105686)
@@ -0,0 +1,17 @@
+package org.jboss.resteasy.test;
+
+import javax.ws.rs.ext.ContextResolver;
+import javax.ws.rs.ext.Provider;
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+ at Provider
+public class MyContextResolver implements ContextResolver<Integer>
+{
+   public Integer getContext(Class<?> type)
+   {
+      return new Integer(42);
+   }
+}

Modified: trunk/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyResource.java
===================================================================
--- trunk/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyResource.java	2010-06-03 23:23:23 UTC (rev 105685)
+++ trunk/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyResource.java	2010-06-03 23:41:37 UTC (rev 105686)
@@ -1,8 +1,11 @@
 package org.jboss.resteasy.test;
 
+import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.GET;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Providers;
 
 /**
  * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
@@ -17,4 +20,14 @@
    {
       return "hello world";
    }
+
+   @Path("resolver")
+   @GET
+   @Produces("text/plain")
+   public String getResolver(@Context Providers providers)
+   {
+      System.out.println("IN RESOLVER!!!");
+      MyContextResolver resolver = (MyContextResolver) providers.getContextResolver(Integer.class, MediaType.TEXT_PLAIN_TYPE);
+      return resolver.getContext(null).toString();
+   }
 }

Modified: trunk/resteasy-int/test/scanned-war/src/test/java/org/jboss/resteasy/test/jboss/ScanningTest.java
===================================================================
--- trunk/resteasy-int/test/scanned-war/src/test/java/org/jboss/resteasy/test/jboss/ScanningTest.java	2010-06-03 23:23:23 UTC (rev 105685)
+++ trunk/resteasy-int/test/scanned-war/src/test/java/org/jboss/resteasy/test/jboss/ScanningTest.java	2010-06-03 23:41:37 UTC (rev 105686)
@@ -2,8 +2,8 @@
 
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientResponse;
+import org.junit.Assert;
 import org.junit.Test;
-import org.junit.Assert;
 
 /**
  * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
@@ -20,4 +20,12 @@
       Assert.assertEquals("hello world", response.getEntity());
 
    }
+
+   @Test
+   public void testScannedContextResolver() throws Exception
+   {
+      ClientRequest request = new ClientRequest("http://localhost:8080/scanned-test/scan/resolver");
+      String res = request.getTarget(String.class);
+      Assert.assertEquals(res, "42");
+   }
 }