Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
169 changes: 132 additions & 37 deletions src/main/resources/META-INF/rewrite/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,37 @@ examples:
language: java
---
type: specs.openrewrite.org/v1beta/example
recipeName: org.openrewrite.java.migrate.MigrateZipErrorToZipException
examples:
- description: ''
sources:
- before: |
import java.util.zip.ZipError;

class Test {
void test() {
try {
// Some zip operation
} catch (ZipError e) {
System.out.println("Zip error occurred: " + e.getMessage());
}
}
}
after: |
import java.util.zip.ZipException;

class Test {
void test() {
try {
// Some zip operation
} catch (ZipException e) {
System.out.println("Zip error occurred: " + e.getMessage());
}
}
}
language: java
---
type: specs.openrewrite.org/v1beta/example
recipeName: org.openrewrite.java.migrate.ReferenceCloneMethod
examples:
- description: ''
Expand Down Expand Up @@ -1025,31 +1056,34 @@ recipeName: org.openrewrite.java.migrate.UpgradePluginsForJava11
examples:
- description: ''
sources:
- before: project
language: mavenProject
- before: |
<project>
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<version>1</version>
<properties>
<wro4j.version>1.8.0</wro4j.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>
<version>${wro4j.version}</version>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>2.3.1</version>
</plugin>
</plugins>
</build>
</project>
after: |
path: pom.xml
language: xml
- description: ''
sources:
- before: |
<project>
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<version>1</version>
<properties>
<wro4j.version>1.10.1</wro4j.version>
<wro4j.version>1.8.0</wro4j.version>
</properties>
<build>
<plugins>
Expand All @@ -1061,23 +1095,20 @@ examples:
</plugins>
</build>
</project>
path: pom.xml
language: xml
- description: ''
sources:
- before: project
language: mavenProject
- before: |
after: |
<project>
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<version>1</version>
<properties>
<wro4j.version>1.10.1</wro4j.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>2.3.1</version>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>
<version>${wro4j.version}</version>
</plugin>
</plugins>
</build>
Expand Down Expand Up @@ -3330,25 +3361,6 @@ examples:
type: specs.openrewrite.org/v1beta/example
recipeName: org.openrewrite.java.migrate.guava.NoGuava
examples:
- description: ''
sources:
- before: |
import com.google.common.base.MoreObjects;

class A {
Object foo(Object obj) {
return MoreObjects.firstNonNull(obj, "default");
}
}
after: |
import java.util.Objects;

class A {
Object foo(Object obj) {
return Objects.requireNonNullElse(obj, "default");
}
}
language: java
- description: ''
sources:
- before: |
Expand Down Expand Up @@ -3395,6 +3407,25 @@ examples:
}
}
language: java
- description: ''
sources:
- before: |
import com.google.common.base.MoreObjects;

class A {
Object foo(Object obj) {
return MoreObjects.firstNonNull(obj, "default");
}
}
after: |
import java.util.Objects;

class A {
Object foo(Object obj) {
return Objects.requireNonNullElse(obj, "default");
}
}
language: java
---
type: specs.openrewrite.org/v1beta/example
recipeName: org.openrewrite.java.migrate.guava.NoGuavaAtomicsNewReference
Expand Down Expand Up @@ -6137,6 +6168,37 @@ examples:
language: java
---
type: specs.openrewrite.org/v1beta/example
recipeName: org.openrewrite.java.migrate.lang.ReplaceUnusedVariablesWithUnderscore
examples:
- description: ''
sources:
- before: |
import java.util.List;

class Test {
int countOrders(List<String> orders) {
int total = 0;
for (String order : orders) {
total++;
}
return total;
}
}
after: |
import java.util.List;

class Test {
int countOrders(List<String> orders) {
int total = 0;
for (String _ : orders) {
total++;
}
return total;
}
}
language: java
---
type: specs.openrewrite.org/v1beta/example
recipeName: org.openrewrite.java.migrate.lang.StringRulesRecipes
examples:
- description: ''
Expand Down Expand Up @@ -7384,6 +7446,39 @@ examples:
language: java
---
type: specs.openrewrite.org/v1beta/example
recipeName: org.openrewrite.java.migrate.util.MigrateInflaterDeflaterToClose
examples:
- description: ''
sources:
- before: |
import java.util.zip.Inflater;

