Browse Source

various fixes

Mike Megally 9 years ago
parent
commit
d800bcaf93

+ 1 - 1
frameworks/Java/undertow-jersey-c3p0/README.md

@@ -1,4 +1,4 @@
-# Undertow+Jersey Benchmarking Test
+# Undertow + Jersey + c3p0 Benchmarking Test
 ### Heavily borrowed from the grizzly-jersey test
 ### Heavily borrowed from the grizzly-jersey test
 
 
 This is the Undertow+Jersey portion of a [benchmarking test suite](../) comparing a variety of web development platforms.
 This is the Undertow+Jersey portion of a [benchmarking test suite](../) comparing a variety of web development platforms.

+ 1 - 1
frameworks/Java/undertow-jersey-c3p0/src/main/java/hello/DbResource.java

@@ -21,7 +21,7 @@ public class DbResource
   private SessionFactory sessionFactory;
   private SessionFactory sessionFactory;
 
 
   @GET
   @GET
-  @Produces(APPLICATION_JSON + "; charset=utf-8")
+  @Produces(APPLICATION_JSON)
   public Object db(@QueryParam("queries") String queryParam,
   public Object db(@QueryParam("queries") String queryParam,
       @QueryParam("single") boolean isSingle)
       @QueryParam("single") boolean isSingle)
       throws ExecutionException, InterruptedException
       throws ExecutionException, InterruptedException

+ 1 - 1
frameworks/Java/undertow-jersey-c3p0/src/main/java/hello/JsonMessageBodyWriter.java

@@ -15,7 +15,7 @@ import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 
 
 @Provider
 @Provider
 @Singleton
 @Singleton
-@Produces(APPLICATION_JSON + "; charset=utf-8")
+@Produces(APPLICATION_JSON)
 public class JsonMessageBodyWriter
 public class JsonMessageBodyWriter
     implements MessageBodyWriter<Object>
     implements MessageBodyWriter<Object>
 {
 {

+ 1 - 1
frameworks/Java/undertow-jersey-c3p0/src/main/java/hello/JsonResource.java

@@ -12,7 +12,7 @@ public class JsonResource
 {
 {
 
 
   @GET
   @GET
-  @Produces(APPLICATION_JSON + "; charset=utf-8")
+  @Produces(APPLICATION_JSON)
   public Object json()
   public Object json()
   {
   {
     Map<String, String> data = new HashMap<String, String>(1);
     Map<String, String> data = new HashMap<String, String>(1);

+ 1 - 1
frameworks/Java/undertow-jersey-c3p0/src/main/java/hello/undertow/UndertowJerseyContainer.java

@@ -78,8 +78,8 @@ public class UndertowJerseyContainer
 
 
     this.applicationHandler = new ApplicationHandler(configuration);
     this.applicationHandler = new ApplicationHandler(configuration);
 
 
-    this.applicationHandler.onReload(this);
     this.applicationHandler.onStartup(this);
     this.applicationHandler.onStartup(this);
+    this.applicationHandler.onReload(this);
   }
   }
 
 
   @Override
   @Override

+ 1 - 1
frameworks/Java/undertow-jersey-hikaricp/README.md

@@ -1,4 +1,4 @@
-# Undertow+Jersey Benchmarking Test
+# Undertow + Jersey + Hikaricp Benchmarking Test
 ### Heavily borrowed from the grizzly-jersey test
 ### Heavily borrowed from the grizzly-jersey test
 
 
 This is the Undertow+Jersey portion of a [benchmarking test suite](../) comparing a variety of web development platforms.
 This is the Undertow+Jersey portion of a [benchmarking test suite](../) comparing a variety of web development platforms.

+ 1 - 1
frameworks/Java/undertow-jersey-hikaricp/src/main/java/hello/DbResource.java

@@ -21,7 +21,7 @@ public class DbResource
   private SessionFactory sessionFactory;
   private SessionFactory sessionFactory;
 
 
   @GET
   @GET
-  @Produces(APPLICATION_JSON + "; charset=utf-8")
+  @Produces(APPLICATION_JSON)
   public Object db(@QueryParam("queries") String queryParam,
   public Object db(@QueryParam("queries") String queryParam,
       @QueryParam("single") boolean isSingle)
       @QueryParam("single") boolean isSingle)
       throws ExecutionException, InterruptedException
       throws ExecutionException, InterruptedException

+ 1 - 1
frameworks/Java/undertow-jersey-hikaricp/src/main/java/hello/JsonMessageBodyWriter.java

@@ -15,7 +15,7 @@ import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 
 
 @Provider
 @Provider
 @Singleton
 @Singleton
-@Produces(APPLICATION_JSON + "; charset=utf-8")
+@Produces(APPLICATION_JSON)
 public class JsonMessageBodyWriter
 public class JsonMessageBodyWriter
     implements MessageBodyWriter<Object>
     implements MessageBodyWriter<Object>
 {
 {

+ 1 - 1
frameworks/Java/undertow-jersey-hikaricp/src/main/java/hello/JsonResource.java

@@ -12,7 +12,7 @@ public class JsonResource
 {
 {
 
 
   @GET
   @GET
-  @Produces(APPLICATION_JSON + "; charset=utf-8")
+  @Produces(APPLICATION_JSON)
   public Object json()
   public Object json()
   {
   {
     Map<String, String> data = new HashMap<String, String>(1);
     Map<String, String> data = new HashMap<String, String>(1);

+ 1 - 1
frameworks/Java/undertow-jersey-hikaricp/src/main/java/hello/undertow/UndertowJerseyContainer.java

@@ -78,8 +78,8 @@ public class UndertowJerseyContainer
 
 
     this.applicationHandler = new ApplicationHandler(configuration);
     this.applicationHandler = new ApplicationHandler(configuration);
 
 
-    this.applicationHandler.onReload(this);
     this.applicationHandler.onStartup(this);
     this.applicationHandler.onStartup(this);
+    this.applicationHandler.onReload(this);
   }
   }
 
 
   @Override
   @Override