-
Notifications
You must be signed in to change notification settings - Fork 110
Inflater deflater autoclosable #843
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
2119017
initial implementation
JohannisK 2c878e9
implementation
JohannisK 188073f
Update src/main/java/org/openrewrite/java/migrate/util/MigrateInflate…
JohannisK 1bd5a57
Update src/main/java/org/openrewrite/java/migrate/util/MigrateInflate…
JohannisK 0573321
fixed imports
JohannisK c982e6e
fixed imports
JohannisK fe89400
Use a declarative recipe instead
timtebeek 6fbf490
Rename declarative recipe as we only call close for now
timtebeek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
75 changes: 75 additions & 0 deletions
75
src/main/java/org/openrewrite/java/migrate/util/MigrateInflaterDeflaterToAutoCloseable.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| * Copyright 2025 the original author or authors. | ||
| * <p> | ||
| * Licensed under the Moderne Source Available License (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * <p> | ||
| * https://docs.moderne.io/licensing/moderne-source-available-license | ||
| * <p> | ||
| * 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 org.openrewrite.java.migrate.util; | ||
|
|
||
| import lombok.EqualsAndHashCode; | ||
| import lombok.Value; | ||
| import org.jspecify.annotations.Nullable; | ||
| import org.openrewrite.ExecutionContext; | ||
| import org.openrewrite.Preconditions; | ||
| import org.openrewrite.Recipe; | ||
| import org.openrewrite.TreeVisitor; | ||
| import org.openrewrite.java.JavaIsoVisitor; | ||
| import org.openrewrite.java.JavaTemplate; | ||
| import org.openrewrite.java.MethodMatcher; | ||
| import org.openrewrite.java.search.UsesJavaVersion; | ||
| import org.openrewrite.java.search.UsesType; | ||
| import org.openrewrite.java.tree.*; | ||
|
|
||
| import java.util.*; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| @EqualsAndHashCode(callSuper = false) | ||
| @Value | ||
| public class MigrateInflaterDeflaterToAutoCloseable extends Recipe { | ||
|
|
||
| private static final String JAVA_UTIL_ZIP_DEFLATER = "java.util.zip.Deflater"; | ||
| private static final String JAVA_UTIL_ZIP_INFLATER = "java.util.zip.Inflater"; | ||
|
|
||
| private static final MethodMatcher JAVA_UTIL_ZIP_DEFLATER_END_MATCHER = new MethodMatcher(JAVA_UTIL_ZIP_DEFLATER + " end()"); | ||
| private static final MethodMatcher JAVA_UTIL_ZIP_INFLATER_END_MATCHER = new MethodMatcher(JAVA_UTIL_ZIP_INFLATER + " end()"); | ||
|
|
||
| @Override | ||
| public String getDisplayName() { | ||
| return "Replace `Inflater` and `Deflater` `end()` calls with `close()` calls"; | ||
| } | ||
|
|
||
| @Override | ||
| public String getDescription() { | ||
| return "Replace `end()` method calls with `close()` method calls for `Inflater` and `Deflater` classes in Java 25+, as they now implement AutoCloseable."; | ||
| } | ||
|
|
||
| @Override | ||
| public TreeVisitor<?, ExecutionContext> getVisitor() { | ||
| return Preconditions.check(Preconditions.and( | ||
| new UsesJavaVersion<>(25), | ||
| Preconditions.or( | ||
| new UsesType<>(JAVA_UTIL_ZIP_DEFLATER, false), | ||
| new UsesType<>(JAVA_UTIL_ZIP_INFLATER, false))), | ||
| new JavaIsoVisitor<ExecutionContext>() { | ||
|
|
||
| @Override | ||
| public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) { | ||
| J.MethodInvocation mi = super.visitMethodInvocation(method, ctx); | ||
| if (JAVA_UTIL_ZIP_DEFLATER_END_MATCHER.matches(mi) || | ||
JohannisK marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| JAVA_UTIL_ZIP_INFLATER_END_MATCHER.matches(mi)) { | ||
| return mi.withName(mi.getName().withSimpleName("close")); | ||
| } | ||
| return mi; | ||
| } | ||
| }); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.