Upgrade Google Java Formatter (GoogleContainerTools#3459)

aivantsov · Sep 13, 2021 · 5e9a65f · 5e9a65f
1 parent 6844d3a
commit 5e9a65f
Show file tree

Hide file tree

Showing 36 changed files with 75 additions and 210 deletions.
diff --git a/build.gradle b/build.gradle
@@ -144,7 +144,7 @@ subprojects {
 
   /* GOOGLE JAVA FORMAT */
   googleJavaFormat {
-    toolVersion = '1.6'
+    toolVersion = '1.7'
   }
   check.dependsOn verifyGoogleJavaFormat
   /* GOOGLE JAVA FORMAT */

diff --git a/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/buildfile/BuildFiles.java b/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/buildfile/BuildFiles.java
@@ -107,9 +107,7 @@ private static JibContainerBuilder createJibContainerBuilder(
       BaseImageSpec baseImageSpec, CommonCliOptions commonCliOptions, ConsoleLogger logger)
       throws InvalidImageReferenceException, FileNotFoundException {
     LinkedHashSet<Platform> platforms =
-        baseImageSpec
-            .getPlatforms()
-            .stream()
+        baseImageSpec.getPlatforms().stream()
             .map(platformSpec -> new Platform(platformSpec.getArchitecture(), platformSpec.getOs()))
             .collect(Collectors.toCollection(LinkedHashSet::new));
     return ContainerBuilders.create(baseImageSpec.getImage(), platforms, commonCliOptions, logger);

diff --git a/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/buildfile/Layers.java b/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/buildfile/Layers.java
@@ -95,15 +95,11 @@ static List<FileEntriesLayer> toLayers(Path buildRoot, LayersSpec layersSpec) th
                 filePropertiesStack.getOwnership());
           } else if (Files.isDirectory(src)) { // directory
             List<PathMatcher> excludes =
-                copySpec
-                    .getExcludes()
-                    .stream()
+                copySpec.getExcludes().stream()
                     .map(Layers::toPathMatcher)
                     .collect(Collectors.toList());
             List<PathMatcher> includes =
-                copySpec
-                    .getIncludes()
-                    .stream()
+                copySpec.getIncludes().stream()
                     .map(Layers::toPathMatcher)
                     .collect(Collectors.toList());
             try (Stream<Path> dirWalk = Files.walk(src)) {

diff --git a/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/jar/JarLayers.java b/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/jar/JarLayers.java
@@ -54,8 +54,7 @@ static List<FileEntriesLayer> getDependenciesLayers(Path jarPath, ProcessingMode
       Predicate<String> isSnapshot = name -> name.contains("SNAPSHOT");
       List<String> allDependencies = Splitter.onPattern("\\s+").splitToList(classPath.trim());
       List<Path> nonSnapshots =
-          allDependencies
-              .stream()
+          allDependencies.stream()
               .filter(isSnapshot.negate())
               .map(Paths::get)
               .collect(Collectors.toList());

diff --git a/...cli/src/test/java/com/google/cloud/tools/jib/cli/jar/SpringBootExplodedProcessorTest.java b/...cli/src/test/java/com/google/cloud/tools/jib/cli/jar/SpringBootExplodedProcessorTest.java
@@ -76,9 +76,7 @@ public void testCreateLayers_layered_allListed() throws IOException, URISyntaxEx
 
     assertThat(nonSnapshotLayer.getName()).isEqualTo("dependencies");
     assertThat(
-            nonSnapshotLayer
-                .getEntries()
-                .stream()
+            nonSnapshotLayer.getEntries().stream()
                 .map(FileEntry::getExtractionPath)
                 .collect(Collectors.toList()))
         .containsExactly(
@@ -87,9 +85,7 @@ public void testCreateLayers_layered_allListed() throws IOException, URISyntaxEx
 
     assertThat(loaderLayer.getName()).isEqualTo("spring-boot-loader");
     assertThat(
-            loaderLayer
-                .getEntries()
-                .stream()
+            loaderLayer.getEntries().stream()
                 .map(FileEntry::getExtractionPath)
                 .collect(Collectors.toList()))
         .containsExactly(
@@ -98,18 +94,14 @@ public void testCreateLayers_layered_allListed() throws IOException, URISyntaxEx
 
     assertThat(snapshotLayer.getName()).isEqualTo("snapshot-dependencies");
     assertThat(
-            snapshotLayer
-                .getEntries()
-                .stream()
+            snapshotLayer.getEntries().stream()
                 .map(FileEntry::getExtractionPath)
                 .collect(Collectors.toList()))
         .containsExactly(AbsoluteUnixPath.get("/app/BOOT-INF/lib/dependency3-SNAPSHOT.jar"));
 
     assertThat(applicationLayer.getName()).isEqualTo("application");
     assertThat(
-            applicationLayer
-                .getEntries()
-                .stream()
+            applicationLayer.getEntries().stream()
                 .map(FileEntry::getExtractionPath)
                 .collect(Collectors.toList()))
         .containsExactly(
@@ -147,9 +139,7 @@ public void testCreateLayers_layered_singleEmptyLayerListed()
 
     assertThat(nonSnapshotLayer.getName()).isEqualTo("dependencies");
     assertThat(
-            nonSnapshotLayer
-                .getEntries()
-                .stream()
+            nonSnapshotLayer.getEntries().stream()
                 .map(FileEntry::getExtractionPath)
                 .collect(Collectors.toList()))
         .containsExactly(
@@ -158,9 +148,7 @@ public void testCreateLayers_layered_singleEmptyLayerListed()
 
     assertThat(loaderLayer.getName()).isEqualTo("spring-boot-loader");
     assertThat(
-            loaderLayer
-                .getEntries()
-                .stream()
+            loaderLayer.getEntries().stream()
                 .map(FileEntry::getExtractionPath)
                 .collect(Collectors.toList()))
         .containsExactly(
@@ -169,9 +157,7 @@ public void testCreateLayers_layered_singleEmptyLayerListed()
 
     assertThat(applicationLayer.getName()).isEqualTo("application");
     assertThat(
-            applicationLayer
-                .getEntries()
-                .stream()
+            applicationLayer.getEntries().stream()
                 .map(FileEntry::getExtractionPath)
                 .collect(Collectors.toList()))
         .containsExactly(
@@ -218,9 +204,7 @@ public void testCreateLayers_nonLayered() throws IOException, URISyntaxException
 
     assertThat(nonSnapshotLayer.getName()).isEqualTo("dependencies");
     assertThat(
-            nonSnapshotLayer
-                .getEntries()
-                .stream()
+            nonSnapshotLayer.getEntries().stream()
                 .map(FileEntry::getExtractionPath)
                 .collect(Collectors.toList()))
         .containsExactly(
@@ -229,9 +213,7 @@ public void testCreateLayers_nonLayered() throws IOException, URISyntaxException
 
     assertThat(loaderLayer.getName()).isEqualTo("spring-boot-loader");
     assertThat(
-            loaderLayer
-                .getEntries()
-                .stream()
+            loaderLayer.getEntries().stream()
                 .map(FileEntry::getExtractionPath)
                 .collect(Collectors.toList()))
         .containsExactly(
@@ -248,9 +230,7 @@ public void testCreateLayers_nonLayered() throws IOException, URISyntaxException
 
     assertThat(classesLayer.getName()).isEqualTo("classes");
     assertThat(
-            classesLayer
-                .getEntries()
-                .stream()
+            classesLayer.getEntries().stream()
                 .map(FileEntry::getExtractionPath)
                 .collect(Collectors.toList()))
         .containsExactly(

diff --git a/jib-cli/src/test/java/com/google/cloud/tools/jib/cli/jar/StandardExplodedProcessorTest.java b/jib-cli/src/test/java/com/google/cloud/tools/jib/cli/jar/StandardExplodedProcessorTest.java
@@ -87,9 +87,7 @@ public void testCreateLayers_withClassPathInManifest() throws IOException, URISy
     // Validate dependencies layers.
     assertThat(nonSnapshotLayer.getName()).isEqualTo("dependencies");
     assertThat(
-            nonSnapshotLayer
-                .getEntries()
-                .stream()
+            nonSnapshotLayer.getEntries().stream()
                 .map(FileEntry::getExtractionPath)
                 .collect(Collectors.toList()))
         .isEqualTo(
@@ -105,9 +103,7 @@ public void testCreateLayers_withClassPathInManifest() throws IOException, URISy
     // Validate resources layer.
     assertThat(resourcesLayer.getName()).isEqualTo("resources");
     List<AbsoluteUnixPath> actualResourcesPaths =
-        resourcesLayer
-            .getEntries()
-            .stream()
+        resourcesLayer.getEntries().stream()
             .map(FileEntry::getExtractionPath)
             .collect(Collectors.toList());
     assertThat(actualResourcesPaths)
@@ -121,9 +117,7 @@ public void testCreateLayers_withClassPathInManifest() throws IOException, URISy
     // Validate classes layer.
     assertThat(classesLayer.getName()).isEqualTo("classes");
     List<AbsoluteUnixPath> actualClassesPaths =
-        classesLayer
-            .getEntries()
-            .stream()
+        classesLayer.getEntries().stream()
             .map(FileEntry::getExtractionPath)
             .collect(Collectors.toList());
     assertThat(actualClassesPaths)
@@ -153,9 +147,7 @@ public void testCreateLayers_withoutClassPathInManifest() throws IOException, UR
     // Validate resources layer.
     assertThat(resourcesLayer.getName()).isEqualTo("resources");
     List<AbsoluteUnixPath> actualResourcesPaths =
-        resourcesLayer
-            .getEntries()
-            .stream()
+        resourcesLayer.getEntries().stream()
             .map(FileEntry::getExtractionPath)
             .collect(Collectors.toList());
     assertThat(actualResourcesPaths)
@@ -169,9 +161,7 @@ public void testCreateLayers_withoutClassPathInManifest() throws IOException, UR
     // Validate classes layer.
     assertThat(classesLayer.getName()).isEqualTo("classes");
     List<AbsoluteUnixPath> actualClassesPaths =
-        classesLayer
-            .getEntries()
-            .stream()
+        classesLayer.getEntries().stream()
             .map(FileEntry::getExtractionPath)
             .collect(Collectors.toList());
     assertThat(actualClassesPaths)
@@ -205,9 +195,7 @@ public void testCreateLayers_withoutClassPathInManifest_containsOnlyClasses()
 
     // Validate classes layer.
     List<AbsoluteUnixPath> actualClassesPath =
-        classesLayer
-            .getEntries()
-            .stream()
+        classesLayer.getEntries().stream()
             .map(FileEntry::getExtractionPath)
             .collect(Collectors.toList());
     assertThat(actualClassesPath)

diff --git a/jib-cli/src/test/java/com/google/cloud/tools/jib/cli/jar/StandardPackagedProcessorTest.java b/jib-cli/src/test/java/com/google/cloud/tools/jib/cli/jar/StandardPackagedProcessorTest.java
@@ -76,9 +76,7 @@ public void testCreateLayers_withClassPathInManifest() throws IOException, URISy
     // Validate dependencies layers.
     assertThat(nonSnapshotLayer.getName()).isEqualTo("dependencies");
     assertThat(
-            nonSnapshotLayer
-                .getEntries()
-                .stream()
+            nonSnapshotLayer.getEntries().stream()
                 .map(FileEntry::getExtractionPath)
                 .collect(Collectors.toList()))
         .isEqualTo(
@@ -88,9 +86,7 @@ public void testCreateLayers_withClassPathInManifest() throws IOException, URISy
                 AbsoluteUnixPath.get("/app/directory/dependency4")));
     assertThat(snapshotLayer.getName()).isEqualTo("snapshot dependencies");
     assertThat(
-            snapshotLayer
-                .getEntries()
-                .stream()
+            snapshotLayer.getEntries().stream()
                 .map(FileEntry::getExtractionPath)
                 .collect(Collectors.toList()))
         .isEqualTo(ImmutableList.of(AbsoluteUnixPath.get("/app/dependency3-SNAPSHOT-1.jar")));

diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/api/JavaContainerBuilder.java b/jib-core/src/main/java/com/google/cloud/tools/jib/api/JavaContainerBuilder.java
@@ -586,9 +586,7 @@ public JibContainerBuilder toContainerBuilder() throws IOException {
             .map(path -> path.getFileName().toString())
             .collect(Collectors.groupingBy(filename -> filename, Collectors.counting()));
     List<String> duplicates =
-        occurrences
-            .entrySet()
-            .stream()
+        occurrences.entrySet().stream()
             .filter(entry -> entry.getValue() > 1)
             .map(Map.Entry::getKey)
             .collect(Collectors.toList());

diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/api/JibContainerBuilder.java b/jib-core/src/main/java/com/google/cloud/tools/jib/api/JibContainerBuilder.java
@@ -215,8 +215,7 @@ public JibContainerBuilder addFileEntriesLayer(FileEntriesLayer layer) {
   @Deprecated
   public JibContainerBuilder setLayers(List<LayerConfiguration> layerConfigurations) {
     return setFileEntriesLayers(
-        layerConfigurations
-            .stream()
+        layerConfigurations.stream()
             .map(LayerConfiguration::toFileEntriesLayer)
             .collect(Collectors.toList()));
   }

diff --git a/...main/java/com/google/cloud/tools/jib/builder/steps/BuildAndCacheApplicationLayerStep.java b/...main/java/com/google/cloud/tools/jib/builder/steps/BuildAndCacheApplicationLayerStep.java
@@ -54,8 +54,7 @@ static ImmutableList<BuildAndCacheApplicationLayerStep> makeList(
         TimerEventDispatcher ignored =
             new TimerEventDispatcher(
                 buildContext.getEventHandlers(), "Preparing application layer builders")) {
-      return layerConfigurations
-          .stream()
+      return layerConfigurations.stream()
           // Skips the layer if empty.
           .filter(layerConfiguration -> !layerConfiguration.getEntries().isEmpty())
           .map(

diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/builder/steps/PullBaseImageStep.java b/jib-core/src/main/java/com/google/cloud/tools/jib/builder/steps/PullBaseImageStep.java
@@ -479,8 +479,7 @@ List<Image> getCachedBaseImages()
           lookUpPlatformSpecificImageManifest((V22ManifestListTemplate) manifestList, platform);
 
       Optional<ManifestAndConfigTemplate> manifestAndConfigFound =
-          manifestsAndConfigs
-              .stream()
+          manifestsAndConfigs.stream()
               .filter(entry -> manifestDigest.equals(entry.getManifestDigest()))
               .findFirst();
       if (!manifestAndConfigFound.isPresent()) {

diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/builder/steps/PushImageStep.java b/jib-core/src/main/java/com/google/cloud/tools/jib/builder/steps/PushImageStep.java
@@ -80,8 +80,7 @@ static ImmutableList<PushImageStep> makeList(
 
       Set<String> imageQualifiers =
           singlePlatform ? tags : Collections.singleton(manifestDigest.toString());
-      return imageQualifiers
-          .stream()
+      return imageQualifiers.stream()
           .map(
               qualifier ->
                   new PushImageStep(

diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/builder/steps/PushLayerStep.java b/jib-core/src/main/java/com/google/cloud/tools/jib/builder/steps/PushLayerStep.java
@@ -43,8 +43,7 @@ static ImmutableList<PushLayerStep> makeList(
             progressEventDispatcherFactory.create("launching layer pushers", cachedLayers.size())) {
 
       // Constructs a PushBlobStep for each layer.
-      return cachedLayers
-          .stream()
+      return cachedLayers.stream()
           .map(
               layer ->
                   new PushLayerStep(

diff --git a/.../src/main/java/com/google/cloud/tools/jib/event/progress/AllocationCompletionTracker.java b/.../src/main/java/com/google/cloud/tools/jib/event/progress/AllocationCompletionTracker.java
@@ -117,9 +117,7 @@ boolean updateProgress(Allocation allocation, long units) {
    */
   @VisibleForTesting
   List<Allocation> getUnfinishedAllocations() {
-    return completionMap
-        .values()
-        .stream()
+    return completionMap.values().stream()
         .filter(IndexedRemainingUnits::isUnfinished)
         .sorted()
         .map(remainingUnits -> remainingUnits.allocation)

diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/image/json/ImageToJsonTranslator.java b/jib-core/src/main/java/com/google/cloud/tools/jib/image/json/ImageToJsonTranslator.java
@@ -81,9 +81,7 @@ static ImmutableList<String> environmentMapToList(@Nullable Map<String, String>
     Preconditions.checkArgument(
         environment.keySet().stream().noneMatch(key -> key.contains("=")),
         "Illegal environment variable: name cannot contain '='");
-    return environment
-        .entrySet()
-        .stream()
+    return environment.entrySet().stream()
         .map(entry -> entry.getKey() + "=" + entry.getValue())
         .collect(ImmutableList.toImmutableList());
   }

diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/image/json/V22ManifestListTemplate.java b/jib-core/src/main/java/com/google/cloud/tools/jib/image/json/V22ManifestListTemplate.java
@@ -110,8 +110,7 @@ public List<ManifestDescriptorTemplate> getManifests() {
    * @return a list of matching digests
    */
   public List<String> getDigestsForPlatform(String architecture, String os) {
-    return getManifests()
-        .stream()
+    return getManifests().stream()
         .filter(
             manifest ->
                 manifest.platform != null

diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/registry/RegistryClient.java b/jib-core/src/main/java/com/google/cloud/tools/jib/registry/RegistryClient.java
@@ -218,9 +218,7 @@ static Multimap<String, String> decodeTokenRepositoryGrants(String token) {
       if (payload.access == null) {
         return null;
       }
-      return payload
-          .access
-          .stream()
+      return payload.access.stream()
           .filter(claim -> "repository".equals(claim.type))
           .collect(
               ImmutableSetMultimap.<AccessClaim, String, String>flatteningToImmutableSetMultimap(

diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/registry/credentials/DockerConfig.java b/jib-core/src/main/java/com/google/cloud/tools/jib/registry/credentials/DockerConfig.java
@@ -36,8 +36,7 @@ class DockerConfig {
   @Nullable
   private static <K, T> Map.Entry<K, T> findFirstInMapByKey(
       Map<K, T> map, List<Predicate<K>> keyMatches) {
-    return keyMatches
-        .stream()
+    return keyMatches.stream()
         .map(keyMatch -> findFirstInMapByKey(map, keyMatch))
         .filter(Objects::nonNull)
         .findFirst()
@@ -47,8 +46,7 @@ private static <K, T> Map.Entry<K, T> findFirstInMapByKey(
   /** Returns the first entry matching the given key predicate. */
   @Nullable
   private static <K, T> Map.Entry<K, T> findFirstInMapByKey(Map<K, T> map, Predicate<K> keyMatch) {
-    return map.entrySet()
-        .stream()
+    return map.entrySet().stream()
         .filter(entry -> keyMatch.test(entry.getKey()))
         .findFirst()
         .orElse(null);

diff --git a/jib-core/src/test/java/com/google/cloud/tools/jib/api/JavaContainerBuilderTest.java b/jib-core/src/test/java/com/google/cloud/tools/jib/api/JavaContainerBuilderTest.java
@@ -42,16 +42,12 @@ private static Path getResource(String directory) throws URISyntaxException {
   /** Gets the extraction paths in the specified layer of a give {@link BuildContext}. */
   private static List<AbsoluteUnixPath> getExtractionPaths(
       BuildContext buildContext, String layerName) {
-    return buildContext
-        .getLayerConfigurations()
-        .stream()
+    return buildContext.getLayerConfigurations().stream()
         .filter(layerConfiguration -> layerConfiguration.getName().equals(layerName))
         .findFirst()
         .map(
             layerConfiguration ->
-                layerConfiguration
-                    .getEntries()
-                    .stream()
+                layerConfiguration.getEntries().stream()
                     .map(FileEntry::getExtractionPath)
                     .collect(Collectors.toList()))
         .orElse(ImmutableList.of());

diff --git a/jib-core/src/test/java/com/google/cloud/tools/jib/cache/CacheStorageWriterTest.java b/jib-core/src/test/java/com/google/cloud/tools/jib/cache/CacheStorageWriterTest.java
@@ -249,9 +249,7 @@ public void testWriteMetadata_v22()
             "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
             "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
             "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
-        savedManifest2
-            .getLayers()
-            .stream()
+        savedManifest2.getLayers().stream()
             .map(layer -> layer.getDigest().getHash())
             .collect(Collectors.toList()));