fix: address PR review feedback on java-cloud-bom migration

Author: jinseopkim0

java-cloud-bom/dashboard/src/main/java/com/google/cloud/tools/opensource/cloudbomdashboard/ArtifactMavenData.java

@@ -116,7 +116,10 @@ private static LatestMetadata getLatestVersionAndLastUpdated(String metadataUrl)
       FileUtils.copyURLToFile(url, metadataFile);
 
       MetadataXpp3Reader reader = new MetadataXpp3Reader();
-      Metadata metadata = reader.read(new FileInputStream(metadataFile));
+      Metadata metadata;
+      try (FileInputStream fis = new FileInputStream(metadataFile)) {
+        metadata = reader.read(fis);
+      }
 
       if (metadata.getVersioning() == null) {
         return new LatestMetadata("", "");
@@ -210,7 +213,10 @@ private static Optional<String> getSharedDependenciesVersionFromUrl(String pomUr
       BufferedInputStream input = new BufferedInputStream(url.openStream());
       FileUtils.copyInputStreamToFile(input, pomFile);
       MavenXpp3Reader read = new MavenXpp3Reader();
-      Model model = read.read(new FileInputStream(pomFile));
+      Model model;
+      try (FileInputStream fis = new FileInputStream(pomFile)) {
+        model = read.read(fis);
+      }
       ModelBuildingRequest request = new DefaultModelBuildingRequest();
       request.setRawModel(model);
       RepositorySystem repositorySystem = RepositoryUtility.newRepositorySystem();

java-cloud-bom/dashboard/src/main/java/com/google/cloud/tools/opensource/cloudbomdashboard/DashboardMain.java

@@ -121,11 +121,11 @@ public static void main(String[] arguments)
       Path relativePath = dashboardArguments.getOutputFile();
       Files.createDirectories(relativePath.getParent());
       File file = new File(String.valueOf(relativePath));
-      OutputStream outputStream = new FileOutputStream(file);
-      if (!report(bom, outputStream)) {
-        throw new RuntimeException("Failed to converge dependencies");
+      try (OutputStream outputStream = new FileOutputStream(file)) {
+        if (!report(bom, outputStream)) {
+          throw new RuntimeException("Failed to converge dependencies");
+        }
       }
-      outputStream.close();
     }
   }
 

java-cloud-bom/libraries-bom-table-generation/updateREADMETable.py

@@ -19,15 +19,15 @@ def run_maven_flatten_clean():
 root = tree.getroot()
 
 # Load the metadata
-with open('libraries-bom-table-generation/javaModulesMetadata.yaml', 'r') as metadata_file:
+with open('libraries-bom-table-generation/javaModulesMetadata.yaml', 'r', encoding='utf-8') as metadata_file:
   metadata = yaml.safe_load(metadata_file)
 
 # Manual list of runtime modules
 runtime_modules = ['google-http-client',
                    'gax',
                    'api-common',
                    'google-cloud-core',
-                   'google-iam-policy'
+                   'google-iam-policy',
                    'google-auth-library',
                    ]
 
@@ -120,7 +120,7 @@ def run_maven_flatten_clean():
   # Append the dependency to the table
   table += f"| {artifact_id} | {library_type} | {library_reference_hyperlink} | {product_reference_hyperlink} |\n"
 
-with open('README.md', 'r') as readme_file:
+with open('README.md', 'r', encoding='utf-8') as readme_file:
   readme = readme_file.read()
 
 # Update existing table in README.md
@@ -129,6 +129,6 @@ def run_maven_flatten_clean():
 table_pattern = re.compile(r'(?s)<!-- TABLE_START -->.*?<!-- TABLE_END -->')
 updated_readme = table_pattern.sub(table_start_comment + "\n" + table + table_end_comment, readme)
 
-with open('README.md', 'w') as readme_file:
+with open('README.md', 'w', encoding='utf-8') as readme_file:
   readme_file.write(updated_readme)
 run_maven_flatten_clean()

java-cloud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java

@@ -614,12 +614,12 @@ static String fetchReleaseNote(String owner, String repository, String tag)
 
     ProcessBuilder builder =
         new ProcessBuilder("gh", "release", "--repo", owner + "/" + repository, "view", tag);
+    builder.redirectErrorStream(true);
     Process process = builder.start();
-    String errorOutput = new String(process.getErrorStream().readAllBytes());
+    String output = new String(process.getInputStream().readAllBytes(), java.nio.charset.StandardCharsets.UTF_8);
     boolean finished = process.waitFor(1, TimeUnit.MINUTES);
     Verify.verify(finished, "The process timed out");
-    Verify.verify(0 == process.exitValue(), "The command failed: %s", errorOutput);
-    String output = new String(process.getInputStream().readAllBytes());
+    Verify.verify(0 == process.exitValue(), "The command failed: %s", output);
     return output;
   }
 }

java-cloud-bom/tests/validate-bom/src/main/java/com/google/cloud/CreateBomCanaryProject.java

@@ -55,7 +55,7 @@ public static void main(String[] arguments) throws Exception {
             .replace("DEPENDENCIES", dependenciesSection);
 
     Path pomToWrite = outputProjectDirectory.resolve("pom.xml");
-    Files.write(pomToWrite, replacedContent.getBytes());
+    Files.write(pomToWrite, replacedContent.getBytes(java.nio.charset.StandardCharsets.UTF_8));
     System.out.println("Wrote " + pomToWrite);
   }
 
@@ -64,7 +64,7 @@ private static String readPomTemplate() throws IOException {
     try (InputStream inputStream =
         CreateBomCanaryProject.class.getClassLoader().getResourceAsStream("template.pom.xml")) {
       Verify.verifyNotNull(inputStream);
-      return new String(inputStream.readAllBytes());
+      return new String(com.google.common.io.ByteStreams.toByteArray(inputStream), java.nio.charset.StandardCharsets.UTF_8);
     }
   }