Merge branch 'message-testlib-jars' into protobuf-shading-poc

Author: lqiu96

.cloudbuild/library_generation/library_generation.Dockerfile

@@ -23,6 +23,12 @@ COPY . .
 ENV DOCKER_GAPIC_GENERATOR_VERSION="2.55.2-SNAPSHOT"
 # {x-version-update-end}
 
+# Download the java formatter
+RUN mvn -pl gapic-generator-java-pom-parent help:evaluate -Dexpression='google-java-format.version' -q -DforceStdout > /java-formatter-version
+RUN cat /java-formatter-version
+RUN V=$(cat /java-formatter-version) && curl -o "/google-java-format.jar" "https://maven-central.storage-download.googleapis.com/maven2/com/google/googlejavaformat/google-java-format/${V}/google-java-format-${V}-all-deps.jar"
+
+# Compile and install packages
 RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
 RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_GENERATOR_VERSION}/gapic-generator-java-${DOCKER_GAPIC_GENERATOR_VERSION}.jar" \
   "./gapic-generator-java.jar"
@@ -52,7 +58,6 @@ FROM docker.io/library/python:3.13.2-alpine3.20@sha256:816feb29731cdee64b15b0ae9
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
 ARG PROTOC_VERSION=25.5
 ARG GRPC_VERSION=1.70.0
-ARG JAVA_FORMAT_VERSION=1.7
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
 
@@ -117,6 +122,11 @@ RUN owl-bot copy-code --version
 RUN chmod o+rx $(which owl-bot)
 RUN apk del -r npm && apk cache clean
 
+# copy the Java formatter
+COPY --from=ggj-build "/google-java-format.jar" "${HOME}"/.library_generation/google-java-format.jar
+RUN chmod 755 "${HOME}"/.library_generation/google-java-format.jar
+ENV JAVA_FORMATTER_LOCATION="${HOME}/.library_generation/google-java-format.jar"
+
 # Here we transfer gapic-generator-java from the previous stage.
 # Note that the destination is a well-known location that will be assumed at runtime
 # We hard-code the location string to avoid making it configurable (via ARG) as
@@ -125,12 +135,6 @@ COPY --from=ggj-build "/sdk-platform-java/gapic-generator-java.jar" "${HOME}/.li
 RUN chmod 755 "${HOME}/.library_generation/gapic-generator-java.jar"
 ENV GAPIC_GENERATOR_LOCATION="${HOME}/.library_generation/gapic-generator-java.jar"
 
-# download the Java formatter
-ADD https://maven-central.storage-download.googleapis.com/maven2/com/google/googlejavaformat/google-java-format/${JAVA_FORMAT_VERSION}/google-java-format-${JAVA_FORMAT_VERSION}-all-deps.jar \
-  "${HOME}"/.library_generation/google-java-format.jar
-RUN chmod 755 "${HOME}"/.library_generation/google-java-format.jar
-ENV JAVA_FORMATTER_LOCATION="${HOME}/.library_generation/google-java-format.jar"
-
 # allow users to access the script folders
 RUN chmod -R o+rx /src
 

.github/workflows/downstream_protobuf_compatibility_check_nightly.yaml

@@ -47,7 +47,13 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          # Use Java 11 for this as Linkage Checker is only compatible with Java 11 or below
+          java-version: 8
+          distribution: temurin
+      - run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
+      # Java Client Libraries are compiled with Java 11 and target Java 8. Java 11 is required because GraalVM
+      # minimum support is for Java 11.
+      - uses: actions/setup-java@v4
+        with:
           java-version: 11
           distribution: temurin
       - name: Print Protobuf-Java testing version

.github/workflows/java_sdk_logging.yaml

@@ -62,6 +62,7 @@ function build_program_arguments() {
   done
 }
 
+# TODO(https://github.com/GoogleCloudPlatform/cloud-opensource-java/issues/2395): Java 17+ support for Linkage Checker
 # cloud-opensource-java contains the Linkage Checker tool
 git clone https://github.com/GoogleCloudPlatform/cloud-opensource-java.git
 pushd cloud-opensource-java

