Merge remote-tracking branch 'origin/main' into greg-python-single-import-multiimport

greg-at-moderne · greg-at-moderne · commit 96088ef2a6a2 · 2026-02-13T09:33:55.000+01:00
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/MergeSpacesVisitor.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/MergeSpacesVisitor.java
@@ -1766,7 +1766,7 @@ public J visitErroneous(J.Erroneous erroneous, @Nullable Object ctx) {
         return u.withMarkers(visitMarkers(u.getMarkers(), newErroneous.getMarkers()));
     }
 
-    @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
+    @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
     private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {
         S style = NamedStyles.merge(styleClass, styles);
         if (style != null) {
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/SpacesVisitor.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/SpacesVisitor.java
@@ -71,7 +71,7 @@ public Space visitSpace(@Nullable Space space, Space.Location loc, P ctx) {
         return super.visitSpace(space, loc, ctx);
     }
 
-    @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
+    @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
     private static <S extends Style> @Nullable S getStyle(Class<S> styleClass, List<NamedStyles> styles) {
         S style = NamedStyles.merge(styleClass, styles);
         if (style != null) {
@@ -80,7 +80,7 @@ public Space visitSpace(@Nullable Space space, Space.Location loc, P ctx) {
         return null;
     }
 
-    @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
+    @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
     private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {
         S style = NamedStyles.merge(styleClass, styles);
         if (style != null) {
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/AutoFormatVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/AutoFormatVisitor.java
@@ -119,7 +119,7 @@ public J visit(@Nullable Tree tree, P p) {
         return (J) tree;
     }
 
-    @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.addStyleMarker now available in parent runtime")
+    @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.addStyleMarker now available in parent runtime")
     private static <T extends SourceFile> T addStyleMarker(T t, List<NamedStyles> styles) {
         if (!styles.isEmpty()) {
             Set<NamedStyles> newNamedStyles = new HashSet<>(styles);
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/BlankLinesVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/BlankLinesVisitor.java
@@ -361,7 +361,7 @@ private static int getNewLineCount(String whitespace) {
         return super.postVisit(tree, p);
     }
 
-    @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
+    @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
     private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {
         S style = NamedStyles.merge(styleClass, styles);
         if (style != null) {
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/MergeSpacesVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/MergeSpacesVisitor.java
@@ -1610,7 +1610,7 @@ public J visitErroneous(J.Erroneous erroneous, @Nullable Object ctx) {
         return u.withMarkers(visitMarkers(u.getMarkers(), newErroneous.getMarkers()));
     }
 
-    @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
+    @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
     private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {
         S style = NamedStyles.merge(styleClass, styles);
         if (style != null) {
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeLineBreaksVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeLineBreaksVisitor.java
@@ -95,7 +95,7 @@ public J postVisit(J tree, P p) {
         return super.visit(tree, p);
     }
 
-    @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
+    @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
     private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {
         S style = NamedStyles.merge(styleClass, styles);
         if (style != null) {
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeTabsOrSpacesVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeTabsOrSpacesVisitor.java
@@ -155,7 +155,7 @@ private String normalize(String text, boolean isComment) {
         return super.visit(tree, p);
     }
 
-    @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
+    @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
     private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {
         S style = NamedStyles.merge(styleClass, styles);
         if (style != null) {
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/SpacesVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/SpacesVisitor.java
@@ -966,7 +966,7 @@ private enum ContainerPosition {
         OPEN, CLOSE, BEFORE_SEPARATOR, AFTER_SEPARATOR, EMPTY
     }
 
-    @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
+    @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
     private static <S extends Style> @Nullable S getStyle(Class<S> styleClass, List<NamedStyles> styles) {
         S style = NamedStyles.merge(styleClass, styles);
         if (style != null) {
@@ -975,7 +975,7 @@ private enum ContainerPosition {
         return null;
     }
 
-    @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
+    @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
     private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {
         S style = NamedStyles.merge(styleClass, styles);
         if (style != null) {
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/TabsAndIndentsVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/TabsAndIndentsVisitor.java
@@ -834,7 +834,7 @@ private <T> T evaluate(Supplier<T> supplier, T defaultValue) {
         }
     }
 
-    @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
+    @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
     private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {
         S style = NamedStyles.merge(styleClass, styles);
         if (style != null) {
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/WrappingAndBracesVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/WrappingAndBracesVisitor.java
@@ -646,7 +646,7 @@ private <T> T evaluate(Supplier<T> supplier, T defaultValue) {
         }
     }
 
-    @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
+    @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
     private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {
         S style = NamedStyles.merge(styleClass, styles);
         if (style != null) {
diff --git a/rewrite-kotlin/src/main/java/org/openrewrite/kotlin/format/MergeSpacesVisitor.java b/rewrite-kotlin/src/main/java/org/openrewrite/kotlin/format/MergeSpacesVisitor.java
@@ -2200,7 +2200,7 @@ public J visitErroneous(J.Erroneous erroneous, @Nullable Object ctx) {
         return u.withMarkers(visitMarkers(u.getMarkers(), newErroneous.getMarkers()));
     }
 
-    @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
+    @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")
     private static <S extends Style> @Nullable S getStyle(Class<S> styleClass, List<NamedStyles> styles) {
         S style = NamedStyles.merge(styleClass, styles);
         if (style != null) {

Original file line number	Diff line number	Diff line change
`@@ -1766,7 +1766,7 @@ public J visitErroneous(J.Erroneous erroneous, @Nullable Object ctx) {`
`1766`	`1766`	`return u.withMarkers(visitMarkers(u.getMarkers(), newErroneous.getMarkers()));`
`1767`	`1767`	`}`
`1768`	`1768`
`1769`		`- @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")`
	`1769`	`+ @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")`
`1770`	`1770`	`private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {`
`1771`	`1771`	`S style = NamedStyles.merge(styleClass, styles);`
`1772`	`1772`	`if (style != null) {`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public J visit(@Nullable Tree tree, P p) {`
`119`	`119`	`return (J) tree;`
`120`	`120`	`}`
`121`	`121`
`122`		`- @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.addStyleMarker now available in parent runtime")`
	`122`	`+ @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.addStyleMarker now available in parent runtime")`
`123`	`123`	`private static <T extends SourceFile> T addStyleMarker(T t, List<NamedStyles> styles) {`
`124`	`124`	`if (!styles.isEmpty()) {`
`125`	`125`	`Set<NamedStyles> newNamedStyles = new HashSet<>(styles);`
Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ private static int getNewLineCount(String whitespace) {`
`361`	`361`	`return super.postVisit(tree, p);`
`362`	`362`	`}`
`363`	`363`
`364`		`- @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")`
	`364`	`+ @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")`
`365`	`365`	`private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {`
`366`	`366`	`S style = NamedStyles.merge(styleClass, styles);`
`367`	`367`	`if (style != null) {`
Original file line number	Diff line number	Diff line change
`@@ -1610,7 +1610,7 @@ public J visitErroneous(J.Erroneous erroneous, @Nullable Object ctx) {`
`1610`	`1610`	`return u.withMarkers(visitMarkers(u.getMarkers(), newErroneous.getMarkers()));`
`1611`	`1611`	`}`
`1612`	`1612`
`1613`		`- @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")`
	`1613`	`+ @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")`
`1614`	`1614`	`private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {`
`1615`	`1615`	`S style = NamedStyles.merge(styleClass, styles);`
`1616`	`1616`	`if (style != null) {`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public J postVisit(J tree, P p) {`
`95`	`95`	`return super.visit(tree, p);`
`96`	`96`	`}`
`97`	`97`
`98`		`- @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")`
	`98`	`+ @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")`
`99`	`99`	`private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {`
`100`	`100`	`S style = NamedStyles.merge(styleClass, styles);`
`101`	`101`	`if (style != null) {`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ private String normalize(String text, boolean isComment) {`
`155`	`155`	`return super.visit(tree, p);`
`156`	`156`	`}`
`157`	`157`
`158`		`- @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")`
	`158`	`+ @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")`
`159`	`159`	`private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {`
`160`	`160`	`S style = NamedStyles.merge(styleClass, styles);`
`161`	`161`	`if (style != null) {`
Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@ private <T> T evaluate(Supplier<T> supplier, T defaultValue) {`
`834`	`834`	`}`
`835`	`835`	`}`
`836`	`836`
`837`		`- @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")`
	`837`	`+ @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")`
`838`	`838`	`private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {`
`839`	`839`	`S style = NamedStyles.merge(styleClass, styles);`
`840`	`840`	`if (style != null) {`
Original file line number	Diff line number	Diff line change
`@@ -646,7 +646,7 @@ private <T> T evaluate(Supplier<T> supplier, T defaultValue) {`
`646`	`646`	`}`
`647`	`647`	`}`
`648`	`648`
`649`		`- @ToBeRemoved(after = "2026-02-30", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")`
	`649`	`+ @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime")`
`650`	`650`	`private static <S extends Style> S getStyle(Class<S> styleClass, List<NamedStyles> styles, Supplier<S> defaultStyle) {`
`651`	`651`	`S style = NamedStyles.merge(styleClass, styles);`
`652`	`652`	`if (style != null) {`