class Test {
public void test(byte[] arg) {
Inflater inflater = new Inflater();
try {
inflater.inflate(arg);
} finally {
inflater.end();
}
}
}
after: |
import java.util.zip.Inflater;

class Test {
public void test(byte[] arg) {
Inflater inflater = new Inflater();
try {
inflater.inflate(arg);
} finally {
inflater.close();
}
}
}
language: java
---
type: specs.openrewrite.org/v1beta/example
recipeName: org.openrewrite.java.migrate.util.OptionalStreamRecipe
examples:
- description: ''
Expand Down
14 changes: 14 additions & 0 deletions src/main/resources/META-INF/rewrite/java-version-25.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ recipeList:
- org.openrewrite.java.migrate.RemoveSecurityPolicy
- org.openrewrite.java.migrate.RemoveSecurityManager
- org.openrewrite.java.migrate.SystemGetSecurityManagerToNull
- org.openrewrite.java.migrate.MigrateZipErrorToZipException

---
type: specs.openrewrite.org/v1beta/recipe
Expand Down Expand Up @@ -134,3 +135,16 @@ recipeList:
methodPattern: java.lang.System#getSecurityManager()
replacement: "null"
- org.openrewrite.staticanalysis.SimplifyConstantIfBranchExecution

---
type: specs.openrewrite.org/v1beta/recipe
name: org.openrewrite.java.migrate.MigrateZipErrorToZipException
displayName: Use `ZipException` instead of `ZipError`
description: Use `ZipException` instead of the deprecated `ZipError` in Java 9 or higher.
preconditions:
- org.openrewrite.java.search.HasJavaVersion:
version: "[25,)"
recipeList:
- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: java.util.zip.ZipError
newFullyQualifiedTypeName: java.util.zip.ZipException
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
/*
* 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.lang;

import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
import org.openrewrite.java.JavaParser;
import org.openrewrite.test.RecipeSpec;
import org.openrewrite.test.RewriteTest;

import static org.openrewrite.java.Assertions.java;
import static org.openrewrite.java.Assertions.javaVersion;

class MigrateZipErrorToZipExceptionTest implements RewriteTest {

@Override
public void defaults(RecipeSpec spec) {
spec
.recipeFromResource("/META-INF/rewrite/java-version-25.yml", "org.openrewrite.java.migrate.MigrateZipErrorToZipException")
.parser(JavaParser.fromJavaVersion())
.allSources(s -> s.markers(javaVersion(25)));
}

@DocumentExample
@Test
void migrateZipErrorInCatchClause() {
rewriteRun(
//language=java
java(
"""
import java.util.zip.ZipError;

class Test {
void test() {
try {
// Some zip operation
} catch (ZipError e) {
System.out.println("Zip error occurred: " + e.getMessage());
}
}
}
""",
"""
import java.util.zip.ZipException;

class Test {
void test() {
try {
// Some zip operation
} catch (ZipException e) {
System.out.println("Zip error occurred: " + e.getMessage());
}
}
}
"""
)
);
}

@Test
void migrateZipErrorInThrowsClause() {
rewriteRun(
//language=java
java(
"""
import java.util.zip.ZipError;

class Test {
void processZip() throws ZipError {
throw new ZipError("Invalid zip file");
}
}
""",
"""
import java.util.zip.ZipException;

class Test {
void processZip() throws ZipException {
throw new ZipException("Invalid zip file");
}
}
"""
)
);
}

@Test
void noChangeWhenZipErrorNotUsed() {
rewriteRun(
//language=java
java(
"""
import java.util.zip.ZipException;

class Test {
void test(boolean flag) {
try {
if (flag) {
throw new ZipException("This is a zip error");
}
throw new Exception("This is a general exception");
} catch (ZipException e) {
System.out.println("ZipException: " + e.getMessage());
} catch (Exception e) {
System.out.println("Exception: " + e.getMessage());
}
}
}
"""
)
);
}
}