feat: Fix google java style issues

hocinehacherouf · hocinehacherouf · commit 385ea88a338e · 2025-10-16T19:37:50.000+02:00
diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/api/JibContainer.java b/jib-core/src/main/java/com/google/cloud/tools/jib/api/JibContainer.java
@@ -101,13 +101,16 @@ public Set<String> getTags() {
   }
 
   /**
-   * Get the image tags with digest
+   * Get the image tags with digest.
+   *
    * @return the image tags with digest
    */
   public Set<String> getImageTagsWithDigest() {
     return tags.stream()
-            .map(tag -> {
-              StringBuilder imageTagWithDigest = new StringBuilder()
+        .map(
+            tag -> {
+              StringBuilder imageTagWithDigest =
+                  new StringBuilder()
                       .append(targetImage.getRegistry())
                       .append("/")
                       .append(targetImage.getRepository())
@@ -117,7 +120,7 @@ public Set<String> getImageTagsWithDigest() {
                       .append(imageDigest);
               return imageTagWithDigest.toString();
             })
-            .collect(Collectors.toSet());
+        .collect(Collectors.toSet());
   }
 
   @Override
diff --git a/jib-core/src/test/java/com/google/cloud/tools/jib/api/JibContainerTest.java b/jib-core/src/test/java/com/google/cloud/tools/jib/api/JibContainerTest.java
@@ -23,11 +23,8 @@
 import com.google.cloud.tools.jib.configuration.ImageConfiguration;
 import com.google.common.collect.ImmutableSet;
 import java.security.DigestException;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -151,18 +148,21 @@ public void testCreation_withBuildContextAndBuildResult() {
   public void testGetImageTagsWithDigest_constructsCorrectImageTagsWithDigest() {
     JibContainer container = new JibContainer(targetImage1, digest1, digest2, tags1, true);
 
-    Set<String> expectedImageTagsWithDigest = tags1.stream()
-            .map(tag -> {
-              StringBuilder imageTagWithDigest = new StringBuilder()
-                      .append(targetImage1.getRegistry())
-                      .append("/")
-                      .append(targetImage1.getRepository())
-                      .append(":")
-                      .append(tag)
-                      .append("@")
-                      .append(digest1);
-              return imageTagWithDigest.toString();
-            })
+    Set<String> expectedImageTagsWithDigest =
+        tags1.stream()
+            .map(
+                tag -> {
+                  StringBuilder imageTagWithDigest =
+                      new StringBuilder()
+                          .append(targetImage1.getRegistry())
+                          .append("/")
+                          .append(targetImage1.getRepository())
+                          .append(":")
+                          .append(tag)
+                          .append("@")
+                          .append(digest1);
+                  return imageTagWithDigest.toString();
+                })
             .collect(Collectors.toSet());
 
     Set<String> imageTagsWithDigest = container.getImageTagsWithDigest();
diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/OutputPathsParameters.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/OutputPathsParameters.java
@@ -61,7 +61,8 @@ public void setDigest(String digest) {
 
   @Input
   public String getImageTagDigest() {
-    return getRelativeToProjectRoot(imageTagDigest, PropertyNames.OUTPUT_PATHS_IMAGE_TAG_DIGEST).toString();
+    return getRelativeToProjectRoot(imageTagDigest, PropertyNames.OUTPUT_PATHS_IMAGE_TAG_DIGEST)
+        .toString();
   }
 
   @Internal
diff --git a/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/GradleRawConfigurationTest.java b/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/GradleRawConfigurationTest.java
@@ -103,7 +103,8 @@ public void testGetters() {
         .thenReturn(new HashMap<>(ImmutableMap.of("docker", "client")));
 
     Mockito.when(outputPathsParameters.getDigestPath()).thenReturn(Paths.get("digest/path"));
-    Mockito.when(outputPathsParameters.getImageTagDigestPath()).thenReturn(Paths.get("image-tag-digest/path"));
+    Mockito.when(outputPathsParameters.getImageTagDigestPath())
+        .thenReturn(Paths.get("image-tag-digest/path"));
     Mockito.when(outputPathsParameters.getImageIdPath()).thenReturn(Paths.get("id/path"));
     Mockito.when(outputPathsParameters.getImageJsonPath()).thenReturn(Paths.get("json/path"));
     Mockito.when(outputPathsParameters.getTarPath()).thenReturn(Paths.get("tar/path"));
@@ -148,7 +149,8 @@ public void testGetters() {
         new HashMap<>(ImmutableMap.of("docker", "client")),
         rawConfiguration.getDockerEnvironment());
     Assert.assertEquals(Paths.get("digest/path"), rawConfiguration.getDigestOutputPath());
-    Assert.assertEquals(Paths.get("image-tag-digest/path"), rawConfiguration.getImageTagDigestOutputPath());
+    Assert.assertEquals(
+        Paths.get("image-tag-digest/path"), rawConfiguration.getImageTagDigestOutputPath());
     Assert.assertEquals(Paths.get("id/path"), rawConfiguration.getImageIdOutputPath());
     Assert.assertEquals(Paths.get("json/path"), rawConfiguration.getImageJsonOutputPath());
     Assert.assertEquals(Paths.get("tar/path"), rawConfiguration.getTarOutputPath());
diff --git a/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/JibPluginConfiguration.java b/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/JibPluginConfiguration.java
@@ -779,9 +779,9 @@ Path getDigestOutputPath() {
 
   Path getImageTagDigestOutputPath() {
     Path configuredPath =
-            outputPaths.imageTagDigest == null
-                    ? Paths.get(getProject().getBuild().getDirectory()).resolve("jib-image-tag.digest")
-                    : outputPaths.imageTagDigest.toPath();
+        outputPaths.imageTagDigest == null
+            ? Paths.get(getProject().getBuild().getDirectory()).resolve("jib-image-tag.digest")
+            : outputPaths.imageTagDigest.toPath();
     return getRelativeToProjectRoot(configuredPath, PropertyNames.OUTPUT_PATHS_IMAGE_TAG_DIGEST);
   }
 
diff --git a/jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/JibPluginConfigurationTest.java b/jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/JibPluginConfigurationTest.java
@@ -207,8 +207,6 @@ public void testSystemPropertiesOutputPaths() {
     assertThat(testPluginConfiguration.getDigestOutputPath()).isEqualTo(Paths.get("/digest/path"));
     sessionSystemProperties.put("jib.outputPaths.imageTagDigest", "/image-tag-digest/path");
     assertThat(testPluginConfiguration.getImageTagDigestOutputPath()).isEqualTo(Paths.get("/image-tag-digest/path"));
-    sessionSystemProperties.put("jib.outputPaths.imageTagDigest", "/image-tag-digest/path");
-    assertThat(testPluginConfiguration.getImageTagDigestOutputPath()).isEqualTo(Paths.get("/image-tag-digest/path"));
     sessionSystemProperties.put("jib.outputPaths.imageId", "/id/path");
     assertThat(testPluginConfiguration.getImageIdOutputPath()).isEqualTo(Paths.get("/id/path"));
     sessionSystemProperties.put("jib.outputPaths.tar", "/tar/path");
@@ -331,7 +329,8 @@ public void testPomPropertiesOutputPaths() {
     project.getProperties().setProperty("jib.outputPaths.digest", "/digest/path");
     assertThat(testPluginConfiguration.getDigestOutputPath()).isEqualTo(Paths.get("/digest/path"));
     project.getProperties().setProperty("jib.outputPaths.imageTagDigest", "/image-tag-digest/path");
-    assertThat(testPluginConfiguration.getImageTagDigestOutputPath()).isEqualTo(Paths.get("/image-tag-digest/path"));
+    assertThat(testPluginConfiguration.getImageTagDigestOutputPath())
+        .isEqualTo(Paths.get("/image-tag-digest/path"));
     project.getProperties().setProperty("jib.outputPaths.imageId", "/id/path");
     assertThat(testPluginConfiguration.getImageIdOutputPath()).isEqualTo(Paths.get("/id/path"));
     project.getProperties().setProperty("jib.outputPaths.imageJson", "/json/path");
diff --git a/jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/MavenRawConfigurationTest.java b/jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/MavenRawConfigurationTest.java
@@ -100,7 +100,8 @@ public void testGetters() {
     Mockito.when(jibPluginConfiguration.getDockerClientEnvironment())
         .thenReturn(new HashMap<>(ImmutableMap.of("docker", "client")));
     Mockito.when(jibPluginConfiguration.getDigestOutputPath()).thenReturn(Paths.get("digest/path"));
-    Mockito.when(jibPluginConfiguration.getImageTagDigestOutputPath()).thenReturn(Paths.get("image-tag-digest/path"));
+    Mockito.when(jibPluginConfiguration.getImageTagDigestOutputPath())
+        .thenReturn(Paths.get("image-tag-digest/path"));
     Mockito.when(jibPluginConfiguration.getImageIdOutputPath()).thenReturn(Paths.get("id/path"));
     Mockito.when(jibPluginConfiguration.getImageJsonOutputPath())
         .thenReturn(Paths.get("json/path"));
@@ -145,7 +146,8 @@ public void testGetters() {
         new HashMap<>(ImmutableMap.of("docker", "client")),
         rawConfiguration.getDockerEnvironment());
     Assert.assertEquals(Paths.get("digest/path"), jibPluginConfiguration.getDigestOutputPath());
-    Assert.assertEquals(Paths.get("image-tag-digest/path"), jibPluginConfiguration.getImageTagDigestOutputPath());
+    Assert.assertEquals(
+        Paths.get("image-tag-digest/path"), jibPluginConfiguration.getImageTagDigestOutputPath());
     Assert.assertEquals(Paths.get("id/path"), jibPluginConfiguration.getImageIdOutputPath());
     Assert.assertEquals(Paths.get("json/path"), jibPluginConfiguration.getImageJsonOutputPath());
     Assert.assertEquals(Paths.get("tar/path"), jibPluginConfiguration.getTarOutputPath());
diff --git a/jib-plugins-common/src/test/java/com/google/cloud/tools/jib/plugins/common/JibBuildRunnerTest.java b/jib-plugins-common/src/test/java/com/google/cloud/tools/jib/plugins/common/JibBuildRunnerTest.java
@@ -256,23 +256,25 @@ public void testBuildImage_writesImageJson() throws Exception {
 
   @Test
   public void testBuildImage_writeImageTagDigest() throws Exception {
-    Set<String> imageTagsDigest = ImmutableSet.of(
+    Set<String> imageTagsDigest =
+        ImmutableSet.of(
             "gcr.io/project/image:latest@sha256:abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789",
             "gcr.io/project/image:custom-tag@sha256:abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789");
 
-    String expectedImageTagsDigestOutput = "gcr.io/project/image:latest@sha256:abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789\n" +
-            "gcr.io/project/image:custom-tag@sha256:abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789\n";
+    String expectedImageTagsDigestOutput =
+        "gcr.io/project/image:latest@sha256:abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789\n"
+            + "gcr.io/project/image:custom-tag@sha256:abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789\n";
 
     final Path outputPath = temporaryFolder.newFile("jib-image-tag.digest").toPath();
 
     Mockito.when(mockJibContainer.getImageTagsWithDigest()).thenReturn(imageTagsDigest);
     Mockito.when(mockJibContainerBuilder.containerize(mockContainerizer))
-            .thenReturn(mockJibContainer);
-    Mockito.when(mockJibContainer.isImagePushed()).thenReturn(true);
+        .thenReturn(mockJibContainer);
 
     testJibBuildRunner.writeImageTagDigest(outputPath).runBuild();
 
-    final String imageTagDigestOutput = new String(Files.readAllBytes(outputPath), StandardCharsets.UTF_8);
+    final String imageTagDigestOutput =
+        new String(Files.readAllBytes(outputPath), StandardCharsets.UTF_8);
 
     Assert.assertEquals(expectedImageTagsDigestOutput, imageTagDigestOutput);
   }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@ public void setDigest(String digest) {`
`61`	`61`
`62`	`62`	`@Input`
`63`	`63`	`public String getImageTagDigest() {`
`64`		`- return getRelativeToProjectRoot(imageTagDigest, PropertyNames.OUTPUT_PATHS_IMAGE_TAG_DIGEST).toString();`
	`64`	`+ return getRelativeToProjectRoot(imageTagDigest, PropertyNames.OUTPUT_PATHS_IMAGE_TAG_DIGEST)`
	`65`	`+ .toString();`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`@Internal`