Disable autoformatting on build, and block Java11 Codebuilds on bad formatting

Author: lavaleri

codebuild/corretto11.yml

@@ -6,4 +6,5 @@ phases:
             java: corretto11
     build:
         commands:
+          - mvn com.coveo:fmt-maven-plugin:check
           - mvn install -Dgpg.skip=true '-DtestVectorZip=https://github.com/awslabs/aws-encryption-sdk-test-vectors/raw/master/vectors/awses-decrypt/python-1.3.8.zip'

codebuild/openjdk11.yml

@@ -6,4 +6,5 @@ phases:
             java: openjdk11
     build:
         commands:
+          - mvn com.coveo:fmt-maven-plugin:check
           - mvn install -Dgpg.skip=true '-DtestVectorZip=https://github.com/awslabs/aws-encryption-sdk-test-vectors/raw/master/vectors/awses-decrypt/python-1.3.8.zip'

pom.xml

@@ -142,14 +142,11 @@
             <plugin>
                 <groupId>com.coveo</groupId>
                 <artifactId>fmt-maven-plugin</artifactId>
-                <version>2.9</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>format</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <version>2.10</version>
+                <!-- Configure no goals. -->
+                <!--Until our CI builds no longer depend on Java 8, skip this during build.-->
+                <!--We instead manually check this in Java 11 environments to block builds, -->
+                <!--And additionally check this explicitly through Github Actions.-->
             </plugin>
         </plugins>
     </build>

src/test/java/com/amazonaws/encryptionsdk/AwsCryptoTest.java

@@ -406,8 +406,7 @@ public EncryptionMaterials getMaterialsForEncrypt(EncryptionMaterialsRequest req
                 new DefaultCryptoMaterialsManager(masterKeyProvider)
                     .getMaterialsForEncrypt(request);
 
-            return encryptionMaterials
-                .toBuilder()
+            return encryptionMaterials.toBuilder()
                 .setAlgorithm(CryptoAlgorithm.ALG_AES_256_GCM_HKDF_SHA512_COMMIT_KEY_ECDSA_P384)
                 .build();
           }
@@ -1094,8 +1093,7 @@ public EncryptionMaterials getMaterialsForEncrypt(EncryptionMaterialsRequest req
                 new DefaultCryptoMaterialsManager(masterKeyProvider)
                     .getMaterialsForEncrypt(request);
 
-            return encryptionMaterials
-                .toBuilder()
+            return encryptionMaterials.toBuilder()
                 .setAlgorithm(CryptoAlgorithm.ALG_AES_256_GCM_IV12_TAG16_HKDF_SHA384_ECDSA_P384)
                 .build();
           }

src/test/java/com/amazonaws/encryptionsdk/caching/CacheTestFixtures.java

@@ -33,10 +33,7 @@ public static EncryptionMaterialsRequest createMaterialsRequest(int index) {
 
   public static EncryptionMaterials createMaterialsResult(EncryptionMaterialsRequest request) {
     return new DefaultCryptoMaterialsManager(FIXED_KEY)
-        .getMaterialsForEncrypt(request)
-        .toBuilder()
-        .setCleartextDataKey(new SentinelKey())
-        .build();
+        .getMaterialsForEncrypt(request).toBuilder().setCleartextDataKey(new SentinelKey()).build();
   }
 
   public static DecryptionMaterialsRequest createDecryptRequest(int index) {
@@ -57,8 +54,7 @@ public static DecryptionMaterialsRequest createDecryptRequest(EncryptionMaterial
   public static DecryptionMaterials createDecryptResult(DecryptionMaterialsRequest request) {
     DecryptionMaterials realResult =
         new DefaultCryptoMaterialsManager(FIXED_KEY).decryptMaterials(request);
-    return realResult
-        .toBuilder()
+    return realResult.toBuilder()
         .setDataKey(
             new DataKey(
                 new SentinelKey(),

src/test/java/com/amazonaws/encryptionsdk/caching/CachingCryptoMaterialsManagerTest.java

@@ -116,8 +116,7 @@ public void whenAlgorithmIsUncachable_resultNotStoredInCache() throws Exception
     EncryptionMaterialsRequest request =
         CacheTestFixtures.createMaterialsRequest(0).toBuilder().setPlaintextSize(100).build();
     EncryptionMaterials result =
-        CacheTestFixtures.createMaterialsResult(request)
-            .toBuilder()
+        CacheTestFixtures.createMaterialsResult(request).toBuilder()
             .setAlgorithm(CryptoAlgorithm.ALG_AES_128_GCM_IV12_TAG16_NO_KDF)
             .build();
     setupForCacheMiss(request, result);
@@ -139,16 +138,14 @@ public void whenAlgorithmIsUncachable_resultNotStoredInCache() throws Exception
   @Test
   public void whenInitialUsageExceedsLimit_cacheIsBypassed() throws Exception {
     EncryptionMaterialsRequest request =
-        CacheTestFixtures.createMaterialsRequest(0)
-            .toBuilder()
+        CacheTestFixtures.createMaterialsRequest(0).toBuilder()
             // Even at _exactly_ the byte-use limit, we won't try the cache,
             // because it's unlikely to be useful to leave an entry with zero
             // bytes remaining.
             .setPlaintextSize(200)
             .build();
     EncryptionMaterials result =
-        CacheTestFixtures.createMaterialsResult(request)
-            .toBuilder()
+        CacheTestFixtures.createMaterialsResult(request).toBuilder()
             .setAlgorithm(CryptoAlgorithm.ALG_AES_256_GCM_HKDF_SHA512_COMMIT_KEY)
             .build();
     setupForCacheMiss(request, result);

src/test/java/com/amazonaws/encryptionsdk/caching/LocalCryptoMaterialsCacheThreadStormTest.java

@@ -139,8 +139,7 @@ public void decryptAddThread() {
 
         CacheTestFixtures.SentinelKey key = new CacheTestFixtures.SentinelKey();
         DecryptionMaterials result =
-            BASE_DECRYPT
-                .toBuilder()
+            BASE_DECRYPT.toBuilder()
                 .setDataKey(
                     new DataKey(
                         key, new byte[0], new byte[0], BASE_DECRYPT.getDataKey().getMasterKey()))
@@ -225,8 +224,7 @@ public void encryptAddThread() {
         ThreadLocalRandom.current().nextBytes(ref);
 
         EncryptionMaterials result =
-            BASE_ENCRYPT
-                .toBuilder()
+            BASE_ENCRYPT.toBuilder()
                 .setCleartextDataKey(new CacheTestFixtures.SentinelKey())
                 .build();
         ConcurrentHashMap<CacheTestFixtures.SentinelKey, Object> keys =

src/test/java/com/amazonaws/encryptionsdk/internal/EncryptionHandlerTest.java

@@ -149,8 +149,7 @@ public void whenConstructWithForbidPolicyAndNonCommittingAlg_succeeds() throws E
   @Test
   public void whenConstructWithRequirePolicyAndNonCommittingAlg_fails() throws Exception {
     final EncryptionMaterials resultWithV1Alg =
-        testResult
-            .toBuilder()
+        testResult.toBuilder()
             .setAlgorithm(CryptoAlgorithm.ALG_AES_256_GCM_IV12_TAG16_HKDF_SHA384_ECDSA_P384)
             .build();