Skip to content
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

Jump to bottom

Small ArtifactAssociation refactoring job #1057

Merged
merged 1 commit into from
Feb 26, 2024
Merged

Small ArtifactAssociation refactoring job #1057

Show file tree
Hide file tree
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
4 changes: 0 additions & 4 deletions versions-common/src/main/java/org/codehaus/mojo/versions/api/ArtifactAssociation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
* @since 1.0-alpha-3
*/
public interface ArtifactAssociation extends Comparable<ArtifactAssociation> {
String getGroupId();

String getArtifactId();

boolean isUsePluginRepositories();

Artifact getArtifact();
Expand Down
20 changes: 6 additions & 14 deletions versions-common/src/main/java/org/codehaus/mojo/versions/api/DefaultArtifactAssociation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@ final class DefaultArtifactAssociation implements ArtifactAssociation {
this.usePluginRepositories = usePluginRepositories;
}

public String getGroupId() {
return artifact.getGroupId();
}

public String getArtifactId() {
return artifact.getArtifactId();
}

public Artifact getArtifact() {
return artifact;
}
Expand All @@ -66,11 +58,11 @@ public int compareTo(ArtifactAssociation o) {
}
DefaultArtifactAssociation that = (DefaultArtifactAssociation) o;

int rv = getGroupId().compareTo(that.getGroupId());
int rv = getArtifact().getGroupId().compareTo(that.getArtifact().getGroupId());
if (rv != 0) {
return rv;
}
rv = getArtifactId().compareTo(that.getArtifactId());
rv = getArtifact().getArtifactId().compareTo(that.getArtifact().getArtifactId());
if (rv != 0) {
return rv;
}
Expand All @@ -93,15 +85,15 @@ public boolean equals(Object o) {
if (usePluginRepositories != that.usePluginRepositories) {
return false;
}
if (!getArtifactId().equals(that.getArtifactId())) {
if (!getArtifact().getArtifactId().equals(that.getArtifact().getArtifactId())) {
return false;
}
return getGroupId().equals(that.getGroupId());
return getArtifact().getGroupId().equals(that.getArtifact().getGroupId());
}

public int hashCode() {
int result = getGroupId().hashCode();
result = 31 * result + getArtifactId().hashCode();
int result = getArtifact().getGroupId().hashCode();
result = 31 * result + getArtifact().getArtifactId().hashCode();
result = 31 * result + (usePluginRepositories ? 1 : 0);
return result;
}
Expand Down
14 changes: 7 additions & 7 deletions versions-common/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,14 +636,14 @@ public Map<Property, PropertyVersions> getVersionPropertiesMap(VersionProperties
}

for (PropertyVersionsBuilder propertyVersionsBuilder : propertyVersionsBuilders) {
final String name = propertyVersionsBuilder.getName();
builders.put(name, propertyVersionsBuilder);
if (!properties.containsKey(name)) {
final Property value = new Property(name);
getLog().debug("Property ${" + name + "}: Adding inferred version range of "
final String propertyName = propertyVersionsBuilder.getName();
builders.put(propertyName, propertyVersionsBuilder);
if (!properties.containsKey(propertyName)) {
final Property property = new Property(propertyName);
getLog().debug("Property ${" + propertyName + "}: Adding inferred version range of "
+ propertyVersionsBuilder.getVersionRange());
value.setVersion(propertyVersionsBuilder.getVersionRange());
properties.put(name, value);
property.setVersion(propertyVersionsBuilder.getVersionRange());
properties.put(propertyName, property);
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions versions-common/src/main/java/org/codehaus/mojo/versions/api/PropertyVersions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ public ArtifactVersion[] getVersions(Collection<Artifact> artifacts) {
// see if the version is available for all associations
for (ArtifactAssociation association : associations) {
for (Artifact artifact : artifacts) {
if (association.getGroupId().equals(artifact.getGroupId())
&& association.getArtifactId().equals(artifact.getArtifactId())) {
if (association.getArtifact().getGroupId().equals(artifact.getGroupId())
&& association.getArtifact().getArtifactId().equals(artifact.getArtifactId())) {
try {
result.add(artifact.getSelectedVersion());
} catch (OverConstrainedVersionException e) {
Expand All @@ -173,8 +173,8 @@ public ArtifactVersion[] getVersions(Collection<Artifact> artifacts) {
associations:
for (ArtifactAssociation association : associations) {
for (Artifact artifact : artifacts) {
if (association.getGroupId().equals(artifact.getGroupId())
&& association.getArtifactId().equals(artifact.getArtifactId())) {
if (association.getArtifact().getGroupId().equals(artifact.getGroupId())
&& association.getArtifact().getArtifactId().equals(artifact.getArtifactId())) {
try {
if (candidate
.toString()
Expand Down
4 changes: 2 additions & 2 deletions versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.util.TreeMap;
import java.util.regex.Pattern;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.maven.artifact.ArtifactUtils;
Expand All @@ -63,9 +64,8 @@
import org.codehaus.mojo.versions.utils.RegexUtils;
import org.codehaus.plexus.components.interactivity.Prompter;
import org.codehaus.plexus.components.interactivity.PrompterException;
import org.codehaus.plexus.util.StringUtils;

import static org.codehaus.plexus.util.StringUtils.isEmpty;
import static org.apache.commons.lang.StringUtils.isEmpty;

/**
* Sets the current project's version and based on that change propagates that change onto any child modules as
Expand Down
4 changes: 2 additions & 2 deletions ...plugin/src/main/java/org/codehaus/mojo/versions/xml/PropertyUpdatesXmlReportRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ private static List<PropertyInfo> createPropertyInfo(
setPropertyAssociations(Arrays.stream(e.getValue().getAssociations())
.map(a -> {
PropertyAssociation pa = new PropertyAssociation();
pa.setGroupId(a.getGroupId());
pa.setArtifactId(a.getArtifactId());
pa.setGroupId(a.getArtifact().getGroupId());
pa.setArtifactId(a.getArtifact().getArtifactId());
return pa;
})
.collect(Collectors.toList()));
Expand Down