Update - now working on tomcat 8.5.14 add jax-rs ri and the multipart…

… feature changed to annotation based depolyment descrp
backtosource · Jun 24, 2017 · be877d9 · be877d9
1 parent 713a4bd
commit be877d9
Show file tree

Hide file tree

Showing 7 changed files with 282 additions and 96 deletions.
diff --git a/gameotron/.idea/libraries/Maven__org_glassfish_jersey_bundles_jaxrs_ri_2_25_1.xml b/gameotron/.idea/libraries/Maven__org_glassfish_jersey_bundles_jaxrs_ri_2_25_1.xml
diff --git a/gameotron/.idea/workspace.xml b/gameotron/.idea/workspace.xml
diff --git a/gameotron/gameotron.iml b/gameotron/gameotron.iml
@@ -33,10 +33,11 @@
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-server:2.25.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-client:2.25.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-jaxb:2.25.1" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
     <orderEntry type="library" name="Maven: javax.ws.rs:javax.ws.rs-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish.jersey.bundles:jaxrs-ri:2.25.1" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-jaxb:2.25.1" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-client:2.25.1" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-moxy:2.25.1" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.25.1" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.persistence:org.eclipse.persistence.moxy:2.6.0" level="project" />

diff --git a/gameotron/pom.xml b/gameotron/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.nttdata.gamotron</groupId>
+	<groupId>com.nttdata.hackathon.gameotron</groupId>
 	<artifactId>trivia-service</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>war</packaging>
@@ -37,6 +37,11 @@
 			<!-- artifactId>jersey-container-servlet</artifactId -->
 		</dependency>
 
+		<dependency>
+			<groupId>org.glassfish.jersey.bundles</groupId>
+			<artifactId>jaxrs-ri</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-moxy</artifactId>

diff --git a/gameotron/src/main/java/com/nttdata/hackathon/gameotron/TriviaService.java b/gameotron/src/main/java/com/nttdata/hackathon/gameotron/TriviaService.java
@@ -14,6 +14,7 @@
 import org.glassfish.jersey.media.multipart.FormDataParam;
 
 import javax.ws.rs.*;
+import javax.ws.rs.core.Application;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.io.ByteArrayInputStream;
@@ -29,6 +30,7 @@
 /**
  * Created by HUETTM on 23.06.2017.
  */
+@Path("trivia")
 public class TriviaService {
 
     private TextToSpeech textToSpeechService;
@@ -82,7 +84,7 @@ public TriviaService(){
      * @return
      */
     @GET
-    @Path("/question/{questionId}")
+    @Path("question/{questionId}")
     @Produces("audio/wav")
     public Response getQuestion(@PathParam("questionId") String questionId){
         Response response = Response.status(Response.Status.NOT_FOUND).build();
@@ -151,7 +153,7 @@ private Response getAudioStreamResponse(String textToSynthsize) {
      * @return
      */
     @POST
-    @Path("/answer/{questionId}")
+    @Path("answer/{questionId}")
     @Consumes(MediaType.MULTIPART_FORM_DATA)
     @Produces("audio/wav")
     public Response getAnswer(@PathParam("questionId") String questionId, @FormDataParam("audio") InputStream audioInputStream) {

diff --git a/gameotron/src/main/java/com/nttdata/hackathon/gameotron/TriviaServiceApp.java b/gameotron/src/main/java/com/nttdata/hackathon/gameotron/TriviaServiceApp.java
@@ -0,0 +1,26 @@
+package com.nttdata.hackathon.gameotron;
+
+import org.glassfish.jersey.filter.LoggingFilter;
+import org.glassfish.jersey.media.multipart.MultiPartFeature;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+import java.util.HashSet;
+import java.util.Set;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * Created by HUETTM on 24.06.2017.
+ */
+@ApplicationPath("/gamotron")
+public class TriviaServiceApp extends Application {
+
+    @Override
+    public Set<Class<?>> getClasses() {
+        final Set<Class<?>> classes = new HashSet<Class<?>>();
+        classes.add(TriviaService.class);
+        classes.add(MultiPartFeature.class);
+        return classes;
+    }
+}
diff --git a/gameotron/src/main/webapp/WEB-INF/web.xml b/gameotron/src/main/webapp/WEB-INF/web.xml
@@ -1,18 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This web.xml file is not required when using Servlet 3.0 container,
-     see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html -->
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-    <servlet>
-        <servlet-name>Jersey Web Application</servlet-name>
-        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
-        <init-param>
-            <param-name>jersey.config.server.provider.packages</param-name>
-            <param-value>com.nttdata.hackathon.gameotron</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Jersey Web Application</servlet-name>
-        <url-pattern>/gamotron/*</url-pattern>
-    </servlet-mapping>
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 </web-app>