Refactored default-method-java8-webapp into java8-webapp.

Change-Id: I238a3aebb91ae65f2445b875ddd61c18ae7786ec
Signed-off-by: Marek Potociar <[email protected]>

Author: Michal Gajdos

examples/default-method-java8-webapp/README.html renamed to examples/java8-webapp/README.html

@@ -46,7 +46,7 @@
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-        <title>Java8 Default Method WebApp Example</title>
+        <title>JAX-RS and Java 8 WebApp Example</title>
 
         <!-- Bootstrap -->
         <link href="http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
@@ -57,21 +57,20 @@
             <div class="row">
                 <div class="col-lg-offset-1 col-lg-10">
                     <header class="page-header">
-                        <h1>Jersey Java8 Default Method Example</h1>
+                        <h1>Jersey and Java 8 Examples <small>Features and Types</small></h1>
                     </header>
 
                     <p>
-                        This example demonstrates the usage of Java8's new construct - the default methods in interfaces.
-                        Default methods can be used as common JAX-RS resource methods.
+                        This example demonstrates the usage of Java 8's new constructs and types.
                     </p>
                     <p>
-                        The application is common web application, only combines methods and interfaces with default
-                        methods to show to show that this use case is possible.
-
+                        Currently demonstrated are:
                     </p>
+                        <ul>
+                            <li>Default methods in interfaces - acting as JAX-RS Resource Methods</li>
+                        </ul>
 
                     <h2>Contents</h2>
-
                     <p>
                         The mapping of the URI path space is presented in the following table:
                     </p>
@@ -88,35 +87,35 @@ <h2>Contents</h2>
 
                         <tbody>
                             <tr>
-                                <td><code>/default-method/application.wadl</code></td>
-                                <td>Generated WADL</td>
-                                <td>GET</td>
-                                <td>returns XML with the application api description</td>
-                            </tr>
-                            <tr>
-                                <td><code>/default-method/compoundResource</code></td>
-                                <td>InterfaceResource</td>
+                                <td><code>/j8/default-method</code></td>
+                                <td>DefaultMethodInterface</td>
                                 <td>GET</td>
                                 <td>returns <code>interface-root</code> in <code>text/plain</code></td>
                             </tr>
                             <tr>
-                                <td><code>/default-method/compoundResource/path</code></td>
-                                <td>InterfaceResource</td>
+                                <td><code>/j8/default-method/path</code></td>
+                                <td>DefaultMethodInterface</td>
                                 <td>GET</td>
                                 <td>returns <code>interface-path</code> in <code>text/plain</code></td>
                             </tr>
                             <tr>
-                                <td><code>/default-method/compoundResource/class</code></td>
-                                <td>ClassResource</td>
+                                <td><code>/j8/default-method/class</code></td>
+                                <td>DefaultMethodResource</td>
                                 <td>GET</td>
                                 <td>returns <code>class</code> in <code>text/plain</code></td>
                             </tr>
+                            <tr>
+                                <td><code>/j8/lambdas/{p}</code></td>
+                                <td>LambdaResource</td>
+                                <td>GET</td>
+                                <td>returns <code>{p}-lambdaized</code> in <code>text/plain</code></td>
+                            </tr>
                         </tbody>
                     </table>
 
                     <p>
                         Application is Servlet 3 based, web.xml-less. Everything needed (resources/providers) is
-                        registered in the <code>DefaultMethodApplication</code> class.
+                        registered in the <code>Java8Application</code> class.
                     </p>
 
                     </p>
@@ -131,10 +130,10 @@ <h2>Running the Example</h2>
                     <p>
                         This deploys current example using Jetty. You can access the application at:
                         <ul>
-                            <li><a href="http://localhost:8080/default-method/application.wadl">http://localhost:8080/default-method/application.wadl</a></li>
-                            <li><a href="http://localhost:8080/default-method/compoundResource">http://localhost:8080/default-method/compoundResource</a></li>
-                            <li><a href="http://localhost:8080/default-method/compoundResource/path">http://localhost:8080/default-method/compoundResource/path</a></li>
-                            <li><a href="http://localhost:8080/default-method/compoundResource/class">http://localhost:8080/default-method/compoundResource/class</a></li>
+                            <li><a href="http://localhost:8080/j8/default-method">http://localhost:8080/j8/default-method</a></li>
+                            <li><a href="http://localhost:8080/j8/default-method/path">http://localhost:8080/j8/default-method/path</a></li>
+                            <li><a href="http://localhost:8080/j8/default-method/class">http://localhost:8080/j8/default-method/class</a></li>
+                            <li><a href="http://localhost:8080/j8/lambdas/test">http://localhost:8080/j8/lambdas/test</a></li>
                         </ul>
                     </p>
                 </div>

