Merge branch 'main' into jdk8-showcase

Author: mpeddada1

.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml

@@ -20,7 +20,7 @@ substitutions:
   _PRIVATE_LATEST_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:latest"
   _PRIVATE_VERSIONED_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:${_GAPIC_GENERATOR_JAVA_VERSION}"
   _PUBLIC_IMAGE_NAME: "gcr.io/cloud-devrel-public-resources/java-library-generation"
-  _PUBLIC_SHA_IMAGE_ID: "${_PUBLIC_IMAGE_NAME}:${COMMIT_SHA}"
+  _PUBLIC_SHA_IMAGE_ID: "${_PUBLIC_IMAGE_NAME}:infrastructure-public-image-${COMMIT_SHA}"
   _PUBLIC_LATEST_IMAGE_ID: "${_PUBLIC_IMAGE_NAME}:latest"
   _PUBLIC_VERSIONED_IMAGE_ID: "${_PUBLIC_IMAGE_NAME}:${_GAPIC_GENERATOR_JAVA_VERSION}"
 steps:

java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITHttpAnnotation.java

@@ -31,6 +31,7 @@
 import com.google.showcase.v1beta1.it.util.TestClientInitializer;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.util.List;
 import java.util.Map;
@@ -73,7 +74,8 @@ static void createClients() throws IOException, GeneralSecurityException {
                 Objects.requireNonNull(
                     ITHttpAnnotation.class
                         .getClassLoader()
-                        .getResourceAsStream("compliance_suite.json"))),
+                        .getResourceAsStream("compliance_suite.json")),
+                StandardCharsets.UTF_8),
             builder);
     complianceSuite = builder.build();