Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions rewrite-core/src/main/java/org/openrewrite/Result.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import org.openrewrite.marker.DeserializationError;
import org.openrewrite.marker.RecipesThatMadeChanges;
import org.openrewrite.marker.SearchResult;
import org.openrewrite.binary.Binary;
import org.openrewrite.quark.Quark;
import org.openrewrite.remote.Remote;

import java.nio.file.Path;
Expand Down Expand Up @@ -268,11 +270,25 @@ public String toString() {

public static boolean isLocalAndHasNoChanges(@Nullable SourceFile before, @Nullable SourceFile after) {
try {
return (before == after) ||
(before != null && after != null &&
// Remote source files are fetched on `printAll`, let's avoid that cost.
!(before instanceof Remote) && !(after instanceof Remote) &&
before.printAll().equals(after.printAll()));
if (before == after) {
return true;
}
if (before == null || after == null) {
return false;
}
// Remote source files are fetched on `printAll`, let's avoid that cost.
if (before instanceof Remote || after instanceof Remote) {
return false;
}
// Quarks don't support printAll(); compare by source path instead
if (before instanceof Quark && after instanceof Quark) {
return before.getSourcePath().equals(after.getSourcePath());
}
// Binary files don't support printAll(); compare by byte content
if (before instanceof Binary && after instanceof Binary) {
return Arrays.equals(((Binary) before).getBytes(), ((Binary) after).getBytes());
}
return before.printAll().equals(after.printAll());
} catch (Exception e) {
return false;
}
Expand Down
30 changes: 30 additions & 0 deletions rewrite-core/src/test/java/org/openrewrite/quark/QuarkTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,45 @@
import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.Test;
import org.openrewrite.*;
import org.openrewrite.marker.Markers;
import org.openrewrite.marker.SearchResult;
import org.openrewrite.remote.Remote;
import org.openrewrite.test.RewriteTest;

import java.net.URI;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.UUID;

import static java.util.Objects.requireNonNull;
import static org.assertj.core.api.Assertions.assertThat;
import static org.openrewrite.test.RewriteTest.toRecipe;
import static org.openrewrite.test.SourceSpecs.other;

class QuarkTest implements RewriteTest {

@Test
void unchangedQuarkHasNoChanges() {
Quark before = new Quark(UUID.randomUUID(), Paths.get("file.jks"), Markers.EMPTY, null, null);
Quark after = new Quark(UUID.randomUUID(), Paths.get("file.jks"), Markers.EMPTY, null, null);
assertThat(Result.isLocalAndHasNoChanges(before, after)).isTrue();
}

@Test
void quarkWithDifferentPathHasChanges() {
Quark before = new Quark(UUID.randomUUID(), Paths.get("old.jks"), Markers.EMPTY, null, null);
Quark after = new Quark(UUID.randomUUID(), Paths.get("new.jks"), Markers.EMPTY, null, null);
assertThat(Result.isLocalAndHasNoChanges(before, after)).isFalse();
}

@Test
void quarkReplacedByRemoteHasChanges() {
Path path = Paths.get(".mvn/wrapper/maven-wrapper.jar");
Quark before = new Quark(UUID.randomUUID(), path, Markers.EMPTY, null, null);
Remote after = Remote.builder(before).build(URI.create("https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"));
assertThat(Result.isLocalAndHasNoChanges(before, after)).isFalse();
}

@DocumentExample
@Test
void renderMarkersOnQuarks() {
Expand Down