examples/default-method-java8-webapp/pom.xml renamed to examples/java8-webapp/pom.xml

@@ -50,11 +50,11 @@
         <version>2.18-SNAPSHOT</version>
     </parent>
 
-    <artifactId>default-method-java8-webapp</artifactId>
+    <artifactId>java8-webapp</artifactId>
     <packaging>war</packaging>
-    <name>jersey-examples-default-method-java8-webapp</name>
+    <name>jersey-examples-java8-webapp</name>
 
-    <description>Jersey App Using Java8 Default Methods Example.</description>
+    <description>Java 8 Types WebApp Example.</description>
 
     <dependencies>
         <dependency>

examples/default-method-java8-webapp/src/main/java/org/glassfish/jersey/examples/defaultMethod/DefaultMethodApplication.java renamed to examples/java8-webapp/src/main/java/org/glassfish/jersey/examples/java8/Java8Application.java

@@ -38,23 +38,25 @@
  * holder.
  */
 
-package org.glassfish.jersey.examples.defaultMethod;
+package org.glassfish.jersey.examples.java8;
 
 import javax.ws.rs.ApplicationPath;
 
-import org.glassfish.jersey.examples.defaultMethod.resources.ClassResource;
+import org.glassfish.jersey.examples.java8.resources.DefaultMethodResource;
+import org.glassfish.jersey.examples.java8.resources.LambdaResource;
 import org.glassfish.jersey.server.ResourceConfig;
 
-
 /**
- * Resource definitions for Default Method example.
+ * Application for illustrating some of the features of Java 8 in JAX-RS.
  *
- * @author Adam Lindenthal (adam.lindenthal at oracle.com)
+ * @author Michal Gajdos (michal.gajdos at oracle.com)
  */
