Pull #2287: use Objects#requireNonNull

Author: Vincent Potucek

impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java

@@ -103,8 +103,8 @@
 import org.eclipse.aether.repository.ArtifactRepository;
 import org.eclipse.aether.transfer.TransferResource;
 
+import static java.util.Objects.requireNonNull;
 import static org.apache.maven.impl.ImplUtils.map;
-import static org.apache.maven.impl.ImplUtils.nonNull;
 
 public abstract class AbstractSession implements InternalSession {
 
@@ -134,7 +134,7 @@ public AbstractSession(
             List<RemoteRepository> repositories,
             List<org.eclipse.aether.repository.RemoteRepository> resolverRepositories,
             Lookup lookup) {
-        this.session = nonNull(session, "session");
+        this.session = requireNonNull(session, "session");
         this.repositorySystem = repositorySystem;
         this.repositories = getRepositories(repositories, resolverRepositories);
         this.lookup = lookup;
@@ -337,7 +337,7 @@ public LocalRepository getLocalRepository() {
     @Nonnull
     @Override
     public Session withLocalRepository(@Nonnull LocalRepository localRepository) {
-        nonNull(localRepository, "localRepository");
+        requireNonNull(localRepository, "localRepository");
         if (session.getLocalRepository() != null
                 && Objects.equals(session.getLocalRepository().getBasePath(), localRepository.getPath())) {
             return this;
@@ -461,12 +461,12 @@ public org.eclipse.aether.artifact.Artifact toArtifact(ArtifactCoordinates coord
 
     @Override
     public void registerListener(@Nonnull Listener listener) {
-        listeners.add(nonNull(listener));
+        listeners.add(requireNonNull(listener));
     }
 
     @Override
     public void unregisterListener(@Nonnull Listener listener) {
-        listeners.remove(nonNull(listener));
+        listeners.remove(requireNonNull(listener));
     }
 
     @Nonnull
@@ -967,7 +967,7 @@ public ProjectScope requireProjectScope(String id) {
 
     @Override
     public DependencyScope requireDependencyScope(String id) {
-        DependencyScope scope = DependencyScope.forId(nonNull(id, "id"));
+        DependencyScope scope = DependencyScope.forId(requireNonNull(id, "id"));
         if (scope == null) {
             throw new IllegalArgumentException("Invalid dependency scope: " + id);
         }

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifact.java

@@ -25,7 +25,7 @@
 import org.apache.maven.api.Version;
 import org.apache.maven.api.annotations.Nonnull;
 
-import static org.apache.maven.impl.ImplUtils.nonNull;
+import static java.util.Objects.requireNonNull;
 
 /**
  * A wrapper class around a maven resolver artifact.
@@ -36,8 +36,8 @@ public class DefaultArtifact implements Artifact {
     protected final String key;
 
     public DefaultArtifact(@Nonnull InternalSession session, @Nonnull org.eclipse.aether.artifact.Artifact artifact) {
-        this.session = nonNull(session, "session");
-        this.artifact = nonNull(artifact, "artifact");
+        this.session = requireNonNull(session, "session");
+        this.artifact = requireNonNull(artifact, "artifact");
         this.key = getGroupId()
                 + ':'
                 + getArtifactId()

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinates.java

@@ -24,7 +24,7 @@
 import org.apache.maven.api.VersionConstraint;
 import org.apache.maven.api.annotations.Nonnull;
 
-import static org.apache.maven.impl.ImplUtils.nonNull;
+import static java.util.Objects.requireNonNull;
 
 /**
  * A wrapper class around a maven resolver artifact.
@@ -35,8 +35,8 @@ public class DefaultArtifactCoordinates implements ArtifactCoordinates {
 
     public DefaultArtifactCoordinates(
             @Nonnull InternalSession session, @Nonnull org.eclipse.aether.artifact.Artifact coordinates) {
-        this.session = nonNull(session, "session");
-        this.coordinates = nonNull(coordinates, "coordinates");
+        this.session = requireNonNull(session, "session");
+        this.coordinates = requireNonNull(coordinates, "coordinates");
     }
 
     public org.eclipse.aether.artifact.Artifact getCoordinates() {

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinatesFactory.java

@@ -26,14 +26,14 @@
 import org.apache.maven.api.services.ArtifactCoordinatesFactoryRequest;
 import org.eclipse.aether.artifact.ArtifactType;
 
-import static org.apache.maven.impl.ImplUtils.nonNull;
+import static java.util.Objects.requireNonNull;
 
 @Named
 @Singleton
 public class DefaultArtifactCoordinatesFactory implements ArtifactCoordinatesFactory {
     @Override
     public ArtifactCoordinates create(@Nonnull ArtifactCoordinatesFactoryRequest request) {
-        nonNull(request, "request");
+        requireNonNull(request, "request");
         InternalSession session = InternalSession.from(request.getSession());
         if (request.getCoordinatesString() != null) {
             return new DefaultArtifactCoordinates(

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactDeployer.java

@@ -31,7 +31,7 @@
 import org.eclipse.aether.deployment.DeployRequest;
 import org.eclipse.aether.deployment.DeploymentException;
 
-import static org.apache.maven.impl.ImplUtils.nonNull;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Implementation of {@link ArtifactDeployer} service.
@@ -42,10 +42,10 @@ public class DefaultArtifactDeployer implements ArtifactDeployer {
 
     @Override
     public void deploy(@Nonnull ArtifactDeployerRequest request) {
-        nonNull(request, "request");
+        requireNonNull(request, "request");
         InternalSession session = InternalSession.from(request.getSession());
-        Collection<ProducedArtifact> artifacts = nonNull(request.getArtifacts(), "request.artifacts");
-        RemoteRepository repository = nonNull(request.getRepository(), "request.repository");
+        Collection<ProducedArtifact> artifacts = requireNonNull(request.getArtifacts(), "request.artifacts");
+        RemoteRepository repository = requireNonNull(request.getRepository(), "request.repository");
         try {
             DeployRequest deployRequest = new DeployRequest()
                     .setRepository(session.toRepository(repository))

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactFactory.java

@@ -27,14 +27,14 @@
 import org.apache.maven.api.services.ArtifactFactoryRequest;
 import org.eclipse.aether.artifact.ArtifactType;
 
-import static org.apache.maven.impl.ImplUtils.nonNull;
+import static java.util.Objects.requireNonNull;
 
 @Named
 @Singleton
 public class DefaultArtifactFactory implements ArtifactFactory {
     @Override
     public Artifact create(@Nonnull ArtifactFactoryRequest request) {
-        nonNull(request, "request");
+        requireNonNull(request, "request");
         InternalSession session = InternalSession.from(request.getSession());
         ArtifactType type = null;
         if (request.getType() != null) {
@@ -59,7 +59,7 @@ public Artifact create(@Nonnull ArtifactFactoryRequest request) {
 
     @Override
     public ProducedArtifact createProduced(@Nonnull ArtifactFactoryRequest request) {
-        nonNull(request, "request");
+        requireNonNull(request, "request");
         InternalSession session = InternalSession.from(request.getSession());
         ArtifactType type = null;
         if (request.getType() != null) {

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactInstaller.java

@@ -29,7 +29,7 @@
 import org.eclipse.aether.installation.InstallRequest;
 import org.eclipse.aether.installation.InstallationException;
 
-import static org.apache.maven.impl.ImplUtils.nonNull;
+import static java.util.Objects.requireNonNull;
 
 @Named
 @Singleton
@@ -39,12 +39,12 @@ public class DefaultArtifactInstaller implements ArtifactInstaller {
 
     @Inject
     DefaultArtifactInstaller(@Nonnull RepositorySystem repositorySystem) {
-        this.repositorySystem = nonNull(repositorySystem);
+        this.repositorySystem = requireNonNull(repositorySystem);
     }
 
     @Override
     public void install(ArtifactInstallerRequest request) throws ArtifactInstallerException, IllegalArgumentException {
-        nonNull(request, "request");
+        requireNonNull(request, "request");
         InternalSession session = InternalSession.from(request.getSession());
         try {
             InstallRequest installRequest =

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactResolver.java

@@ -51,7 +51,7 @@
 import org.eclipse.aether.resolution.ArtifactResult;
 import org.eclipse.aether.transfer.ArtifactNotFoundException;
 
-import static org.apache.maven.impl.ImplUtils.nonNull;
+import static java.util.Objects.requireNonNull;
 
 @Named
 @Singleton
@@ -60,7 +60,7 @@ public class DefaultArtifactResolver implements ArtifactResolver {
     @Override
     public ArtifactResolverResult resolve(ArtifactResolverRequest request)
             throws ArtifactResolverException, IllegalArgumentException {
-        nonNull(request, "request");
+        requireNonNull(request, "request");
         InternalSession session = InternalSession.from(request.getSession());
         return session.request(request, this::doResolve);
     }

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultChecksumAlgorithmService.java

@@ -41,7 +41,7 @@
 import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactory;
 import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactorySelector;
 
-import static org.apache.maven.impl.ImplUtils.nonNull;
+import static java.util.Objects.requireNonNull;
 
 @Named
 @Singleton
@@ -51,7 +51,7 @@ public class DefaultChecksumAlgorithmService implements ChecksumAlgorithmService
     @Inject
     public DefaultChecksumAlgorithmService(ChecksumAlgorithmFactorySelector checksumAlgorithmFactorySelector) {
         this.checksumAlgorithmFactorySelector =
-                nonNull(checksumAlgorithmFactorySelector, "checksumAlgorithmFactorySelector");
+                requireNonNull(checksumAlgorithmFactorySelector, "checksumAlgorithmFactorySelector");
     }
 
     @Override
@@ -63,7 +63,7 @@ public Collection<String> getChecksumAlgorithmNames() {
 
     @Override
     public ChecksumAlgorithm select(String algorithmName) {
-        nonNull(algorithmName, "algorithmName");
+        requireNonNull(algorithmName, "algorithmName");
         try {
             return new DefaultChecksumAlgorithm(checksumAlgorithmFactorySelector.select(algorithmName));
         } catch (IllegalArgumentException e) {
@@ -73,7 +73,7 @@ public ChecksumAlgorithm select(String algorithmName) {
 
     @Override
     public Collection<ChecksumAlgorithm> select(Collection<String> algorithmNames) {
-        nonNull(algorithmNames, "algorithmNames");
+        requireNonNull(algorithmNames, "algorithmNames");
         try {
             return checksumAlgorithmFactorySelector.selectList(new ArrayList<>(algorithmNames)).stream()
                     .map(DefaultChecksumAlgorithm::new)
@@ -85,8 +85,8 @@ public Collection<ChecksumAlgorithm> select(Collection<String> algorithmNames) {
 
     @Override
     public Map<ChecksumAlgorithm, String> calculate(byte[] data, Collection<ChecksumAlgorithm> algorithms) {
-        nonNull(data, "data");
-        nonNull(algorithms, "algorithms");
+        requireNonNull(data, "data");
+        requireNonNull(algorithms, "algorithms");
         try {
             return calculate(new ByteArrayInputStream(data), algorithms);
         } catch (IOException e) {
@@ -96,8 +96,8 @@ public Map<ChecksumAlgorithm, String> calculate(byte[] data, Collection<Checksum
 
     @Override
     public Map<ChecksumAlgorithm, String> calculate(ByteBuffer data, Collection<ChecksumAlgorithm> algorithms) {
-        nonNull(data, "data");
-        nonNull(algorithms, "algorithms");
+        requireNonNull(data, "data");
+        requireNonNull(algorithms, "algorithms");
         LinkedHashMap<ChecksumAlgorithm, ChecksumCalculator> algMap = new LinkedHashMap<>();
         algorithms.forEach(f -> algMap.put(f, f.getCalculator()));
         data.mark();
@@ -113,8 +113,8 @@ public Map<ChecksumAlgorithm, String> calculate(ByteBuffer data, Collection<Chec
     @Override
     public Map<ChecksumAlgorithm, String> calculate(Path file, Collection<ChecksumAlgorithm> algorithms)
             throws IOException {
-        nonNull(file, "file");
-        nonNull(algorithms, "algorithms");
+        requireNonNull(file, "file");
+        requireNonNull(algorithms, "algorithms");
         try (InputStream inputStream = new BufferedInputStream(Files.newInputStream(file))) {
             return calculate(inputStream, algorithms);
         }
@@ -123,8 +123,8 @@ public Map<ChecksumAlgorithm, String> calculate(Path file, Collection<ChecksumAl
     @Override
     public Map<ChecksumAlgorithm, String> calculate(InputStream stream, Collection<ChecksumAlgorithm> algorithms)
             throws IOException {
-        nonNull(stream, "stream");
-        nonNull(algorithms, "algorithms");
+        requireNonNull(stream, "stream");
+        requireNonNull(algorithms, "algorithms");
         LinkedHashMap<ChecksumAlgorithm, ChecksumCalculator> algMap = new LinkedHashMap<>();
         algorithms.forEach(f -> algMap.put(f, f.getCalculator()));
         final byte[] buffer = new byte[1024 * 32];

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinatesFactory.java

@@ -27,8 +27,8 @@
 import org.apache.maven.api.services.DependencyCoordinatesFactoryRequest;
 import org.eclipse.aether.artifact.ArtifactType;
 
+import static java.util.Objects.requireNonNull;
 import static org.apache.maven.impl.ImplUtils.map;
-import static org.apache.maven.impl.ImplUtils.nonNull;
 
 @Named
 @Singleton
@@ -37,7 +37,7 @@ public class DefaultDependencyCoordinatesFactory implements DependencyCoordinate
     @Nonnull
     @Override
     public DependencyCoordinates create(@Nonnull DependencyCoordinatesFactoryRequest request) {
-        nonNull(request, "request");
+        requireNonNull(request, "request");
         InternalSession session = InternalSession.from(request.getSession());
 
         ArtifactType type = null;

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java

@@ -60,9 +60,9 @@
 import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
 import org.eclipse.aether.util.graph.transformer.ConflictResolver;
 
+import static java.util.Objects.requireNonNull;
 import static org.apache.maven.impl.ImplUtils.cast;
 import static org.apache.maven.impl.ImplUtils.map;
-import static org.apache.maven.impl.ImplUtils.nonNull;
 
 @Named
 @Singleton
@@ -72,7 +72,7 @@ public class DefaultDependencyResolver implements DependencyResolver {
     @Override
     public DependencyResolverResult collect(@Nonnull DependencyResolverRequest request)
             throws DependencyResolverException, IllegalArgumentException {
-        nonNull(request, "request");
+        requireNonNull(request, "request");
         InternalSession session = InternalSession.from(request.getSession());
         RequestTraceHelper.ResolverTrace trace = RequestTraceHelper.enter(session, request);
         try {
@@ -169,7 +169,7 @@ private static DependencyFilter getScopeDependencyFilter(PathScope scope) {
     public DependencyResolverResult resolve(DependencyResolverRequest request)
             throws DependencyResolverException, ArtifactResolverException {
         InternalSession session =
-                InternalSession.from(nonNull(request, "request").getSession());
+                InternalSession.from(requireNonNull(request, "request").getSession());
         RequestTraceHelper.ResolverTrace trace = RequestTraceHelper.enter(session, request);
         try {
             DependencyResolverResult result;

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultLocalRepository.java

@@ -23,14 +23,14 @@
 import org.apache.maven.api.LocalRepository;
 import org.apache.maven.api.annotations.Nonnull;
 
-import static org.apache.maven.impl.ImplUtils.nonNull;
+import static java.util.Objects.requireNonNull;
 
 public class DefaultLocalRepository implements LocalRepository {
 
     private final @Nonnull org.eclipse.aether.repository.LocalRepository repository;
 
     public DefaultLocalRepository(@Nonnull org.eclipse.aether.repository.LocalRepository repository) {
-        this.repository = nonNull(repository, "repository");
+        this.repository = requireNonNull(repository, "repository");
     }
 
     @Nonnull

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java

@@ -40,7 +40,7 @@
 import org.apache.maven.model.v4.MavenStaxReader;
 import org.apache.maven.model.v4.MavenStaxWriter;
 
-import static org.apache.maven.impl.ImplUtils.nonNull;
+import static java.util.Objects.requireNonNull;
 import static org.apache.maven.impl.StaxLocation.getLocation;
 import static org.apache.maven.impl.StaxLocation.getMessage;
 
@@ -50,7 +50,7 @@ public class DefaultModelXmlFactory implements ModelXmlFactory {
     @Override
     @Nonnull
     public Model read(@Nonnull XmlReaderRequest request) throws XmlReaderException {
-        nonNull(request, "request");
+        requireNonNull(request, "request");
         Model model = doRead(request);
         if (isModelVersionGreaterThan400(model)
                 && !model.getNamespaceUri().startsWith("http://maven.apache.org/POM/")) {
@@ -114,8 +114,8 @@ private Model doRead(XmlReaderRequest request) throws XmlReaderException {
 
     @Override
     public void write(XmlWriterRequest<Model> request) throws XmlWriterException {
-        nonNull(request, "request");
-        Model content = nonNull(request.getContent(), "content");
+        requireNonNull(request, "request");
+        Model content = requireNonNull(request.getContent(), "content");
         Path path = request.getPath();
         OutputStream outputStream = request.getOutputStream();
         Writer writer = request.getWriter();