Align with new Remote API in rewrite-core (#590)

openrewrite · Jul 3, 2023 · 701ef03 · 701ef03
1 parent bf2736a
commit 701ef03
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/src/main/java/org/openrewrite/maven/AbstractRewriteDryRunMojo.java b/src/main/java/org/openrewrite/maven/AbstractRewriteDryRunMojo.java
@@ -17,6 +17,7 @@
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Parameter;
+import org.openrewrite.ExecutionContext;
 import org.openrewrite.Result;
 import org.openrewrite.internal.lang.Nullable;
 
@@ -57,7 +58,8 @@ public void execute() throws MojoExecutionException {
             return;
         }
 
-        ResultsContainer results = listResults();
+        ExecutionContext ctx = executionContext();
+        ResultsContainer results = listResults(ctx);
 
         RuntimeException firstException = results.getFirstException();
         if (firstException != null) {

diff --git a/src/main/java/org/openrewrite/maven/AbstractRewriteMojo.java b/src/main/java/org/openrewrite/maven/AbstractRewriteMojo.java
@@ -183,7 +183,7 @@ private void collectBasePaths(MavenProject project, Set<Path> paths, Path localR
         }
     }
 
-    protected ResultsContainer listResults() throws MojoExecutionException {
+    protected ResultsContainer listResults(ExecutionContext ctx) throws MojoExecutionException {
         try (MeterRegistryProvider meterRegistryProvider = new MeterRegistryProvider(getLog(),
                 metricsUri, metricsUsername, metricsPassword)) {
             Metrics.addRegistry(meterRegistryProvider.registry());
@@ -224,7 +224,6 @@ protected ResultsContainer listResults() throws MojoExecutionException {
                 }
             }
 
-            ExecutionContext ctx = executionContext();
             LargeSourceSet sourceSet = loadSourceSet(repositoryRoot, env, ctx);
 
             List<Result> results = runRecipe(recipe, sourceSet, ctx);

diff --git a/src/main/java/org/openrewrite/maven/AbstractRewriteRunMojo.java b/src/main/java/org/openrewrite/maven/AbstractRewriteRunMojo.java
@@ -16,12 +16,9 @@
 package org.openrewrite.maven;
 
 import org.apache.maven.plugin.MojoExecutionException;
-import org.openrewrite.FileAttributes;
-import org.openrewrite.PrintOutputCapture;
-import org.openrewrite.Result;
+import org.openrewrite.*;
 import org.openrewrite.binary.Binary;
 import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.ipc.http.HttpUrlConnectionSender;
 import org.openrewrite.quark.Quark;
 import org.openrewrite.remote.Remote;
 
@@ -52,7 +49,8 @@ public void execute() throws MojoExecutionException {
             return;
         }
 
-        ResultsContainer results = listResults();
+        ExecutionContext ctx = executionContext();
+        ResultsContainer results = listResults(ctx);
         @Nullable RuntimeException firstException = results.getFirstException();
         if (firstException != null) {
             getLog().error("The recipe produced an error. Please report this to the recipe author.");
@@ -95,7 +93,7 @@ public void execute() throws MojoExecutionException {
             try {
                 for (Result result : results.generated) {
                     assert result.getAfter() != null;
-                    writeAfter(results.getProjectRoot(), result);
+                    writeAfter(results.getProjectRoot(), result, ctx);
                 }
                 for (Result result : results.deleted) {
                     assert result.getBefore() != null;
@@ -132,13 +130,13 @@ public void execute() throws MojoExecutionException {
                         // On Mac this can return "false" even when the file was deleted, so skip the check
                         //noinspection ResultOfMethodCallIgnored
                         originalLocation.toFile().delete();
-                        writeAfter(results.getProjectRoot(), result);
+                        writeAfter(results.getProjectRoot(), result, ctx);
                     }
                 }
                 for (Result result : results.refactoredInPlace) {
                     assert result.getBefore() != null;
                     assert result.getAfter() != null;
-                    writeAfter(results.getProjectRoot(), result);
+                    writeAfter(results.getProjectRoot(), result, ctx);
                 }
                 List<Path> emptyDirectories = results.newlyEmptyDirectories();
                 if (!emptyDirectories.isEmpty()) {
@@ -154,7 +152,7 @@ public void execute() throws MojoExecutionException {
         }
     }
 
-    private static void writeAfter(Path root, Result result) {
+    private static void writeAfter(Path root, Result result, ExecutionContext ctx) {
         if (result.getAfter() == null || result.getAfter() instanceof Quark) {
             return;
         }
@@ -173,7 +171,7 @@ private static void writeAfter(Path root, Result result) {
         } else if (result.getAfter() instanceof Remote) {
             Remote remote = (Remote) result.getAfter();
             try (FileOutputStream sourceFileWriter = new FileOutputStream(targetFile)) {
-                InputStream source = remote.getInputStream(new HttpUrlConnectionSender());
+                InputStream source = remote.getInputStream(ctx);
                 byte[] buf = new byte[4096];
                 int length;
                 while ((length = source.read(buf)) > 0) {