Skip to content

Commit 70f60f0

Browse files
committed
fixed cr comments
1 parent 0a2ba73 commit 70f60f0

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

gateway-ha/src/main/java/io/trino/gateway/ha/resource/GatewayWebAppResource.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616
import com.google.common.base.Strings;
1717
import com.google.inject.Inject;
1818
import io.trino.gateway.ha.clustermonitor.ClusterStats;
19-
import io.trino.gateway.ha.config.HaGatewayConfiguration;
20-
import io.trino.gateway.ha.config.ProxyBackendConfiguration;
21-
import io.trino.gateway.ha.config.RulesType;
22-
import io.trino.gateway.ha.config.UIConfiguration;
19+
import io.trino.gateway.ha.config.*;
2320
import io.trino.gateway.ha.domain.Result;
2421
import io.trino.gateway.ha.domain.RoutingRule;
2522
import io.trino.gateway.ha.domain.TableData;
@@ -74,10 +71,10 @@ public class GatewayWebAppResource
7471
private final QueryHistoryManager queryHistoryManager;
7572
private final BackendStateManager backendStateManager;
7673
private final ResourceGroupsManager resourceGroupsManager;
74+
private final RoutingRulesConfiguration routingRules;
7775
// TODO Avoid putting mutable objects in fields
7876
private final UIConfiguration uiConfiguration;
7977
private final RoutingRulesManager routingRulesManager;
80-
private final HaGatewayConfiguration haGatewayConfiguration;
8178

8279
@Inject
8380
public GatewayWebAppResource(
@@ -94,7 +91,7 @@ public GatewayWebAppResource(
9491
this.resourceGroupsManager = requireNonNull(resourceGroupsManager, "resourceGroupsManager is null");
9592
this.uiConfiguration = configuration.getUiConfiguration();
9693
this.routingRulesManager = requireNonNull(routingRulesManager, "routingRulesManager is null");
97-
this.haGatewayConfiguration = configuration;
94+
this.routingRules = configuration.getRoutingRules();
9895
}
9996

10097
@POST
@@ -163,7 +160,7 @@ public Response getDistribution(QueryDistributionRequest query)
163160
Map<String, List<DistributionResponse.LineChart>> lineChartMap = lineChart.stream().collect(Collectors.groupingBy(DistributionResponse.LineChart::getName));
164161
List<DistributionResponse.DistributionChart> distributionChart = lineChartMap.values().stream().map(d -> {
165162
DistributionResponse.DistributionChart dc = new DistributionResponse.DistributionChart();
166-
DistributionResponse.LineChart lc = d.getFirst();
163+
DistributionResponse.LineChart lc = d.get(0);
167164
long sum = d.stream().collect(Collectors.summarizingLong(DistributionResponse.LineChart::getQueryCount)).getSum();
168165
dc.setQueryCount(sum);
169166
dc.setBackendUrl(lc.getBackendUrl());
@@ -449,7 +446,7 @@ public Response readExactMatchSourceSelector()
449446
public Response getRoutingRules()
450447
throws IOException
451448
{
452-
if (haGatewayConfiguration.getRoutingRules().isRulesEngineEnabled() && haGatewayConfiguration.getRoutingRules().getRulesType() == RulesType.EXTERNAL) {
449+
if (routingRules.isRulesEngineEnabled() && routingRules.getRulesType() == RulesType.EXTERNAL) {
453450
return Response.status(Response.Status.NO_CONTENT)
454451
.entity(Result.fail("Routing rules are managed by an external service")).build();
455452
}

0 commit comments

Comments
 (0)