Merge pull request #1143 from uhafner/openrewrite-var

Apply several OpenRewrite rules

pom.xml

@@ -277,17 +277,24 @@
           <artifactId>rewrite-maven-plugin</artifactId>
           <version>${rewrite-maven-plugin.version}</version>
           <configuration>
+            <exclusions>
+              <exclusion>**/docker/**</exclusion>
+              <exclusion>**/AbstractComparableTest.java</exclusion>
+              <exclusion>**/ResourceExtractorTest.java</exclusion>
+            </exclusions>
             <activeRecipes>
-              <recipe>org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertions</recipe>
               <recipe>org.openrewrite.maven.BestPractices</recipe>
               <recipe>org.openrewrite.staticanalysis.MissingOverrideAnnotation</recipe>
               <recipe>org.openrewrite.staticanalysis.CommonStaticAnalysis</recipe>
               <recipe>org.openrewrite.staticanalysis.RemoveExtraSemicolons</recipe>
               <recipe>org.openrewrite.java.migrate.Java8toJava11</recipe>
+              <recipe>org.openrewrite.java.RemoveUnusedImports</recipe>
               <recipe>org.openrewrite.java.migrate.util.SequencedCollection</recipe>
+              <recipe>org.openrewrite.java.migrate.lang.var.UseVarForObject</recipe>
               <recipe>org.openrewrite.java.format.RemoveTrailingWhitespace</recipe>
               <recipe>org.openrewrite.java.format.BlankLines</recipe>
               <recipe>org.openrewrite.java.format.EmptyNewlineAtEndOfFile</recipe>
+              <recipe>org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertions</recipe>
             </activeRecipes>
           </configuration>
           <dependencies>

src/main/java/edu/hm/hafner/util/Ensure.java

