Use Java 11 language features where possible (#405)

jenkinsci · Dec 1, 2022 · 2a3bf4b · 2a3bf4b
1 parent 13db53e
commit 2a3bf4b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java
@@ -33,7 +33,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
@@ -283,7 +282,7 @@ public void setContainerConfigXML(File containerConfigXML) {
     protected String[] getExcludes() {
         List<String> excludeList = new ArrayList<>();
         if (StringUtils.isNotEmpty(warSourceExcludes)) {
-            excludeList.addAll(Arrays.asList(StringUtils.split(warSourceExcludes, ",")));
+            excludeList.addAll(List.of(StringUtils.split(warSourceExcludes, ",")));
         }
 
         // if contextXML is specified, omit the one in the source directory
@@ -355,7 +354,7 @@ public void buildExplodedWebapp(File webappDirectory, File jarFile)
         }
 
         try {
-            List<Resource> webResources = this.webResources != null ? Arrays.asList(this.webResources) : null;
+            List<Resource> webResources = this.webResources != null ? List.of(this.webResources) : null;
             if (webResources != null && webResources.size() > 0) {
                 Properties filterProperties = getBuildFilterProperties();
                 for (Resource resource : webResources) {

diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/Artifacts.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/Artifacts.java
@@ -4,7 +4,6 @@
 import org.apache.maven.project.MavenProject;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.function.Predicate;
@@ -46,42 +45,42 @@ public Artifacts removeAll(Predicate<Artifact> filter) {
     }
 
     public Artifacts scopeIs(String... scopes) {
-        final List<String> s = Arrays.asList(scopes);
+        final List<String> s = List.of(scopes);
         return retainAll(a -> s.contains(a.getScope()));
     }
 
     public Artifacts scopeIsNot(String... scopes) {
-        final List<String> s = Arrays.asList(scopes);
+        final List<String> s = List.of(scopes);
         return removeAll(a -> s.contains(a.getScope()));
     }
 
     public Artifacts typeIs(String... type) {
-        final List<String> s = Arrays.asList(type);
+        final List<String> s = List.of(type);
         return retainAll(a -> s.contains(a.getType()));
     }
 
     public Artifacts typeIsNot(String... type) {
-        final List<String> s = Arrays.asList(type);
+        final List<String> s = List.of(type);
         return removeAll(a -> s.contains(a.getType()));
     }
 
     public Artifacts groupIdIs(String... groupId) {
-        final List<String> s = Arrays.asList(groupId);
+        final List<String> s = List.of(groupId);
         return retainAll(a -> s.contains(a.getType()));
     }
 
     public Artifacts groupIdIsNot(String... groupId) {
-        final List<String> s = Arrays.asList(groupId);
+        final List<String> s = List.of(groupId);
         return removeAll(a -> s.contains(a.getType()));
     }
 
     public Artifacts artifactIdIs(String... artifactId) {
-        final List<String> s = Arrays.asList(artifactId);
+        final List<String> s = List.of(artifactId);
         return retainAll(a -> s.contains(a.getType()));
     }
 
     public Artifacts artifactIdIsNot(String... artifactId) {
-        final List<String> s = Arrays.asList(artifactId);
+        final List<String> s = List.of(artifactId);
         return removeAll(a -> s.contains(a.getType()));
     }
 }
diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/ReservedName.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/ReservedName.java
@@ -1,14 +1,13 @@
 package org.jenkinsci.maven.plugins.hpi;
 
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
 /**
  * @author Kohsuke Kawaguchi
  */
 class ReservedName {
-    static Set<String> NAMES = new HashSet<>(Arrays.asList(
+    static Set<String> NAMES = Set.of(
         "abstract",
         "assert",
         "boolean",
@@ -64,5 +63,5 @@ class ReservedName {
         "true",
         "false",
         "null"
-    ));
+    );
 }