remove caffeine and add ehcache

Author: litongjava

frameworks/Java/act/src/main/resources/conf/ebean_mysql/db.properties

@@ -3,7 +3,7 @@ mysql.host=localhost
 app.batch_save=false
 
 db.impl=act.db.ebean.EbeanPlugin
-db.url=jdbc:mysql://${mysql.host}:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&PrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts=true&cacheRSMetadata=true&serverTimezone=UTC&useSSL=false
+db.url=jdbc:mysql://${mysql.host}:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts=true&cacheRSMetadata=true&serverTimezone=UTC&useSSL=false
 
 db.slave.maxConnections=48
 db.slave.minConnections=48

frameworks/Java/tio-server/pom.xml

@@ -15,14 +15,21 @@
     <dependency>
       <groupId>com.litongjava</groupId>
       <artifactId>tio-http-server</artifactId>
-      <version>3.7.3.v20231218-RELEASE</version>
+      <version>3.7.3.v20231224-RELEASE</version>
     </dependency>
 
 
+    <!-- https://mvnrepository.com/artifact/com.jfinal/activerecord -->
     <dependency>
-      <groupId>com.litongjava</groupId>
-      <artifactId>table-to-json</artifactId>
-      <version>1.2.1</version>
+      <groupId>com.jfinal</groupId>
+      <artifactId>activerecord</artifactId>
+      <version>5.1.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache-core</artifactId>
+      <version>2.6.11</version>
     </dependency>
 
 
@@ -155,7 +162,7 @@
         </dependency>
       </dependencies>
       <build>
-        <finalName>${final.name}</finalName>
+        <finalName>${project.build.finalName}-native</finalName>
         <plugins>
           <plugin>
             <groupId>org.graalvm.nativeimage</groupId>
@@ -171,7 +178,7 @@
             </executions>
             <configuration>
               <skip>false</skip>
-              <imageName>${project.build.finalName}</imageName>
+              <imageName>${project.build.finalName}-native</imageName>
               <mainClass>${main.class}</mainClass>
               <buildArgs>
                 -H:+RemoveSaturatedTypeFlows

frameworks/Java/tio-server/src/main/java/com/litongjava/tio/http/server/MainApp.java

@@ -1,26 +1,24 @@
 package com.litongjava.tio.http.server;
 
-import java.io.IOException;
-
 import com.litongjava.tio.http.common.HttpConfig;
 import com.litongjava.tio.http.common.handler.HttpRequestHandler;
-import com.litongjava.tio.http.server.config.CaffeineCacheConfig;
+import com.litongjava.tio.http.server.config.EhCachePluginConfig;
 import com.litongjava.tio.http.server.config.EnjoyEngineConfig;
 import com.litongjava.tio.http.server.config.MysqlDbConfig;
 import com.litongjava.tio.http.server.controller.CacheController;
 import com.litongjava.tio.http.server.controller.DbController;
 import com.litongjava.tio.http.server.controller.IndexController;
 import com.litongjava.tio.http.server.handler.HttpRoutes;
-import com.litongjava.tio.http.server.handler.SimpleHttpDispahterHanlder;
+import com.litongjava.tio.http.server.handler.SimpleHttpDispatcherHandler;
 import com.litongjava.tio.http.server.handler.SimpleHttpRoutes;
-import com.litongjava.tio.http.server.utils.EnviormentUtils;
 import com.litongjava.tio.server.ServerTioConfig;
