Upgrade to Blade 2.0.4-R1 (#3015)

* Add blade framework

* Update pom.xml

* fix some configuration

* Update Application.java

* Update Blade

* Update Blade

* Update Blade

* Update Blade

* Add oss releases

* Update setup.sh

* Update setup.sh

* Update setup.sh

* Update .travis.yml

* Update pom.xml

* fix

.travis.yml

@@ -75,6 +75,7 @@ env:
     - "TESTDIR=Java/activeweb"
     - "TESTDIR=Java/baratine"
     - "TESTDIR=Java/bayou"
+    - "TESTDIR=Java/blade"
     - "TESTDIR=Java/comsat-servlet"
     - "TESTDIR=Java/comsat-webactors"
     - "TESTDIR=Java/curacao"

frameworks/Java/blade/pom.xml

@@ -19,7 +19,13 @@
         <dependency>
             <groupId>com.bladejava</groupId>
             <artifactId>blade-mvc</artifactId>
-            <version>2.0.3</version>
+            <version>2.0.4-R1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.bladejava</groupId>
+            <artifactId>blade-jdbc</artifactId>
+            <version>0.2.2-beta</version>
         </dependency>
 
         <dependency>
@@ -29,12 +35,6 @@
             <classifier>linux-x86_64</classifier>
         </dependency>
 
-        <dependency>
-            <groupId>com.bladejava</groupId>
-            <artifactId>blade-jdbc</artifactId>
-            <version>0.2.2-beta</version>
-        </dependency>
-
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -49,6 +49,19 @@
 
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>oss-releases</id>
+            <url>https://oss.sonatype.org/content/repositories/releases</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <build>
         <resources>
             <resource>

frameworks/Java/blade/setup.sh

@@ -5,4 +5,4 @@ fw_depends mysql java maven
 mvn clean package
 cd target/dist/hello-blade-1.0.0-BUILD-SNAPSHOT
 
-java -Xms2G -Xmx2G -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -jar hello-blade-1.0.0-BUILD-SNAPSHOT.jar &
+java -Xms2G -Xmx2G -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -jar hello-blade-1.0.0-BUILD-SNAPSHOT.jar &

frameworks/Java/blade/src/main/java/hello/Application.java

@@ -1,9 +1,12 @@
 package hello;
 
 import com.blade.Blade;
+import com.blade.server.netty.HttpConst;
 import hello.model.Message;
 import hello.model.World;
+import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import io.netty.util.AsciiString;
 import io.netty.util.CharsetUtil;
 
 import java.util.Optional;
@@ -18,8 +21,10 @@ import java.util.concurrent.ThreadLocalRandom;
  */
 public class Application {
 
-    private static final int    DB_ROWS           = 308;
-    private static final byte[] STATIC_HELLO_TEXT = "Hello, World!".getBytes(CharsetUtil.UTF_8);
+    private static final int          DB_ROWS                  = 308;
+    private static final byte[]       STATIC_PLAINTEXT         = "Hello, World!".getBytes(CharsetUtil.UTF_8);
+    private static final ByteBuf      PLAINTEXT_CONTENT_BUFFER = Unpooled.unreleasableBuffer(Unpooled.directBuffer().writeBytes(STATIC_PLAINTEXT));
+    private static final CharSequence PLAINTEXT_CLHEADER_VALUE = AsciiString.cached(String.valueOf(STATIC_PLAINTEXT.length));
 
     private static int getQueries(Optional<Integer> queryCount) {
         int count = queryCount.orElse(1);
@@ -30,9 +35,13 @@ public class Application {
 
     public static void main(String[] args) {
         Blade.me()
-                .get("/json", (request, response) -> response.json(new Message()))
+                .get("/json", (request, response) -> {
+                    response.contentType(HttpConst.getContentType("application/json"));
+                    response.json(new Message());
+                })
                 .get("/db", (request, response) -> {
                     final Random random = ThreadLocalRandom.current();
+                    response.contentType(HttpConst.getContentType("application/json"));
                     response.json(new World().find(random.nextInt(DB_ROWS) + 1));
                 })
                 .get("/queries", (request, response) -> {
@@ -42,9 +51,15 @@ public class Application {
                     for (int i = 0; i < queries; i++) {
                         worlds[i] = new World().find(random.nextInt(DB_ROWS) + 1);
                     }
+                    response.contentType(HttpConst.getContentType("application/json"));
                     response.json(worlds);
                 })
-                .get("/plaintext", (request, response) -> response.body(Unpooled.unreleasableBuffer(Unpooled.directBuffer().writeBytes(STATIC_HELLO_TEXT)).duplicate()))
+                .get("/plaintext", (request, response) -> {
+                    response.contentType(HttpConst.getContentType("text/plain"));
+                    response.header(HttpConst.CONTENT_LENGTH, PLAINTEXT_CLHEADER_VALUE);
+                    response.body(PLAINTEXT_CONTENT_BUFFER.duplicate());
+                })
+                .disableSession()
                 .start(Application.class, args);
     }