OpenRewriteRecipeBestPractices

Application_Properties.java

@@ -1 +1,2 @@
 
+

pom.xml

@@ -162,17 +162,24 @@
 		          <recipe>org.openrewrite.staticanalysis.JavaApiBestPractices</recipe>
 		          <recipe>org.openrewrite.staticanalysis.CommonStaticAnalysis</recipe>
 		          <recipe>org.openrewrite.staticanalysis.CodeCleanup</recipe>
+		          <recipe>org.openrewrite.recipes.rewrite.OpenRewriteRecipeBestPractices</recipe>
 		        </activeRecipes>
 		        <exclusions>
 					<exclusion>**/generated/**</exclusion>
 				</exclusions>
 		      </configuration>
+		      
 		      <dependencies>
 		        <dependency>
 		          <groupId>org.openrewrite.recipe</groupId>
 		          <artifactId>rewrite-migrate-java</artifactId>
 		          <version>3.14.1</version>
 		        </dependency>
+				<dependency>
+					<groupId>org.openrewrite.recipe</groupId>
+					<artifactId>rewrite-rewrite</artifactId>
+					<version>0.5.0</version>
+				</dependency>
 		      </dependencies>
 		    </plugin>
 		</plugins>

src/main/java/de/kreth/property2java/Configuration.java

@@ -10,9 +10,9 @@ import java.nio.file.Path;
 import java.util.EnumSet;
 import java.util.Map;
 
-import org.apache.commons.text.WordUtils;
 
 import de.kreth.property2java.config.Regex;
+import org.apache.commons.text.WordUtils;
 
 public interface Configuration {
 

src/main/java/de/kreth/property2java/Generator.java

@@ -17,8 +17,10 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Collectors;
 
+
 import de.kreth.property2java.cli.ArgumentConfiguration;
 import de.kreth.property2java.config.FreemarkerConfig;
+
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
 

src/main/java/de/kreth/property2java/cli/ArgumentConfiguration.java

@@ -12,6 +12,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+
 import de.kreth.property2java.Configuration;
 
 public final class ArgumentConfiguration implements Configuration {

src/main/java/de/kreth/property2java/cli/CliConfig.java

@@ -2,6 +2,8 @@ package de.kreth.property2java.cli;
 
 import java.io.IOException;
 
+
+import de.kreth.property2java.cli.ArgumentConfiguration.Builder;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
@@ -11,8 +13,6 @@ import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
-import de.kreth.property2java.cli.ArgumentConfiguration.Builder;
-
 public class CliConfig {
 
 	private final Options options = options();

src/main/java/de/kreth/property2java/config/FreemarkerConfig.java

@@ -2,7 +2,9 @@ package de.kreth.property2java.config;
 
 import java.io.IOException;
 
+
 import de.kreth.property2java.Format;
+
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 

src/main/java/de/kreth/property2java/processor/GenerateProperty2Java.java

@@ -6,6 +6,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+
 import de.kreth.property2java.Format;
 import de.kreth.property2java.GeneratorOptions;
 

src/main/java/de/kreth/property2java/processor/GenerateResourceBundleProperty2Java.java

@@ -7,6 +7,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+
 import de.kreth.property2java.Format;
 import de.kreth.property2java.GeneratorOptions;
 

src/main/java/de/kreth/property2java/processor/ProcessorConfiguration.java

@@ -11,7 +11,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-
 import javax.annotation.processing.Filer;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.PackageElement;
@@ -19,6 +18,7 @@ import javax.lang.model.element.TypeElement;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 
+
 import de.kreth.property2java.Configuration;
 import de.kreth.property2java.Format;
 import de.kreth.property2java.Generator;

src/main/java/de/kreth/property2java/processor/Property2JavaGenerator.java

@@ -6,7 +6,6 @@ import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
-
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
@@ -16,6 +15,7 @@ import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic.Kind;
 
+
 import de.kreth.property2java.Format;
 import de.kreth.property2java.GeneratorException;
 import de.kreth.property2java.GeneratorOptions;

src/test/java/de/kreth/property2java/ConfigurationTest.java

@@ -10,6 +10,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
 
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;

src/test/java/de/kreth/property2java/GeneratorTests.java

@@ -9,10 +9,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,6 +25,7 @@ import java.util.Optional;
 import java.util.StringTokenizer;
 import java.util.stream.Collectors;
 
+
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

src/test/java/de/kreth/property2java/GeneratorWithInnerPropertiesTest.java

@@ -2,14 +2,9 @@ package de.kreth.property2java;
 
 import static de.kreth.property2java.TestPropertiesSource.testProperties;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,6 +20,7 @@ import java.util.Optional;
 import java.util.StringTokenizer;
 import java.util.stream.Collectors;
 
+
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -123,11 +119,11 @@ public class GeneratorWithInnerPropertiesTest {
 		String load = null;
 		while (sourceTokenizer.hasMoreTokens()) {
 			String line = sourceTokenizer.nextToken();
-			if (line.contains("Properties") 
+			if (line.contains("Properties") &&
-					&& !line.contains("import")
+					!line.contains("import") &&
-					&& !line.contains("enum")
+					!line.contains("enum") &&
-					&& !line.contains("@link")
+					!line.contains("@link") &&
-					&& !line.contains("class")) {
+					!line.contains("class")) {
 				declaration = line;
 			} else if (line.contains(".load")) {
 				load = line;

src/test/java/de/kreth/property2java/TestPropertiesSource.java

@@ -5,6 +5,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.StringReader;
 
+
 import de.kreth.property2java.generated.GenerateTheTest;
 
 public class TestPropertiesSource {

src/test/java/de/kreth/property2java/parts/ReplaceLogicForTemplate.java

@@ -1,6 +1,6 @@
 package de.kreth.property2java.parts;
 
-public class ReplaceLogicForTemplate {
+public final class ReplaceLogicForTemplate {
 
 	static String doReplacements(String property, Object...objects) {
 		StringBuilder text = new StringBuilder();
@@ -14,8 +14,8 @@ public class ReplaceLogicForTemplate {
 				String theIndex = property.substring(index, endIndex);
 				int withIndex = Integer.valueOf(theIndex);
 				if (withIndex+1> objects.length) {
-					throw new IllegalStateException("No Argument for Index {" + theIndex
+					throw new IllegalStateException("No Argument for Index {" + theIndex +
-							+ "}" + " at Position=" + (index - 1) + " in \"" + property + "\"");
+							"}" + " at Position=" + (index - 1) + " in \"" + property + "\"");
 				}
 				text.append(objects[withIndex].toString());
 				index = property.indexOf('{', endIndex);

src/test/java/de/kreth/property2java/parts/ReplaceLogicForTemplateTest.java

@@ -1,7 +1,10 @@
 package de.kreth.property2java.parts;
 
-import static org.assertj.core.api.Assertions.*;
 import static de.kreth.property2java.parts.ReplaceLogicForTemplate.doReplacements;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+
 import org.junit.jupiter.api.Test;
 
 public class ReplaceLogicForTemplateTest {

src/test/java/de/kreth/property2java/processor/Property2JavaGeneratorTest.java

@@ -4,12 +4,12 @@ import static org.mockito.Mockito.when;
 
 import java.util.HashSet;
 import java.util.Set;
-
 import javax.annotation.processing.Messager;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 import javax.lang.model.element.TypeElement;
 
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;