This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new e80c9f5ac1 Pull #2290: Modernize codebase with Java improvements -
Replace custom null checks with Objects.requireNonNull (#2290)
e80c9f5ac1 is described below
commit e80c9f5ac1cbeb3ffc263feaa5e310be5a761982
Author: Pankraz76 <8830888+pankra...@users.noreply.github.com>
AuthorDate: Tue May 27 15:58:41 2025 +0200
Pull #2290: Modernize codebase with Java improvements - Replace custom null
checks with Objects.requireNonNull (#2290)
Co-authored-by: Vincent Potucek <vpotu...@me.com>
---
.../org/apache/maven/impl/AbstractSession.java | 12 +++++------
.../org/apache/maven/impl/DefaultArtifact.java | 6 +++---
.../maven/impl/DefaultArtifactCoordinates.java | 6 +++---
.../impl/DefaultArtifactCoordinatesFactory.java | 4 ++--
.../apache/maven/impl/DefaultArtifactDeployer.java | 8 ++++----
.../apache/maven/impl/DefaultArtifactFactory.java | 6 +++---
.../maven/impl/DefaultArtifactInstaller.java | 6 +++---
.../apache/maven/impl/DefaultArtifactResolver.java | 4 ++--
.../impl/DefaultChecksumAlgorithmService.java | 24 +++++++++++-----------
.../impl/DefaultDependencyCoordinatesFactory.java | 4 ++--
.../maven/impl/DefaultDependencyResolver.java | 6 +++---
.../apache/maven/impl/DefaultLocalRepository.java | 4 ++--
.../apache/maven/impl/DefaultModelXmlFactory.java | 8 ++++----
.../apache/maven/impl/DefaultPluginXmlFactory.java | 8 ++++----
.../maven/impl/DefaultRepositoryFactory.java | 8 ++++----
.../maven/impl/DefaultToolchainsXmlFactory.java | 4 ++--
.../apache/maven/impl/DefaultVersionParser.java | 4 ++--
.../apache/maven/impl/DefaultVersionResolver.java | 4 ++--
.../maven/impl/ExtensibleEnumRegistries.java | 4 ++--
.../main/java/org/apache/maven/impl/ImplUtils.java | 13 ------------
.../maven/impl/DefaultModelXmlFactoryTest.java | 2 +-
21 files changed, 66 insertions(+), 79 deletions(-)
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java
index e81a217a8e..605a36b903 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java
+++ b/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);
}
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifact.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifact.java
index c757d930ac..4e034569ea 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifact.java
+++ b/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()
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinates.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinates.java
index 3abf27729d..27f299ecf3 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinates.java
+++
b/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() {
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinatesFactory.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinatesFactory.java
index 6832ae6f16..d7b6da1174 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinatesFactory.java
+++
b/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(
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactDeployer.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactDeployer.java
index 572522b646..fb6291bd74 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactDeployer.java
+++
b/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))
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactFactory.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactFactory.java
index 40af9412c7..bf904a5c42 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactFactory.java
+++
b/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) {
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactInstaller.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactInstaller.java
index e3b1936f30..368d2f839c 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactInstaller.java
+++
b/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 =
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactResolver.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactResolver.java
index acc0b23be5..3614056b28 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactResolver.java
+++
b/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);
}
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultChecksumAlgorithmService.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultChecksumAlgorithmService.java
index ef062acdc7..5a6570480e 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultChecksumAlgorithmService.java
+++
b/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];
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinatesFactory.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinatesFactory.java
index 9ebb084cb3..cd52a06bfc 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinatesFactory.java
+++
b/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;
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java
index 7bab2446c6..ac6ba73d5f 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java
+++
b/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;
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultLocalRepository.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultLocalRepository.java
index af657a403e..be5626c81f 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultLocalRepository.java
+++
b/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
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java
index 7a5abd7d82..e7c9cf884b 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java
+++
b/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();
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultPluginXmlFactory.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultPluginXmlFactory.java
index 8764950974..f6dc37400e 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultPluginXmlFactory.java
+++
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultPluginXmlFactory.java
@@ -38,7 +38,7 @@
import org.apache.maven.plugin.descriptor.io.PluginDescriptorStaxReader;
import org.apache.maven.plugin.descriptor.io.PluginDescriptorStaxWriter;
-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;
@@ -47,7 +47,7 @@
public class DefaultPluginXmlFactory implements PluginXmlFactory {
@Override
public PluginDescriptor read(@Nonnull XmlReaderRequest request) throws
XmlReaderException {
- nonNull(request, "request");
+ requireNonNull(request, "request");
Path path = request.getPath();
URL url = request.getURL();
Reader reader = request.getReader();
@@ -78,8 +78,8 @@ public PluginDescriptor read(@Nonnull XmlReaderRequest
request) throws XmlReader
@Override
public void write(XmlWriterRequest<PluginDescriptor> request) throws
XmlWriterException {
- nonNull(request, "request");
- PluginDescriptor content = nonNull(request.getContent(), "content");
+ requireNonNull(request, "request");
+ PluginDescriptor content = requireNonNull(request.getContent(),
"content");
Path path = request.getPath();
OutputStream outputStream = request.getOutputStream();
Writer writer = request.getWriter();
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultRepositoryFactory.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultRepositoryFactory.java
index ec6edf4627..9cd9b6a0f4 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultRepositoryFactory.java
+++
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultRepositoryFactory.java
@@ -32,7 +32,7 @@
import org.eclipse.aether.impl.RemoteRepositoryManager;
import org.eclipse.aether.repository.RepositoryPolicy;
-import static org.apache.maven.impl.ImplUtils.nonNull;
+import static java.util.Objects.requireNonNull;
@Named
@Singleton
@@ -71,11 +71,11 @@ public List<RemoteRepository> aggregate(
List<RemoteRepository> dominant,
List<RemoteRepository> recessive,
boolean processRecessive) {
- InternalSession internalSession =
InternalSession.from(nonNull(session, "session"));
+ InternalSession internalSession =
InternalSession.from(requireNonNull(session, "session"));
List<org.eclipse.aether.repository.RemoteRepository> repos =
remoteRepositoryManager.aggregateRepositories(
internalSession.getSession(),
- internalSession.toRepositories(nonNull(dominant, "dominant")),
- internalSession.toRepositories(nonNull(recessive,
"recessive")),
+ internalSession.toRepositories(requireNonNull(dominant,
"dominant")),
+ internalSession.toRepositories(requireNonNull(recessive,
"recessive")),
processRecessive);
return repos.stream()
.<RemoteRepository>map(DefaultRemoteRepository::new)
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainsXmlFactory.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainsXmlFactory.java
index 5037f7696b..2db24aa8ec 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainsXmlFactory.java
+++
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainsXmlFactory.java
@@ -37,7 +37,7 @@
import org.apache.maven.toolchain.v4.MavenToolchainsStaxReader;
import org.apache.maven.toolchain.v4.MavenToolchainsStaxWriter;
-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;
@@ -71,7 +71,7 @@ public PersistedToolchains read(@Nonnull XmlReaderRequest
request) throws XmlRea
@Override
public void write(XmlWriterRequest<PersistedToolchains> request) throws
XmlWriterException {
- nonNull(request, "request");
+ requireNonNull(request, "request");
PersistedToolchains content =
Objects.requireNonNull(request.getContent(), "content");
OutputStream outputStream = request.getOutputStream();
Writer writer = request.getWriter();
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionParser.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionParser.java
index d84ebcddc3..4400477d02 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionParser.java
+++
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionParser.java
@@ -27,7 +27,7 @@
import org.apache.maven.api.services.VersionParser;
import org.apache.maven.api.services.model.ModelVersionParser;
-import static org.apache.maven.impl.ImplUtils.nonNull;
+import static java.util.Objects.requireNonNull;
/**
* A wrapper class around a resolver version that works as model version
parser as well.
@@ -39,7 +39,7 @@ public class DefaultVersionParser implements VersionParser {
@Inject
public DefaultVersionParser(ModelVersionParser modelVersionParser) {
- this.modelVersionParser = nonNull(modelVersionParser,
"modelVersionParser");
+ this.modelVersionParser = requireNonNull(modelVersionParser,
"modelVersionParser");
}
@Override
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionResolver.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionResolver.java
index cc140caf92..c80a1d24ad 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionResolver.java
+++
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionResolver.java
@@ -35,7 +35,7 @@
import org.eclipse.aether.resolution.VersionResolutionException;
import org.eclipse.aether.resolution.VersionResult;
-import static org.apache.maven.impl.ImplUtils.nonNull;
+import static java.util.Objects.requireNonNull;
@Named
@Singleton
@@ -50,7 +50,7 @@ public DefaultVersionResolver(RepositorySystem
repositorySystem) {
@Override
public VersionResolverResult resolve(VersionResolverRequest request)
throws VersionResolverException {
- nonNull(request, "request");
+ requireNonNull(request, "request");
InternalSession session = InternalSession.from(request.getSession());
return session.request(request, this::doResolve);
}
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/ExtensibleEnumRegistries.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/ExtensibleEnumRegistries.java
index f252605c14..5716538702 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/ExtensibleEnumRegistries.java
+++
b/impl/maven-impl/src/main/java/org/apache/maven/impl/ExtensibleEnumRegistries.java
@@ -42,7 +42,7 @@
import org.apache.maven.api.spi.PathScopeProvider;
import org.apache.maven.api.spi.ProjectScopeProvider;
-import static org.apache.maven.impl.ImplUtils.nonNull;
+import static java.util.Objects.requireNonNull;
public class ExtensibleEnumRegistries {
@@ -97,7 +97,7 @@ public DefaultExtensibleEnumRegistry(List<P> providers, T...
builtinValues) {
@Override
public Optional<T> lookup(String id) {
- return Optional.ofNullable(values.get(nonNull(id,
"id").toLowerCase(Locale.ROOT)));
+ return Optional.ofNullable(values.get(requireNonNull(id,
"id").toLowerCase(Locale.ROOT)));
}
}
}
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/ImplUtils.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/ImplUtils.java
index 37e0f36e1b..6424810891 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/ImplUtils.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/ImplUtils.java
@@ -25,19 +25,6 @@
import java.util.stream.Collectors;
class ImplUtils {
- public static <T> T nonNull(T t) {
- if (t == null) {
- throw new IllegalArgumentException();
- }
- return t;
- }
-
- public static <T> T nonNull(T t, String name) {
- if (t == null) {
- throw new IllegalArgumentException(name + " cannot be null");
- }
- return t;
- }
public static <T> T cast(Class<T> clazz, Object o, String name) {
if (!clazz.isInstance(o)) {
diff --git
a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultModelXmlFactoryTest.java
b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultModelXmlFactoryTest.java
index f10d46fdd8..436d7b9798 100644
---
a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultModelXmlFactoryTest.java
+++
b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultModelXmlFactoryTest.java
@@ -105,7 +105,7 @@ void testNoNamespaceWithModelVersion400() throws Exception {
@Test
void testNullRequest() {
- assertThrows(IllegalArgumentException.class, () ->
factory.read((XmlReaderRequest) null));
+ assertThrows(NullPointerException.class, () ->
factory.read((XmlReaderRequest) null));
}
@Test