.kokoro/nightly/downstream-protobuf-binary-compatibility.sh

@@ -28,11 +28,17 @@ for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma
   git clone "https://github.com/googleapis/$repo.git" --depth=1
   pushd "$repo"
 
+  # Compile with Java 11 and run the tests with Java 8
+  mvn clean compile -T 1C
+
+  export JAVA_HOME="${JAVA8_HOME}"
+  export PATH=$JAVA_HOME/bin:$PATH
+
   # Compile the Handwritten Library with the Protobuf-Java version to test source compatibility
   # Run unit tests to help check for any behavior differences (dependant on coverage)
   if [ "${repo}" == "google-cloud-java" ]; then
     # The `-am` command also builds anything these libraries depend on (i.e. proto-* and grpc-* sub modules)
-    mvn clean test -B -V -ntp \
+    mvn test -B -V -ntp \
       -Dclirr.skip \
       -Denforcer.skip \
       -Dmaven.javadoc.skip \
@@ -41,7 +47,7 @@ for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma
       -pl "${google_cloud_java_handwritten_maven_args}" -am \
       -T 1C
   else
-    mvn clean test -B -V -ntp \
+    mvn test -B -V -ntp \
       -Dclirr.skip \
       -Denforcer.skip \
       -Dmaven.javadoc.skip \

.kokoro/nightly/downstream-protobuf-source-compatibility.sh

