Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.maven.shared.io.location;

import java.util.List;
import java.util.Objects;

import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
Expand Down Expand Up @@ -55,10 +56,7 @@ public ArtifactLocatorStrategy(
ArtifactResolver resolver,
ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories) {
this.factory = factory;
this.resolver = resolver;
this.localRepository = localRepository;
this.remoteRepositories = remoteRepositories;
this(factory, resolver, localRepository, remoteRepositories, "jar", null);
}

/**
Expand All @@ -74,11 +72,7 @@ public ArtifactLocatorStrategy(
ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
String defaultArtifactType) {
this.factory = factory;
this.resolver = resolver;
this.localRepository = localRepository;
this.remoteRepositories = remoteRepositories;
this.defaultArtifactType = defaultArtifactType;
this(factory, resolver, localRepository, remoteRepositories, defaultArtifactType, null);
}

/**
Expand All @@ -96,9 +90,9 @@ public ArtifactLocatorStrategy(
List<ArtifactRepository> remoteRepositories,
String defaultArtifactType,
String defaultClassifier) {
this.factory = factory;
this.resolver = resolver;
this.localRepository = localRepository;
this.factory = Objects.requireNonNull(factory, "factory");
this.resolver = Objects.requireNonNull(resolver, "resolver");
this.localRepository = Objects.requireNonNull(localRepository, "localRepository");
this.remoteRepositories = remoteRepositories;
this.defaultArtifactType = defaultArtifactType;
this.defaultClassifier = defaultClassifier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

Expand Down Expand Up @@ -78,6 +79,33 @@ void shouldConstructWithDefaultArtifactType() {
verify(factory, resolver, localRepository);
}

@Test
void shouldRejectNullFactory() {
NullPointerException exception = assertThrows(
NullPointerException.class,
() -> new ArtifactLocatorStrategy(null, resolver, localRepository, Collections.EMPTY_LIST));

assertEquals("factory", exception.getMessage());
}

@Test
void shouldRejectNullResolver() {
NullPointerException exception = assertThrows(
NullPointerException.class,
() -> new ArtifactLocatorStrategy(factory, null, localRepository, Collections.EMPTY_LIST));

assertEquals("resolver", exception.getMessage());
}

@Test
void shouldRejectNullLocalRepository() {
NullPointerException exception = assertThrows(
NullPointerException.class,
() -> new ArtifactLocatorStrategy(factory, resolver, null, Collections.EMPTY_LIST));

assertEquals("localRepository", exception.getMessage());
}

@Test
void shouldFailToResolveSpecWithOneToken() {
replay(factory, resolver, localRepository);
Expand Down
Loading