diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 1ce75e8..3d796be 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -19,6 +19,6 @@ jobs: - name: Set up JDK 1.8 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Build with Maven run: mvn -B package --file pom.xml diff --git a/pom.xml b/pom.xml index 7bd865f..ae6adcc 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ UTF-8 UTF-8 - 11 + 17 5.3.0-M1 1.7.36 2.17.2 @@ -47,6 +47,12 @@ slf4j-api ${org.slf4j} + + jakarta.annotation + jakarta.annotation-api + 1.3.5 + provided + org.apache.logging.log4j log4j-api @@ -140,12 +146,29 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.14.0 ${java.version} -proc:none + + org.openrewrite.maven + rewrite-maven-plugin + 6.15.0 + + + org.openrewrite.java.migrate.UpgradeToJava17 + + + + + org.openrewrite.recipe + rewrite-migrate-java + 3.14.1 + + + diff --git a/src/main/java/de/kreth/property2java/GeneratorException.java b/src/main/java/de/kreth/property2java/GeneratorException.java index 3083d4e..1529503 100644 --- a/src/main/java/de/kreth/property2java/GeneratorException.java +++ b/src/main/java/de/kreth/property2java/GeneratorException.java @@ -1,7 +1,10 @@ package de.kreth.property2java; +import java.io.Serial; + public class GeneratorException extends Exception { + @Serial private static final long serialVersionUID = -7319030228448260990L; public GeneratorException(String message, Throwable cause) { diff --git a/src/main/java/de/kreth/property2java/processor/ProcessorConfiguration.java b/src/main/java/de/kreth/property2java/processor/ProcessorConfiguration.java index ce423e7..1fefdf9 100644 --- a/src/main/java/de/kreth/property2java/processor/ProcessorConfiguration.java +++ b/src/main/java/de/kreth/property2java/processor/ProcessorConfiguration.java @@ -49,8 +49,7 @@ public class ProcessorConfiguration implements Configuration { public String getPackage() { String packageName = ""; - if (element instanceof TypeElement) { - TypeElement typeElement = (TypeElement) element; + if (element instanceof TypeElement typeElement) { PackageElement packageElement = (PackageElement) typeElement.getEnclosingElement(); packageName = packageElement.getQualifiedName().toString(); } diff --git a/src/test/java/de/kreth/property2java/TestPropertiesSource.java b/src/test/java/de/kreth/property2java/TestPropertiesSource.java index ed73950..0142c9b 100644 --- a/src/test/java/de/kreth/property2java/TestPropertiesSource.java +++ b/src/test/java/de/kreth/property2java/TestPropertiesSource.java @@ -10,23 +10,34 @@ import de.kreth.property2java.generated.GenerateTheTest; public class TestPropertiesSource { public static StringReader testProperties() { - return new StringReader("\r\n" + "label = \r\n" + "\r\n" + "label.addarticle = Add Article\r\n" - + "label.cancel = Cancel\r\n" + "label.close = Close\r\n" - + "label.delete = Delete\r\n" + "label.discart = Discart\r\n" - + "label.loggedin = Logged in:\r\n" + "label.logout = Logout\r\n" - + "label.ok = OK\r\n" + "label.store = Store\r\n" - + "label.preview = Preview\r\n" + "label.open = Open\r\n" - + "label.user.register = Register\r\n" + "\r\n" - + "message.article.priceerror = Please set the price.\r\n" - + "message.delete.text = Delete {0}?\r\n" - + "message.delete.title = Really delete?\r\n" - + "message.invoiceitem.allfieldsmustbeset = Start, end and article must not be \\r\\n" - + " empty!\r\n" - + "message.invoiceitem.startbeforeend = End must be later than start.\r\n" - + "message.user.create.success = Thanks {0} created!\r\n" - + "message.user.loginfailure = Login Error! Wrong user or password?\r\n" - + "message.user.passwordmissmatch = Passwords don't match.\r\n" - + "message.with.five.placeholders = Third is first{2}, then last \"{4}\", second={1}, fourth={3} and first is last={0}\r\n"); + return new StringReader(""" + + label = + + label.addarticle = Add Article + label.cancel = Cancel + label.close = Close + label.delete = Delete + label.discart = Discart + label.loggedin = Logged in: + label.logout = Logout + label.ok = OK + label.store = Store + label.preview = Preview + label.open = Open + label.user.register = Register + + message.article.priceerror = Please set the price. + message.delete.text = Delete {0}? + message.delete.title = Really delete? + message.invoiceitem.allfieldsmustbeset = Start, end and article must not be \\r\\n\ + empty! + message.invoiceitem.startbeforeend = End must be later than start. + message.user.create.success = Thanks {0} created! + message.user.loginfailure = Login Error! Wrong user or password? + message.user.passwordmissmatch = Passwords don't match. + message.with.five.placeholders = Third is first{2}, then last "{4}", second={1}, fourth={3} and first is last={0} + """); } public static void main(String[] args) throws IOException { diff --git a/src/test/java/de/kreth/property2java/generated/GenerateTheTest.java b/src/test/java/de/kreth/property2java/generated/GenerateTheTest.java index 026949b..5a26eac 100644 --- a/src/test/java/de/kreth/property2java/generated/GenerateTheTest.java +++ b/src/test/java/de/kreth/property2java/generated/GenerateTheTest.java @@ -3,7 +3,6 @@ package de.kreth.property2java.generated; import java.io.IOException; import java.io.Reader; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.EnumSet; import java.util.HashMap; import java.util.Map; @@ -25,7 +24,7 @@ public class GenerateTheTest { public static final String RESOURCE_BUNDLE = "resource_bundle.properties"; public static void main(String[] args) throws IOException, GeneratorException { - Path current = Paths.get(".", "src", "test", "java", "de", "kreth", "property2java", "generated").toAbsolutePath().normalize(); + Path current = Path.of(".", "src", "test", "java", "de", "kreth", "property2java", "generated").toAbsolutePath().normalize(); System.out.println(current); withUnaryOperatorParameter(current);