diff --git a/build.gradle b/build.gradle index ab78860c6d..f9a3b5d06e 100644 --- a/build.gradle +++ b/build.gradle @@ -271,7 +271,7 @@ subprojects { requireUpperBoundDepsMatch(configurations.runtimeClasspath, project) } } - tasks.named('compileJava').configure { + tasks.named('assemble').configure { dependsOn checkUpperBoundDeps } } diff --git a/core/BUILD.bazel b/core/BUILD.bazel index 3ca51e66c9..a4c1b29612 100644 --- a/core/BUILD.bazel +++ b/core/BUILD.bazel @@ -6,19 +6,8 @@ java_library( java_library( name = "inprocess", - srcs = glob([ - "src/main/java/io/grpc/inprocess/*.java", - ]), visibility = ["//visibility:public"], - deps = [ - ":internal", - "//api", - "//context", - "@com_google_code_findbugs_jsr305//jar", - "@com_google_errorprone_error_prone_annotations//jar", - "@com_google_guava_guava//jar", - "@com_google_j2objc_j2objc_annotations//jar", - ], + exports = ["//inprocess"], ) java_library( @@ -47,21 +36,8 @@ java_library( java_library( name = "util", - srcs = glob([ - "src/main/java/io/grpc/util/*.java", - ]), - resources = glob([ - "src/bazel-util/resources/**", - ]), visibility = ["//visibility:public"], - deps = [ - ":internal", - "//api", - "@com_google_code_findbugs_jsr305//jar", - "@com_google_guava_guava//jar", - "@com_google_j2objc_j2objc_annotations//jar", - "@org_codehaus_mojo_animal_sniffer_annotations//jar", - ], + exports = ["//util"], ) # Mirrors the dependencies included in the artifact on Maven Central for usage @@ -71,9 +47,8 @@ java_library( name = "core_maven", visibility = ["//visibility:public"], exports = [ - ":inprocess", ":internal", - ":util", "//api", + "//inprocess", ], ) diff --git a/core/build.gradle b/core/build.gradle index c2e87127c7..fa2e6f8302 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -23,7 +23,8 @@ description = 'gRPC: Core' dependencies { api project(':grpc-api') // force dependent jars to depend on latest grpc-context - runtimeOnly project(":grpc-context") + runtimeOnly project(":grpc-context"), + project(":grpc-util") // need grpc-util to pull in round robin implementation libraries.gson, libraries.android.annotations, libraries.animalsniffer.annotations, diff --git a/core/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider b/core/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider index d68a57c4eb..bbc367f8fc 100644 --- a/core/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider +++ b/core/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider @@ -1,3 +1 @@ io.grpc.internal.PickFirstLoadBalancerProvider -io.grpc.util.SecretRoundRobinLoadBalancerProvider$Provider -io.grpc.util.OutlierDetectionLoadBalancerProvider diff --git a/grpclb/BUILD.bazel b/grpclb/BUILD.bazel index 0ca4d695bb..e82d8022bd 100644 --- a/grpclb/BUILD.bazel +++ b/grpclb/BUILD.bazel @@ -14,7 +14,7 @@ java_library( "//api", "//context", "//core:internal", - "//core:util", + "//util", "//stub", "@com_google_code_findbugs_jsr305//jar", "@com_google_guava_guava//jar", diff --git a/grpclb/build.gradle b/grpclb/build.gradle index 7aa2d62b0f..eacfb48773 100644 --- a/grpclb/build.gradle +++ b/grpclb/build.gradle @@ -19,6 +19,7 @@ dependencies { runtimeOnly libraries.errorprone.annotations compileOnly libraries.javax.annotation testImplementation libraries.truth, + project(':grpc-inprocess'), testFixtures(project(':grpc-core')) signature libraries.signature.java diff --git a/inprocess/BUILD.bazel b/inprocess/BUILD.bazel new file mode 100644 index 0000000000..65f2adceda --- /dev/null +++ b/inprocess/BUILD.bazel @@ -0,0 +1,16 @@ +java_library( + name = "inprocess", + srcs = glob([ + "src/main/java/io/grpc/inprocess/*.java", + ]), + visibility = ["//visibility:public"], + deps = [ + "//core:internal", + "//api", + "//context", + "@com_google_code_findbugs_jsr305//jar", + "@com_google_errorprone_error_prone_annotations//jar", + "@com_google_guava_guava//jar", + "@com_google_j2objc_j2objc_annotations//jar", + ], +) diff --git a/inprocess/build.gradle b/inprocess/build.gradle new file mode 100644 index 0000000000..84293f6d8d --- /dev/null +++ b/inprocess/build.gradle @@ -0,0 +1,24 @@ +plugins { + id "java-library" + id "maven-publish" + + id "ru.vyarus.animalsniffer" +} + +description = 'gRPC: Inprocess' + +dependencies { + api project(':grpc-core') + + implementation libraries.guava + testImplementation project(':grpc-testing'), + testFixtures(project(':grpc-core')) + testImplementation libraries.guava.testlib + + signature libraries.signature.java + signature libraries.signature.android +} + +tasks.named("javadoc").configure { + exclude 'io/grpc/inprocess/Internal*' +} diff --git a/core/src/main/java/io/grpc/inprocess/AnonymousInProcessSocketAddress.java b/inprocess/src/main/java/io/grpc/inprocess/AnonymousInProcessSocketAddress.java similarity index 100% rename from core/src/main/java/io/grpc/inprocess/AnonymousInProcessSocketAddress.java rename to inprocess/src/main/java/io/grpc/inprocess/AnonymousInProcessSocketAddress.java diff --git a/core/src/main/java/io/grpc/inprocess/InProcessChannelBuilder.java b/inprocess/src/main/java/io/grpc/inprocess/InProcessChannelBuilder.java similarity index 100% rename from core/src/main/java/io/grpc/inprocess/InProcessChannelBuilder.java rename to inprocess/src/main/java/io/grpc/inprocess/InProcessChannelBuilder.java diff --git a/core/src/main/java/io/grpc/inprocess/InProcessServer.java b/inprocess/src/main/java/io/grpc/inprocess/InProcessServer.java similarity index 100% rename from core/src/main/java/io/grpc/inprocess/InProcessServer.java rename to inprocess/src/main/java/io/grpc/inprocess/InProcessServer.java diff --git a/core/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java b/inprocess/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java similarity index 100% rename from core/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java rename to inprocess/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java diff --git a/core/src/main/java/io/grpc/inprocess/InProcessSocketAddress.java b/inprocess/src/main/java/io/grpc/inprocess/InProcessSocketAddress.java similarity index 100% rename from core/src/main/java/io/grpc/inprocess/InProcessSocketAddress.java rename to inprocess/src/main/java/io/grpc/inprocess/InProcessSocketAddress.java diff --git a/core/src/main/java/io/grpc/inprocess/InProcessTransport.java b/inprocess/src/main/java/io/grpc/inprocess/InProcessTransport.java similarity index 100% rename from core/src/main/java/io/grpc/inprocess/InProcessTransport.java rename to inprocess/src/main/java/io/grpc/inprocess/InProcessTransport.java diff --git a/core/src/main/java/io/grpc/inprocess/InternalInProcess.java b/inprocess/src/main/java/io/grpc/inprocess/InternalInProcess.java similarity index 100% rename from core/src/main/java/io/grpc/inprocess/InternalInProcess.java rename to inprocess/src/main/java/io/grpc/inprocess/InternalInProcess.java diff --git a/core/src/main/java/io/grpc/inprocess/InternalInProcessChannelBuilder.java b/inprocess/src/main/java/io/grpc/inprocess/InternalInProcessChannelBuilder.java similarity index 100% rename from core/src/main/java/io/grpc/inprocess/InternalInProcessChannelBuilder.java rename to inprocess/src/main/java/io/grpc/inprocess/InternalInProcessChannelBuilder.java diff --git a/core/src/main/java/io/grpc/inprocess/InternalInProcessServerBuilder.java b/inprocess/src/main/java/io/grpc/inprocess/InternalInProcessServerBuilder.java similarity index 100% rename from core/src/main/java/io/grpc/inprocess/InternalInProcessServerBuilder.java rename to inprocess/src/main/java/io/grpc/inprocess/InternalInProcessServerBuilder.java diff --git a/core/src/main/java/io/grpc/inprocess/package-info.java b/inprocess/src/main/java/io/grpc/inprocess/package-info.java similarity index 100% rename from core/src/main/java/io/grpc/inprocess/package-info.java rename to inprocess/src/main/java/io/grpc/inprocess/package-info.java diff --git a/core/src/test/java/io/grpc/inprocess/AnonymousInProcessSocketAddressTest.java b/inprocess/src/test/java/io/grpc/inprocess/AnonymousInProcessSocketAddressTest.java similarity index 100% rename from core/src/test/java/io/grpc/inprocess/AnonymousInProcessSocketAddressTest.java rename to inprocess/src/test/java/io/grpc/inprocess/AnonymousInProcessSocketAddressTest.java diff --git a/core/src/test/java/io/grpc/inprocess/AnonymousInProcessTransportTest.java b/inprocess/src/test/java/io/grpc/inprocess/AnonymousInProcessTransportTest.java similarity index 100% rename from core/src/test/java/io/grpc/inprocess/AnonymousInProcessTransportTest.java rename to inprocess/src/test/java/io/grpc/inprocess/AnonymousInProcessTransportTest.java diff --git a/core/src/test/java/io/grpc/inprocess/InProcessChannelBuilderTest.java b/inprocess/src/test/java/io/grpc/inprocess/InProcessChannelBuilderTest.java similarity index 100% rename from core/src/test/java/io/grpc/inprocess/InProcessChannelBuilderTest.java rename to inprocess/src/test/java/io/grpc/inprocess/InProcessChannelBuilderTest.java diff --git a/core/src/test/java/io/grpc/inprocess/InProcessClientTransportFactoryTest.java b/inprocess/src/test/java/io/grpc/inprocess/InProcessClientTransportFactoryTest.java similarity index 100% rename from core/src/test/java/io/grpc/inprocess/InProcessClientTransportFactoryTest.java rename to inprocess/src/test/java/io/grpc/inprocess/InProcessClientTransportFactoryTest.java diff --git a/core/src/test/java/io/grpc/inprocess/InProcessServerBuilderTest.java b/inprocess/src/test/java/io/grpc/inprocess/InProcessServerBuilderTest.java similarity index 100% rename from core/src/test/java/io/grpc/inprocess/InProcessServerBuilderTest.java rename to inprocess/src/test/java/io/grpc/inprocess/InProcessServerBuilderTest.java diff --git a/core/src/test/java/io/grpc/inprocess/InProcessServerTest.java b/inprocess/src/test/java/io/grpc/inprocess/InProcessServerTest.java similarity index 100% rename from core/src/test/java/io/grpc/inprocess/InProcessServerTest.java rename to inprocess/src/test/java/io/grpc/inprocess/InProcessServerTest.java diff --git a/core/src/test/java/io/grpc/inprocess/InProcessSocketAddressTest.java b/inprocess/src/test/java/io/grpc/inprocess/InProcessSocketAddressTest.java similarity index 100% rename from core/src/test/java/io/grpc/inprocess/InProcessSocketAddressTest.java rename to inprocess/src/test/java/io/grpc/inprocess/InProcessSocketAddressTest.java diff --git a/core/src/test/java/io/grpc/inprocess/InProcessTransportTest.java b/inprocess/src/test/java/io/grpc/inprocess/InProcessTransportTest.java similarity index 100% rename from core/src/test/java/io/grpc/inprocess/InProcessTransportTest.java rename to inprocess/src/test/java/io/grpc/inprocess/InProcessTransportTest.java diff --git a/core/src/test/java/io/grpc/inprocess/StandaloneInProcessTransportTest.java b/inprocess/src/test/java/io/grpc/inprocess/StandaloneInProcessTransportTest.java similarity index 100% rename from core/src/test/java/io/grpc/inprocess/StandaloneInProcessTransportTest.java rename to inprocess/src/test/java/io/grpc/inprocess/StandaloneInProcessTransportTest.java diff --git a/okhttp/BUILD.bazel b/okhttp/BUILD.bazel index e550634aca..30a77b1146 100644 --- a/okhttp/BUILD.bazel +++ b/okhttp/BUILD.bazel @@ -11,7 +11,7 @@ java_library( deps = [ "//api", "//core:internal", - "//core:util", + "//util", "@com_google_code_findbugs_jsr305//jar", "@com_google_errorprone_error_prone_annotations//jar", "@com_google_guava_guava//jar", diff --git a/okhttp/build.gradle b/okhttp/build.gradle index 37d033350c..daaec3e6fd 100644 --- a/okhttp/build.gradle +++ b/okhttp/build.gradle @@ -9,7 +9,7 @@ plugins { description = "gRPC: OkHttp" dependencies { - api project(':grpc-core') + api project(':grpc-util') implementation libraries.okio, libraries.guava, libraries.perfmark.api diff --git a/repositories.bzl b/repositories.bzl index 79d2f7c510..4ca172b30e 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -69,6 +69,7 @@ IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS = { "io.grpc:grpc-core": "@io_grpc_grpc_java//core:core_maven", "io.grpc:grpc-googleapis": "@io_grpc_grpc_java//googleapis", "io.grpc:grpc-grpclb": "@io_grpc_grpc_java//grpclb", + "io.grpc:grpc-inprocess": "@io_grpc_grpc_java//inprocess", "io.grpc:grpc-netty": "@io_grpc_grpc_java//netty", "io.grpc:grpc-netty-shaded": "@io_grpc_grpc_java//netty:shaded_maven", "io.grpc:grpc-okhttp": "@io_grpc_grpc_java//okhttp", @@ -79,6 +80,7 @@ IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS = { "io.grpc:grpc-stub": "@io_grpc_grpc_java//stub", "io.grpc:grpc-testing": "@io_grpc_grpc_java//testing", "io.grpc:grpc-xds": "@io_grpc_grpc_java//xds:xds_maven", + "io.grpc:grpc-util": "@io_grpc_grpc_java//util", } def grpc_java_repositories(): diff --git a/rls/BUILD.bazel b/rls/BUILD.bazel index d4af356924..c67c7cd56b 100644 --- a/rls/BUILD.bazel +++ b/rls/BUILD.bazel @@ -12,7 +12,7 @@ java_library( "//api", "//core", "//core:internal", - "//core:util", + "//util", "//stub", "@com_google_auto_value_auto_value_annotations//jar", "@com_google_code_findbugs_jsr305//jar", diff --git a/rls/build.gradle b/rls/build.gradle index 453052addf..e57af7b0c8 100644 --- a/rls/build.gradle +++ b/rls/build.gradle @@ -1,5 +1,5 @@ plugins { - id "java" + id "java-library" id "maven-publish" id "com.google.protobuf" id "jacoco" @@ -9,7 +9,7 @@ plugins { description = "gRPC: RouteLookupService Loadbalancing plugin" dependencies { - implementation project(':grpc-core'), + implementation project(':grpc-util'), project(':grpc-protobuf'), project(':grpc-stub'), libraries.auto.value.annotations, diff --git a/services/BUILD.bazel b/services/BUILD.bazel index bf12df6eeb..f4ec14cc25 100644 --- a/services/BUILD.bazel +++ b/services/BUILD.bazel @@ -154,7 +154,7 @@ java_library( ":_health_java_grpc", "//api", "//core:internal", - "//core:util", + "//util", "@com_google_code_findbugs_jsr305//jar", "@com_google_guava_guava//jar", "@io_grpc_grpc_proto//:health_java_proto", diff --git a/services/build.gradle b/services/build.gradle index b834fcd2d7..73cb90d184 100644 --- a/services/build.gradle +++ b/services/build.gradle @@ -19,7 +19,7 @@ tasks.named("compileJava").configure { dependencies { api project(':grpc-protobuf'), project(':grpc-stub'), - project(':grpc-core') + project(':grpc-util') implementation libraries.protobuf.java.util, libraries.guava.jre // JRE required by protobuf-java-util diff --git a/servlet/build.gradle b/servlet/build.gradle index f5ef32ae11..f5b93432a2 100644 --- a/servlet/build.gradle +++ b/servlet/build.gradle @@ -34,7 +34,7 @@ dependencies { compileOnly 'javax.servlet:javax.servlet-api:4.0.1', libraries.javax.annotation // java 9, 10 needs it - implementation project(':grpc-core'), + implementation project(':grpc-util'), libraries.guava testImplementation 'javax.servlet:javax.servlet-api:4.0.1', @@ -43,6 +43,7 @@ dependencies { itImplementation project(':grpc-servlet'), project(':grpc-netty'), project(':grpc-core').sourceSets.test.runtimeClasspath, + project(':grpc-util').sourceSets.test.runtimeClasspath, libraries.junit itImplementation(project(':grpc-interop-testing')) { // Avoid grpc-netty-shaded dependency diff --git a/servlet/jakarta/build.gradle b/servlet/jakarta/build.gradle index 59f5ac78d8..264a47c426 100644 --- a/servlet/jakarta/build.gradle +++ b/servlet/jakarta/build.gradle @@ -74,12 +74,13 @@ dependencies { compileOnly 'jakarta.servlet:jakarta.servlet-api:5.0.0', libraries.javax.annotation - implementation project(':grpc-core'), + implementation project(':grpc-util'), libraries.guava itImplementation project(':grpc-servlet-jakarta'), project(':grpc-netty'), project(':grpc-core').sourceSets.test.runtimeClasspath, + project(':grpc-util').sourceSets.test.runtimeClasspath, libraries.junit itImplementation(project(':grpc-interop-testing')) { // Avoid grpc-netty-shaded dependency diff --git a/settings.gradle b/settings.gradle index 2d2c65c897..f1293fec7c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -60,6 +60,8 @@ include ":grpc-authz" include ":grpc-gcp-observability" include ":grpc-gcp-observability:interop" include ":grpc-istio-interop-testing" +include ":grpc-inprocess" +include ":grpc-util" project(':grpc-api').projectDir = "$rootDir/api" as File project(':grpc-core').projectDir = "$rootDir/core" as File @@ -91,6 +93,8 @@ project(':grpc-authz').projectDir = "$rootDir/authz" as File project(':grpc-gcp-observability').projectDir = "$rootDir/gcp-observability" as File project(':grpc-gcp-observability:interop').projectDir = "$rootDir/gcp-observability/interop" as File project(':grpc-istio-interop-testing').projectDir = "$rootDir/istio-interop-testing" as File +project(':grpc-inprocess').projectDir = "$rootDir/inprocess" as File +project(':grpc-util').projectDir = "$rootDir/util" as File if (settings.hasProperty('skipCodegen') && skipCodegen.toBoolean()) { println '*** Skipping the build of codegen and compilation of proto files because skipCodegen=true' diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel index f1e9a5743e..071a9650b1 100644 --- a/testing/BUILD.bazel +++ b/testing/BUILD.bazel @@ -11,8 +11,8 @@ java_library( deps = [ "//api", "//context", - "//core:inprocess", - "//core:util", + "//inprocess", + "//util", "//stub", "@com_google_code_findbugs_jsr305//jar", "@com_google_guava_guava//jar", diff --git a/testing/build.gradle b/testing/build.gradle index 0c08381a77..43332ba8a7 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -9,7 +9,8 @@ plugins { description = "gRPC: Testing" dependencies { - api project(':grpc-core'), + api project(':grpc-inprocess'), + project(':grpc-util'), project(':grpc-stub'), libraries.junit // Only io.grpc.internal.testing.StatsTestUtils depends on opencensus_api, for internal use. diff --git a/util/BUILD.bazel b/util/BUILD.bazel new file mode 100644 index 0000000000..b95e428f43 --- /dev/null +++ b/util/BUILD.bazel @@ -0,0 +1,18 @@ +java_library( + name = "util", + srcs = glob([ + "src/main/java/io/grpc/util/*.java", + ]), + resources = glob([ + "src/main/resources/**", + ]), + visibility = ["//visibility:public"], + deps = [ + "//api", + "//core:internal", + "@com_google_code_findbugs_jsr305//jar", + "@com_google_guava_guava//jar", + "@com_google_j2objc_j2objc_annotations//jar", + "@org_codehaus_mojo_animal_sniffer_annotations//jar", + ], +) diff --git a/util/build.gradle b/util/build.gradle new file mode 100644 index 0000000000..ffc3e80fbe --- /dev/null +++ b/util/build.gradle @@ -0,0 +1,34 @@ +plugins { + id "java-library" + id "maven-publish" + + id "me.champeau.jmh" + id "ru.vyarus.animalsniffer" +} + +description = 'gRPC: Util' + +dependencies { + api project(':grpc-core') + + implementation libraries.animalsniffer.annotations, + libraries.guava + runtimeOnly libraries.gson // to fix checkUpperBoundDeps error in services + testImplementation testFixtures(project(':grpc-api')), + testFixtures(project(':grpc-core')), + project(':grpc-testing') + testImplementation libraries.guava.testlib + + jmh project(':grpc-testing') + + signature libraries.signature.java + signature libraries.signature.android +} + +animalsniffer { + // Don't check sourceSets.jmh + sourceSets = [ + sourceSets.main, + sourceSets.test + ] +} diff --git a/core/src/jmh/java/io/grpc/util/HandlerRegistryBenchmark.java b/util/src/jmh/java/io/grpc/util/HandlerRegistryBenchmark.java similarity index 100% rename from core/src/jmh/java/io/grpc/util/HandlerRegistryBenchmark.java rename to util/src/jmh/java/io/grpc/util/HandlerRegistryBenchmark.java diff --git a/core/src/main/java/io/grpc/util/AdvancedTlsX509KeyManager.java b/util/src/main/java/io/grpc/util/AdvancedTlsX509KeyManager.java similarity index 100% rename from core/src/main/java/io/grpc/util/AdvancedTlsX509KeyManager.java rename to util/src/main/java/io/grpc/util/AdvancedTlsX509KeyManager.java diff --git a/core/src/main/java/io/grpc/util/AdvancedTlsX509TrustManager.java b/util/src/main/java/io/grpc/util/AdvancedTlsX509TrustManager.java similarity index 100% rename from core/src/main/java/io/grpc/util/AdvancedTlsX509TrustManager.java rename to util/src/main/java/io/grpc/util/AdvancedTlsX509TrustManager.java diff --git a/core/src/main/java/io/grpc/util/CertificateUtils.java b/util/src/main/java/io/grpc/util/CertificateUtils.java similarity index 100% rename from core/src/main/java/io/grpc/util/CertificateUtils.java rename to util/src/main/java/io/grpc/util/CertificateUtils.java diff --git a/core/src/main/java/io/grpc/util/ForwardingClientStreamTracer.java b/util/src/main/java/io/grpc/util/ForwardingClientStreamTracer.java similarity index 100% rename from core/src/main/java/io/grpc/util/ForwardingClientStreamTracer.java rename to util/src/main/java/io/grpc/util/ForwardingClientStreamTracer.java diff --git a/core/src/main/java/io/grpc/util/ForwardingLoadBalancer.java b/util/src/main/java/io/grpc/util/ForwardingLoadBalancer.java similarity index 100% rename from core/src/main/java/io/grpc/util/ForwardingLoadBalancer.java rename to util/src/main/java/io/grpc/util/ForwardingLoadBalancer.java diff --git a/core/src/main/java/io/grpc/util/ForwardingLoadBalancerHelper.java b/util/src/main/java/io/grpc/util/ForwardingLoadBalancerHelper.java similarity index 100% rename from core/src/main/java/io/grpc/util/ForwardingLoadBalancerHelper.java rename to util/src/main/java/io/grpc/util/ForwardingLoadBalancerHelper.java diff --git a/core/src/main/java/io/grpc/util/ForwardingSubchannel.java b/util/src/main/java/io/grpc/util/ForwardingSubchannel.java similarity index 100% rename from core/src/main/java/io/grpc/util/ForwardingSubchannel.java rename to util/src/main/java/io/grpc/util/ForwardingSubchannel.java diff --git a/core/src/main/java/io/grpc/util/GracefulSwitchLoadBalancer.java b/util/src/main/java/io/grpc/util/GracefulSwitchLoadBalancer.java similarity index 100% rename from core/src/main/java/io/grpc/util/GracefulSwitchLoadBalancer.java rename to util/src/main/java/io/grpc/util/GracefulSwitchLoadBalancer.java diff --git a/core/src/main/java/io/grpc/util/MutableHandlerRegistry.java b/util/src/main/java/io/grpc/util/MutableHandlerRegistry.java similarity index 100% rename from core/src/main/java/io/grpc/util/MutableHandlerRegistry.java rename to util/src/main/java/io/grpc/util/MutableHandlerRegistry.java diff --git a/core/src/main/java/io/grpc/util/OutlierDetectionLoadBalancer.java b/util/src/main/java/io/grpc/util/OutlierDetectionLoadBalancer.java similarity index 100% rename from core/src/main/java/io/grpc/util/OutlierDetectionLoadBalancer.java rename to util/src/main/java/io/grpc/util/OutlierDetectionLoadBalancer.java diff --git a/core/src/main/java/io/grpc/util/OutlierDetectionLoadBalancerProvider.java b/util/src/main/java/io/grpc/util/OutlierDetectionLoadBalancerProvider.java similarity index 100% rename from core/src/main/java/io/grpc/util/OutlierDetectionLoadBalancerProvider.java rename to util/src/main/java/io/grpc/util/OutlierDetectionLoadBalancerProvider.java diff --git a/core/src/main/java/io/grpc/util/RoundRobinLoadBalancer.java b/util/src/main/java/io/grpc/util/RoundRobinLoadBalancer.java similarity index 100% rename from core/src/main/java/io/grpc/util/RoundRobinLoadBalancer.java rename to util/src/main/java/io/grpc/util/RoundRobinLoadBalancer.java diff --git a/core/src/main/java/io/grpc/util/SecretRoundRobinLoadBalancerProvider.java b/util/src/main/java/io/grpc/util/SecretRoundRobinLoadBalancerProvider.java similarity index 100% rename from core/src/main/java/io/grpc/util/SecretRoundRobinLoadBalancerProvider.java rename to util/src/main/java/io/grpc/util/SecretRoundRobinLoadBalancerProvider.java diff --git a/core/src/main/java/io/grpc/util/TransmitStatusRuntimeExceptionInterceptor.java b/util/src/main/java/io/grpc/util/TransmitStatusRuntimeExceptionInterceptor.java similarity index 100% rename from core/src/main/java/io/grpc/util/TransmitStatusRuntimeExceptionInterceptor.java rename to util/src/main/java/io/grpc/util/TransmitStatusRuntimeExceptionInterceptor.java diff --git a/core/src/main/java/io/grpc/util/package-info.java b/util/src/main/java/io/grpc/util/package-info.java similarity index 100% rename from core/src/main/java/io/grpc/util/package-info.java rename to util/src/main/java/io/grpc/util/package-info.java diff --git a/core/src/bazel-util/resources/META-INF/services/io.grpc.LoadBalancerProvider b/util/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider similarity index 54% rename from core/src/bazel-util/resources/META-INF/services/io.grpc.LoadBalancerProvider rename to util/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider index 4c21dd2e1b..1fdd69cb00 100644 --- a/core/src/bazel-util/resources/META-INF/services/io.grpc.LoadBalancerProvider +++ b/util/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider @@ -1 +1,2 @@ io.grpc.util.SecretRoundRobinLoadBalancerProvider$Provider +io.grpc.util.OutlierDetectionLoadBalancerProvider diff --git a/core/src/test/java/io/grpc/util/CertificateUtilsTest.java b/util/src/test/java/io/grpc/util/CertificateUtilsTest.java similarity index 100% rename from core/src/test/java/io/grpc/util/CertificateUtilsTest.java rename to util/src/test/java/io/grpc/util/CertificateUtilsTest.java diff --git a/core/src/test/java/io/grpc/util/ForwardingClientStreamTracerTest.java b/util/src/test/java/io/grpc/util/ForwardingClientStreamTracerTest.java similarity index 100% rename from core/src/test/java/io/grpc/util/ForwardingClientStreamTracerTest.java rename to util/src/test/java/io/grpc/util/ForwardingClientStreamTracerTest.java diff --git a/core/src/test/java/io/grpc/util/ForwardingLoadBalancerHelperTest.java b/util/src/test/java/io/grpc/util/ForwardingLoadBalancerHelperTest.java similarity index 100% rename from core/src/test/java/io/grpc/util/ForwardingLoadBalancerHelperTest.java rename to util/src/test/java/io/grpc/util/ForwardingLoadBalancerHelperTest.java diff --git a/core/src/test/java/io/grpc/util/ForwardingLoadBalancerTest.java b/util/src/test/java/io/grpc/util/ForwardingLoadBalancerTest.java similarity index 100% rename from core/src/test/java/io/grpc/util/ForwardingLoadBalancerTest.java rename to util/src/test/java/io/grpc/util/ForwardingLoadBalancerTest.java diff --git a/core/src/test/java/io/grpc/util/ForwardingSubchannelTest.java b/util/src/test/java/io/grpc/util/ForwardingSubchannelTest.java similarity index 100% rename from core/src/test/java/io/grpc/util/ForwardingSubchannelTest.java rename to util/src/test/java/io/grpc/util/ForwardingSubchannelTest.java diff --git a/core/src/test/java/io/grpc/util/GracefulSwitchLoadBalancerTest.java b/util/src/test/java/io/grpc/util/GracefulSwitchLoadBalancerTest.java similarity index 100% rename from core/src/test/java/io/grpc/util/GracefulSwitchLoadBalancerTest.java rename to util/src/test/java/io/grpc/util/GracefulSwitchLoadBalancerTest.java diff --git a/core/src/test/java/io/grpc/util/MutableHandlerRegistryTest.java b/util/src/test/java/io/grpc/util/MutableHandlerRegistryTest.java similarity index 100% rename from core/src/test/java/io/grpc/util/MutableHandlerRegistryTest.java rename to util/src/test/java/io/grpc/util/MutableHandlerRegistryTest.java diff --git a/core/src/test/java/io/grpc/util/OutlierDetectionLoadBalancerProviderTest.java b/util/src/test/java/io/grpc/util/OutlierDetectionLoadBalancerProviderTest.java similarity index 100% rename from core/src/test/java/io/grpc/util/OutlierDetectionLoadBalancerProviderTest.java rename to util/src/test/java/io/grpc/util/OutlierDetectionLoadBalancerProviderTest.java diff --git a/core/src/test/java/io/grpc/util/OutlierDetectionLoadBalancerTest.java b/util/src/test/java/io/grpc/util/OutlierDetectionLoadBalancerTest.java similarity index 100% rename from core/src/test/java/io/grpc/util/OutlierDetectionLoadBalancerTest.java rename to util/src/test/java/io/grpc/util/OutlierDetectionLoadBalancerTest.java diff --git a/core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java b/util/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java similarity index 100% rename from core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java rename to util/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java diff --git a/core/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java b/util/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java similarity index 100% rename from core/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java rename to util/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java diff --git a/xds/BUILD.bazel b/xds/BUILD.bazel index d2c57fde01..d3b746e39f 100644 --- a/xds/BUILD.bazel +++ b/xds/BUILD.bazel @@ -38,7 +38,7 @@ java_library( "//api", "//context", "//core:internal", - "//core:util", + "//util", "//netty", "//stub", "//services:metrics", @@ -145,7 +145,7 @@ java_library( "//api", "//context", "//core:internal", - "//core:util", + "//util", "//protobuf", "//services:metrics", "//services:metrics_internal",