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 42f98b3ee8 requireNonNull (#2181)
42f98b3ee8 is described below
commit 42f98b3ee812a7aacec5ed17f5ff2d09458ae824
Author: Elliotte Rusty Harold <[email protected]>
AuthorDate: Mon Mar 24 18:23:23 2025 -0400
requireNonNull (#2181)
* requireNonNull
---
.../org/apache/maven/internal/impl/CoreUtils.java | 13 ----------
.../internal/impl/DefaultArtifactManager.java | 6 ++---
.../apache/maven/internal/impl/DefaultProject.java | 8 +++---
.../maven/internal/impl/DefaultProjectManager.java | 29 ++++++++++++----------
.../apache/maven/internal/impl/DefaultSession.java | 11 ++++----
.../maven/internal/impl/DefaultTypeRegistry.java | 10 ++++----
6 files changed, 34 insertions(+), 43 deletions(-)
diff --git
a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/CoreUtils.java
b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/CoreUtils.java
index 07844b9368..b5c62658ec 100644
---
a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/CoreUtils.java
+++
b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/CoreUtils.java
@@ -25,19 +25,6 @@
import java.util.stream.Collectors;
class CoreUtils {
- 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-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
index 50571774ea..0f20222060 100644
---
a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
+++
b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
@@ -37,7 +37,7 @@
import org.apache.maven.project.MavenProject;
import org.eclipse.sisu.Typed;
-import static org.apache.maven.internal.impl.CoreUtils.nonNull;
+import static java.util.Objects.requireNonNull;
@Named
@Typed
@@ -57,7 +57,7 @@ public DefaultArtifactManager(@Nonnull InternalMavenSession
session) {
@Nonnull
@Override
public Optional<Path> getPath(@Nonnull Artifact artifact) {
- String id = id(nonNull(artifact, "artifact"));
+ String id = id(requireNonNull(artifact, "artifact cannot be null"));
if (session.getMavenSession().getAllProjects() != null) {
for (MavenProject project :
session.getMavenSession().getAllProjects()) {
if (id.equals(id(project.getArtifact()))
@@ -75,7 +75,7 @@ public Optional<Path> getPath(@Nonnull Artifact artifact) {
@Override
public void setPath(@Nonnull ProducedArtifact artifact, Path path) {
- String id = id(nonNull(artifact, "artifact"));
+ String id = id(requireNonNull(artifact, "artifact cannot be null"));
if (session.getMavenSession().getAllProjects() != null) {
session.getMavenSession().getAllProjects().stream()
.flatMap(this::getProjectArtifacts)
diff --git
a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java
b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java
index 787ceee565..5c53a246a5 100644
---
a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java
+++
b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java
@@ -47,8 +47,6 @@
import org.apache.maven.project.artifact.ProjectArtifact;
import org.eclipse.aether.util.artifact.ArtifactIdUtils;
-import static org.apache.maven.internal.impl.CoreUtils.nonNull;
-
public class DefaultProject implements Project {
private final InternalMavenSession session;
@@ -122,13 +120,15 @@ public Model getModel() {
@Nonnull
@Override
public Path getPomPath() {
- return nonNull(project.getFile(), "pomPath").toPath();
+ return Objects.requireNonNull(project.getFile(), "pomPath cannot be
null")
+ .toPath();
}
@Nonnull
@Override
public Path getBasedir() {
- return nonNull(project.getBasedir(), "basedir").toPath();
+ return Objects.requireNonNull(project.getBasedir(), "basedir cannot be
null")
+ .toPath();
}
@Nonnull
diff --git
a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java
b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java
index 72aa267479..c7d7505724 100644
---
a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java
+++
b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java
@@ -49,8 +49,8 @@
import org.apache.maven.project.MavenProject;
import org.eclipse.sisu.Typed;
+import static java.util.Objects.requireNonNull;
import static org.apache.maven.internal.impl.CoreUtils.map;
-import static org.apache.maven.internal.impl.CoreUtils.nonNull;
@Named
@Typed
@@ -69,7 +69,7 @@ public DefaultProjectManager(InternalMavenSession session,
ArtifactManager artif
@Nonnull
@Override
public Optional<Path> getPath(@Nonnull Project project) {
- nonNull(project, "project");
+ requireNonNull(project, "project" + " cannot be null");
Optional<ProducedArtifact> mainArtifact = project.getMainArtifact();
return mainArtifact.flatMap(artifactManager::getPath);
}
@@ -77,7 +77,7 @@ public Optional<Path> getPath(@Nonnull Project project) {
@Nonnull
@Override
public Collection<ProducedArtifact> getAttachedArtifacts(@Nonnull Project
project) {
- nonNull(project, "project");
+ requireNonNull(project, "project" + " cannot be null");
Collection<ProducedArtifact> attached =
map(getMavenProject(project).getAttachedArtifacts(), a ->
getSession(project)
.getArtifact(ProducedArtifact.class,
RepositoryUtils.toArtifact(a)));
@@ -87,7 +87,7 @@ public Collection<ProducedArtifact>
getAttachedArtifacts(@Nonnull Project projec
@Override
@Nonnull
public Collection<ProducedArtifact> getAllArtifacts(@Nonnull Project
project) {
- nonNull(project, "project");
+ requireNonNull(project, "project cannot be null");
ArrayList<ProducedArtifact> result = new ArrayList<>(2);
result.addAll(project.getArtifacts());
result.addAll(getAttachedArtifacts(project));
@@ -97,9 +97,9 @@ public Collection<ProducedArtifact> getAllArtifacts(@Nonnull
Project project) {
@Override
@SuppressWarnings("deprecation")
public void attachArtifact(@Nonnull Project project, @Nonnull
ProducedArtifact artifact, @Nonnull Path path) {
- nonNull(project, "project");
- nonNull(artifact, "artifact");
- nonNull(path, "path");
+ requireNonNull(project, "project cannot be null");
+ requireNonNull(artifact, "artifact cannot be null");
+ requireNonNull(path, "path cannot be null");
if (artifact.getGroupId().isEmpty()
|| artifact.getArtifactId().isEmpty()
|| artifact.getBaseVersion().toString().isEmpty()) {
@@ -132,21 +132,21 @@ public void attachArtifact(@Nonnull Project project,
@Nonnull ProducedArtifact a
@Nonnull
@Override
public Collection<SourceRoot> getSourceRoots(@Nonnull Project project) {
- MavenProject prj = getMavenProject(nonNull(project, "project"));
+ MavenProject prj = getMavenProject(requireNonNull(project, "project" +
" cannot be null"));
return prj.getSourceRoots();
}
@Nonnull
@Override
public Stream<SourceRoot> getEnabledSourceRoots(@Nonnull Project project,
ProjectScope scope, Language language) {
- MavenProject prj = getMavenProject(nonNull(project, "project"));
+ MavenProject prj = getMavenProject(requireNonNull(project, "project" +
" cannot be null"));
return prj.getEnabledSourceRoots(scope, language);
}
@Override
public void addSourceRoot(@Nonnull Project project, @Nonnull SourceRoot
source) {
- MavenProject prj = getMavenProject(nonNull(project, "project"));
- prj.addSourceRoot(nonNull(source, "source"));
+ MavenProject prj = getMavenProject(requireNonNull(project, "project" +
" cannot be null"));
+ prj.addSourceRoot(requireNonNull(source, "source" + " cannot be
null"));
}
@Override
@@ -155,8 +155,11 @@ public void addSourceRoot(
@Nonnull ProjectScope scope,
@Nonnull Language language,
@Nonnull Path directory) {
- MavenProject prj = getMavenProject(nonNull(project, "project"));
- prj.addSourceRoot(nonNull(scope, "scope"), nonNull(language,
"language"), nonNull(directory, "directory"));
+ MavenProject prj = getMavenProject(requireNonNull(project, "project" +
" cannot be null"));
+ prj.addSourceRoot(
+ requireNonNull(scope, "scope" + " cannot be null"),
+ requireNonNull(language, "language" + " cannot be null"),
+ requireNonNull(directory, "directory" + " cannot be null"));
}
@Override
diff --git
a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
index 4809cd3505..44481cbd3a 100644
---
a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
+++
b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
@@ -53,8 +53,8 @@
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
+import static java.util.Objects.requireNonNull;
import static org.apache.maven.internal.impl.CoreUtils.map;
-import static org.apache.maven.internal.impl.CoreUtils.nonNull;
public class DefaultSession extends AbstractSession implements
InternalMavenSession {
@@ -72,7 +72,7 @@ public DefaultSession(
@Nonnull Lookup lookup,
@Nonnull RuntimeInformation runtimeInformation) {
super(
- nonNull(session).getRepositorySession(),
+ requireNonNull(session).getRepositorySession(),
repositorySystem,
remoteRepositories,
remoteRepositories == null
@@ -182,7 +182,7 @@ public List<Project> getProjects() {
@Nonnull
@Override
public Map<String, Object> getPluginContext(Project project) {
- nonNull(project, "project");
+ requireNonNull(project, "project" + " cannot be null");
try {
MojoExecution mojoExecution = lookup.lookup(MojoExecution.class);
MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
@@ -195,7 +195,8 @@ public Map<String, Object> getPluginContext(Project
project) {
@Override
protected Session newSession(RepositorySystemSession repoSession,
List<RemoteRepository> repositories) {
- final MavenSession ms = nonNull(getMavenSession());
+ MavenSession t = getMavenSession();
+ final MavenSession ms = requireNonNull(t);
final MavenSession mss;
if (repoSession != ms.getRepositorySession()) {
mss = new MavenSession(repoSession, ms.getRequest(),
ms.getResult());
@@ -207,7 +208,7 @@ protected Session newSession(RepositorySystemSession
repoSession, List<RemoteRep
protected Session newSession(MavenSession mavenSession,
List<RemoteRepository> repositories) {
return new DefaultSession(
- nonNull(mavenSession),
+ requireNonNull(mavenSession),
getRepositorySystem(),
repositories,
mavenRepositorySystem,
diff --git
a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java
b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java
index f388773772..9431ec3a76 100644
---
a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java
+++
b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java
@@ -40,8 +40,8 @@
import org.apache.maven.execution.ExecutionEvent;
import org.apache.maven.impl.resolver.type.DefaultType;
+import static java.util.Objects.requireNonNull;
import static java.util.function.Function.identity;
-import static org.apache.maven.internal.impl.CoreUtils.nonNull;
@Named
@Singleton
@@ -57,12 +57,12 @@ public class DefaultTypeRegistry extends AbstractEventSpy
implements TypeRegistr
@Inject
public DefaultTypeRegistry(
List<TypeProvider> providers, LanguageRegistry languageRegistry,
LegacyArtifactHandlerManager manager) {
- this.types = nonNull(providers, "providers").stream()
+ this.types = requireNonNull(providers, "providers cannot be
null").stream()
.flatMap(p -> p.provides().stream())
.collect(Collectors.toMap(Type::id, identity()));
- this.languageRegistry = nonNull(languageRegistry, "languageRegistry");
+ this.languageRegistry = requireNonNull(languageRegistry,
"languageRegistry cannot be null");
this.usedTypes = new ConcurrentHashMap<>();
- this.manager = nonNull(manager, "artifactHandlerManager");
+ this.manager = requireNonNull(manager, "artifactHandlerManager cannot
be null");
}
@Override
@@ -82,7 +82,7 @@ public Optional<Type> lookup(String id) {
@Override
@Nonnull
public Type require(String id) {
- nonNull(id, "id");
+ requireNonNull(id, "id cannot be null");
return usedTypes.computeIfAbsent(id, i -> {
Type type = types.get(id);
if (type == null) {
