Improve code structure and use plexus-util

Author: pcastornii

bom-properties-maven-plugin/pom.xml

@@ -26,10 +26,6 @@
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
     </dependencies>
 </project>
 

bom-properties-maven-plugin/src/main/java/com/techsenger/maven/plugins/bomproperties/CopyPropertiesMojo.java

@@ -21,8 +21,6 @@
 import java.io.InputStream;
 import java.util.List;
 import java.util.Properties;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.IOCase;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.plugin.AbstractMojo;
@@ -31,6 +29,7 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.SelectorUtils;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
@@ -48,6 +47,49 @@ private static String getId(Bom bom) {
         return bom.getGroupId() + ":" + bom.getArtifactId() + ":" + bom.getVersion();
     }
 
+    private static void validateBom(Bom bom) throws MojoExecutionException {
+        if (bom.getGroupId() == null || bom.getGroupId().isBlank()) {
+            throw new MojoExecutionException("BOM groupId is required");
+        }
+        if (bom.getArtifactId() == null || bom.getArtifactId().isBlank()) {
+            throw new MojoExecutionException("BOM artifactId is required");
+        }
+        if (bom.getVersion() == null || bom.getVersion().isBlank()) {
+            throw new MojoExecutionException("BOM version is required");
+        }
+        if (bom.getIncludes() == null || bom.getIncludes().isEmpty()) {
+            throw new MojoExecutionException("BOM has no includes");
+        }
+        if (bom.getPrefix() == null || bom.getPrefix().isBlank()) {
+            throw new MojoExecutionException("BOM has no prefix");
+        }
+    }
+
+    private static boolean isPropertyIncluded(String key, Bom bom) {
+        boolean included = false;
+        boolean excluded = false;
+
+        for (var include : bom.getIncludes()) {
+            if (SelectorUtils.match(include, key, bom.isCaseSensitive())) {
+                included = true;
+                break;
+            }
+        }
+        if (!included) {
+            return false;
+        }
+
+        if (bom.getExcludes() != null) {
+            for (var exclude : bom.getExcludes()) {
+                if (SelectorUtils.match(exclude, key, bom.isCaseSensitive())) {
+                    excluded = true;
+                    break;
+                }
+            }
+        }
+        return !excluded;
+    }
+
     @Parameter(defaultValue = "${project}", readonly = true)
     private MavenProject project;
 
@@ -72,45 +114,15 @@ public void execute() throws MojoExecutionException {
         for (var bom : boms) {
             getLog().info("Processing BOM: " + getId(bom));
             validateBom(bom);
-
-            IOCase iOCase = IOCase.SENSITIVE;
-            if (!bom.isCaseSensitive()) {
-                iOCase = IOCase.INSENSITIVE;
-            }
-
             try {
                 var properties = getBomProperties(bom);
                 var count = 0;
-
                 for (var entry : properties.entrySet()) {
                     var key = (String) entry.getKey();
-
-                    boolean included = false;
-                    boolean excluded = false;
-
-                    for (var include : bom.getIncludes()) {
-                        if (FilenameUtils.wildcardMatch(key, include, iOCase)) {
-                            included = true;
-                            break;
-                        }
-                    }
-                    if (!included) {
-                        continue;
+                    if (isPropertyIncluded(key, bom)) {
+                        props.put(bom.getPrefix() + "." + key, entry.getValue());
+                        count++;
                     }
-
-                    if (bom.getExcludes() != null) {
-                        for (var exclude : bom.getExcludes()) {
-                            if (FilenameUtils.wildcardMatch(key, exclude, iOCase)) {
-                                excluded = true;
-                                break;
-                            }
-                        }
-                    }
-                    if (excluded) {
-                        continue;
-                    }
-                    props.put(bom.getPrefix() + "." + key, entry.getValue());
-                    count++;
                 }
                 getLog().info("Added " + count + " properties with prefix: " + bom.getPrefix());
             } catch (Exception ex) {
@@ -120,24 +132,6 @@ public void execute() throws MojoExecutionException {
         }
     }
 
-    private void validateBom(Bom bom) throws MojoExecutionException {
-        if (bom.getGroupId() == null || bom.getGroupId().isBlank()) {
-            throw new MojoExecutionException("BOM groupId is required");
-        }
-        if (bom.getArtifactId() == null || bom.getArtifactId().isBlank()) {
-            throw new MojoExecutionException("BOM artifactId is required");
-        }
-        if (bom.getVersion() == null || bom.getVersion().isBlank()) {
-            throw new MojoExecutionException("BOM version is required");
-        }
-        if (bom.getIncludes() == null || bom.getIncludes().isEmpty()) {
-            throw new MojoExecutionException("BOM has no includes");
-        }
-        if (bom.getPrefix() == null || bom.getPrefix().isBlank()) {
-            throw new MojoExecutionException("BOM has no scope");
-        }
-    }
-
     private Properties getBomProperties(Bom bom) throws Exception {
         var file = resolveBomFile(bom);
         try (InputStream is = new FileInputStream(file)) {