core, inprocess, util: move inprocess and util code into their own new artifacts grpc-inprocess and grpc-util

core/BUILD.bazel

@@ -4,33 +4,16 @@ java_library(
     exports = ["//api"],
 )
 
-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",
-    ],
-)
-
 java_library(
     name = "internal",
+    visibility = ["//visibility:public"],
     srcs = glob([
         "src/main/java/io/grpc/internal/*.java",
     ]),
     javacopts = ["-Xep:DoNotCall:OFF"],  # Remove once requiring Bazel 3.4.0+; allows non-final
     resources = glob([
         "src/bazel-internal/resources/**",
     ]),
-    visibility = ["//:__subpackages__"],
     deps = [
         "//api",
         "//context",
@@ -45,35 +28,14 @@ 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",
-    ],
-)
-
 # Mirrors the dependencies included in the artifact on Maven Central for usage
 # with maven_install's override_targets. Should only be used as a dep for
 # pre-compiled binaries on Maven Central.
 java_library(
     name = "core_maven",
     visibility = ["//visibility:public"],
     exports = [
-        ":inprocess",
         ":internal",
-        ":util",
         "//api",
     ],
 )

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

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",

grpclb/build.gradle

@@ -10,7 +10,7 @@ plugins {
 description = "gRPC: GRPCLB LoadBalancer plugin"
 
 dependencies {
-    implementation project(':grpc-core'),
+    implementation project(':grpc-inprocess'),
             project(':grpc-protobuf'),
             project(':grpc-stub'),
             libraries.protobuf.java,

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",
+    ],
+)

inprocess/build.gradle

@@ -0,0 +1,65 @@
+plugins {
+    id "java-library"
+    id "java-test-fixtures"
+    id "maven-publish"
+
+    id "me.champeau.jmh"
+    id "ru.vyarus.animalsniffer"
+}
+
+import static java.nio.charset.StandardCharsets.US_ASCII;
+
+import com.google.common.primitives.Bytes;
+
+description = 'gRPC: Inprocess'
+
+dependencies {
+    api project(':grpc-core')
+    // force dependent jars to depend on latest grpc-context
+    runtimeOnly project(":grpc-context")
+    implementation libraries.gson,
+            libraries.android.annotations,
+            libraries.animalsniffer.annotations,
+            libraries.errorprone.annotations,
+            libraries.guava,
+            libraries.perfmark.api
+    testFixturesApi libraries.junit
+    testFixturesImplementation libraries.guava,
+            libraries.mockito.core,
+            libraries.truth,
+            project(':grpc-testing')
+    testImplementation testFixtures(project(':grpc-api')),
+            project(':grpc-testing'),
+            project(':grpc-grpclb'),
+            testFixtures(project(':grpc-core'))
+    testImplementation libraries.guava.testlib
+
+    testRuntimeOnly project(':grpc-census')
+
+    jmh project(':grpc-testing')
+
+    signature libraries.signature.java
+    signature libraries.signature.android
+}
+
+tasks.named("javadoc").configure {
+    exclude 'io/grpc/inprocess/Internal*'
+}
+
+animalsniffer {
+    // Don't check sourceSets.jmh
+    sourceSets = [
+        sourceSets.main,
+        sourceSets.test
+    ]
+}
+
+components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { skip() }
+components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) { skip() }
+
+
+tasks.register("versionFile") {
+    doLast {
+        new File(buildDir, "version").write("${project.version}\n")
+    }
+}

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",

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

repositories.bzl

@@ -79,6 +79,8 @@ 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-inprocess": "@io_grpc_grpc_java//inprocess",
+    "io.grpc:grpc-util": "@io_grpc_grpc_java//util",
 }
 
 def grpc_java_repositories():

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",

rls/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "java"
+    id "java-library"
     id "maven-publish"
     id "com.google.protobuf"
     id "jacoco"
@@ -9,8 +9,8 @@ plugins {
 description = "gRPC: RouteLookupService Loadbalancing plugin"
 
 dependencies {
-    implementation project(':grpc-core'),
-            project(':grpc-protobuf'),
+    api project(':grpc-util')
+    implementation project(':grpc-protobuf'),
             project(':grpc-stub'),
             libraries.auto.value.annotations,
             libraries.guava

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",

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
 

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

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

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'

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",

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.

util/BUILD.bazel

@@ -0,0 +1,30 @@
+java_library(
+    name = "util",
+    srcs = glob([
+        "src/main/java/io/grpc/util/*.java",
+    ]),
+    resources = glob([
+        "src/bazel-util/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",
+    ],
+)
+
+# Mirrors the dependencies included in the artifact on Maven Central for usage
+# with maven_install's override_targets. Should only be used as a dep for
+# pre-compiled binaries on Maven Central.
+java_library(
+    name = "util_maven",
+    visibility = ["//visibility:public"],
+    exports = [
+        ":util",
+        "//api",
+    ],
+)