Skip to content
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

Delete deprecated finalize #506

Merged
merged 7 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from 6 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
15 changes: 15 additions & 0 deletions src/main/resources/META-INF/rewrite/java-version-21.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ recipeList:
- org.openrewrite.staticanalysis.ReplaceDeprecatedRuntimeExecMethods
- org.openrewrite.github.SetupJavaUpgradeJavaVersion
- org.openrewrite.java.migrate.UpgradePluginsForJava21
- org.openrewrite.java.migrate.DeleteDeprecatedFinalize

---
type: specs.openrewrite.org/v1beta/recipe
Expand Down Expand Up @@ -110,3 +111,17 @@ recipeList:
- org.openrewrite.java.ChangeMethodName:
methodPattern: javax.security.auth.Subject callAs()
newMethodName: doAs
---
type: specs.openrewrite.org/v1beta/recipe
name: org.openrewrite.java.migrate.DeleteDeprecatedFinalize
displayName: Avoid using the deprecated empty `finalize()` method in `java.desktop`
description: The java.desktop module had a few implementations of finalize() that did nothing and have been removed. This recipe will remove these methods.
tags:
- java21
recipeList:
- org.openrewrite.java.migrate.RemoveMethodInvocation:
methodPattern: java.awt.color.ICC_Profile finalize()
- org.openrewrite.java.migrate.RemoveMethodInvocation:
methodPattern: java.awt.image.ColorModel finalize()
- org.openrewrite.java.migrate.RemoveMethodInvocation:
methodPattern: java.awt.image.IndexColorModel finalize()
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
/*
* Copyright 2024 the original author or authors.
* <p>
* 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
* <p>
* https://www.apache.org/licenses/LICENSE-2.0
* <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;
timtebeek marked this conversation as resolved.
Show resolved Hide resolved

import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
import org.openrewrite.test.RecipeSpec;
timtebeek marked this conversation as resolved.
Show resolved Hide resolved
import org.openrewrite.test.RewriteTest;
import static org.openrewrite.java.Assertions.java;
timtebeek marked this conversation as resolved.
Show resolved Hide resolved

public class DeleteDeprecatedFinalizeTest implements RewriteTest {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
public class DeleteDeprecatedFinalizeTest implements RewriteTest {
class DeleteDeprecatedFinalizeTest implements RewriteTest {


@Override
public void defaults(RecipeSpec spec) {
spec.recipeFromResource("/META-INF/rewrite/java-version-21.yml",
"org.openrewrite.java.migrate.DeleteDeprecatedFinalize");
}

@DocumentExample
@Test
timtebeek marked this conversation as resolved.
Show resolved Hide resolved
timtebeek marked this conversation as resolved.
Show resolved Hide resolved
void deleteDeprecatedFinalize() {
rewriteRun(
//language=java
java(
"""
package java.awt.color;

import java.awt.color.ICC_Profile;
import java.awt.image.ColorModel;
import java.awt.image.IndexColorModel;

public class Test {
public static void main(String[] args) {
byte ff = (byte) 0xff;
byte[] r = { ff, 0, 0, ff, 0 };
byte[] g = { 0, ff, 0, ff, 0 };
byte[] b = { 0, 0, ff, ff, 0 };

ICC_Profile profile = ICC_Profile.getInstance(ICC_Profile.CLASS_COLORSPACECONVERSION);
// flag
profile.finalize();

ColorModel cm = new IndexColorModel(3, 5, r, g, b);

// flag
cm.finalize();

IndexColorModel icm = new IndexColorModel(3, 5, r, g, b);
// flag
icm.finalize();

}
}
""",
"""
package java.awt.color;

import java.awt.color.ICC_Profile;
import java.awt.image.ColorModel;
import java.awt.image.IndexColorModel;

public class Test {
public static void main(String[] args) {
byte ff = (byte) 0xff;
byte[] r = { ff, 0, 0, ff, 0 };
byte[] g = { 0, ff, 0, ff, 0 };
byte[] b = { 0, 0, ff, ff, 0 };

ICC_Profile profile = ICC_Profile.getInstance(ICC_Profile.CLASS_COLORSPACECONVERSION);

ColorModel cm = new IndexColorModel(3, 5, r, g, b);

IndexColorModel icm = new IndexColorModel(3, 5, r, g, b);

}
}
"""));
}
}
timtebeek marked this conversation as resolved.
Show resolved Hide resolved