diff --git a/.kokoro/presubmit/lint.cfg b/.kokoro/presubmit/lint.cfg index 0cc493acd9ed..3d32bf71481d 100644 --- a/.kokoro/presubmit/lint.cfg +++ b/.kokoro/presubmit/lint.cfg @@ -4,7 +4,7 @@ env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" + value: "gcr.io/cloud-devrel-kokoro-resources/java11" } env_vars: { diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml index 2859bffcdffa..68146043f9f3 100644 --- a/google-api-grpc/pom.xml +++ b/google-api-grpc/pom.xml @@ -96,7 +96,7 @@ com.coveo fmt-maven-plugin - 2.9 + 2.12 true @@ -105,7 +105,7 @@ com.google.googlejavaformat google-java-format - 1.7 + 1.11.0 diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml index cc13e89ec4ac..3679fd98e1d5 100644 --- a/google-cloud-clients/pom.xml +++ b/google-cloud-clients/pom.xml @@ -172,7 +172,7 @@ com.coveo fmt-maven-plugin - 2.9 + 2.12 true @@ -181,7 +181,7 @@ com.google.googlejavaformat google-java-format - 1.7 + 1.11.0 diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml index e7866af2c873..4b6ad8bd5856 100644 --- a/google-cloud-examples/pom.xml +++ b/google-cloud-examples/pom.xml @@ -241,7 +241,7 @@ com.coveo fmt-maven-plugin - 2.9 + 2.12 true @@ -250,7 +250,7 @@ com.google.googlejavaformat google-java-format - 1.7 + 1.11.0 diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/EnableLifecycleManagement.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/EnableLifecycleManagement.java index 9b87033d8941..e50a51b2bf96 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/EnableLifecycleManagement.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/EnableLifecycleManagement.java @@ -36,8 +36,7 @@ public static void enableLifecycleManagement(String projectId, String bucketName // See the LifecycleRule documentation for additional info on what you can do with lifecycle // management rules. This one deletes objects that are over 100 days old. // https://googleapis.dev/java/google-cloud-clients/latest/com/google/cloud/storage/BucketInfo.LifecycleRule.html - bucket - .toBuilder() + bucket.toBuilder() .setLifecycleRules( ImmutableList.of( new LifecycleRule( diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/MakeBucketPublic.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/MakeBucketPublic.java index 3ef720676fcc..4777ff8ff30a 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/MakeBucketPublic.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/MakeBucketPublic.java @@ -34,8 +34,7 @@ public static void makeBucketPublic(String projectId, String bucketName) { Policy originalPolicy = storage.getIamPolicy(bucketName); storage.setIamPolicy( bucketName, - originalPolicy - .toBuilder() + originalPolicy.toBuilder() .addIdentity(StorageRoles.objectViewer(), Identity.allUsers()) // All users can view .build()); diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/SetPublicAccessPreventionEnforced.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/SetPublicAccessPreventionEnforced.java index 3815ee0a82bc..7b2f62b25868 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/SetPublicAccessPreventionEnforced.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/SetPublicAccessPreventionEnforced.java @@ -33,8 +33,7 @@ public static void setPublicAccessPreventionEnforced(String projectId, String bu Bucket bucket = storage.get(bucketName); // Enforces public access prevention for the bucket - bucket - .toBuilder() + bucket.toBuilder() .setIamConfiguration( BucketInfo.IamConfiguration.newBuilder() .setPublicAccessPrevention(BucketInfo.PublicAccessPrevention.ENFORCED) diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/SetPublicAccessPreventionInherited.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/SetPublicAccessPreventionInherited.java index 2b9e4da6ff74..d90b77edea4a 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/SetPublicAccessPreventionInherited.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/SetPublicAccessPreventionInherited.java @@ -33,8 +33,7 @@ public static void setPublicAccessPreventionInherited(String projectId, String b Bucket bucket = storage.get(bucketName); // Sets public access prevention to 'inherited' for the bucket - bucket - .toBuilder() + bucket.toBuilder() .setIamConfiguration( BucketInfo.IamConfiguration.newBuilder() .setPublicAccessPrevention(BucketInfo.PublicAccessPrevention.INHERITED) diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/SetPublicAccessPreventionUnspecified.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/SetPublicAccessPreventionUnspecified.java index 0de22ce08ed0..f048f1261198 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/SetPublicAccessPreventionUnspecified.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/SetPublicAccessPreventionUnspecified.java @@ -33,8 +33,7 @@ public static void setPublicAccessPreventionUnspecified(String projectId, String Bucket bucket = storage.get(bucketName); // Sets public access prevention to 'unspecified' for the bucket - bucket - .toBuilder() + bucket.toBuilder() .setIamConfiguration( BucketInfo.IamConfiguration.newBuilder() .setPublicAccessPrevention(BucketInfo.PublicAccessPrevention.UNSPECIFIED) diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITBucketSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITBucketSnippets.java index 956c1c107b0e..c25ce388ca0f 100644 --- a/google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITBucketSnippets.java +++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITBucketSnippets.java @@ -221,8 +221,7 @@ public void testGetBucketMetadata() { Bucket bucket = storage.get(BUCKET, Storage.BucketGetOption.fields(Storage.BucketField.values())); bucket = - bucket - .toBuilder() + bucket.toBuilder() .setLabels(ImmutableMap.of("k", "v")) .setLifecycleRules( ImmutableList.of( @@ -292,9 +291,7 @@ public void testEnableLifecycleManagement() { @Test public void testDisableLifecycleManagement() { - storage - .get(BUCKET) - .toBuilder() + storage.get(BUCKET).toBuilder() .setLifecycleRules( ImmutableList.of( new BucketInfo.LifecycleRule( @@ -312,9 +309,7 @@ public void testGetPublicAccessPrevention() { try { // By default a bucket PAP state is INHERITED and we are changing the state to validate // non-default state. - storage - .get(BUCKET) - .toBuilder() + storage.get(BUCKET).toBuilder() .setIamConfiguration( BucketInfo.IamConfiguration.newBuilder() .setPublicAccessPrevention(BucketInfo.PublicAccessPrevention.ENFORCED) @@ -328,9 +323,7 @@ public void testGetPublicAccessPrevention() { String snippetOutput = snippetOutputCapture.toString(); System.setOut(standardOut); assertTrue(snippetOutput.contains("enforced")); - storage - .get(BUCKET) - .toBuilder() + storage.get(BUCKET).toBuilder() .setIamConfiguration( BucketInfo.IamConfiguration.newBuilder() .setPublicAccessPrevention(BucketInfo.PublicAccessPrevention.INHERITED) @@ -338,10 +331,8 @@ public void testGetPublicAccessPrevention() { .build() .update(); } finally { - // No matter what happens make sure test set bucket back to INHERITED - storage - .get(BUCKET) - .toBuilder() + // No matter what happens make sure test set bucket back to UNSPECIFIED + storage.get(BUCKET).toBuilder() .setIamConfiguration( BucketInfo.IamConfiguration.newBuilder() .setPublicAccessPrevention(BucketInfo.PublicAccessPrevention.INHERITED) @@ -358,9 +349,7 @@ public void testSetPublicAccessPreventionEnforced() { assertEquals( storage.get(BUCKET).getIamConfiguration().getPublicAccessPrevention(), BucketInfo.PublicAccessPrevention.ENFORCED); - storage - .get(BUCKET) - .toBuilder() + storage.get(BUCKET).toBuilder() .setIamConfiguration( BucketInfo.IamConfiguration.newBuilder() .setPublicAccessPrevention(BucketInfo.PublicAccessPrevention.INHERITED) @@ -368,10 +357,8 @@ public void testSetPublicAccessPreventionEnforced() { .build() .update(); } finally { - // No matter what happens make sure test set bucket back to INHERITED - storage - .get(BUCKET) - .toBuilder() + // No matter what happens make sure test set bucket back to UNSPECIFIED + storage.get(BUCKET).toBuilder() .setIamConfiguration( BucketInfo.IamConfiguration.newBuilder() .setPublicAccessPrevention(BucketInfo.PublicAccessPrevention.INHERITED) @@ -384,9 +371,7 @@ public void testSetPublicAccessPreventionEnforced() { @Test public void testSetPublicAccessPreventionInherited() { try { - storage - .get(BUCKET) - .toBuilder() + storage.get(BUCKET).toBuilder() .setIamConfiguration( BucketInfo.IamConfiguration.newBuilder() .setPublicAccessPrevention(BucketInfo.PublicAccessPrevention.ENFORCED) @@ -398,10 +383,8 @@ public void testSetPublicAccessPreventionInherited() { storage.get(BUCKET).getIamConfiguration().getPublicAccessPrevention(), BucketInfo.PublicAccessPrevention.INHERITED); } finally { - // No matter what happens make sure test set bucket back to INHERITED - storage - .get(BUCKET) - .toBuilder() + // No matter what happens make sure test set bucket back to UNSPECIFIED + storage.get(BUCKET).toBuilder() .setIamConfiguration( BucketInfo.IamConfiguration.newBuilder() .setPublicAccessPrevention(BucketInfo.PublicAccessPrevention.INHERITED) @@ -458,9 +441,7 @@ public void testMakeBucketPublic() { @Test public void deleteBucketDefaultKmsKey() { - storage - .get(BUCKET) - .toBuilder() + storage.get(BUCKET).toBuilder() .setDefaultKmsKeyName( "projects/gcloud-devel/locations/global/keyRings/gcs_kms_key_ring/cryptoKeys/key") .build() @@ -500,9 +481,7 @@ public void testConfigureBucketCors() { @Test public void testRemoveBucketCors() { - storage - .get(BUCKET) - .toBuilder() + storage.get(BUCKET).toBuilder() .setCors( ImmutableList.of( Cors.newBuilder() diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml index 9e45ea2c4e43..de61894c2849 100644 --- a/google-cloud-testing/pom.xml +++ b/google-cloud-testing/pom.xml @@ -127,7 +127,7 @@ com.coveo fmt-maven-plugin - 2.9 + 2.12 true @@ -136,7 +136,7 @@ com.google.googlejavaformat google-java-format - 1.7 + 1.11.0 diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml index fc118f68fc11..3d119dc0adfc 100644 --- a/google-cloud-util/pom.xml +++ b/google-cloud-util/pom.xml @@ -61,7 +61,7 @@ com.coveo fmt-maven-plugin - 2.9 + 2.12 true @@ -70,7 +70,7 @@ com.google.googlejavaformat google-java-format - 1.7 + 1.11.0 diff --git a/pom.xml b/pom.xml index 3307d76a9649..b7245775978e 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ com.coveo fmt-maven-plugin - 2.9 + 2.12 true