Upgrade dependencies, locate all files entering refactoring relative …

…to the root gradle project, mirroring the fix for openrewrite/rewrite-maven-plugin#72
openrewrite · Dec 14, 2020 · 3ad667f · 3ad667f
1 parent f72d4b3
commit 3ad667f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -68,7 +68,7 @@ dependencies {
     plugin("org.openrewrite:rewrite-java:latest.release")
 
     plugin("io.micrometer.prometheus:prometheus-rsocket-client:latest.release")
-    plugin("io.rsocket:rsocket-transport-netty:1.0.0")
+    plugin("io.rsocket:rsocket-transport-netty:latest.release")
 
     implementation("org.openrewrite:rewrite-java-11:latest.release")
     implementation("org.openrewrite:rewrite-java-8:latest.release")
@@ -79,7 +79,7 @@ dependencies {
     api("org.openrewrite:rewrite-java:latest.release")
     api("org.eclipse.jgit:org.eclipse.jgit:latest.release")
     api("io.micrometer.prometheus:prometheus-rsocket-client:latest.release")
-    api("io.rsocket:rsocket-transport-netty:1.0.0")
+    api("io.rsocket:rsocket-transport-netty:latest.release")
 
     testImplementation(gradleTestKit())
     testImplementation("org.codehaus.groovy:groovy-all:2.5.10")

diff --git a/plugin/src/main/java/org/openrewrite/gradle/AbstractRewriteTask.java b/plugin/src/main/java/org/openrewrite/gradle/AbstractRewriteTask.java
@@ -161,7 +161,7 @@ protected Collection<Change> listChanges() {
                     .map(File::toPath)
                     .collect(toList());
 
-            Path projectDir = getProject().getProjectDir().toPath();
+            Path projectDir = getProject().getRootProject().getProjectDir().toPath();
 
             sourceFiles.addAll(JavaParser.fromJavaVersion()
                     .classpath(dependencyPaths)

diff --git a/plugin/src/main/java/org/openrewrite/gradle/MeterRegistryProvider.java b/plugin/src/main/java/org/openrewrite/gradle/MeterRegistryProvider.java
@@ -34,7 +34,7 @@
 import java.time.Duration;
 import java.util.Base64;
 
-import static io.rsocket.transport.netty.UriUtils.getPort;
+import static org.openrewrite.gradle.RewriteMetricsPlugin.getPort;
 
 public class MeterRegistryProvider implements AutoCloseable {
     private final Logger log;

diff --git a/plugin/src/main/java/org/openrewrite/gradle/RewriteMetricsPlugin.java b/plugin/src/main/java/org/openrewrite/gradle/RewriteMetricsPlugin.java
@@ -38,8 +38,7 @@
 import java.net.URI;
 import java.time.Duration;
 import java.util.Base64;
-
-import static io.rsocket.transport.netty.UriUtils.getPort;
+import java.util.Objects;
 
 /**
  * Coordinates the publication of metrics for each rewrite plugin and each subproject along with general purpose metrics
@@ -89,6 +88,7 @@ private void connectToPrometheusProxy(Project project) {
                 case "ephemeral":
                 case "https":
                 case "wss": {
+
                     TcpClient tcpClient = TcpClient.create().secure().host(uri.getHost()).port(getPort(uri, 443));
                     clientTransport = websocketClientTransport(tcpClient);
                     break;
@@ -148,6 +148,20 @@ private ClientTransport websocketClientTransport(TcpClient tcpClient) {
         return WebsocketClientTransport.create(httpClient, "/");
     }
 
+    /**
+     * Returns the port of a URI. If the port is unset (i.e. {@code -1}) then returns the {@code
+     * defaultPort}.
+     *
+     * @param uri the URI to extract the port from
+     * @param defaultPort the default to use if the port is unset
+     * @return the port of a URI or {@code defaultPort} if unset
+     * @throws NullPointerException if {@code uri} is {@code null}
+     */
+    static int getPort(URI uri, int defaultPort) {
+        Objects.requireNonNull(uri, "uri must not be null");
+        return uri.getPort() == -1 ? defaultPort : uri.getPort();
+    }
+
     Iterable<Tag> getExtraTags() {
         return extension.getExtraMetricsTags();
     }