Fixing the application packaging for annotated and application case

arun-gupta · arun-gupta · commit 126c8c4da8f1 · 2013-11-21T17:06:58.000-08:00
diff --git a/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/MyAnnotatedApplication.java b/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/MyAnnotatedApplication.java
@@ -0,0 +1,11 @@
+package org.javaee7.jaxrs.singleton;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+/**
+ * @author Arun Gupta
+ */
+@ApplicationPath("webresources")
+public class MyAnnotatedApplication extends Application {
+}
diff --git a/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/MyApplication.java b/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/MyApplication.java
@@ -49,10 +49,10 @@
 @ApplicationPath("webresources")
 public class MyApplication extends Application {
 
-//    @Override
-//    public Set<Object> getSingletons() {
-//        Set<Object> resources = new java.util.HashSet<>();
-//        resources.add(new ApplicationSingletonResource());
-//        return resources;
-//    }
+    @Override
+    public Set<Object> getSingletons() {
+        Set<Object> resources = new java.util.HashSet<>();
+        resources.add(new ApplicationSingletonResource());
+        return resources;
+    }
 }
diff --git a/jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/AnnotatedSingletonResourceTest.java b/jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/AnnotatedSingletonResourceTest.java
@@ -54,9 +54,8 @@ public void tearDown() {
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class)
                 .addClasses(
-                        MyApplication.class, 
-                        AnnotatedSingletonResource.class,
-                        ApplicationSingletonResource.class);
+                        MyAnnotatedApplication.class, 
+                        AnnotatedSingletonResource.class);
     }
 
     @Test
@@ -72,13 +71,13 @@ public void test1Post() {
         assertEquals(4, tokens.countTokens());
     }
 
-//    @Test
+    @Test
     public void test2Get() {
         String response = target.path("2").request().get(String.class);
         assertEquals("kiwi", response);
     }
 
-//    @Test
+    @Test
     public void test3Delete() {
         target.path("kiwi").request().delete();
 
@@ -87,7 +86,7 @@ public void test3Delete() {
         assertEquals(3, tokens.countTokens());
     }
 
-//    @Test
+    @Test
     public void test4Put() {
         target.request().put(Entity.text("apple"));
 
diff --git a/jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/ApplicationSingletonResourceTest.java b/jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/ApplicationSingletonResourceTest.java
@@ -53,8 +53,7 @@ public void tearDown() {
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class)
                 .addClasses(
-                        MyApplication.class, 
-                        AnnotatedSingletonResource.class,
+                        MyApplication.class,
                         ApplicationSingletonResource.class);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,7 @@ public void tearDown() {`
`53`	`53`	`public static WebArchive createDeployment() {`
`54`	`54`	`return ShrinkWrap.create(WebArchive.class)`
`55`	`55`	`.addClasses(`
`56`		`- MyApplication.class,`
`57`		`- AnnotatedSingletonResource.class,`
	`56`	`+ MyApplication.class,`
`58`	`57`	`ApplicationSingletonResource.class);`
`59`	`58`	`}`
`60`	`59`