Browse Source

[ci fw-only Act/java] update to act-1.8.8-RC6 (#3763)

* add act-ebean-pgsql-rythm to compare rythm vs mustache template engine

* update act to 1.8.8-RC4

* update act to 1.8.8-RC5-SNAPSHOT for performance fix

* [ci fw-only Java/act] update dependency version for act-sql-common

* [ci fw-only Java/act] update to act-1.8.8-RC6

* [ci fw-only Java/act]fix ebean library conflict issue
Green Luo 7 years ago
parent
commit
ae41ea3483

+ 20 - 7
frameworks/Java/act/pom.xml

@@ -22,7 +22,7 @@
   <groupId>com.techempower</groupId>
   <artifactId>actframework</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.8.1</version>
+  <version>1.8.8.2</version>
 
   <name>TEB ActFramework Project</name>
   <description>TEB benchmark project with ActFramework</description>
@@ -36,13 +36,16 @@
   <parent>
     <groupId>org.actframework</groupId>
     <artifactId>act-starter-parent</artifactId>
-    <version>1.8.8.1</version>
+    <version>1.8.8.2</version>
   </parent>
 
   <properties>
     <java.version>1.8</java.version>
     <mysql.version>5.1.45</mysql.version>
-    <postgres-jdbc.version>42.2.1</postgres-jdbc.version>
+    <postgres-jdbc.version>42.2.2</postgres-jdbc.version>
+    <morphia.version>1.3.2</morphia.version>
+    <ebean-annotation.version>3.4</ebean-annotation.version>
+    <act-sql-common.version>1.3.4</act-sql-common.version>
     <app.entry>com.techempower.act.AppEntry</app.entry>
   </properties>
 
@@ -60,19 +63,29 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>3.4</version>
+      <version>${ebean-annotation.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.mongodb.morphia</groupId>
       <artifactId>morphia</artifactId>
-      <version>1.3.2</version>
+      <version>${morphia.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.actframework</groupId>
-      <artifactId>act-jpa-common</artifactId>
-      <version>1.2.3</version>
+      <artifactId>act-sql-common</artifactId>
+      <version>${act-sql-common.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.avaje.ebean</groupId>
+          <artifactId>ebean</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.avaje.ebean</groupId>
+          <artifactId>ebean-agent</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
   </dependencies>

+ 2 - 1
frameworks/Java/act/src/main/java/com/techempower/act/controller/HelloWorldController.java

@@ -24,6 +24,7 @@ import act.Act;
 import act.job.OnAppStart;
 import act.sys.Env;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.techempower.act.AppEntry;
 import org.osgl.http.H;
 
@@ -46,7 +47,7 @@ public class HelloWorldController {
     public void routing() {
         Act.getNonblock("/json", context -> context.resp()
                 .contentType(H.Format.JSON.contentType())
-                .writeContent(JSON.toJSONString(new Message(HELLO_WORLD))));
+                .writeContent(JSON.toJSONString(new Message(HELLO_WORLD), SerializerFeature.DisableCircularReferenceDetect)));
     }
 
 }

+ 4 - 5
frameworks/Java/act/src/main/java/com/techempower/act/controller/WorldController.java

@@ -28,12 +28,11 @@ import act.db.sql.tx.Transactional;
 import act.sys.Env;
 import act.util.FastJsonFeature;
 import act.util.Global;
+import act.util.JsonView;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.techempower.act.AppEntry;
 import com.techempower.act.model.World;
-import org.osgl.http.H;
 import org.osgl.mvc.annotation.GetAction;
-import org.osgl.mvc.annotation.ResponseContentType;
 import org.osgl.mvc.annotation.SessionFree;
 
 import java.util.ArrayList;
@@ -43,7 +42,7 @@ import javax.inject.Inject;
 
 @AutoConfig
 @Env.RequireProfile(value = AppEntry.PROFILE_JSON_PLAINTEXT, except = true)
-@ResponseContentType(H.MediaType.JSON)
+@JsonView
 public class WorldController {
 
     private static boolean BATCH_SAVE;
@@ -114,11 +113,11 @@ public class WorldController {
     }
 
     private static int regulateQueries(String param) {
-        if (null == param || "".equals(param)) {
+        if (null == param) {
             return 1;
         }
         try {
-            int val = Integer.parseInt(param);
+            int val = Integer.parseInt(param, 10);
             return val < 1 ? 1 : val > 500 ? 500 : val;
         } catch (NumberFormatException e) {
             return 1;

+ 2 - 0
frameworks/Java/act/src/main/resources/conf/app.properties

@@ -1,6 +1,8 @@
 # disable charset output for JSON response
 render.json.output_charset=false
 
+server.header=act
+
 # disable CLI service
 cli=false