@@ -60,7 +60,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.longrunning.Operation;
-import com.google.protobuf.AbstractMessage;
 import com.google.protobuf.Any;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -902,7 +901,7 @@ protected abstract List<Statement> createRpcLroExceptionTestCatchBody(
   private static TypeStore createStaticTypes() {
     List<Class<?>> concreteClazzes =
         Arrays.asList(
-            AbstractMessage.class,
+            com.google.protobuf.Message.class,
             After.class,
             AfterClass.class,
             Any.class,

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java

@@ -36,7 +36,7 @@
 import com.google.api.generator.gapic.model.GapicClass.Kind;
 import com.google.api.generator.gapic.model.GapicContext;
 import com.google.api.generator.gapic.model.Service;
-import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
 import io.grpc.ServerServiceDefinition;
 import java.util.Arrays;
 import java.util.List;
@@ -130,7 +130,7 @@ private static MethodDefinition createGetRequestsMethod(
         TypeNode.withReference(
             ConcreteReference.builder()
                 .setClazz(List.class)
-                .setGenerics(Arrays.asList(typeStore.get("AbstractMessage").reference()))
+                .setGenerics(Arrays.asList(typeStore.get("Message").reference()))
                 .build());
     String methodName = "getRequests";
     Expr returnExpr =
@@ -153,10 +153,7 @@ private static MethodDefinition createAddResponseMethod(
     String methodName = "addResponse";
     VariableExpr responseArgExpr =
         VariableExpr.withVariable(
-            Variable.builder()
-                .setName("response")
-                .setType(typeStore.get("AbstractMessage"))
-                .build());
+            Variable.builder().setName("response").setType(typeStore.get("Message")).build());
 
     Expr methodInvocationExpr =
         MethodInvocationExpr.builder()
@@ -235,8 +232,7 @@ private static MethodDefinition createResetMethod(VariableExpr serviceImplVarExp
 
   private static TypeStore createTypes(Service service) {
     List<Class<?>> concreteClazzes =
-        Arrays.asList(
-            AbstractMessage.class, BetaApi.class, Generated.class, ServerServiceDefinition.class);
+        Arrays.asList(Message.class, BetaApi.class, Generated.class, ServerServiceDefinition.class);
     TypeStore typeStore = new TypeStore(concreteClazzes);
 
     typeStore.put("com.google.api.gax.grpc.testing", "MockGrpcService");

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java

@@ -51,7 +51,7 @@
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.longrunning.Operation;
-import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
 import io.grpc.ServerServiceDefinition;
 import io.grpc.stub.StreamObserver;
 import java.util.ArrayList;
@@ -75,8 +75,7 @@ public class MockServiceImplClassComposer implements ClassComposer {
                   TypeNode.withReference(
                       ConcreteReference.builder()
                           .setClazz(List.class)
-                          .setGenerics(
-                              Arrays.asList(FIXED_TYPESTORE.get("AbstractMessage").reference()))
+                          .setGenerics(Arrays.asList(FIXED_TYPESTORE.get("Message").reference()))
                           .build()))
               .build());
 
@@ -179,10 +178,7 @@ private static MethodDefinition createGetRequestsMethod() {
   private static MethodDefinition createAddResponseMethod() {
     VariableExpr responseArgExpr =
         VariableExpr.withVariable(
-            Variable.builder()
-                .setName("response")
-                .setType(FIXED_TYPESTORE.get("AbstractMessage"))
-                .build());
+            Variable.builder().setName("response").setType(FIXED_TYPESTORE.get("Message")).build());
     Expr methodInvocationExpr =
         MethodInvocationExpr.builder()
             .setMethodName("add")
@@ -207,8 +203,7 @@ private static MethodDefinition createSetResponsesMethod(Service service) {
                     TypeNode.withReference(
                         ConcreteReference.builder()
                             .setClazz(List.class)
-                            .setGenerics(
-                                Arrays.asList(FIXED_TYPESTORE.get("AbstractMessage").reference()))
+                            .setGenerics(Arrays.asList(FIXED_TYPESTORE.get("Message").reference()))
                             .build()))
                 .build());
     Expr responseAssignExpr =
@@ -598,7 +593,7 @@ private static Statement createHandleObjectStatement(
   private static TypeStore createStaticTypes() {
     List<Class<?>> concreteClazzes =
         Arrays.asList(
-            AbstractMessage.class,
+            Message.class,
             ArrayList.class,
             BetaApi.class,
             Generated.class,

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java

@@ -53,7 +53,6 @@
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.common.base.Preconditions;
-import com.google.protobuf.AbstractMessage;
 import io.grpc.StatusRuntimeException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -378,7 +377,7 @@ protected List<Statement> constructRpcTestCheckerLogic(
                         ConcreteReference.builder()
                             .setClazz(List.class)
                             .setGenerics(
-                                Arrays.asList(ConcreteReference.withClazz(AbstractMessage.class)))
+                                Arrays.asList(ConcreteReference.withClazz(com.google.protobuf.Message.class)))
                             .build()))
                 .setName("actualRequests")
                 .build());
@@ -416,7 +415,7 @@ protected List<Statement> constructRpcTestCheckerLogic(
             .setArguments(
                 ValueExpr.withValue(
                     PrimitiveValue.builder().setType(TypeNode.INT).setValue("0").build()))
-            .setReturnType(FIXED_TYPESTORE.get("AbstractMessage"))
+            .setReturnType(FIXED_TYPESTORE.get("Message"))
             .build();
     getFirstRequestExpr =
         CastExpr.builder().setType(method.inputType()).setExpr(getFirstRequestExpr).build();

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java

@@ -2,7 +2,7 @@ package com.google.testdata.v1;
 
 import com.google.api.core.BetaApi;
 import com.google.api.gax.grpc.testing.MockGrpcService;
-import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
 import io.grpc.ServerServiceDefinition;
 import java.util.List;
 import javax.annotation.Generated;
@@ -17,12 +17,12 @@ public class MockDeprecatedService implements MockGrpcService {
   }
 
   @Override
-  public List<AbstractMessage> getRequests() {
+  public List<Message> getRequests() {
     return serviceImpl.getRequests();
   }
 
   @Override
-  public void addResponse(AbstractMessage response) {
+  public void addResponse(Message response) {
     serviceImpl.addResponse(response);
   }