From db665ef7dbb7d3d8e50701fd96027ba97b9cdb72 Mon Sep 17 00:00:00 2001 From: Patrik Korytar Date: Wed, 29 Jan 2025 13:57:53 +0100 Subject: [PATCH] NCL-7815 Rename ArtifactVersion DTO to ParsedArtifact --- .../dto/response/DeliveredArtifactInMilestones.java | 2 +- .../{ArtifactVersion.java => ParsedArtifact.java} | 6 +++--- .../providers/ProductMilestoneProviderImpl.java | 13 +++++-------- .../endpoints/ProductMilestoneEndpointTest.java | 8 ++++---- 4 files changed, 13 insertions(+), 16 deletions(-) rename dto/src/main/java/org/jboss/pnc/dto/response/{ArtifactVersion.java => ParsedArtifact.java} (90%) diff --git a/dto/src/main/java/org/jboss/pnc/dto/response/DeliveredArtifactInMilestones.java b/dto/src/main/java/org/jboss/pnc/dto/response/DeliveredArtifactInMilestones.java index 8e39337c89..2af773f6ea 100644 --- a/dto/src/main/java/org/jboss/pnc/dto/response/DeliveredArtifactInMilestones.java +++ b/dto/src/main/java/org/jboss/pnc/dto/response/DeliveredArtifactInMilestones.java @@ -49,7 +49,7 @@ public class DeliveredArtifactInMilestones { * Product Milestone ID mapped to list of Artifact versions delivered in the Milestone with the same identifier * prefix. */ - private final Map> productMilestoneArtifacts; + private final Map> productMilestoneArtifacts; @JsonPOJOBuilder(withPrefix = "") @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/dto/src/main/java/org/jboss/pnc/dto/response/ArtifactVersion.java b/dto/src/main/java/org/jboss/pnc/dto/response/ParsedArtifact.java similarity index 90% rename from dto/src/main/java/org/jboss/pnc/dto/response/ArtifactVersion.java rename to dto/src/main/java/org/jboss/pnc/dto/response/ParsedArtifact.java index 75854eccfc..4f6bec7ddb 100644 --- a/dto/src/main/java/org/jboss/pnc/dto/response/ArtifactVersion.java +++ b/dto/src/main/java/org/jboss/pnc/dto/response/ParsedArtifact.java @@ -23,15 +23,15 @@ import lombok.Data; /** - * Artifact identifier version part with ID of the Artifact. + * Artifact identifier parsed into its version, type, and optional classifier. * * @author Patrik Korytár <pkorytar@redhat.com> */ @Data @lombok.Builder(builderClassName = "Builder", toBuilder = true) -@JsonDeserialize(builder = ArtifactVersion.Builder.class) +@JsonDeserialize(builder = ParsedArtifact.Builder.class) @JsonIgnoreProperties(ignoreUnknown = true) -public class ArtifactVersion { +public class ParsedArtifact { /** * ID of the artifact. diff --git a/facade/src/main/java/org/jboss/pnc/facade/providers/ProductMilestoneProviderImpl.java b/facade/src/main/java/org/jboss/pnc/facade/providers/ProductMilestoneProviderImpl.java index 61fb1dde32..bfc9b3c3af 100644 --- a/facade/src/main/java/org/jboss/pnc/facade/providers/ProductMilestoneProviderImpl.java +++ b/facade/src/main/java/org/jboss/pnc/facade/providers/ProductMilestoneProviderImpl.java @@ -25,7 +25,7 @@ import org.jboss.pnc.common.util.ArtifactCoordinatesUtils; import org.jboss.pnc.constants.Patterns; import org.jboss.pnc.datastore.repositories.internal.SortInfoConverter; -import org.jboss.pnc.dto.response.ArtifactVersion; +import org.jboss.pnc.dto.response.ParsedArtifact; import org.jboss.pnc.dto.response.DeliveredArtifactInMilestones; import org.jboss.pnc.dto.ProductMilestone; import org.jboss.pnc.dto.ProductMilestoneCloseResult; @@ -62,7 +62,6 @@ import org.jboss.pnc.model.Product_; import org.jboss.pnc.spi.datastore.repositories.DeliverableArtifactRepository; import org.jboss.pnc.spi.datastore.repositories.ProductMilestoneRepository; -import org.jboss.pnc.spi.datastore.repositories.api.PageInfo; import org.jboss.pnc.spi.datastore.repositories.api.Predicate; import org.jboss.pnc.spi.datastore.repositories.api.SortInfo; import org.slf4j.Logger; @@ -82,8 +81,6 @@ import javax.persistence.criteria.Root; import javax.persistence.criteria.SetJoin; import java.time.Instant; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.HashSet; @@ -370,7 +367,7 @@ public List getArtifactsDeliveredInMilestonesGrou private List parseDeliveredArtifactsInMilestoneTuples( List tuples, List milestoneId) { - Map>> artifactsDeliveredInMilestonesMap = tuples.stream() + Map>> artifactsDeliveredInMilestonesMap = tuples.stream() .collect( Collectors.groupingBy( this::parseArtifactNameFromTuple, @@ -426,7 +423,7 @@ private String parseArtifactNameFromDeployPath(String deployPath, RepositoryType return ""; } - private Stream>> parseMilestonePresencesFromTuple( + private Stream>> parseMilestonePresencesFromTuple( Tuple tuple, List milestoneIds) { String id = tuple.get(0, Integer.class).toString(); @@ -437,7 +434,7 @@ private Stream>> parseMilestonePresences String type = parseArtifactTypeFromDeployPath(deployPath, repositoryType); String classifier = parseArtifactClassifierFromDeployPath(deployPath, repositoryType); - ArtifactVersion artifactVersion = ArtifactVersion.builder() + ParsedArtifact parsedArtifact = ParsedArtifact.builder() .id(id) .artifactVersion(version) .type(type) @@ -447,7 +444,7 @@ private Stream>> parseMilestonePresences return milestoneIds.stream().filter(milestoneId -> { Boolean milestonePresence = tuple.get(3 + milestoneIds.indexOf(milestoneId), Boolean.class); return milestonePresence.booleanValue(); - }).map(milestoneId -> Map.entry(milestoneId.toString(), List.of(artifactVersion))); + }).map(milestoneId -> Map.entry(milestoneId.toString(), List.of(parsedArtifact))); } private String parseArtifactVersionFromDeployPath(String deployPath, RepositoryType repositoryType) { diff --git a/integration-test/src/test/java/org/jboss/pnc/integration/endpoints/ProductMilestoneEndpointTest.java b/integration-test/src/test/java/org/jboss/pnc/integration/endpoints/ProductMilestoneEndpointTest.java index 00b12fbde8..13909ec3f3 100644 --- a/integration-test/src/test/java/org/jboss/pnc/integration/endpoints/ProductMilestoneEndpointTest.java +++ b/integration-test/src/test/java/org/jboss/pnc/integration/endpoints/ProductMilestoneEndpointTest.java @@ -31,7 +31,7 @@ import org.jboss.pnc.dto.Artifact; import org.jboss.pnc.dto.Build; import org.jboss.pnc.dto.DeliverableAnalyzerOperation; -import org.jboss.pnc.dto.response.ArtifactVersion; +import org.jboss.pnc.dto.response.ParsedArtifact; import org.jboss.pnc.dto.response.DeliveredArtifactInMilestones; import org.jboss.pnc.dto.Product; import org.jboss.pnc.dto.ProductMilestone; @@ -431,13 +431,13 @@ public void testCompareArtifactsDeliveredInMilestonesWithTwoMilestonesAndCommonP // arrange ProductMilestoneClient client = new ProductMilestoneClient(RestClientConfiguration.asAnonymous()); - ArtifactVersion artifactVersion1 = ArtifactVersion.builder() + ParsedArtifact parsedArtifact1 = ParsedArtifact.builder() .id("117") .artifactVersion("1.0.redhat-a") .type("jar") .classifier(null) .build(); - ArtifactVersion artifactVersion2 = ArtifactVersion.builder() + ParsedArtifact parsedArtifact2 = ParsedArtifact.builder() .id("118") .artifactVersion("1.0.redhat-b") .type("jar") @@ -447,7 +447,7 @@ public void testCompareArtifactsDeliveredInMilestonesWithTwoMilestonesAndCommonP DeliveredArtifactInMilestones expectedDeliveredArtifactsInMilestones = DeliveredArtifactInMilestones.builder() .artifactIdentifierPrefix("demo:built-artifact16") .productMilestoneArtifacts( - Map.of("100", List.of(artifactVersion1, artifactVersion2), "101", List.of(artifactVersion2))) + Map.of("100", List.of(parsedArtifact1, parsedArtifact2), "101", List.of(parsedArtifact2))) .build(); // act