feat(API): refactor merge http servlets

errorprone/build.gradle

@@ -2,6 +2,8 @@ if (!JavaVersion.current().isJava11Compatible()) {
     // ErrorProne core requires JDK 11+; skip this module on JDK 8
     tasks.withType(JavaCompile).configureEach { enabled = false }
     tasks.withType(Jar).configureEach { enabled = false }
+    // No jar is produced, so the root maven-publish setup must not try to publish one
+    tasks.withType(AbstractPublishToMaven).configureEach { enabled = false }
 } else {
     dependencies {
         compileOnly "com.google.errorprone:error_prone_annotations:${errorproneVersion}"

framework/src/main/java/org/tron/common/application/HttpService.java

@@ -43,6 +43,11 @@ public abstract class HttpService extends AbstractService {
 
   protected long maxRequestSize = 4 * 1024 * 1024; // 4MB
 
+  // Applied by ConnectionLimit only while maxHttpConnectNumber is reached: existing
+  // connections idle out after this long so the acceptor can resume. Jetty restores the
+  // connector default (30s) once the count drops back below the limit.
+  private static final long CONNECTION_LIMIT_IDLE_TIMEOUT_MS = 5000L;
+
   @VisibleForTesting
   public long getMaxRequestSize() {
     return this.maxRequestSize;
@@ -80,7 +85,9 @@ protected void initServer() {
     this.apiServer = new Server(this.port);
     int maxHttpConnectNumber = Args.getInstance().getMaxHttpConnectNumber();
     if (maxHttpConnectNumber > 0) {
-      this.apiServer.addBean(new ConnectionLimit(maxHttpConnectNumber, this.apiServer));
+      ConnectionLimit connectionLimit = new ConnectionLimit(maxHttpConnectNumber, this.apiServer);
+      connectionLimit.setIdleTimeout(CONNECTION_LIMIT_IDLE_TIMEOUT_MS);
+      this.apiServer.addBean(connectionLimit);
     }
     this.apiServer.setErrorHandler(new OversizedRequestErrorHandler());
   }

framework/src/main/java/org/tron/core/config/DefaultConfig.java

@@ -11,10 +11,10 @@
 import org.tron.core.config.args.Args;
 import org.tron.core.db.RevokingDatabase;
 import org.tron.core.db2.core.SnapshotManager;
+import org.tron.core.services.interfaceOnPBFT.HttpApiOnPBFTService;
 import org.tron.core.services.interfaceOnPBFT.RpcApiServiceOnPBFT;
-import org.tron.core.services.interfaceOnPBFT.http.PBFT.HttpApiOnPBFTService;
+import org.tron.core.services.interfaceOnSolidity.HttpApiOnSolidityService;
 import org.tron.core.services.interfaceOnSolidity.RpcApiServiceOnSolidity;
-import org.tron.core.services.interfaceOnSolidity.http.solidity.HttpApiOnSolidityService;
 
 @Slf4j(topic = "app")
 @Configuration

framework/src/main/java/org/tron/core/services/RpcApiService.java

@@ -95,7 +95,7 @@
 import org.tron.core.exception.VMIllegalException;
 import org.tron.core.exception.ZksnarkException;
 import org.tron.core.metrics.MetricsApiService;
-import org.tron.core.services.http.Util;
+import org.tron.core.services.http.servlets.Util;
 import org.tron.core.utils.TransactionUtil;
 import org.tron.core.zen.address.DiversifierT;
 import org.tron.core.zen.address.IncomingViewingKey;

framework/src/main/java/org/tron/core/services/filter/LiteFnQueryHttpFilter.java

@@ -36,15 +36,10 @@ public static Set<String> getFilterPaths() {
     filterPaths.add("/wallet/getblockbylatestnum");
     filterPaths.add("/wallet/getblockbylimitnext");
     filterPaths.add("/wallet/getblockbynum");
-    filterPaths.add("/wallet/getmerkletreevoucherinfo");
     filterPaths.add("/wallet/gettransactionbyid");
     filterPaths.add("/wallet/gettransactioncountbyblocknum");
     filterPaths.add("/wallet/gettransactioninfobyid");
     filterPaths.add("/wallet/gettransactionreceiptbyid");
-    filterPaths.add("/wallet/isspend");
-    filterPaths.add("/wallet/scanandmarknotebyivk");
-    filterPaths.add("/wallet/scannotebyivk");
-    filterPaths.add("/wallet/scannotebyovk");
     filterPaths.add("/wallet/totaltransaction");
     filterPaths.add("/wallet/gettransactioninfobyblocknum");
     filterPaths.add("/wallet/getmarketorderbyaccount");
@@ -61,14 +56,9 @@ public static Set<String> getFilterPaths() {
     filterPaths.add("/walletsolidity/getblockbylatestnum");
     filterPaths.add("/walletsolidity/getblockbylimitnext");
     filterPaths.add("/walletsolidity/getblockbynum");
-    filterPaths.add("/walletsolidity/getmerkletreevoucherinfo");
     filterPaths.add("/walletsolidity/gettransactionbyid");
     filterPaths.add("/walletsolidity/gettransactioncountbyblocknum");
     filterPaths.add("/walletsolidity/gettransactioninfobyid");
-    filterPaths.add("/walletsolidity/isspend");
-    filterPaths.add("/walletsolidity/scanandmarknotebyivk");
-    filterPaths.add("/walletsolidity/scannotebyivk");
-    filterPaths.add("/walletsolidity/scannotebyovk");
     filterPaths.add("/walletsolidity/gettransactioninfobyblocknum");
     filterPaths.add("/walletsolidity/getmarketorderbyaccount");
     filterPaths.add("/walletsolidity/getmarketorderbyid");
@@ -84,14 +74,10 @@ public static Set<String> getFilterPaths() {
     filterPaths.add("/walletpbft/getblockbylatestnum");
     filterPaths.add("/walletpbft/getblockbylimitnext");
     filterPaths.add("/walletpbft/getblockbynum");
-    filterPaths.add("/walletpbft/getmerkletreevoucherinfo");
     filterPaths.add("/walletpbft/gettransactionbyid");
     filterPaths.add("/walletpbft/gettransactioncountbyblocknum");
     filterPaths.add("/walletpbft/gettransactioninfobyid");
-    filterPaths.add("/walletpbft/isspend");
-    filterPaths.add("/walletpbft/scanandmarknotebyivk");
-    filterPaths.add("/walletpbft/scannotebyivk");
-    filterPaths.add("/walletpbft/scannotebyovk");
+    filterPaths.add("/walletpbft/gettransactioninfobyblocknum");
     filterPaths.add("/walletpbft/getmarketorderbyaccount");
     filterPaths.add("/walletpbft/getmarketorderbyid");
     filterPaths.add("/walletpbft/getmarketpricebypair");

framework/src/main/java/org/tron/core/services/filter/PbftCursorFilter.java

@@ -0,0 +1,15 @@
+package org.tron.core.services.filter;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.tron.core.db.Manager;
+import org.tron.core.db2.core.Chainbase;
+
+@Component
+public class PbftCursorFilter extends WalletCursorFilter {
+
+  @Autowired
+  public PbftCursorFilter(Manager dbManager) {
+    super(dbManager, Chainbase.Cursor.PBFT);
+  }
+}

framework/src/main/java/org/tron/core/services/filter/SolidityCursorFilter.java

@@ -0,0 +1,15 @@
+package org.tron.core.services.filter;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.tron.core.db.Manager;
+import org.tron.core.db2.core.Chainbase;
+
+@Component
+public class SolidityCursorFilter extends WalletCursorFilter {
+
+  @Autowired
+  public SolidityCursorFilter(Manager dbManager) {
+    super(dbManager, Chainbase.Cursor.SOLIDITY);
+  }
+}

framework/src/main/java/org/tron/core/services/filter/WalletCursorFilter.java

@@ -0,0 +1,56 @@
+package org.tron.core.services.filter;
+
+import java.io.IOException;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import org.tron.core.db.Manager;
+import org.tron.core.db2.core.Chainbase;
+
+/**
+ * Selects which state view (HEAD / SOLIDITY / PBFT) the http servlets on this port read from.
+ *
+ * <p>The read cursor is a per-thread setting ({@code ThreadLocal} in {@code Chainbase}): it only
+ * decides from which snapshot the current thread starts its reads, and has no effect on any
+ * other thread. This filter sets the cursor before the servlet runs, so the same stateless
+ * servlet beans can serve {@code /wallet} (HEAD), {@code /walletsolidity} (SOLIDITY) and
+ * {@code /walletpbft} (PBFT) without per-port subclasses.
+ *
+ * <p>The cursor is always reset to HEAD in a finally block: jetty pools its worker threads, and
+ * a leftover cursor would leak into the next request served by the same thread. Only read-only
+ * endpoints may be mounted behind this filter — write paths must run with the HEAD cursor.
+ */
+public abstract class WalletCursorFilter implements Filter {
+
+  private final Manager dbManager;
+  private final Chainbase.Cursor cursor;
+
+  protected WalletCursorFilter(Manager dbManager, Chainbase.Cursor cursor) {
+    this.dbManager = dbManager;
+    this.cursor = cursor;
+  }
+
+  @Override
+  public void init(FilterConfig filterConfig) throws ServletException {
+    // do nothing
+  }
+
+  @Override
+  public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse,
+                       FilterChain filterChain) throws IOException, ServletException {
+    try {
+      dbManager.setCursor(cursor);
+      filterChain.doFilter(servletRequest, servletResponse);
+    } finally {
+      dbManager.resetCursor();
+    }
+  }
+
+  @Override
+  public void destroy() {
+    // do nothing
+  }
+}