@@ -478,7 +478,7 @@ public void isNotBlank(final String explanation, final Object... args) {
         }
 
         private boolean isBlank() {
-            String string = getValue();
+            var string = getValue();
             if (string.isEmpty()) {
                 return true;
             }

src/main/java/edu/hm/hafner/util/FilteredLog.java

@@ -27,7 +27,7 @@ public class FilteredLog implements Serializable {
 
     private final String title;
     private final int maxLines;
-    private int lines = 0;
+    private int lines;
 
     private final List<String> infoMessages = new ArrayList<>();
     private final List<String> errorMessages = new ArrayList<>();

src/main/java/edu/hm/hafner/util/Generated.java

@@ -4,7 +4,7 @@
 import java.lang.annotation.Target;
 
 import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.RetentionPolicy.CLASS;
 
 /**
  * This annotation is used to mark source code that has been generated or is somehow not relevant for style checking or

src/main/java/edu/hm/hafner/util/LineRangeList.java

@@ -125,7 +125,7 @@ public final boolean addAll(final Iterable<? extends LineRange> ranges) {
      */
     private void ensure(final int n) {
         if (data.length < n) {
-            byte[] buf = new byte[Math.max(n, data.length * 2)];
+            var buf = new byte[Math.max(n, data.length * 2)];
             System.arraycopy(data, 0, buf, 0, len);
             data = buf;
         }
@@ -204,7 +204,7 @@ public ListIterator<LineRange> listIterator(final int index) {
      */
     public void trim() {
         if (len != data.length) {
-            byte[] small = new byte[len];
+            var small = new byte[len];
             System.arraycopy(data, 0, small, 0, len);
             data = small;
         }
@@ -390,8 +390,8 @@ private void adjust(final int diff) {
          * @return the changed line range
          */
         public LineRange rewrite(final LineRange other) {
-            Cursor c = copy();
-            LineRange old = c.next();
+            var c = copy();
+            var old = c.next();
             int oldSize = c.position - position;
             int newSize = sizeOf(other);
             adjust(newSize - oldSize);
@@ -420,8 +420,8 @@ public void add(final LineRange v) {
          * @return the deleted element
          */
         public LineRange delete() {
-            Cursor c = copy();
-            LineRange old = c.next();
+            var c = copy();
+            var old = c.next();
             adjust(position - c.position);
             return old;
         }

src/main/java/edu/hm/hafner/util/LookaheadStream.java

@@ -18,9 +18,9 @@ public class LookaheadStream implements AutoCloseable {
     private final Iterator<String> lineIterator;
     private final String fileName;
 
-    private boolean isLookaheadFilled = false;
+    private boolean isLookaheadFilled;
     private String lookaheadLine = StringUtils.EMPTY;
-    private int line = 0;
+    private int line;
 
     /**
      * Wraps the specified stream of lines into a {@link LookaheadStream}.

src/main/java/edu/hm/hafner/util/PathUtil.java

@@ -6,7 +6,6 @@
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Objects;
 
 import org.apache.commons.io.FilenameUtils;
@@ -42,7 +41,7 @@ public class PathUtil {
      */
     public boolean exists(final String fileName) {
         try {
-            return Files.exists(Paths.get(fileName));
+            return Files.exists(Path.of(fileName));
         }
         catch (IllegalArgumentException ignore) {
             return false;
@@ -83,7 +82,7 @@ public boolean exists(final String fileName, final String directory) {
      */
     public String getAbsolutePath(final String path) {
         try {
-            return getAbsolutePath(Paths.get(path));
+            return getAbsolutePath(Path.of(path));
         }
         catch (IllegalArgumentException ignored) {
             return makeUnixPath(path);
@@ -126,7 +125,7 @@ public String getAbsolutePath(final Path path) {
      */
     public String getRelativePath(final Path base, final String path) {
         try {
-            return getRelativePath(base, Paths.get(path));
+            return getRelativePath(base, Path.of(path));
         }
         catch (IllegalArgumentException ignored) {
             return makeUnixPath(path);
@@ -149,7 +148,7 @@ public String getRelativePath(final Path base, final String path) {
      */
     public String getRelativePath(final String base, final String path) {
         try {
-            return getRelativePath(Paths.get(base), Paths.get(path));
+            return getRelativePath(Path.of(base), Path.of(path));
         }
         catch (IllegalArgumentException ignored) {
             return makeUnixPath(path);
@@ -172,7 +171,7 @@ public String getRelativePath(final String base, final String path) {
      */
     public String getRelativePath(final Path base, final Path path) {
         try {
-            Path normalizedBase = normalize(base);
+            var normalizedBase = normalize(base);
             if (path.isAbsolute()) {
                 return makeUnixPath(normalizedBase.relativize(normalize(path)).toString());
             }
@@ -212,7 +211,7 @@ public String getRelativePath(final Path relative) {
      */
     public String getRelativePath(final String relative) {
         try {
-            return getRelativePath(Paths.get(relative));
+            return getRelativePath(Path.of(relative));
         }
         catch (IllegalArgumentException ignored) {
             // ignore and return the path as such
@@ -234,7 +233,7 @@ public String createAbsolutePath(@CheckForNull final String directory, final Str
         if (isAbsolute(fileName) || StringUtils.isBlank(directory)) {
             return makeUnixPath(fileName);
         }
-        String path = makeUnixPath(Objects.requireNonNull(directory));
+        var path = makeUnixPath(Objects.requireNonNull(directory));
 
         String separator;
         if (path.endsWith(SLASH)) {
@@ -245,7 +244,7 @@ public String createAbsolutePath(@CheckForNull final String directory, final Str
         }
 
         try {
-            String normalized = FilenameUtils.normalize(String.join(separator, path, fileName));
+            var normalized = FilenameUtils.normalize(String.join(separator, path, fileName));
             return makeUnixPath(normalized == null ? fileName : normalized);
         }
         catch (IllegalArgumentException ignored) {
@@ -279,7 +278,7 @@ private Path normalize(final Path path) throws IOException {
     }
 
     private String makeUnixPath(final String fileName) {
-        String unixStyle = fileName.replace(BACK_SLASH, SLASH);
+        var unixStyle = fileName.replace(BACK_SLASH, SLASH);
         if (unixStyle.matches(DRIVE_LETTER_PREFIX)) {
             unixStyle = StringUtils.capitalize(unixStyle);
         }

src/main/java/edu/hm/hafner/util/ResourceExtractor.java

@@ -2,14 +2,10 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.UncheckedIOException;
-import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.security.CodeSource;
 import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Enumeration;
@@ -44,19 +40,19 @@ public ResourceExtractor(final Class<?> targetClass) {
 
     @VisibleForTesting
     ResourceExtractor(final Class<?> targetClass, final ProtectionDomain protectionDomain) {
-        CodeSource codeSource = protectionDomain.getCodeSource();
+        var codeSource = protectionDomain.getCodeSource();
         if (codeSource == null) {
             throw new IllegalArgumentException("There is no CodeSource for " + targetClass);
         }
-        URL location = codeSource.getLocation();
+        var location = codeSource.getLocation();
         if (location == null) {
             throw new IllegalArgumentException("There is no CodeSource location for " + targetClass);
         }
-        String locationPath = location.getPath();
+        var locationPath = location.getPath();
         if (StringUtils.isBlank(locationPath)) {
             throw new IllegalArgumentException("The CodeSource location path is not set for " + targetClass);
         }
-        Path entryPoint = new File(locationPath).toPath();
+        var entryPoint = new File(locationPath).toPath();
         readingFromJarFile = Files.isRegularFile(entryPoint);
         if (readingFromJarFile) {
             extractor = new JarExtractor(entryPoint);
@@ -90,7 +86,7 @@ public void extract(final Path targetDirectory, final String source, final Strin
             throw new IllegalArgumentException(
                     "Target directory must be an existing directory: " + targetDirectory); // implement
         }
-        String[] allSources = Arrays.copyOf(sources, sources.length + 1);
+        var allSources = Arrays.copyOf(sources, sources.length + 1);
         allSources[sources.length] = source;
         extractor.extractFiles(targetDirectory, allSources);
     }
@@ -124,7 +120,7 @@ private static class FolderExtractor extends Extractor {
         public void extractFiles(final Path targetDirectory, final String... sources) {
             try {
                 for (String source : sources) {
-                    Path targetFile = targetDirectory.resolve(source);
+                    var targetFile = targetDirectory.resolve(source);
                     Files.createDirectories(targetFile);
                     copy(targetFile, source);
                 }
@@ -155,11 +151,11 @@ private static class JarExtractor extends Extractor {
         @Override
         public void extractFiles(final Path targetDirectory, final String... sources) {
             Set<String> remaining = Arrays.stream(sources).collect(Collectors.toSet());
-            try (JarFile jar = new JarFile(getEntryPoint().toFile())) {
+            try (var jar = new JarFile(getEntryPoint().toFile())) {
                 Enumeration<JarEntry> entries = jar.entries();
                 while (entries.hasMoreElements()) {
-                    JarEntry entry = entries.nextElement();
-                    String name = entry.getName();
+                    var entry = entries.nextElement();
+                    var name = entry.getName();
                     if (remaining.contains(name)) {
                         copy(targetDirectory, jar, entry, name);
                         remaining.remove(name);
@@ -176,15 +172,15 @@ public void extractFiles(final Path targetDirectory, final String... sources) {
 
         private void copy(final Path targetDirectory, final JarFile jar, final JarEntry entry, final String name)
                 throws IOException {
-            Path targetFile = targetDirectory.resolve(name);
+            var targetFile = targetDirectory.resolve(name);
             if (!targetFile.normalize().startsWith(targetDirectory)) {
                 throw new IllegalArgumentException("Corrupt jar structure, contains invalid path: " + name);
             }
-            Path parent = targetFile.getParent();
+            var parent = targetFile.getParent();
             if (parent != null) {
                 Files.createDirectories(parent);
             }
-            try (InputStream inputStream = jar.getInputStream(entry); OutputStream outputStream = Files.newOutputStream(targetFile)) {
+            try (var inputStream = jar.getInputStream(entry); var outputStream = Files.newOutputStream(targetFile)) {
                 IOUtils.copy(inputStream, outputStream);
             }
         }

src/main/java/edu/hm/hafner/util/SecureXmlParserFactory.java

@@ -153,7 +153,7 @@ public SAXParser createSaxParser() {
             var factory = createSaxParserFactory();
             configureSaxParserFactory(factory);
 
-            SAXParser parser = factory.newSAXParser();
+            var parser = factory.newSAXParser();
             secureParser(parser);
             return parser;
         }

src/main/java/edu/hm/hafner/util/TreeString.java

@@ -70,7 +70,7 @@ String getLabel() {
     TreeString split(final String prefix) {
         Ensure.that(getLabel().startsWith(prefix)).isTrue();
 
-        char[] suffix = new char[label.length - prefix.length()];
+        var suffix = new char[label.length - prefix.length()];
         System.arraycopy(label, prefix.length(), suffix, 0, suffix.length);
 
         var middle = new TreeString(parent, prefix);
@@ -94,7 +94,7 @@ TreeString getParent() {
      */
     private int depth() {
         int i = 0;
-        for (TreeString p = this; p != null; p = p.parent) {
+        for (var p = this; p != null; p = p.parent) {
             i++;
         }
         return i;
@@ -121,10 +121,10 @@ public int hashCode() {
      */
     @Override
     public String toString() {
-        char[][] tokens = new char[depth()][];
+        var tokens = new char[depth()][];
         int i = tokens.length;
         int sz = 0;
-        for (TreeString p = this; p != null; p = p.parent) {
+        for (var p = this; p != null; p = p.parent) {
             tokens[--i] = p.label;
             sz += p.label.length;
         }
@@ -144,8 +144,8 @@ public String toString() {
      *         the table containing the existing strings
      */
     void dedup(final Map<String, char[]> table) {
-        String l = getLabel();
-        char[] v = table.get(l);
+        var l = getLabel();
+        var v = table.get(l);
         if (v == null) {
             table.put(l, label);
         }

src/main/java/edu/hm/hafner/util/TreeStringBuilder.java

@@ -90,9 +90,9 @@ public Child intern(final String string) {
                 if (plen > 0) {
                     if (plen < entry.getKey().length()) {
                         // insert a node between this and entry.value
-                        Child child = entry.getValue();
-                        String prefix = string.substring(0, plen);
-                        Child middle = child.split(prefix);
+                        var child = entry.getValue();
+                        var prefix = string.substring(0, plen);
+                        var middle = child.split(prefix);
 
                         // add 'middle' instead of 'child'
                         children.remove(entry.getKey());
@@ -107,7 +107,7 @@ public Child intern(final String string) {
             }
 
             // no common prefix. an entirely new node.
-            Child t = children.get(string);
+            var t = children.get(string);
             if (t == null) {
                 t = new Child(new TreeString(getNode(), string));
                 children.put(string, t);
@@ -134,7 +134,7 @@ private void makeWritable() {
          * @return the node
          */
         private Child split(final String prefix) {
-            String suffix = getNode().getLabel().substring(prefix.length());
+            var suffix = getNode().getLabel().substring(prefix.length());
 
             var middle = new Child(getNode().split(prefix));
             middle.makeWritable();

src/test/java/edu/hm/hafner/util/AbstractEqualsTest.java

@@ -36,7 +36,7 @@ void shouldReturnFalseOnEqualsNull() {
     @SuppressWarnings("EqualsWithItself")
     @Test
     void shouldReturnTrueOnEqualsThis() {
-        Object sut = createSut();
+        var sut = createSut();
 
         assertThat(sut.equals(sut)).isTrue();
     }

src/test/java/edu/hm/hafner/util/ArchitectureRules.java

@@ -7,7 +7,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 
 import com.tngtech.archunit.base.DescribedPredicate;
-import com.tngtech.archunit.core.domain.AccessTarget.ConstructorCallTarget;
 import com.tngtech.archunit.core.domain.JavaCall;
 import com.tngtech.archunit.core.domain.JavaClass;
 import com.tngtech.archunit.core.domain.JavaConstructorCall;
@@ -188,7 +187,7 @@ private static class ExceptionHasNoContext extends DescribedPredicate<JavaConstr
 
         @Override
         public boolean test(final JavaConstructorCall javaConstructorCall) {
-            ConstructorCallTarget target = javaConstructorCall.getTarget();
+            var target = javaConstructorCall.getTarget();
             if (!target.getRawParameterTypes().isEmpty()) {
                 return false;
             }