+import com.litongjava.tio.utils.environment.EnvironmentUtils;
 
 public class MainApp {
 
   public static void main(String[] args) {
     long start = System.currentTimeMillis();
-    EnviormentUtils.buildCmdArgsMap(args);
+    EnvironmentUtils.buildCmdArgsMap(args);
     // add route
     IndexController controller = new IndexController();
     HttpRoutes simpleHttpRoutes = new SimpleHttpRoutes();
@@ -36,7 +34,6 @@ public static void main(String[] args) {
 
     CacheController cacheController = new CacheController();
     simpleHttpRoutes.add("/cacheQuery", cacheController::cacheQuery);
-    simpleHttpRoutes.add("/cacheList", cacheController::cacheList);
 
     // config server
     HttpConfig httpConfig = new HttpConfig(8080, null, null, null);
@@ -45,7 +42,7 @@ public static void main(String[] args) {
     httpConfig.setCheckHost(false);
     httpConfig.setCompatible1_0(false);
 
-    HttpRequestHandler requestHandler = new SimpleHttpDispahterHanlder(httpConfig, simpleHttpRoutes);
+    HttpRequestHandler requestHandler = new SimpleHttpDispatcherHandler(httpConfig, simpleHttpRoutes);
     HttpServerStarter httpServerStarter = new HttpServerStarter(httpConfig, requestHandler);
     ServerTioConfig serverTioConfig = httpServerStarter.getServerTioConfig();
     // close Heartbeat
@@ -56,7 +53,7 @@ public static void main(String[] args) {
       httpServerStarter.start();
       new MysqlDbConfig().init();
       new EnjoyEngineConfig().engine();
-      new CaffeineCacheConfig().register();
+      new EhCachePluginConfig().ehCachePlugin();
       long end = System.currentTimeMillis();
       System.out.println((end - start) + "ms");
     } catch (Exception e) {

frameworks/Java/tio-server/src/main/java/com/litongjava/tio/http/server/config/CaffeineCacheConfig.java

@@ -0,0 +1,13 @@
+package com.litongjava.tio.http.server.config;
+
+
+import com.jfinal.plugin.ehcache.EhCachePlugin;
+
+public class EhCachePluginConfig {
+
+  public EhCachePlugin ehCachePlugin() {
+    EhCachePlugin ehCachePlugin = new EhCachePlugin();
+    ehCachePlugin.start();
+    return ehCachePlugin;
+  }
+}

frameworks/Java/tio-server/src/main/java/com/litongjava/tio/http/server/config/EhCachePluginConfig.java

@@ -3,19 +3,20 @@
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.OrderedFieldContainerFactory;
 import com.jfinal.plugin.hikaricp.HikariCpPlugin;
-import com.litongjava.tio.http.server.utils.EnviormentUtils;
+import com.litongjava.tio.utils.environment.EnvironmentUtils;
 
 public class MysqlDbConfig {
 
   public void init() {
     // start active recored
-    String jdbcUrl = EnviormentUtils.get("JDBC_URL");
+
+    String jdbcUrl = EnvironmentUtils.get("JDBC_URL");
     // String jdbcUrl = "jdbc:mysql://192.168.3.9/hello_world";
 
-    String jdbcUser = EnviormentUtils.get("JDBC_USER");
+    String jdbcUser = EnvironmentUtils.get("JDBC_USER");
 //    String jdbcUser = "root";
 
-    String jdbcPswd = EnviormentUtils.get("JDBC_PSWD");
+    String jdbcPswd = EnvironmentUtils.get("JDBC_PSWD");
 //    String jdbcPswd = "robot_123456#";
     HikariCpPlugin hikariCpPlugin = new HikariCpPlugin(jdbcUrl, jdbcUser, jdbcPswd);
 

frameworks/Java/tio-server/src/main/java/com/litongjava/tio/http/server/config/MysqlDbConfig.java

@@ -25,12 +25,12 @@ public class CacheController {
   public HttpResponse cacheQuery(HttpRequest request) {
     String queries = request.getParam("queries");
     List<Map<String, Object>> recordMaps = RandomUtils.randomWorldNumbers()
-        // limit
-        .limit(RandomUtils.parseQueryCount(queries)) // 限制查询数量
-        .mapToObj(id -> findByIdWithCache("world", id)) // 使用 mapToObj 将 int 映射为对象
-        .filter(Objects::nonNull) // 过滤掉 null 值
-        .map(Record::toMap) // 将每个 Record 对象转换为 Map
-        .collect(Collectors.toList()); // 收集到 List
+      // limit
+      .limit(RandomUtils.parseQueryCount(queries)) // 限制查询数量
+      .mapToObj(id -> findByIdWithCache("world", id)) // 使用 mapToObj 将 int 映射为对象
+      .filter(Objects::nonNull) // 过滤掉 null 值
+      .map(Record::toMap) // 将每个 Record 对象转换为 Map
+      .collect(Collectors.toList()); // 收集到 List
 
     HttpResponse httpResponse = new HttpResponse(request);
     httpResponse.addHeader(HeaderName.Content_Type, HeaderValue.Content_Type.TEXT_PLAIN_JSON);
@@ -40,30 +40,7 @@ public HttpResponse cacheQuery(HttpRequest request) {
   }
 
   private Record findByIdWithCache(String tableName, int id) {
-
-    ICache cache = CaffeineCache.getCache("world");
-
-    // firsthandCreater用户查询数据库
-    FirsthandCreater<Record> firsthandCreater = new FirsthandCreater<Record>() {
-      @Override
-      public Record create() {
-        // log.info("select from db:{},id", tableName, id);
-        return Db.findById(tableName, id);
-      }
-    };
-
-    String key = id + "";
-    boolean putTempToCacheIfNull = false;
-    Record value = CacheUtils.get(cache, key, putTempToCacheIfNull, firsthandCreater);
-    return value;
-  }
-
-  public HttpResponse cacheList(HttpRequest request) {
-    Collection<String> keys = CaffeineCache.getCache("world").keys();
-
-    HttpResponse httpResponse = new HttpResponse(request);
-    httpResponse.addHeader(HeaderName.Content_Type, HeaderValue.Content_Type.TEXT_PLAIN_JSON);
-    httpResponse.setBody(JSON.toJSONString(keys).getBytes());
-    return httpResponse;
+    String sql = "SELECT id, randomNumber FROM world WHERE id = ?";
+    return Db.findFirstByCache(tableName, id, sql, id);
   }
 }

frameworks/Java/tio-server/src/main/java/com/litongjava/tio/http/server/controller/CacheController.java

@@ -11,6 +11,7 @@
 import com.alibaba.fastjson2.JSON;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.ehcache.CacheKit;
 import com.jfinal.template.Engine;
 import com.jfinal.template.Template;
 import com.litongjava.tio.http.common.HeaderName;
@@ -71,8 +72,7 @@ public HttpResponse queries(HttpRequest request) {
   public HttpResponse updates(HttpRequest request) {
     String queries = request.getParam("queries");
 
-    ICache cache = CaffeineCache.getCache("world");
-    cache.clear();
+    CacheKit.removeAll("world");
 
     List<Map<String, Object>> updatedRecords = RandomUtils.randomWorldNumbers()// random numbers
         // limit