From 6a11e2c0e43a60006a780cb289c74ca8d16385ab Mon Sep 17 00:00:00 2001 From: Gus Brodman Date: Tue, 23 Jun 2026 13:23:06 -0400 Subject: [PATCH] Remove class name option in GetRoutingMapCommand we only have the one component now, and in general it's a good idea to remove class loading based on user input, even if that user is one of us --- .../google/registry/module/RequestComponent.java | 2 +- .../registry/request/RouterDisplayHelper.java | 14 -------------- .../registry/tools/GetRoutingMapCommand.java | 14 ++------------ .../registry/testing/GoldenFileTestHelper.java | 2 +- 4 files changed, 4 insertions(+), 28 deletions(-) diff --git a/core/src/main/java/google/registry/module/RequestComponent.java b/core/src/main/java/google/registry/module/RequestComponent.java index c13a50e24f9..7708ded4261 100644 --- a/core/src/main/java/google/registry/module/RequestComponent.java +++ b/core/src/main/java/google/registry/module/RequestComponent.java @@ -164,7 +164,7 @@ ToolsServerModule.class, WhiteboxModule.class }) -interface RequestComponent { +public interface RequestComponent { FlowComponent.Builder flowComponentBuilder(); BrdaCopyAction brdaCopyAction(); diff --git a/core/src/main/java/google/registry/request/RouterDisplayHelper.java b/core/src/main/java/google/registry/request/RouterDisplayHelper.java index 5433e29d8a0..81567f4b1dc 100644 --- a/core/src/main/java/google/registry/request/RouterDisplayHelper.java +++ b/core/src/main/java/google/registry/request/RouterDisplayHelper.java @@ -14,11 +14,9 @@ package google.registry.request; -import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.stream.Collectors.joining; import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Streams; import java.util.Comparator; @@ -64,18 +62,6 @@ public static String extractHumanReadableRoutesFromComponent(Class componentC return formatRoutes(Router.extractRoutesFromComponent(componentClass).values()); } - public static ImmutableList extractHumanReadableRoutesWithWrongService( - Class componentClass, Action.Service expectedService) { - return Router.extractRoutesFromComponent(componentClass).values().stream() - .filter(route -> route.action().service() != expectedService) - .map( - route -> - String.format( - "%s (%s%s)", - route.actionClass(), route.action().service(), route.action().path())) - .collect(toImmutableList()); - } - private static String getFormatString(Map columnWidths) { return String.format( FORMAT, diff --git a/core/src/main/java/google/registry/tools/GetRoutingMapCommand.java b/core/src/main/java/google/registry/tools/GetRoutingMapCommand.java index cf9ce8ea2c5..19c7bd9c870 100644 --- a/core/src/main/java/google/registry/tools/GetRoutingMapCommand.java +++ b/core/src/main/java/google/registry/tools/GetRoutingMapCommand.java @@ -14,27 +14,17 @@ package google.registry.tools; -import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import google.registry.module.RequestComponent; import google.registry.request.RouterDisplayHelper; /** Generates the routing map file used for unit testing. */ @Parameters(commandDescription = "Generate a routing map file") final class GetRoutingMapCommand implements Command { - @Parameter( - names = {"-c", "--class"}, - description = - "Request component class (e.g. google.registry.module.backend.BackendRequestComponent)" - + " for which routing map should be generated", - required = true - ) - private String serviceClassName; - @Override public void run() throws Exception { System.out.println( - RouterDisplayHelper.extractHumanReadableRoutesFromComponent( - Class.forName(serviceClassName))); + RouterDisplayHelper.extractHumanReadableRoutesFromComponent(RequestComponent.class)); } } diff --git a/core/src/test/java/google/registry/testing/GoldenFileTestHelper.java b/core/src/test/java/google/registry/testing/GoldenFileTestHelper.java index 23b5e489b19..5cd6b262f0f 100644 --- a/core/src/test/java/google/registry/testing/GoldenFileTestHelper.java +++ b/core/src/test/java/google/registry/testing/GoldenFileTestHelper.java @@ -55,7 +55,7 @@ public static GoldenFileTestHelper assertThat(String actualValue) { public static GoldenFileTestHelper assertThatRoutesFromComponent(Class component) { return assertThat(RouterDisplayHelper.extractHumanReadableRoutesFromComponent(component)) - .createdByNomulusCommand("get_routing_map -c " + component.getName()); + .createdByNomulusCommand("get_routing_map"); } public GoldenFileTestHelper createdByNomulusCommand(String nomulusCommand) {