Remove ProxyBackendConfiguration

trinodb · Jul 11, 2024 · 4c40750 · 4c40750
1 parent fbc45ba
commit 4c40750
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 199 deletions.
diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/config/ProxyBackendConfiguration.java b/gateway-ha/src/main/java/io/trino/gateway/ha/config/ProxyBackendConfiguration.java
@@ -15,16 +15,38 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSetter;
-import io.trino.gateway.proxyserver.ProxyServerConfiguration;
 
 public class ProxyBackendConfiguration
-        extends ProxyServerConfiguration
 {
     private boolean active = true;
     private String routingGroup = "adhoc";
     private String externalUrl;
+    private String name;
+    private String proxyTo;
 
-    public ProxyBackendConfiguration() {}
+    @JsonProperty
+    public String getName()
+    {
+        return this.name;
+    }
+
+    @JsonProperty
+    public String getProxyTo()
+    {
+        return this.proxyTo;
+    }
+
+    @JsonSetter
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    @JsonSetter
+    public void setProxyTo(String proxyTo)
+    {
+        this.proxyTo = proxyTo;
+    }
 
     @JsonProperty
     public String getExternalUrl()

diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/router/RoutingManager.java b/gateway-ha/src/main/java/io/trino/gateway/ha/router/RoutingManager.java
@@ -19,7 +19,6 @@
 import io.airlift.log.Logger;
 import io.trino.gateway.ha.clustermonitor.ClusterStats;
 import io.trino.gateway.ha.config.ProxyBackendConfiguration;
-import io.trino.gateway.proxyserver.ProxyServerConfiguration;
 import jakarta.ws.rs.HttpMethod;
 
 import java.net.HttpURLConnection;
@@ -147,7 +146,7 @@ protected String findBackendForUnknownQueryId(String queryId)
 
         Map<String, Future<Integer>> responseCodes = new HashMap<>();
         try {
-            for (ProxyServerConfiguration backend : backends) {
+            for (ProxyBackendConfiguration backend : backends) {
                 String target = backend.getProxyTo() + "/v1/query/" + queryId;
 
                 Future<Integer> call =

diff --git a/gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyServerConfiguration.java b/gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyServerConfiguration.java