Make MavenNoCompileTest more reliable (#6733)

Author: davidh44

test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenNoCompileTest.java

@@ -15,6 +15,8 @@
 
 package software.amazon.awssdk.v2migrationtests;
 
+import static software.amazon.awssdk.v2migrationtests.TestUtils.assertTwoDirectoriesHaveSameStructure;
+import static software.amazon.awssdk.v2migrationtests.TestUtils.normalizeImports;
 import static software.amazon.awssdk.v2migrationtests.TestUtils.replaceVersion;
 
 import java.io.File;
@@ -50,6 +52,8 @@ static void setUp() throws IOException {
     @Test
     @EnabledIf("versionAvailable")
     void mavenProject_shouldConvert() throws IOException {
-        verifyTransformation();
+        runTransformation();
+        normalizeImports(mavenActual);
+        assertTwoDirectoriesHaveSameStructure(mavenActual, mavenExpected);
     }
 }

test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenTestBase.java

@@ -47,7 +47,7 @@ protected static void deleteTempDirectories() throws IOException {
         FileUtils.deleteDirectory(mavenExpected.toFile());
     }
 
-    protected static void verifyTransformation() throws IOException {
+    protected static void runTransformation() throws IOException {
         String recipeCmd = "-Drewrite.activeRecipes=software.amazon.awssdk.v2migration.AwsSdkJavaV1ToV2";
         List<String> rewriteArgs = new ArrayList<>();
         // pin version since updates have broken tests
@@ -57,6 +57,10 @@ protected static void verifyTransformation() throws IOException {
 
         run(mavenActual, rewriteArgs.toArray(new String[0]));
         FileUtils.deleteDirectory(mavenActual.resolve("target").toFile());
+    }
+
+    protected static void verifyTransformation() throws IOException {
+        runTransformation();
         assertTwoDirectoriesHaveSameStructure(mavenActual, mavenExpected);
     }
 

test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/TestUtils.java

@@ -20,9 +20,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
-import java.net.HttpURLConnection;
-import java.net.Proxy;
-import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -129,6 +128,45 @@ public static String toFileTreeString(Path root) {
         return sb.toString();
     }
 
+    public static void normalizeImports(Path directory) throws IOException {
+        try (Stream<Path> paths = Files.walk(directory)) {
+            paths.filter(p -> p.toString().endsWith(".java"))
+                 .forEach(TestUtils::normalizeFileImports);
+        }
+    }
+
+    private static void normalizeFileImports(Path file) {
+        try {
+            List<String> lines = Files.readAllLines(file);
+            int importStart = -1;
+            int importEnd = -1;
+            List<String> imports = new ArrayList<>();
+
+            for (int i = 0; i < lines.size(); i++) {
+                String line = lines.get(i);
+                if (line.startsWith("import ")) {
+                    if (importStart == -1) {
+                        importStart = i;
+                    }
+                    importEnd = i;
+                    imports.add(line);
+                } else if (importStart != -1 && line.startsWith("public class ")) {
+                    break;
+                }
+            }
+
+            if (importStart != -1) {
+                Collections.sort(imports);
+                List<String> result = new ArrayList<>(lines.subList(0, importStart));
+                result.addAll(imports);
+                result.addAll(lines.subList(importEnd + 1, lines.size()));
+                Files.write(file, result);
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
     public static Result run(Path dir, String... args) {
         ProcessBuilder processBuilder = new ProcessBuilder(args);
         processBuilder.redirectErrorStream(true);

test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-nocompile/after/src/main/java/foo/bar/S3EnDateTime.java

@@ -14,11 +14,11 @@
  */
 
 package foo.bar;
+import org.joda.time.DateTime;
+import software.amazon.awssdk.eventnotifications.s3.model.GlacierEventData;
+import software.amazon.awssdk.eventnotifications.s3.model.RestoreEventData;
 import software.amazon.awssdk.eventnotifications.s3.model.S3EventNotification;
 import software.amazon.awssdk.eventnotifications.s3.model.S3EventNotificationRecord;
-import software.amazon.awssdk.eventnotifications.s3.model.RestoreEventData;
-import software.amazon.awssdk.eventnotifications.s3.model.GlacierEventData;
-import org.joda.time.DateTime;
 
 public class S3EnDateTime {
 
@@ -37,4 +37,4 @@ public void parseEvent(String jsonInput) {
         }
     }
 
-}
+}

test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-nocompile/after/src/main/java/foo/bar/S3Transforms.java

@@ -18,6 +18,10 @@
 import com.amazonaws.HttpMethod;
 import com.amazonaws.services.s3.model.SSEAwsKeyManagementParams;
 import com.amazonaws.services.s3.model.SSECustomerKey;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Date;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.AccessControlPolicy;
@@ -30,11 +34,6 @@
 import software.amazon.awssdk.transfer.s3.S3TransferManager;
 import software.amazon.awssdk.transfer.s3.model.UploadRequest;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Date;
-
 public class S3Transforms {
 
     S3Client s3;