diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java index 47d09582b8c..79e95781214 100644 --- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java +++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java @@ -331,7 +331,7 @@ public void visitClass(ClassNode clazz) { randomId(), compName.getPrefix(), Markers.EMPTY, compName.withPrefix(EMPTY), emptyList(), null, typeMapping.variableType(compName.getSimpleName(), rc.getType())); J.VariableDeclarations varDecl = new J.VariableDeclarations(randomId(), compPrefix, Markers.EMPTY, - emptyList(), emptyList(), typeExpr, null, emptyList(), singletonList(JRightPadded.build(namedVar))); + emptyList(), emptyList(), typeExpr, null, singletonList(JRightPadded.build(namedVar))); componentDecls.add(JRightPadded.build((Statement) varDecl) .withAfter(i == components.size() - 1 ? sourceBefore(")") : sourceBefore(","))); } 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 index 2cee3719895..0ab7093b0e4 100644 --- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/MergeSpacesVisitor.java +++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/MergeSpacesVisitor.java @@ -21,13 +21,11 @@ import org.openrewrite.groovy.GroovyVisitor; import org.openrewrite.groovy.tree.*; import org.openrewrite.internal.ListUtils; -import org.openrewrite.internal.ToBeRemoved; import org.openrewrite.java.style.IntelliJ; import org.openrewrite.java.style.WrappingAndBracesStyle; import org.openrewrite.java.tree.*; import org.openrewrite.marker.Markers; import org.openrewrite.style.NamedStyles; -import org.openrewrite.style.Style; import org.openrewrite.style.StyleHelper; import java.util.List; @@ -39,7 +37,7 @@ public class MergeSpacesVisitor extends GroovyVisitor { private final WrappingAndBracesStyle wrappingAndBracesStyle; public MergeSpacesVisitor(List styles) { - this.wrappingAndBracesStyle = getStyle(WrappingAndBracesStyle.class, styles, IntelliJ::wrappingAndBraces); + this.wrappingAndBracesStyle = StyleHelper.getStyle(WrappingAndBracesStyle.class, styles, (Supplier) IntelliJ::wrappingAndBraces); } @Override @@ -1772,15 +1770,6 @@ public J visitErroneous(J.Erroneous erroneous, @Nullable Object ctx) { return u.withMarkers(visitMarkers(u.getMarkers(), newErroneous.getMarkers())); } - @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime") - private static S getStyle(Class styleClass, List styles, Supplier defaultStyle) { - S style = NamedStyles.merge(styleClass, styles); - if (style != null) { - return StyleHelper.merge(defaultStyle.get(), style); - } - return defaultStyle.get(); - } - private boolean evaluate(Supplier supplier, boolean defaultValue) { try { return supplier.get(); 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 index ed5a1b18e31..9907f11e2c0 100644 --- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/SpacesVisitor.java +++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/SpacesVisitor.java @@ -18,14 +18,12 @@ import org.jspecify.annotations.Nullable; import org.openrewrite.Tree; import org.openrewrite.groovy.marker.AsStyleTypeCast; -import org.openrewrite.internal.ToBeRemoved; import org.openrewrite.java.style.*; import org.openrewrite.java.tree.J; import org.openrewrite.java.tree.JLeftPadded; import org.openrewrite.java.tree.JRightPadded; import org.openrewrite.java.tree.Space; import org.openrewrite.style.NamedStyles; -import org.openrewrite.style.Style; import org.openrewrite.style.StyleHelper; import java.util.List; @@ -33,7 +31,7 @@ public class SpacesVisitor

extends org.openrewrite.java.format.SpacesVisitor

{ public SpacesVisitor(List styles, @Nullable Tree stopAfter) { - this(getStyle(SpacesStyle.class, styles, IntelliJ::spaces), getStyle(EmptyForInitializerPadStyle.class, styles), getStyle(EmptyForIteratorPadStyle.class, styles), getStyle(WrappingAndBracesStyle.class, styles, IntelliJ::wrappingAndBraces), stopAfter); + this(StyleHelper.getStyle(SpacesStyle.class, styles, (Supplier) IntelliJ::spaces), StyleHelper.getStyle(EmptyForInitializerPadStyle.class, styles), StyleHelper.getStyle(EmptyForIteratorPadStyle.class, styles), StyleHelper.getStyle(WrappingAndBracesStyle.class, styles, (Supplier) IntelliJ::wrappingAndBraces), stopAfter); } public SpacesVisitor(SpacesStyle spacesStyle, @Nullable EmptyForInitializerPadStyle emptyForInitializerPadStyle, @Nullable EmptyForIteratorPadStyle emptyForIteratorPadStyle, WrappingAndBracesStyle wrappingAndBracesStyle, @Nullable Tree stopAfter) { @@ -85,22 +83,4 @@ public Space visitSpace(@Nullable Space space, Space.Location loc, P ctx) { } return super.visitSpace(space, loc, ctx); } - - @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime") - private static @Nullable S getStyle(Class styleClass, List styles) { - S style = NamedStyles.merge(styleClass, styles); - if (style != null) { - return (S) style.applyDefaults(); - } - return null; - } - - @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime") - private static S getStyle(Class styleClass, List styles, Supplier defaultStyle) { - S style = NamedStyles.merge(styleClass, styles); - if (style != null) { - return StyleHelper.merge(defaultStyle.get(), style); - } - return defaultStyle.get(); - } } diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/Hcl.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/Hcl.java index 4b70f998c48..54b3ce6656a 100644 --- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/Hcl.java +++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/Hcl.java @@ -26,7 +26,6 @@ import org.openrewrite.hcl.HclVisitor; import org.openrewrite.hcl.internal.HclPrinter; import org.openrewrite.internal.ListUtils; -import org.openrewrite.internal.ToBeRemoved; import org.openrewrite.marker.Markers; import java.lang.ref.WeakReference; @@ -1556,23 +1555,6 @@ class TemplateInterpolation implements Hcl, Expression { HclRightPadded paddedExpression; - @JsonCreator - @ToBeRemoved(after = "2026-04-01", reason = "Temporary constructor to aid deserialization of older models") - TemplateInterpolation(UUID id, - Space prefix, - Markers markers, - @Nullable Expression expression, - @Nullable HclRightPadded paddedExpression) { - this.id = id; - this.prefix = prefix; - this.markers = markers; - if (expression != null) { - this.paddedExpression = HclRightPadded.withElement(null, expression); - } else { - this.paddedExpression = requireNonNull(paddedExpression); - } - } - public Expression getExpression() { return paddedExpression.getElement(); } diff --git a/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java b/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java index 33ffe340dea..06b610fdcf1 100644 --- a/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java +++ b/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java @@ -1596,8 +1596,6 @@ private J.VariableDeclarations visitVariables(List nodes, Space fm typeExpr = new J.AnnotatedType(randomId(), prefix, Markers.EMPTY, ListUtils.mapFirst(typeExprAnnotations, a -> a.withPrefix(EMPTY)), typeExpr); } - List> beforeDimensions = emptyList(); - Space varargs = null; if (typeExpr != null && typeExpr.getMarkers().findFirst(JavaVarKeyword.class).isEmpty()) { int varargStart = indexOfNextNonWhitespace(cursor, source); @@ -1632,7 +1630,7 @@ private J.VariableDeclarations visitVariables(List nodes, Space fm ); } - return new J.VariableDeclarations(randomId(), fmt, Markers.EMPTY, modifierResults.getLeadingAnnotations(), modifierResults.getModifiers(), typeExpr, varargs, beforeDimensions, vars); + return new J.VariableDeclarations(randomId(), fmt, Markers.EMPTY, modifierResults.getLeadingAnnotations(), modifierResults.getModifiers(), typeExpr, varargs, vars); } private List> arrayDimensions() { diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java index b8ab219fd60..7e8780b076d 100644 --- a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java +++ b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java @@ -1568,8 +1568,6 @@ private J.VariableDeclarations visitVariables(List nodes, Space fm typeExpr = new J.AnnotatedType(randomId(), prefix, Markers.EMPTY, ListUtils.mapFirst(typeExprAnnotations, a -> a.withPrefix(EMPTY)), typeExpr); } - List> beforeDimensions = emptyList(); - Space varargs = null; if (typeExpr != null) { int varargStart = indexOfNextNonWhitespace(cursor, source); @@ -1604,7 +1602,7 @@ private J.VariableDeclarations visitVariables(List nodes, Space fm ); } - return new J.VariableDeclarations(randomId(), fmt, Markers.EMPTY, modifierResults.getLeadingAnnotations(), modifierResults.getModifiers(), typeExpr, varargs, beforeDimensions, vars); + return new J.VariableDeclarations(randomId(), fmt, Markers.EMPTY, modifierResults.getLeadingAnnotations(), modifierResults.getModifiers(), typeExpr, varargs, vars); } private List> arrayDimensions() { diff --git a/rewrite-java-test/build.gradle.kts b/rewrite-java-test/build.gradle.kts index 49046dff048..83f0b45b25c 100644 --- a/rewrite-java-test/build.gradle.kts +++ b/rewrite-java-test/build.gradle.kts @@ -15,7 +15,6 @@ dependencies { implementation(project(":rewrite-java")) implementation(project(":rewrite-test")) - testImplementation("io.github.classgraph:classgraph:latest.release") testImplementation("org.junit-pioneer:junit-pioneer:latest.release") testRuntimeOnly(project(":rewrite-java-21")) testRuntimeOnly("org.apache.hbase:hbase-shaded-client:2.4.11") diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/JavaParserTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/JavaParserTest.java index c4a079f8fe3..dbed1b8ab66 100644 --- a/rewrite-java-test/src/test/java/org/openrewrite/java/JavaParserTest.java +++ b/rewrite-java-test/src/test/java/org/openrewrite/java/JavaParserTest.java @@ -15,8 +15,6 @@ */ package org.openrewrite.java; -import io.github.classgraph.ClassGraph; -import io.github.classgraph.ScanResult; import org.intellij.lang.annotations.Language; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -25,12 +23,9 @@ import org.openrewrite.DocumentExample; import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.Issue; -import org.openrewrite.SourceFile; import org.openrewrite.java.search.FindCompileErrors; -import org.openrewrite.java.tree.J; import org.openrewrite.test.RewriteTest; -import java.io.IOException; import java.net.URI; import java.net.URL; import java.net.URLClassLoader; @@ -207,45 +202,6 @@ void runtimeClasspathIncludesIsolatedClassLoaderEntries(@TempDir Path temp) thro } } - @Issue("https://github.com/openrewrite/rewrite/issues/3222") - @Test - void parseFromByteArray() { - try (ScanResult scan = new ClassGraph().scan()) { - byte[][] classes = scan.getResourcesMatchingWildcard("javaparser-byte-array-tests/**.class").stream() - .map(it -> { - try { - return it.read().array(); - } catch (IOException e) { - throw new RuntimeException(e); - } - }) - .toArray(byte[][]::new); - - JavaParser parser = JavaParser.fromJavaVersion() - .classpath(classes) - .build(); - - @Language("java") - String source = """ - import example.InterfaceA; - public class User implements InterfaceA, InterfaceB { - @Override - public void methodA() {} - - @Override - public void methodB() {} - } - """; - Stream compilationUnits = parser.parse(new InMemoryExecutionContext(Throwable::printStackTrace), source); - assertThat(compilationUnits.map(J.CompilationUnit.class::cast)).singleElement() - .satisfies(cu -> assertThat(cu.getClasses()).singleElement() - .satisfies(cd -> assertThat(cd.getImplements()).satisfiesExactly( - i -> assertThat(i.getType()).hasToString("example.InterfaceA"), - i -> assertThat(i.getType()).hasToString("InterfaceB") - ))); - } - } - @ParameterizedTest // language=java @ValueSource(strings = { diff --git a/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/InterfaceB.class b/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/InterfaceB.class deleted file mode 100644 index e66387d9c8b..00000000000 Binary files a/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/InterfaceB.class and /dev/null differ diff --git a/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/InterfaceB.java b/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/InterfaceB.java deleted file mode 100644 index a1d5315372f..00000000000 --- a/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/InterfaceB.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2023 the original author or authors. - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * https://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -public interface InterfaceB { - void methodB(); -} diff --git a/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/example/InterfaceA.class b/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/example/InterfaceA.class deleted file mode 100644 index a0428399adb..00000000000 Binary files a/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/example/InterfaceA.class and /dev/null differ diff --git a/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/example/InterfaceA.java b/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/example/InterfaceA.java deleted file mode 100644 index d65f1e8b8d4..00000000000 --- a/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/example/InterfaceA.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2023 the original author or authors. - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * https://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package example; -public interface InterfaceA { - void methodA(); -} diff --git a/rewrite-java/src/main/java/org/openrewrite/java/JavaParser.java b/rewrite-java/src/main/java/org/openrewrite/java/JavaParser.java index fe826b15032..b9ecd59831a 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/JavaParser.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/JavaParser.java @@ -19,7 +19,6 @@ import org.intellij.lang.annotations.Language; import org.jspecify.annotations.Nullable; import org.openrewrite.*; -import org.openrewrite.internal.ToBeRemoved; import org.openrewrite.java.internal.JavaTypeCache; import org.openrewrite.java.internal.JavaTypeFactory; import org.openrewrite.java.internal.parser.RewriteClasspathJarClasspathLoader; @@ -341,16 +340,6 @@ public B classpathFromResources(ExecutionContext ctx, String... classpath) { return (B) this; } - /** - * @deprecated prefer {@link #classpath} and {@link #classpathFromResources(ExecutionContext, String...)}. - */ - @Deprecated - @ToBeRemoved(after = "2025-12-31", reason = "Use classpath or classpathFromResources instead.") - public B classpath(byte[]... classpath) { - this.classBytesClasspath = Arrays.asList(classpath); - return (B) this; - } - public B styles(Iterable styles) { for (NamedStyles style : styles) { this.styles.add(style); 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 index 953b288facb..3068d67a00a 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/format/AutoFormatVisitor.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/format/AutoFormatVisitor.java @@ -19,12 +19,11 @@ import org.openrewrite.Cursor; import org.openrewrite.SourceFile; import org.openrewrite.Tree; -import org.openrewrite.internal.ToBeRemoved; import org.openrewrite.java.JavaIsoVisitor; import org.openrewrite.java.tree.J; import org.openrewrite.java.tree.JavaSourceFile; -import org.openrewrite.marker.Markers; import org.openrewrite.style.NamedStyles; +import org.openrewrite.style.StyleHelper; import java.util.*; @@ -77,7 +76,7 @@ public J visit(@Nullable Tree tree, P p, Cursor cursor) { tree = new RemoveTrailingWhitespaceVisitor<>(stopAfter).visitNonNull(tree, p, cursor.fork()); if (tree instanceof JavaSourceFile) { - return addStyleMarker((JavaSourceFile) tree, styles); + return StyleHelper.addStyleMarker((JavaSourceFile) tree, styles); } return (J) tree; @@ -113,31 +112,10 @@ public J visit(@Nullable Tree tree, P p) { tree = new RemoveTrailingWhitespaceVisitor<>(stopAfter).visitNonNull(tree, p); if (tree instanceof J.CompilationUnit) { - return addStyleMarker((JavaSourceFile) tree, styles); + return StyleHelper.addStyleMarker((JavaSourceFile) tree, styles); } } //noinspection DataFlowIssue return (J) tree; } - - @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.addStyleMarker now available in parent runtime") - private static T addStyleMarker(T t, List styles) { - if (!styles.isEmpty()) { - Set newNamedStyles = new HashSet<>(styles); - boolean styleAlreadyPresent = false; - for (NamedStyles namedStyle : t.getMarkers().findAll(NamedStyles.class)) { - styleAlreadyPresent = !newNamedStyles.add(namedStyle) || styleAlreadyPresent; - } - // As the order or NamedStyles matters, we cannot simply use addIfAbsent. - if (!styleAlreadyPresent) { - Markers markers = t.getMarkers().removeByType(NamedStyles.class); - for (NamedStyles namedStyle : newNamedStyles) { - markers = markers.add(namedStyle); - } - - return t.withMarkers(markers); - } - } - return t; - } } 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 index 7d36f512500..950c30aa41f 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/format/BlankLinesVisitor.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/format/BlankLinesVisitor.java @@ -20,13 +20,11 @@ import org.openrewrite.Tree; import org.openrewrite.internal.ListUtils; import org.openrewrite.internal.StringUtils; -import org.openrewrite.internal.ToBeRemoved; import org.openrewrite.java.JavaIsoVisitor; import org.openrewrite.java.style.BlankLinesStyle; import org.openrewrite.java.style.IntelliJ; import org.openrewrite.java.tree.*; import org.openrewrite.style.NamedStyles; -import org.openrewrite.style.Style; import org.openrewrite.style.StyleHelper; import java.util.HashSet; @@ -48,7 +46,7 @@ public BlankLinesVisitor(SourceFile sourceFile, @Nullable Tree stopAfter) { } public BlankLinesVisitor(List styles, @Nullable Tree stopAfter) { - this.style = getStyle(BlankLinesStyle.class, styles, IntelliJ::blankLines); + this.style = StyleHelper.getStyle(BlankLinesStyle.class, styles, (Supplier) IntelliJ::blankLines); this.stopAfter = stopAfter; } @@ -360,13 +358,4 @@ private static int getNewLineCount(String whitespace) { } return super.postVisit(tree, p); } - - @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime") - private static S getStyle(Class styleClass, List styles, Supplier defaultStyle) { - S style = NamedStyles.merge(styleClass, styles); - if (style != null) { - return StyleHelper.merge(defaultStyle.get(), style); - } - return defaultStyle.get(); - } } 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 index 6dedd32ec22..6353bcd47d0 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/format/MergeSpacesVisitor.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/format/MergeSpacesVisitor.java @@ -22,14 +22,12 @@ import org.openrewrite.SourceFile; import org.openrewrite.Tree; import org.openrewrite.internal.ListUtils; -import org.openrewrite.internal.ToBeRemoved; import org.openrewrite.java.JavaVisitor; import org.openrewrite.java.style.IntelliJ; import org.openrewrite.java.style.WrappingAndBracesStyle; import org.openrewrite.java.tree.*; import org.openrewrite.marker.Markers; import org.openrewrite.style.NamedStyles; -import org.openrewrite.style.Style; import org.openrewrite.style.StyleHelper; import java.util.List; @@ -44,7 +42,7 @@ public class MergeSpacesVisitor extends JavaVisitor { private final WrappingAndBracesStyle wrappingAndBracesStyle; public MergeSpacesVisitor(List styles) { - this.wrappingAndBracesStyle = getStyle(WrappingAndBracesStyle.class, styles, IntelliJ::wrappingAndBraces); + this.wrappingAndBracesStyle = StyleHelper.getStyle(WrappingAndBracesStyle.class, styles, (Supplier) IntelliJ::wrappingAndBraces); } @Override @@ -1611,15 +1609,6 @@ public J visitErroneous(J.Erroneous erroneous, @Nullable Object ctx) { return u.withMarkers(visitMarkers(u.getMarkers(), newErroneous.getMarkers())); } - @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime") - private static S getStyle(Class styleClass, List styles, Supplier defaultStyle) { - S style = NamedStyles.merge(styleClass, styles); - if (style != null) { - return StyleHelper.merge(defaultStyle.get(), style); - } - return defaultStyle.get(); - } - private boolean evaluate(Supplier supplier, boolean defaultValue) { try { return supplier.get(); 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 index 5a65cf5d383..42a5d453169 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeLineBreaksVisitor.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeLineBreaksVisitor.java @@ -18,14 +18,12 @@ import org.jspecify.annotations.Nullable; import org.openrewrite.Tree; import org.openrewrite.internal.ListUtils; -import org.openrewrite.internal.ToBeRemoved; import org.openrewrite.java.JavaIsoVisitor; import org.openrewrite.java.JavaVisitor; import org.openrewrite.java.JavadocVisitor; import org.openrewrite.java.tree.*; import org.openrewrite.style.GeneralFormatStyle; import org.openrewrite.style.NamedStyles; -import org.openrewrite.style.Style; import org.openrewrite.style.StyleHelper; import java.util.List; @@ -52,7 +50,7 @@ public NormalizeLineBreaksVisitor(JavaSourceFile cu, @Nullable Tree stopAfter) { } public NormalizeLineBreaksVisitor(List styles, JavaSourceFile cu, @Nullable Tree stopAfter) { - this(getStyle(GeneralFormatStyle.class, styles, () -> autodetectGeneralFormatStyle(cu)), stopAfter); + this(StyleHelper.getStyle(GeneralFormatStyle.class, styles, (Supplier) () -> autodetectGeneralFormatStyle(cu)), stopAfter); } public NormalizeLineBreaksVisitor(GeneralFormatStyle style, @Nullable Tree stopAfter) { @@ -94,13 +92,4 @@ public J postVisit(J tree, P p) { } return super.visit(tree, p); } - - @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime") - private static S getStyle(Class styleClass, List styles, Supplier defaultStyle) { - S style = NamedStyles.merge(styleClass, styles); - if (style != null) { - return StyleHelper.merge(defaultStyle.get(), style); - } - return defaultStyle.get(); - } } 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 index 07a9b1525d9..7f6d85c0076 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeTabsOrSpacesVisitor.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeTabsOrSpacesVisitor.java @@ -21,7 +21,6 @@ import org.openrewrite.Tree; import org.openrewrite.internal.ListUtils; import org.openrewrite.internal.StringUtils; -import org.openrewrite.internal.ToBeRemoved; import org.openrewrite.java.JavaIsoVisitor; import org.openrewrite.java.JavaVisitor; import org.openrewrite.java.JavadocVisitor; @@ -29,7 +28,6 @@ import org.openrewrite.java.style.TabsAndIndentsStyle; import org.openrewrite.java.tree.*; import org.openrewrite.style.NamedStyles; -import org.openrewrite.style.Style; import org.openrewrite.style.StyleHelper; import java.util.List; @@ -46,7 +44,7 @@ public NormalizeTabsOrSpacesVisitor(SourceFile sourceFile, @Nullable Tree stopAf } public NormalizeTabsOrSpacesVisitor(List styles, @Nullable Tree stopAfter) { - this(getStyle(TabsAndIndentsStyle.class, styles, IntelliJ::tabsAndIndents), stopAfter); + this(StyleHelper.getStyle(TabsAndIndentsStyle.class, styles, (Supplier) IntelliJ::tabsAndIndents), stopAfter); } @Deprecated @@ -154,13 +152,4 @@ private String normalize(String text, boolean isComment) { } return super.visit(tree, p); } - - @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime") - private static S getStyle(Class styleClass, List styles, Supplier defaultStyle) { - S style = NamedStyles.merge(styleClass, styles); - if (style != null) { - return StyleHelper.merge(defaultStyle.get(), style); - } - return defaultStyle.get(); - } } 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 index 0738579a02d..64b55e1846d 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/format/SpacesVisitor.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/format/SpacesVisitor.java @@ -21,13 +21,11 @@ import org.openrewrite.Tree; import org.openrewrite.internal.ListUtils; import org.openrewrite.internal.StringUtils; -import org.openrewrite.internal.ToBeRemoved; import org.openrewrite.java.JavaIsoVisitor; import org.openrewrite.java.style.*; import org.openrewrite.java.tree.*; import org.openrewrite.marker.Markers; import org.openrewrite.style.NamedStyles; -import org.openrewrite.style.Style; import org.openrewrite.style.StyleHelper; import java.util.Arrays; @@ -54,7 +52,7 @@ public SpacesVisitor(SourceFile sourceFile, @Nullable Tree stopAfter) { } public SpacesVisitor(List styles, @Nullable Tree stopAfter) { - this(getStyle(SpacesStyle.class, styles, IntelliJ::spaces), getStyle(EmptyForInitializerPadStyle.class, styles), getStyle(EmptyForIteratorPadStyle.class, styles), getStyle(WrappingAndBracesStyle.class, styles, IntelliJ::wrappingAndBraces), stopAfter); + this(StyleHelper.getStyle(SpacesStyle.class, styles, (Supplier) IntelliJ::spaces), StyleHelper.getStyle(EmptyForInitializerPadStyle.class, styles), StyleHelper.getStyle(EmptyForIteratorPadStyle.class, styles), StyleHelper.getStyle(WrappingAndBracesStyle.class, styles, (Supplier) IntelliJ::wrappingAndBraces), stopAfter); } @Deprecated @@ -988,22 +986,4 @@ private boolean hasLineBreakInSpace(Space space) { private enum ContainerPosition { OPEN, CLOSE, BEFORE_SEPARATOR, AFTER_SEPARATOR, EMPTY } - - @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime") - private static @Nullable S getStyle(Class styleClass, List styles) { - S style = NamedStyles.merge(styleClass, styles); - if (style != null) { - return (S) style.applyDefaults(); - } - return null; - } - - @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime") - private static S getStyle(Class styleClass, List styles, Supplier defaultStyle) { - S style = NamedStyles.merge(styleClass, styles); - if (style != null) { - return StyleHelper.merge(defaultStyle.get(), style); - } - return defaultStyle.get(); - } } 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 index a0387141b32..422f4bb8961 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/format/TabsAndIndentsVisitor.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/format/TabsAndIndentsVisitor.java @@ -21,7 +21,6 @@ import org.openrewrite.Tree; import org.openrewrite.internal.ListUtils; import org.openrewrite.internal.StringUtils; -import org.openrewrite.internal.ToBeRemoved; import org.openrewrite.java.JavaIsoVisitor; import org.openrewrite.java.service.SourcePositionService; import org.openrewrite.java.service.Span.ColSpan; @@ -31,7 +30,6 @@ import org.openrewrite.java.style.WrappingAndBracesStyle; import org.openrewrite.java.tree.*; import org.openrewrite.style.NamedStyles; -import org.openrewrite.style.Style; import org.openrewrite.style.StyleHelper; import java.util.ArrayList; @@ -51,9 +49,9 @@ public TabsAndIndentsVisitor(SourceFile sourceFile, @Nullable Tree stopAfter) { } public TabsAndIndentsVisitor(List styles, @Nullable Tree stopAfter) { - this(getStyle(TabsAndIndentsStyle.class, styles, IntelliJ::tabsAndIndents), - getStyle(SpacesStyle.class, styles, IntelliJ::spaces), - getStyle(WrappingAndBracesStyle.class, styles, IntelliJ::wrappingAndBraces), + this(StyleHelper.getStyle(TabsAndIndentsStyle.class, styles, (Supplier) IntelliJ::tabsAndIndents), + StyleHelper.getStyle(SpacesStyle.class, styles, (Supplier) IntelliJ::spaces), + StyleHelper.getStyle(WrappingAndBracesStyle.class, styles, (Supplier) IntelliJ::wrappingAndBraces), stopAfter); } @@ -852,13 +850,4 @@ private T evaluate(Supplier supplier, T defaultValue) { return defaultValue; } } - - @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime") - private static S getStyle(Class styleClass, List styles, Supplier defaultStyle) { - S style = NamedStyles.merge(styleClass, styles); - if (style != null) { - return StyleHelper.merge(defaultStyle.get(), style); - } - return defaultStyle.get(); - } } 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 index 21b738b9911..83e415f1274 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/format/WrappingAndBracesVisitor.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/format/WrappingAndBracesVisitor.java @@ -21,7 +21,6 @@ import org.openrewrite.Tree; import org.openrewrite.internal.ListUtils; import org.openrewrite.internal.StringUtils; -import org.openrewrite.internal.ToBeRemoved; import org.openrewrite.java.JavaIsoVisitor; import org.openrewrite.java.MethodMatcher; import org.openrewrite.java.service.SourcePositionService; @@ -31,7 +30,6 @@ import org.openrewrite.java.tree.*; import org.openrewrite.style.LineWrapSetting; import org.openrewrite.style.NamedStyles; -import org.openrewrite.style.Style; import org.openrewrite.style.StyleHelper; import java.util.List; @@ -58,7 +56,7 @@ public WrappingAndBracesVisitor(SourceFile sourceFile, @Nullable Tree stopAfter) } public WrappingAndBracesVisitor(List styles, @Nullable Tree stopAfter) { - this(getStyle(SpacesStyle.class, styles, IntelliJ::spaces), getStyle(WrappingAndBracesStyle.class, styles, IntelliJ::wrappingAndBraces), stopAfter); + this(StyleHelper.getStyle(SpacesStyle.class, styles, (Supplier) IntelliJ::spaces), StyleHelper.getStyle(WrappingAndBracesStyle.class, styles, (Supplier) IntelliJ::wrappingAndBraces), stopAfter); } public WrappingAndBracesVisitor(SpacesStyle spacesStyle, WrappingAndBracesStyle wrappingAndBracesStyle, @Nullable Tree stopAfter) { @@ -661,13 +659,4 @@ private T evaluate(Supplier supplier, T defaultValue) { return defaultValue; } } - - @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime") - private static S getStyle(Class styleClass, List styles, Supplier defaultStyle) { - S style = NamedStyles.merge(styleClass, styles); - if (style != null) { - return StyleHelper.merge(defaultStyle.get(), style); - } - return defaultStyle.get(); - } } diff --git a/rewrite-java/src/main/java/org/openrewrite/java/style/CheckstyleConfigLoader.java b/rewrite-java/src/main/java/org/openrewrite/java/style/CheckstyleConfigLoader.java index 693797dbbd5..74e8e76b865 100755 --- a/rewrite-java/src/main/java/org/openrewrite/java/style/CheckstyleConfigLoader.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/style/CheckstyleConfigLoader.java @@ -21,7 +21,6 @@ import lombok.Getter; import org.intellij.lang.annotations.Language; import org.jspecify.annotations.Nullable; -import org.openrewrite.internal.ToBeRemoved; import org.xml.sax.InputSource; import java.io.ByteArrayInputStream; @@ -1048,7 +1047,7 @@ private static void addRegExpPackages(ImportLayoutStyle.Builder builder, String } } - boolean isInflow = !staticsOnTop && !staticsOnBottom && shouldKnowInflowStyle(); + boolean isInflow = !staticsOnTop && !staticsOnBottom; // Add non-static import groups if (groups != null && !groups.isEmpty()) { @@ -1086,16 +1085,6 @@ private static void addRegExpPackages(ImportLayoutStyle.Builder builder, String .collect(toSet()); } - @ToBeRemoved(after = "2026-06-01", reason = "All parent runtimes have had few weeks to update") - private static boolean shouldKnowInflowStyle() { - try { - ImportLayoutStyle.Builder.class.getMethod("importAllOthersInflow"); - return true; - } catch (NoSuchMethodError | NoSuchMethodException e) { - return false; - } - } - private static void addGroupBlocks(ImportLayoutStyle.Builder builder, String groups, boolean separated, boolean isStatic) { String[] groupArray = groups.split("\\s*,\\s*"); for (int i = 0; i < groupArray.length; i++) { diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/J.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/J.java index 76fecb22a15..ee12d3652e5 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/tree/J.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/J.java @@ -6234,33 +6234,8 @@ final class VariableDeclarations implements J, Statement, TypedTree { @Getter Space varargs; - @Deprecated - @ToBeRemoved(after = "2025-10-31") - public List> getDimensionsBeforeName() { - return emptyList(); - } - - @Deprecated - @ToBeRemoved(after = "2025-10-31") - public VariableDeclarations withDimensionsBeforeName(List> dimensionsBeforeName) { - return this; - } - List> variables; - @Deprecated - @ToBeRemoved(after = "2025-10-31") - public VariableDeclarations(UUID id, Space prefix, Markers markers, List leadingAnnotations, List modifiers, @Nullable TypeTree typeExpression, @Nullable Space varargs, @Nullable List> dimensionsBeforeName, List> variables) { - this.id = id; - this.prefix = prefix; - this.markers = markers; - this.leadingAnnotations = leadingAnnotations; - this.modifiers = modifiers; - this.typeExpression = typeExpression; - this.varargs = varargs; - this.variables = variables; - } - public List getVariables() { return JRightPadded.getElements(variables); } diff --git a/rewrite-java/src/test/java/org/openrewrite/java/tree/AddKeywordContainerSpacingTest.java b/rewrite-java/src/test/java/org/openrewrite/java/tree/AddKeywordContainerSpacingTest.java index e44961ec26e..d10faa35813 100644 --- a/rewrite-java/src/test/java/org/openrewrite/java/tree/AddKeywordContainerSpacingTest.java +++ b/rewrite-java/src/test/java/org/openrewrite/java/tree/AddKeywordContainerSpacingTest.java @@ -171,7 +171,7 @@ varName, emptyList(), J.VariableDeclarations decl = new J.VariableDeclarations( Tree.randomId(), Space.EMPTY, Markers.EMPTY, emptyList(), emptyList(), - acType, null, emptyList(), + acType, null, singletonList(new JRightPadded<>(namedVar, Space.EMPTY, Markers.EMPTY))); J.Try.Resource resource = new J.Try.Resource( Tree.randomId(), Space.EMPTY, Markers.EMPTY, decl, false); 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 index d92d74ae4a0..864f8c6a987 100644 --- a/rewrite-kotlin/src/main/java/org/openrewrite/kotlin/format/MergeSpacesVisitor.java +++ b/rewrite-kotlin/src/main/java/org/openrewrite/kotlin/format/MergeSpacesVisitor.java @@ -19,7 +19,6 @@ import org.openrewrite.Cursor; import org.openrewrite.Tree; import org.openrewrite.internal.ListUtils; -import org.openrewrite.internal.ToBeRemoved; import org.openrewrite.java.tree.*; import org.openrewrite.kotlin.KotlinVisitor; import org.openrewrite.kotlin.marker.TypeReferencePrefix; @@ -27,8 +26,6 @@ import org.openrewrite.kotlin.tree.*; import org.openrewrite.marker.Marker; import org.openrewrite.marker.Markers; -import org.openrewrite.style.NamedStyles; -import org.openrewrite.style.Style; import java.util.List; import java.util.Objects; @@ -2222,15 +2219,6 @@ public J visitErroneous(J.Erroneous erroneous, @Nullable Object ctx) { return u.withMarkers(visitMarkers(u.getMarkers(), newErroneous.getMarkers())); } - @ToBeRemoved(after = "2026-03-01", reason = "Replace me with org.openrewrite.style.StyleHelper.getStyle now available in parent runtime") - private static @Nullable S getStyle(Class styleClass, List styles) { - S style = NamedStyles.merge(styleClass, styles); - if (style != null) { - return (S) style.applyDefaults(); - } - return null; - } - private boolean evaluate(Supplier supplier, boolean defaultValue) { try { return supplier.get(); diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/IndentsVisitor.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/IndentsVisitor.java index f57a3315fd9..8640bde5617 100755 --- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/IndentsVisitor.java +++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/IndentsVisitor.java @@ -19,7 +19,6 @@ import org.openrewrite.Cursor; import org.openrewrite.Tree; import org.openrewrite.internal.StringUtils; -import org.openrewrite.internal.ToBeRemoved; import org.openrewrite.yaml.MultilineScalarChanged; import org.openrewrite.yaml.YamlIsoVisitor; import org.openrewrite.yaml.style.IndentsStyle; @@ -28,7 +27,6 @@ import java.util.Arrays; import java.util.Iterator; import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Supplier; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -82,7 +80,7 @@ public IndentsVisitor(IndentsStyle style, @Nullable Tree stopAfter) { if (y instanceof Yaml.Sequence.Entry) { indent = getCursor().getParentOrThrow().getMessage("sequenceEntryIndent", indent); - int seqIndentOffset = evaluate(() -> style.isIndentedSequences(), true) ? style.getIndentSize() : 0; + int seqIndentOffset = style.isIndentedSequences() ? style.getIndentSize() : 0; int dashColumn = indent + seqIndentOffset; y = y.withPrefix(indentTo(y.getPrefix(), dashColumn)); @@ -233,16 +231,6 @@ private int findIndent(String prefix) { return size; } - @ToBeRemoved(after = "2026-06-01", reason = "All parent runtimes have had few weeks to update") - private T evaluate(Supplier supplier, T defaultValue) { - try { - return supplier.get(); - } catch (NoSuchMethodError | NoSuchFieldError e) { - // Handle newly introduced method calls on style that are not part of lst yet - return defaultValue; - } - } - private String firstIndent(Yaml yaml) { AtomicReference<@Nullable String> indent = new AtomicReference<>(); diff --git a/rewrite.yml b/rewrite.yml index f8714f9c26d..e834681396b 100644 --- a/rewrite.yml +++ b/rewrite.yml @@ -39,7 +39,7 @@ recipeList: - org.openrewrite.recipes.JavaRecipeBestPracticesSubset - org.openrewrite.recipes.RecipeTestingBestPracticesSubset - org.openrewrite.recipes.RecipeNullabilityBestPracticesSubset -# - org.openrewrite.java.recipes.RemoveToBeRemoved # deletes 195 lines of past-due @ToBeRemoved code in 16 files; do that in a reviewed PR, not as a suggestion bot + - org.openrewrite.java.recipes.RemoveToBeRemoved # - org.openrewrite.java.recipes.UpgradeTestsToJava21 # 166 files, +2512/-1983; a version bump, not a cleanup # - org.openrewrite.java.recipes.ExamplesExtractor # deliberately not applied here: too opinionated for this repository # - org.openrewrite.java.OrderImports # deliberately not applied here: too opinionated for this repository