Replace org.apache.commons.lang3.Validate#notNull with java.util.Obje…

…cts#requireNonNull
apache · Jul 15, 2018 · 72dca39 · 72dca39
1 parent 6f41a82
commit 72dca39
Show file tree

Hide file tree

Showing 40 changed files with 122 additions and 142 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -30,7 +30,8 @@ def tests
 
 try {
 
-node(jenkinsEnv.labelForOS(buildOs)) {
+def osNode = jenkinsEnv.labelForOS(buildOs) 
+node(jenkinsEnv.nodeSelection(osNode)) {
     dir('build') {
         stage('Checkout') {
             checkout scm
@@ -73,7 +74,7 @@ for (String os in runITsOses) {
         String stageId = "${os}-jdk${jdk}"
         String stageLabel = "Run ITs ${os.capitalize()} Java ${jdk}"
         runITsTasks[stageId] = {
-            node(osLabel) {
+            node(jenkinsEnv.nodeSelection(osLabel)) {
                 stage("${stageLabel}") {
                     // on Windows, need a short path or we hit 256 character limit for paths
                     // using EXECUTOR_NUMBER guarantees that concurrent builds on same agent

diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
@@ -33,11 +33,4 @@ under the License.
   <name>Maven Builder Support</name>
   <description>Support for descriptor builders (model, setting, toolchains)</description>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-  </dependencies>
-
 </project>
diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java b/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java
@@ -23,8 +23,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-
-import org.apache.commons.lang3.Validate;
+import java.util.Objects;
 
 /**
  * Wraps an ordinary {@link File} as a source.
@@ -43,7 +42,7 @@ public class FileSource
      */
     public FileSource( File file )
     {
-        this.file = Validate.notNull( file, "file cannot be null" ).getAbsoluteFile();
+        this.file = Objects.requireNonNull( file, "file cannot be null" ).getAbsoluteFile();
     }
 
     @Override

diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/UrlSource.java b/maven-builder-support/src/main/java/org/apache/maven/building/UrlSource.java
@@ -22,8 +22,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-
-import org.apache.commons.lang3.Validate;
+import java.util.Objects;
 
 /**
  * Wraps an ordinary {@link URL} as a source.
@@ -43,7 +42,7 @@ public class UrlSource
      */
     public UrlSource( URL url )
     {
-        this.url = Validate.notNull( url, "url cannot be null" );
+        this.url = Objects.requireNonNull( url, "url cannot be null" );
     }
 
     @Override

diff --git a/...core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java b/...core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
@@ -22,8 +22,8 @@
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
@@ -89,7 +89,7 @@ public static RepositorySystemSession overlay( ArtifactRepository repository, Re
 
     private LegacyLocalRepositoryManager( ArtifactRepository delegate )
     {
-        this.delegate = Validate.notNull( delegate, "delegate cannot be null" );
+        this.delegate = Objects.requireNonNull( delegate, "delegate cannot be null" );
 
         ArtifactRepositoryLayout layout = delegate.getLayout();
         repo =

diff --git a/...src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/...src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
@@ -24,8 +24,8 @@
 import java.io.InputStream;
 import java.io.Reader;
 import java.util.Map;
+import java.util.Objects;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.maven.artifact.repository.metadata.Metadata;
 import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
 import org.codehaus.plexus.component.annotations.Component;
@@ -45,7 +45,7 @@ public class DefaultMetadataReader
     public Metadata read( File input, Map<String, ?> options )
         throws IOException
     {
-        Validate.notNull( input, "input cannot be null" );
+        Objects.requireNonNull( input, "input cannot be null" );
 
         Metadata metadata = read( ReaderFactory.newXmlReader( input ), options );
 
@@ -55,7 +55,7 @@ public Metadata read( File input, Map<String, ?> options )
     public Metadata read( Reader input, Map<String, ?> options )
         throws IOException
     {
-        Validate.notNull( input, "input cannot be null" );
+        Objects.requireNonNull( input, "input cannot be null" );
 
         try ( final Reader in = input )
         {
@@ -70,7 +70,7 @@ public Metadata read( Reader input, Map<String, ?> options )
     public Metadata read( InputStream input, Map<String, ?> options )
         throws IOException
     {
-        Validate.notNull( input, "input cannot be null" );
+        Objects.requireNonNull( input, "input cannot be null" );
 
         try ( final InputStream in = input )
         {

diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -26,6 +26,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Random;
 import java.util.Set;
 import java.util.TreeMap;
@@ -34,7 +35,6 @@
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.classrealm.ClassRealmRequest.RealmType;
 import org.apache.maven.extension.internal.CoreExportsProvider;
@@ -227,7 +227,7 @@ public ClassRealm getCoreRealm()
 
     public ClassRealm createProjectRealm( Model model, List<Artifact> artifacts )
     {
-        Validate.notNull( model, "model cannot be null" );
+        Objects.requireNonNull( model, "model cannot be null" );
 
         ClassLoader parent = getMavenApiRealm();
 
@@ -241,7 +241,7 @@ private static String getKey( Model model )
 
     public ClassRealm createExtensionRealm( Plugin plugin, List<Artifact> artifacts )
     {
-        Validate.notNull( plugin, "plugin cannot be null" );
+        Objects.requireNonNull( plugin, "plugin cannot be null" );
 
         ClassLoader parent = PARENT_CLASSLOADER;
 
@@ -259,7 +259,7 @@ private boolean isProvidedArtifact( Artifact artifact )
     public ClassRealm createPluginRealm( Plugin plugin, ClassLoader parent, List<String> parentImports,
                                          Map<String, ClassLoader> foreignImports, List<Artifact> artifacts )
     {
-        Validate.notNull( plugin, "plugin cannot be null" );
+        Objects.requireNonNull( plugin, "plugin cannot be null" );
 
         if ( parent == null )
         {

diff --git a/...n-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java b/...n-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
@@ -20,8 +20,8 @@
  */
 
 import java.io.File;
+import java.util.Objects;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.maven.configuration.BeanConfigurationException;
 import org.apache.maven.configuration.BeanConfigurationPathTranslator;
 import org.apache.maven.configuration.BeanConfigurationRequest;
@@ -54,8 +54,8 @@ public class DefaultBeanConfigurator
     public void configureBean( BeanConfigurationRequest request )
         throws BeanConfigurationException
     {
-        Validate.notNull( request, "request cannot be null" );
-        Validate.notNull( request.getBean(), "request.bean cannot be null" );
+        Objects.requireNonNull( request, "request cannot be null" );
+        Objects.requireNonNull( request.getBean(), "request.bean cannot be null" );
 
         Object configuration = request.getConfiguration();
         if ( configuration == null )

diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java b/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java
@@ -19,7 +19,8 @@
  * under the License.
  */
 
-import org.apache.commons.lang3.Validate;
+import java.util.Objects;
+
 import org.apache.maven.project.MavenProject;
 
 /**
@@ -48,7 +49,7 @@ public abstract class BuildSummary
      */
     protected BuildSummary( MavenProject project, long time )
     {
-        this.project = Validate.notNull( project, "project cannot be null" );
+        this.project = Objects.requireNonNull( project, "project cannot be null" );
         // TODO Validate for < 0?
         this.time = time;
     }

diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -25,9 +25,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.eventspy.internal.EventSpyDispatcher;
 import org.apache.maven.model.Profile;
@@ -778,7 +778,7 @@ public MavenExecutionRequest setProxies( List<Proxy> proxies )
     @Override
     public MavenExecutionRequest addProxy( Proxy proxy )
     {
-        Validate.notNull( proxy, "proxy cannot be null" );
+        Objects.requireNonNull( proxy, "proxy cannot be null" );
 
         for ( Proxy p : getProxies() )
         {
@@ -821,7 +821,7 @@ public MavenExecutionRequest setServers( List<Server> servers )
     @Override
     public MavenExecutionRequest addServer( Server server )
     {
-        Validate.notNull( server, "server cannot be null" );
+        Objects.requireNonNull( server, "server cannot be null" );
 
         for ( Server p : getServers() )
         {
@@ -864,7 +864,7 @@ public MavenExecutionRequest setMirrors( List<Mirror> mirrors )
     @Override
     public MavenExecutionRequest addMirror( Mirror mirror )
     {
-        Validate.notNull( mirror, "mirror cannot be null" );
+        Objects.requireNonNull( mirror, "mirror cannot be null" );
 
         for ( Mirror p : getMirrors() )
         {
@@ -1111,7 +1111,7 @@ public ProjectBuildingRequest getProjectBuildingRequest()
     @Override
     public MavenExecutionRequest addProfile( Profile profile )
     {
-        Validate.notNull( profile, "profile cannot be null" );
+        Objects.requireNonNull( profile, "profile cannot be null" );
 
         for ( Profile p : getProfiles() )
         {

diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
@@ -24,9 +24,9 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.maven.execution.ProjectDependencyGraph;
 import org.apache.maven.project.DuplicateProjectException;
 import org.apache.maven.project.MavenProject;
@@ -95,7 +95,7 @@ public List<MavenProject> getSortedProjects()
 
     public List<MavenProject> getDownstreamProjects( MavenProject project, boolean transitive )
     {
-        Validate.notNull( project, "project cannot be null" );
+        Objects.requireNonNull( project, "project cannot be null" );
 
         Set<String> projectIds = new HashSet<>();
 
@@ -117,7 +117,7 @@ private void getDownstreamProjects( String projectId, Set<String> projectIds, bo
 
     public List<MavenProject> getUpstreamProjects( MavenProject project, boolean transitive )
     {
-        Validate.notNull( project, "project cannot be null" );
+        Objects.requireNonNull( project, "project cannot be null" );
 
         Set<String> projectIds = new HashSet<>();
 

diff --git a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
@@ -24,8 +24,8 @@
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.maven.execution.ProjectDependencyGraph;
 import org.apache.maven.project.MavenProject;
 
@@ -54,7 +54,7 @@ class FilteredProjectDependencyGraph
                                     Collection<? extends MavenProject> whiteList )
     {
         this.projectDependencyGraph =
-            Validate.notNull( projectDependencyGraph, "projectDependencyGraph cannot be null" );
+                Objects.requireNonNull( projectDependencyGraph, "projectDependencyGraph cannot be null" );
 
         this.whiteList = new IdentityHashMap<MavenProject, Object>();
 

diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
@@ -23,9 +23,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.project.ExtensionDescriptor;
 import org.apache.maven.project.MavenProject;
@@ -126,7 +126,7 @@ public CacheRecord get( Key key )
     public CacheRecord put( Key key, ClassRealm extensionRealm, ExtensionDescriptor extensionDescriptor,
                             List<Artifact> artifacts )
     {
-        Validate.notNull( extensionRealm, "extensionRealm cannot be null" );
+        Objects.requireNonNull( extensionRealm, "extensionRealm cannot be null" );
 
         if ( cache.containsKey( key ) )
         {

diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
@@ -26,7 +26,6 @@
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Plugin;
@@ -151,7 +150,7 @@ public CacheRecord get( Key key )
 
     public CacheRecord put( Key key, List<Artifact> pluginArtifacts )
     {
-        Validate.notNull( pluginArtifacts, "pluginArtifacts cannot be null" );
+        Objects.requireNonNull( pluginArtifacts, "pluginArtifacts cannot be null" );
 
         assertUniqueKey( key );
 
@@ -173,7 +172,7 @@ protected void assertUniqueKey( Key key )
 
     public CacheRecord put( Key key, PluginResolutionException exception )
     {
-        Validate.notNull( exception, "exception cannot be null" );
+        Objects.requireNonNull( exception, "exception cannot be null" );
 
         assertUniqueKey( key );
 

diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
@@ -26,7 +26,6 @@
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Plugin;
@@ -159,8 +158,8 @@ public CacheRecord get( Key key )
 
     public CacheRecord put( Key key, ClassRealm pluginRealm, List<Artifact> pluginArtifacts )
     {
-        Validate.notNull( pluginRealm, "pluginRealm cannot be null" );
-        Validate.notNull( pluginArtifacts, "pluginArtifacts cannot be null" );
+        Objects.requireNonNull( pluginRealm, "pluginRealm cannot be null" );
+        Objects.requireNonNull( pluginArtifacts, "pluginArtifacts cannot be null" );
 
         if ( cache.containsKey( key ) )
         {

diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.commons.lang3.Validate;
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.classrealm.ClassRealmManager;
@@ -104,6 +103,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
@@ -385,10 +385,11 @@ private void createPluginRealm( PluginDescriptor pluginDescriptor, MavenSession
                                     Map<String, ClassLoader> foreignImports, DependencyFilter filter )
         throws PluginResolutionException, PluginContainerException
     {
-        Plugin plugin = Validate.notNull( pluginDescriptor.getPlugin(), "pluginDescriptor.plugin cannot be null" );
+        Plugin plugin =
+            Objects.requireNonNull( pluginDescriptor.getPlugin(), "pluginDescriptor.plugin cannot be null" );
 
-        Artifact pluginArtifact =
-            Validate.notNull( pluginDescriptor.getPluginArtifact(), "pluginDescriptor.pluginArtifact cannot be null" );
+        Artifact pluginArtifact = Objects.requireNonNull( pluginDescriptor.getPluginArtifact(),
+                                                          "pluginDescriptor.pluginArtifact cannot be null" );
 
         MavenProject project = session.getCurrentProject();