Skip to content

Fixed NPE in master build. #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Fixed NPE in master build. #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions src/main/java/com/e_gineering/maven/gitflowhelper/AbstractGitflowBasedRepositoryMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,21 @@ private static PrintWriter newPrintWriter(File catalog) throws FileNotFoundExcep
* @throws MojoFailureException if the repository id is not defined.
*/
ArtifactRepository getDeploymentRepository(final String id) throws MojoFailureException {
return getDeploymentRepositoryOpt(id).orElseThrow(() -> new MojoFailureException("No Repository with id `" + id + "` is defined."));
}

/**
* Get an repository by the repository ID.
*
* @param id the repository identifier
* @return optional to the repository (never @Code{null})
*/
Optional<ArtifactRepository> getDeploymentRepositoryOpt(String id) {
Objects.requireNonNull(id, "A repository id must be specified.");

Optional<ArtifactRepository> repo = project.getRemoteArtifactRepositories().stream().filter(r -> r.getId().equals(id)).findFirst();
if (repo.isPresent()) {
return repo.get();
return repo;
}

Optional<ArtifactRepository> mirroredRepo = project.getRemoteArtifactRepositories().stream()
Expand All @@ -105,9 +115,10 @@ ArtifactRepository getDeploymentRepository(final String id) throws MojoFailureEx
if(artifactRepository.getAuthentication() == null) {
artifactRepository.setAuthentication(getAuthentication(artifactRepository));
}
return artifactRepository;
return Optional.of(artifactRepository);
}
throw new MojoFailureException("No Repository with id `" + id + "` is defined.");

return Optional.empty();
}

/**
Expand Down Expand Up @@ -210,10 +221,11 @@ private void catalogArtifact(PrintWriter writer, Artifact artifact) {
* @throws MojoExecutionException for any unhandled maven exception
*/
void attachExistingArtifacts(@Nullable final String sourceRepository, final boolean disableLocal)
throws MojoExecutionException, MojoFailureException {
throws MojoExecutionException {

List<ArtifactRepository> remoteArtifactRepositories = new ArrayList<>();
Optional<ArtifactRepository> repo = project.getRemoteArtifactRepositories().stream().filter(r -> r.getId().equals(sourceRepository)).findFirst();

Optional<ArtifactRepository> repo = getDeploymentRepositoryOpt(sourceRepository);
if (repo.isPresent()) {
remoteArtifactRepositories.add(repo.get());
} else {
Expand Down