From 2fac7d1c075ee46873083f7baa2ed6a991f7fa7a Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Fri, 5 May 2023 14:34:55 -0700 Subject: [PATCH] xds: Avoid default locale and reset() Found via linter --- xds/src/main/java/io/grpc/xds/RoutingUtils.java | 3 ++- xds/src/test/java/io/grpc/xds/orca/OrcaServiceImplTest.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xds/src/main/java/io/grpc/xds/RoutingUtils.java b/xds/src/main/java/io/grpc/xds/RoutingUtils.java index 4bdb72a41f2..2b60e90deda 100644 --- a/xds/src/main/java/io/grpc/xds/RoutingUtils.java +++ b/xds/src/main/java/io/grpc/xds/RoutingUtils.java @@ -165,7 +165,8 @@ private static boolean matchPath(PathMatcher pathMatcher, String fullMethodName) } else if (pathMatcher.prefix() != null) { return pathMatcher.caseSensitive() ? fullMethodName.startsWith(pathMatcher.prefix()) - : fullMethodName.toLowerCase().startsWith(pathMatcher.prefix().toLowerCase()); + : fullMethodName.toLowerCase(Locale.US).startsWith( + pathMatcher.prefix().toLowerCase(Locale.US)); } return pathMatcher.regEx().matches(fullMethodName); } diff --git a/xds/src/test/java/io/grpc/xds/orca/OrcaServiceImplTest.java b/xds/src/test/java/io/grpc/xds/orca/OrcaServiceImplTest.java index 01e9c906bf3..124a21ddb76 100644 --- a/xds/src/test/java/io/grpc/xds/orca/OrcaServiceImplTest.java +++ b/xds/src/test/java/io/grpc/xds/orca/OrcaServiceImplTest.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -115,7 +116,6 @@ public void testReportingLifeCycle() { } @Test - @SuppressWarnings("unchecked") public void testReportingLifeCycle_serverShutdown() { ClientCall call = channel.newCall( OpenRcaServiceGrpc.getStreamCoreMetricsMethod(), CallOptions.DEFAULT); @@ -128,7 +128,7 @@ public void testReportingLifeCycle_serverShutdown() { OrcaLoadReport expect = OrcaLoadReport.newBuilder().putUtilization("buffer", 0.2).build(); assertThat(((OrcaServiceImpl)orcaServiceImpl).clientCount.get()).isEqualTo(1); verify(listener).onMessage(eq(expect)); - reset(listener); + verify(listener, never()).onClose(any(), any()); oobServer.shutdownNow(); assertThat(fakeClock.forwardTime(1, TimeUnit.SECONDS)).isEqualTo(0); assertThat(((OrcaServiceImpl)orcaServiceImpl).clientCount.get()).isEqualTo(0);