-@ApplicationPath("default-method")
-public class DefaultMethodApplication extends ResourceConfig {
+@ApplicationPath("j8")
+public class Java8Application extends ResourceConfig {
 
-    public DefaultMethodApplication() {
-        register(ClassResource.class);
+    public Java8Application() {
+        // Resources.
+        register(DefaultMethodResource.class);
+        register(LambdaResource.class);
     }
 }

examples/default-method-java8-webapp/src/main/java/org/glassfish/jersey/examples/defaultMethod/resources/InterfaceResource.java renamed to examples/java8-webapp/src/main/java/org/glassfish/jersey/examples/java8/resources/DefaultMethodInterface.java

@@ -38,7 +38,7 @@
  * holder.
  */
 
-package org.glassfish.jersey.examples.defaultMethod.resources;
+package org.glassfish.jersey.examples.java8.resources;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -48,7 +48,7 @@
  *
  * @author Adam Lindenthal (adam.lindenthal at oracle.com)
  */
-public interface InterfaceResource {
+public interface DefaultMethodInterface {
 
     @GET
     default String root() {

examples/default-method-java8-webapp/src/main/java/org/glassfish/jersey/examples/defaultMethod/resources/ClassResource.java renamed to examples/java8-webapp/src/main/java/org/glassfish/jersey/examples/java8/resources/DefaultMethodResource.java

@@ -38,7 +38,7 @@
  * holder.
  */
 
-package org.glassfish.jersey.examples.defaultMethod.resources;
+package org.glassfish.jersey.examples.java8.resources;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -49,9 +49,9 @@
  *
  * @author Adam Lindenthal (adam.lindenthal at oracle.com)
  */
-@Path("compoundResource")
+@Path("default-method")
 @Produces("text/plain")
-public class ClassResource implements InterfaceResource {
+public class DefaultMethodResource implements DefaultMethodInterface {
 
     @GET
     @Path("class")

examples/java8-webapp/src/main/java/org/glassfish/jersey/examples/java8/resources/LambdaResource.java

@@ -0,0 +1,60 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package org.glassfish.jersey.examples.java8.resources;
+
+import java.util.Collections;
+import java.util.stream.Collectors;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ * JAX-RS resource using Java SE 8 lambdas.
+ *
+ * @author Marek Potociar (marek.potociar at oracle.com)
+ */
+@Path("lambdas/{p}")
+public class LambdaResource {
+    @GET
+    public String getLambdaResult(@PathParam("p") String p) {
+        return Collections.singleton(p).stream().map(v -> v + "-lambdaized").collect(Collectors.joining());
+    }
+}

examples/default-method-java8-webapp/src/test/java/org/glassfish/jersey/examples/defaultMethod/DefaultMethodTest.java renamed to examples/java8-webapp/src/test/java/org/glassfish/jersey/examples/java8/DefaultMethodResourceTest.java

@@ -38,11 +38,12 @@
  * holder.
  */
 
-package org.glassfish.jersey.examples.defaultMethod;
+package org.glassfish.jersey.examples.java8;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Application;
 
-import org.glassfish.jersey.test.DeploymentContext;
 import org.glassfish.jersey.test.JerseyTest;
-import org.glassfish.jersey.test.ServletDeploymentContext;
 
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
@@ -52,36 +53,35 @@
  *
  * @author Adam Lindenthal (adam.lindenthal at oracle.com)
  */
-public class DefaultMethodTest extends JerseyTest {
+public class DefaultMethodResourceTest extends JerseyTest {
 
     @Override
-    protected DeploymentContext configureDeployment() {
-        return ServletDeploymentContext.builder(DefaultMethodApplication.class).contextPath("default-method").build();
+    protected Application configure() {
+        return new Java8Application();
     }
 
     /**
-     * Test that JDK8 default methods do work as common JAX-RS resource methods
+     * Test that JDK8 default methods do work as common JAX-RS resource methods.
      */
     @Test
     public void testDefaultMethods() {
+        final WebTarget defaultMethodTarget = target("default-method");
 
         // test default method with no @Path annotation
-        System.out.println("URI: " + target().getUri());
-        String response = target("compoundResource").request().get(String.class);
+        String response = defaultMethodTarget.request().get(String.class);
         assertEquals("interface-root", response);
 
         // test default method with with @Path annotation
-        response = target("compoundResource").path("path").request().get(String.class);
+        response = defaultMethodTarget.path("path").request().get(String.class);
         assertEquals("interface-path", response);
     }
 
     /**
-     * Test, that resource methods defined in the class implementing the interface with default method do work normally
-     * @throws Exception
+     * Test, that resource methods defined in the class implementing the interface with default method do work normally.
      */
     @Test
     public void testImplementingClass() throws Exception {
-        final String response = target("compoundResource").path("class").request().get(String.class);
+        final String response = target("default-method").path("class").request().get(String.class);
         assertEquals("class", response);
     }
 }

examples/java8-webapp/src/test/java/org/glassfish/jersey/examples/java8/LambdaResourceTest.java

@@ -0,0 +1,76 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package org.glassfish.jersey.examples.java8;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Application;
+
+import org.glassfish.jersey.test.JerseyTest;
+
+import org.junit.Test;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Test usage of Java SE 8 lambdas in JAX-RS resource methods.
+ *
+ * @author Marek Potociar (marek.potociar at oracle.com)
+ */
+public class LambdaResourceTest extends JerseyTest {
+
+    @Override
+    protected Application configure() {
+        return new Java8Application();
+    }
+
+    /**
+     * Test that JDK8 lambdas do work in common JAX-RS resource methods.
+     */
+    @Test
+    public void testLambdas() {
+        final WebTarget target = target("lambdas/{p}");
+
+        // test default method with no @Path annotation
+        String response = target.resolveTemplate("p", "test").request().get(String.class);
+        assertThat(response, equalTo("test-lambdaized"));
+    }
+
+}

pom.xml

@@ -896,7 +896,7 @@
                 <jdk>1.8</jdk>
             </activation>
             <modules>
-                <module>examples/default-method-java8-webapp</module>
+                <module>examples/java8-webapp</module>
                 <module>examples/rx-client-java8-webapp</module>
                 <module>ext/rx/rx-client-java8</module>
             </modules>