[MNG-7834] Fix NullPointerException in flatten-maven-plugin #1195
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gnodet
commented
Jul 4, 2023
| @@ -201,18 +201,25 @@ public class ${class.name} | |||
| if (!Objects.equals(map, getDelegate().get${cap}())) { | |||
| update(getDelegate().with${cap}(map)); | |||
| } | |||
| #else | |||
| #elseif ( $field.to != "String" && $field.type == "java.util.List" && $field.multiplicity == "*" ) | |||
| if (${field.name} == null) { | |||
There was a problem hiding this comment.
So the new code now looks like:
public void setDependencies(List<Dependency> dependencies) {
if (dependencies == null) {
dependencies = Collections.emptyList();
}
if (!Objects.equals(dependencies, getDependencies())) {
update(getDelegate().withDependencies(
dependencies.stream().map(c -> c.getDelegate()).collect(Collectors.toList())));
dependencies.forEach(e -> e.childrenTracking = this::replace);
}
}
gnodet
commented
Jul 4, 2023
| #else | ||
| } | ||
| #elseif ( $field.to && $field.to != "String" ) | ||
| if (!Objects.equals(${field.name}, ${pfx}${cap}())){ |
There was a problem hiding this comment.
The new code looks like:
public void setDistributionManagement(DistributionManagement distributionManagement) {
if (!Objects.equals(distributionManagement, getDistributionManagement())){
if (distributionManagement != null) {
update(getDelegate().withDistributionManagement(distributionManagement.getDelegate()));
distributionManagement.childrenTracking = this::replace;
} else {
update(getDelegate().withDistributionManagement(null));
}
}
}
gnodet
force-pushed
the
MNG-7834-NPE-in-flatten-maven-plugin
branch
from
58f1361
to
43681d7
Compare
elharo
approved these changes
Jul 5, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JIRA issue: https://issues.apache.org/jira/browse/MNG-7834
The flatten-maven-plugin fails with a NPE: