Skip to content

Remove redundant try-catch from PublicResource #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ebyhr merged 1 commit into from
Feb 14, 2024
Merged

Remove redundant try-catch from PublicResource #252

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions gateway-ha/src/main/java/io/trino/gateway/ha/resource/PublicResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package io.trino.gateway.ha.resource;

import com.google.inject.Inject;
import io.trino.gateway.ha.config.ProxyBackendConfiguration;
import io.trino.gateway.ha.router.BackendStateManager;
import io.trino.gateway.ha.router.GatewayBackendManager;
import jakarta.ws.rs.GET;
Expand All @@ -24,8 +23,6 @@
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;

import java.util.NoSuchElementException;

import static java.util.Objects.requireNonNull;

@Path("/api/public")
Expand Down Expand Up @@ -53,30 +50,16 @@ public Response getAllBackends()
@Path("/backends/{name}")
public Response getBackend(@PathParam("name") String name)
{
try {
ProxyBackendConfiguration backend = gatewayBackendManager
.getBackendByName(name)
.orElseThrow();
return Response.ok(backend).build();
}
catch (NoSuchElementException e) {
return Response.status(404).build();
}
return gatewayBackendManager.getBackendByName(name).map(Response::ok)
.orElseGet(() -> Response.status(404)).build();
}

@GET
@Path("/backends/{name}/state")
public Response getBackendState(@PathParam("name") String name)
{
try {
BackendStateManager.BackendState state = gatewayBackendManager
.getBackendByName(name)
.map(backendStateManager::getBackendState)
.orElseThrow();
return Response.ok(state.state()).build();
}
catch (NoSuchElementException e) {
return Response.status(404).build();
}
return gatewayBackendManager.getBackendByName(name).map(backendStateManager::getBackendState)
.map(state -> Response.ok(state.state()).build())
.orElseGet(() -> Response.status(404).build());
}
}