From 69dd3c71477cb800c8d19deed0c8d347cb4921cd Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Fri, 21 Feb 2025 00:50:00 +0100 Subject: [PATCH] Declare `AlreadyReplaced#find` as `@Nullable` It was already used in this way by some recipes. --- .../src/main/java/org/openrewrite/marker/AlreadyReplaced.java | 2 ++ .../src/main/java/org/openrewrite/xml/ChangeTagValue.java | 2 +- .../main/java/org/openrewrite/yaml/AppendToSequenceVisitor.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rewrite-core/src/main/java/org/openrewrite/marker/AlreadyReplaced.java b/rewrite-core/src/main/java/org/openrewrite/marker/AlreadyReplaced.java index 6c00f7b9a4c..c0422a9636a 100644 --- a/rewrite-core/src/main/java/org/openrewrite/marker/AlreadyReplaced.java +++ b/rewrite-core/src/main/java/org/openrewrite/marker/AlreadyReplaced.java @@ -29,6 +29,8 @@ @With public class AlreadyReplaced implements Marker { UUID id; + + @Nullable String find; @Nullable diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/ChangeTagValue.java b/rewrite-xml/src/main/java/org/openrewrite/xml/ChangeTagValue.java index 254fb705ed7..99ba45f7b47 100644 --- a/rewrite-xml/src/main/java/org/openrewrite/xml/ChangeTagValue.java +++ b/rewrite-xml/src/main/java/org/openrewrite/xml/ChangeTagValue.java @@ -127,7 +127,7 @@ private Xml.Tag updateUsingRegex(Xml.Tag t, Xml.CharData content) { if (oldMarkers .findAll(AlreadyReplaced.class) .stream() - .noneMatch(m -> m.getFind().equals(oldValue) && newValue.equals(m.getReplace()))) { + .noneMatch(m -> oldValue.equals(m.getFind()) && newValue.equals(m.getReplace()))) { return t.withContent(singletonList(content .withText(text.replaceAll(oldValue, newValue)) .withMarkers(oldMarkers.add(new AlreadyReplaced(randomId(), oldValue, newValue))))); diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/AppendToSequenceVisitor.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/AppendToSequenceVisitor.java index 6a13fa5dc47..fc0e401ba03 100644 --- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/AppendToSequenceVisitor.java +++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/AppendToSequenceVisitor.java @@ -47,7 +47,7 @@ public AppendToSequenceVisitor(JsonPathMatcher matcher, String value, @Nullable public Yaml.Sequence visitSequence(Yaml.Sequence existingSeq, ExecutionContext ctx) { Cursor parent = getCursor().getParent(); if (matcher.matches(parent) && - !existingSeq.getMarkers().findFirst(AlreadyReplaced.class).filter(m -> m.getFind().equals(value)).isPresent() && + !existingSeq.getMarkers().findFirst(AlreadyReplaced.class).filter(m -> value.equals(m.getFind())).isPresent() && checkExistingSequenceValues(existingSeq, parent)) { return appendToSequence(existingSeq, this.value, ctx); }