From e69f4fe554dc78b009d98e3c52f136d62bd6c247 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 15 Sep 2023 05:02:50 -0700
Subject: [PATCH] Migrated syntax to Java 8+

---
 src/bld/java/rife/BldBuild.java               |  6 ++---
 .../bld/dependencies/Xml2MavenMetadata.java   | 27 +++++++++----------
 .../operations/AbstractCreateOperation.java   |  4 +--
 .../rife/bld/operations/CreateOperation.java  |  6 ++---
 .../rife/bld/operations/JarOperation.java     |  1 +
 5 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/bld/java/rife/BldBuild.java b/src/bld/java/rife/BldBuild.java
index 8626a87..a6550ce 100644
--- a/src/bld/java/rife/BldBuild.java
+++ b/src/bld/java/rife/BldBuild.java
@@ -132,11 +132,9 @@ public class BldBuild extends AbstractRife2Build {
                             f.perms(0755);
                         });
                     });
-                    b.dir("lib", l -> {
-                        l.file("bld-wrapper.jar", f -> f.move(path(tmp, "lib", "bld", "bld-wrapper.jar")));
-                    });
+                    b.dir("lib", l -> l.file("bld-wrapper.jar", f -> f.move(path(tmp, "lib", "bld", "bld-wrapper.jar"))));
                 });
-                t.dir("lib", l -> l.delete());
+                t.dir("lib", DirBuilder::delete);
             });
 
             zipBldOperation
diff --git a/src/main/java/rife/bld/dependencies/Xml2MavenMetadata.java b/src/main/java/rife/bld/dependencies/Xml2MavenMetadata.java
index 51ad0b7..3a21b0c 100644
--- a/src/main/java/rife/bld/dependencies/Xml2MavenMetadata.java
+++ b/src/main/java/rife/bld/dependencies/Xml2MavenMetadata.java
@@ -89,20 +89,19 @@ public class Xml2MavenMetadata extends Xml2Data implements MavenMetadata {
     public void endDocument()
     throws SAXException {
         // determine latest stable version by removing pre-release qualifiers
-        var filtered_versions = new TreeSet<VersionNumber>();
-        filtered_versions.addAll(versions_.stream()
-            .filter(v -> {
-                if (v.qualifier() == null) return true;
-                var q = v.qualifier().toLowerCase();
-                return !q.startsWith("rc") &&
-                       !q.startsWith("cr") &&
-                       !q.contains("milestone") &&
-                       !MILESTONE.matcher(q).matches() &&
-                       !q.contains("beta") &&
-                       !BETA.matcher(q).matches() &&
-                       !q.contains("alpha") &&
-                       !ALPHA.matcher(q).matches();
-            }).toList());
+        var filtered_versions = new TreeSet<>(versions_.stream()
+                .filter(v -> {
+                    if (v.qualifier() == null) return true;
+                    var q = v.qualifier().toLowerCase();
+                    return !q.startsWith("rc") &&
+                            !q.startsWith("cr") &&
+                            !q.contains("milestone") &&
+                            !MILESTONE.matcher(q).matches() &&
+                            !q.contains("beta") &&
+                            !BETA.matcher(q).matches() &&
+                            !q.contains("alpha") &&
+                            !ALPHA.matcher(q).matches();
+                }).toList());
 
         // only replace the stable version from the metadata when
         // something remained from the filtering, then use the
diff --git a/src/main/java/rife/bld/operations/AbstractCreateOperation.java b/src/main/java/rife/bld/operations/AbstractCreateOperation.java
index dd0a0a8..ec5a23d 100644
--- a/src/main/java/rife/bld/operations/AbstractCreateOperation.java
+++ b/src/main/java/rife/bld/operations/AbstractCreateOperation.java
@@ -364,10 +364,10 @@ public abstract class AbstractCreateOperation<T extends AbstractCreateOperation<
     public T fromArguments(List<String> arguments) {
         String package_name = null;
         String project_name = null;
-        if (arguments.size() > 0) {
+        if (!arguments.isEmpty()) {
             package_name = arguments.remove(0);
         }
-        if (arguments.size() > 0) {
+        if (!arguments.isEmpty()) {
             project_name = arguments.remove(0);
         }
         if ((package_name == null || project_name == null) && System.console() == null) {
diff --git a/src/main/java/rife/bld/operations/CreateOperation.java b/src/main/java/rife/bld/operations/CreateOperation.java
index 066cf57..9a64ffe 100644
--- a/src/main/java/rife/bld/operations/CreateOperation.java
+++ b/src/main/java/rife/bld/operations/CreateOperation.java
@@ -27,13 +27,13 @@ public class CreateOperation {
         String type = null;
         String package_name = null;
         String project_name = null;
-        if (arguments.size() > 0) {
+        if (!arguments.isEmpty()) {
             type = arguments.remove(0);
         }
-        if (arguments.size() > 0) {
+        if (!arguments.isEmpty()) {
             package_name = arguments.remove(0);
         }
-        if (arguments.size() > 0) {
+        if (!arguments.isEmpty()) {
             project_name = arguments.remove(0);
         }
         if ((type == null || package_name == null || project_name == null) && System.console() == null) {
diff --git a/src/main/java/rife/bld/operations/JarOperation.java b/src/main/java/rife/bld/operations/JarOperation.java
index af29057..9e8e869 100644
--- a/src/main/java/rife/bld/operations/JarOperation.java
+++ b/src/main/java/rife/bld/operations/JarOperation.java
@@ -94,6 +94,7 @@ public class JarOperation extends AbstractOperation<JarOperation> {
             // don't use putAll since Attributes does an instanceof check
             // on the map being passed in, causing it to fail if it's not
             // and instance of Attributes
+            //noinspection UseBulkOperation
             attributes.put(entry.getKey(), entry.getValue());
             // ^^^ READ above, don't use putAll
         }