diff --git a/common/pom.xml b/common/pom.xml index c36adec1d..6d48d6a1f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -32,11 +32,6 @@ constants - - org.jboss.pnc - pnc-common - - junit junit diff --git a/common/src/main/java/org/jboss/da/common/ScopedGAVStrategy.java b/common/src/main/java/org/jboss/da/common/ScopedGAVStrategy.java deleted file mode 100644 index 34d552810..000000000 --- a/common/src/main/java/org/jboss/da/common/ScopedGAVStrategy.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.jboss.da.common; - -import lombok.experimental.SuperBuilder; -import org.jboss.da.model.rest.Strategy; -import org.jboss.da.model.rest.GAV; -import org.jboss.pnc.common.alignment.ranking.AlignmentPredicate; -import org.jboss.pnc.common.alignment.ranking.AlignmentRanking; -import org.jboss.pnc.common.alignment.ranking.exception.ValidationException; - -@SuperBuilder -public class ScopedGAVStrategy extends ScopedStrategy { - - @Override - public int matchSignificance(GAV gav) { - if (getArtifactScope() == null) { - // Null signifies a global scope for a strategy. It has the least non-zero significance. - return 1; - } - - String[] scopeSplit = getArtifactScope().split(":"); - String group = gav.getGroupId(); - String artifact = gav.getArtifactId(); - String version = gav.getVersion(); - - if (scopeSplit.length == 1 && group.equals(scopeSplit[0])) { - // gav matched groupID - return 2; - } - if (scopeSplit.length == 2 && group.equals(scopeSplit[0]) && artifact.equals(scopeSplit[1])) { - // gav matched groupID and artifactID - return 3; - } - if (scopeSplit.length == 3 && group.equals(scopeSplit[0]) && artifact.equals(scopeSplit[1]) - && version.equals(scopeSplit[2])) { - // gav matched groupID, artifactID and version - return 4; - } - - // no match - return 0; - } - - public static ScopedGAVStrategy from(Strategy restStrategy) throws ValidationException { - return builder().artifactScope(restStrategy.getArtifactScope()) - .ranks(new AlignmentRanking(restStrategy.getRanks(), null)) - .allowList(new AlignmentPredicate(restStrategy.getAllowList(), ver -> true)) - .denyList(new AlignmentPredicate(restStrategy.getDenyList(), ver -> false)) - .build(); - } -} diff --git a/common/src/main/java/org/jboss/da/common/ScopedStrategy.java b/common/src/main/java/org/jboss/da/common/ScopedStrategy.java deleted file mode 100644 index edbabeb59..000000000 --- a/common/src/main/java/org/jboss/da/common/ScopedStrategy.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.jboss.da.common; - -import lombok.Getter; -import lombok.experimental.SuperBuilder; -import org.jboss.pnc.common.alignment.ranking.VersionStrategy; - -import java.util.Comparator; - -@SuperBuilder -public abstract class ScopedStrategy extends VersionStrategy implements Comparator { - @Getter - private final String artifactScope; - - /** - * Returns a number that conveys how much does an artifact identifier conform to an artifactScope. Higher number - * suggests a better match. The method returns 0 if the identifier doesn't match the artifactScope at all. - * - * @param artifactIdentifier artifact identifier - * @return an integer. Higher value means higher match. No match return 0. - */ - public abstract int matchSignificance(T artifactIdentifier); - - /** - * Returns such strategy that do not alter behaviour of version analysis - * - * @return strategy that do not affect version analysis - */ - public static ScopedStrategy none() { - return DefaultScopedStrategy.get(); - } - - @SuperBuilder - private static class DefaultScopedStrategy extends ScopedStrategy { - @Override - public int matchSignificance(Object artifactIdentifier) { - return 0; - } - - private static DefaultScopedStrategy get() { - var vStrategy = VersionStrategy.none(); - - return builder().artifactScope(null) - .ranks(vStrategy.getRanks()) - .allowList(vStrategy.getAllowList()) - .denyList(vStrategy.getDenyList()) - .build(); - } - } - - /** - * Compare objects of Type T on how significant they match against this strategy's scope. T is usually a GAV. - * - * @param o1 the first object to be compared. - * @param o2 the second object to be compared. - * @return - */ - @Override - public int compare(T o1, T o2) { - int s1 = matchSignificance(o1); - int s2 = matchSignificance(o2); - - return Integer.compare(s1, s2); - } -} diff --git a/communication/pom.xml b/communication/pom.xml index 97452ca3d..9ab863d78 100644 --- a/communication/pom.xml +++ b/communication/pom.xml @@ -36,6 +36,10 @@ + + org.jboss.pnc + pnc-common + org.jboss.pnc rest-api diff --git a/communication/src/main/java/org/jboss/da/communication/pnc/PncConnector.java b/communication/src/main/java/org/jboss/da/communication/pnc/PncConnector.java index beb7c8f29..52743530a 100644 --- a/communication/src/main/java/org/jboss/da/communication/pnc/PncConnector.java +++ b/communication/src/main/java/org/jboss/da/communication/pnc/PncConnector.java @@ -3,11 +3,8 @@ import org.jboss.da.common.json.LookupMode; import org.jboss.da.communication.repository.api.RepositoryException; import org.jboss.da.model.rest.GA; -import org.jboss.pnc.api.dependencyanalyzer.dto.QualifiedVersion; -import org.jboss.pnc.dto.requests.QValue; import java.util.List; -import java.util.Set; public interface PncConnector { @@ -18,17 +15,15 @@ public interface PncConnector { * @return list of available versions for given groupId:artifactId in repository, never {@code null} * @throws RepositoryException When there is problem with communication. */ - List getMavenVersions(GA ga, LookupMode mode, Set qualifiers) throws RepositoryException; + List getMavenVersions(GA ga, LookupMode mode) throws RepositoryException; /** * Finds available versions for given npm package. * * @param packageName Name of the npm package - * @param qualifiers * @return list of available versions for package in repository, never {@code null} * @throws RepositoryException When there is problem with communication. */ - List getNpmVersions(String packageName, LookupMode mode, Set qualifiers) - throws RepositoryException; + List getNpmVersions(String packageName, LookupMode mode) throws RepositoryException; } diff --git a/communication/src/main/java/org/jboss/da/communication/pnc/PncConnectorImpl.java b/communication/src/main/java/org/jboss/da/communication/pnc/PncConnectorImpl.java index 97514581c..45fb5461a 100644 --- a/communication/src/main/java/org/jboss/da/communication/pnc/PncConnectorImpl.java +++ b/communication/src/main/java/org/jboss/da/communication/pnc/PncConnectorImpl.java @@ -5,13 +5,11 @@ import org.jboss.da.common.util.ConfigurationParseException; import org.jboss.da.communication.repository.api.RepositoryException; import org.jboss.da.model.rest.GA; -import org.jboss.pnc.api.dependencyanalyzer.dto.QualifiedVersion; import org.jboss.pnc.client.ArtifactClient; import org.jboss.pnc.client.Configuration; import org.jboss.pnc.client.RemoteCollection; import org.jboss.pnc.client.RemoteResourceException; import org.jboss.pnc.common.logging.MDCUtils; -import org.jboss.pnc.dto.requests.QValue; import org.jboss.pnc.dto.response.ArtifactInfo; import org.jboss.pnc.enums.RepositoryType; import org.slf4j.Logger; @@ -23,7 +21,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Set; /** * @author Petr Kocandrle @@ -45,29 +42,16 @@ public PncConnectorImpl(org.jboss.da.common.util.Configuration configuration) { } } - private Collection getArtifacts( - String identifierPattern, - RepositoryType repoType, - LookupMode mode, - Set qualifiers) throws RepositoryException { + private Collection getArtifacts(String identifierPattern, RepositoryType repoType, LookupMode mode) + throws RepositoryException { ArtifactClient artifactClient = getArtifactClient(); RemoteCollection artCollection; try { - if (qualifiers.isEmpty()) { - artCollection = artifactClient.getAllFiltered( - identifierPattern, - mode.getArtifactQualities(), - repoType, - mode.getBuildCategories(), - null); - } else { - artCollection = artifactClient.getAllFiltered( - identifierPattern, - mode.getArtifactQualities(), - repoType, - mode.getBuildCategories(), - qualifiers); - } + artCollection = artifactClient.getAllFiltered( + identifierPattern, + mode.getArtifactQualities(), + repoType, + mode.getBuildCategories()); } catch (RemoteResourceException ex) { log.debug("Error when reading artifacts from PNC: " + ex, ex); throw new RepositoryException("Error when reading artifacts from PNC: " + ex, ex); @@ -76,17 +60,16 @@ private Collection getArtifacts( } @Override - public List getMavenVersions(GA ga, LookupMode mode, Set qualifiers) - throws RepositoryException { + public List getMavenVersions(GA ga, LookupMode mode) throws RepositoryException { String identifierPattern = ga.getGroupId() + ':' + ga.getArtifactId() + ":pom:*"; - Collection arts = getArtifacts(identifierPattern, RepositoryType.MAVEN, mode, qualifiers); + Collection arts = getArtifacts(identifierPattern, RepositoryType.MAVEN, mode); - List versions = new ArrayList<>(arts.size()); + List versions = new ArrayList<>(arts.size()); for (ArtifactInfo art : arts) { String[] parts = art.getIdentifier().split(":"); if (parts.length == 4) { // TODO filtering by target repository if necessary - versions.add(new QualifiedVersion(parts[3], art.getQualifiers())); + versions.add(parts[3]); } else { log.error("Cannot read version for artifact with identifier {}", art.getIdentifier()); } @@ -95,17 +78,16 @@ public List getMavenVersions(GA ga, LookupMode mode, Set getNpmVersions(String packageName, LookupMode mode, Set qualifiers) - throws RepositoryException { + public List getNpmVersions(String packageName, LookupMode mode) throws RepositoryException { String identifierPattern = packageName + ":*"; - Collection arts = getArtifacts(identifierPattern, RepositoryType.NPM, mode, qualifiers); + Collection arts = getArtifacts(identifierPattern, RepositoryType.NPM, mode); - List versions = new ArrayList<>(arts.size()); + List versions = new ArrayList<>(arts.size()); for (ArtifactInfo art : arts) { String[] parts = art.getIdentifier().split(":"); if (parts.length == 2) { // TODO filtering by target repository if necessary - versions.add(new QualifiedVersion(parts[1], art.getQualifiers())); + versions.add(parts[1]); } else { log.error("Cannot read version for artifact with identifier {}", art.getIdentifier()); } @@ -129,8 +111,7 @@ private Configuration getClientConfig(String protocol, String host, int port) { builder.mdcToHeadersMappings(MDCUtils.HEADER_KEY_MAPPING); - Configuration config = builder.build(); - return config; + return builder.build(); } } diff --git a/pom.xml b/pom.xml index fa903841a..36299d081 100644 --- a/pom.xml +++ b/pom.xml @@ -81,9 +81,10 @@ UTF-8 1 1 - 2.5.0-SNAPSHOT - 2.4.0-SNAPSHOT - 2.5.0-SNAPSHOT + 3.4.2 + 3.4.1-SNAPSHOT + 3.4.2 + 0.16.2 0.13.4 0.12.2 11 @@ -150,6 +151,16 @@ org.jboss.pnc pnc-common ${version.pnc-common} + + + io.opentelemetry + * + + + org.apache.httpcomponents + * + + org.jboss.pnc @@ -254,7 +265,11 @@ galley-cache-partyline ${version.galley} - + + org.commonjava.maven.atlas + atlas-identities + ${atlasVersion} + org.projectlombok @@ -360,6 +375,18 @@ + + Central Portal Snapshots + central-portal-snapshots + https://central.sonatype.com/repository/maven-snapshots/ + + false + + + true + + + MRRC GA https://maven.repository.redhat.com/ga diff --git a/reports-backend/src/main/java/org/jboss/da/listings/api/service/BlackArtifactService.java b/reports-backend/src/main/java/org/jboss/da/listings/api/service/BlackArtifactService.java index 35ad91a09..526397fbf 100644 --- a/reports-backend/src/main/java/org/jboss/da/listings/api/service/BlackArtifactService.java +++ b/reports-backend/src/main/java/org/jboss/da/listings/api/service/BlackArtifactService.java @@ -5,12 +5,11 @@ import org.jboss.da.listings.api.model.BlackArtifact; import org.jboss.da.model.rest.GA; import org.jboss.da.model.rest.GAV; -import org.jboss.pnc.api.dependencyanalyzer.dto.QualifiedVersion; import java.util.Set; /** - * + * * @author Jozef Mrazek <jmrazek@redhat.com> * */ @@ -30,7 +29,7 @@ public interface BlackArtifactService extends ArtifactService { /** * Checks if list contains artifact with specific GAV. All restrictions and conversions are applied like using * getArtifact method of specific list. - * + * * @param gav * @return True if list contains the artifact otherwise false. */ @@ -46,7 +45,7 @@ public interface BlackArtifactService extends ArtifactService { /** * Checks if blacklist contains artifact with specific groupId, artifactId and version. If the version have redhat * suffix it is removed. Then the version is converted to OSGi version and finds this version in blacklist; - * + * * @return found artifact */ public Optional getArtifact(String groupId, String artifactId, String version); @@ -61,7 +60,7 @@ public interface BlackArtifactService extends ArtifactService { /** * Remove artifact from list. Removes only exact match of artifact. - * + * * @param groupId * @param artifactId * @param version @@ -89,5 +88,5 @@ public interface BlackArtifactService extends ArtifactService { * @param version Version to check in the blocklist. * @return True, if the GA + version is present in the blocklist. */ - boolean isBlocklisted(Set cache, GA ga, QualifiedVersion version); + boolean isBlocklisted(Set cache, GA ga, String version); } diff --git a/reports-backend/src/main/java/org/jboss/da/listings/impl/service/BlackArtifactServiceImpl.java b/reports-backend/src/main/java/org/jboss/da/listings/impl/service/BlackArtifactServiceImpl.java index 8d610d67d..5a04160e5 100644 --- a/reports-backend/src/main/java/org/jboss/da/listings/impl/service/BlackArtifactServiceImpl.java +++ b/reports-backend/src/main/java/org/jboss/da/listings/impl/service/BlackArtifactServiceImpl.java @@ -20,12 +20,11 @@ import java.util.TreeSet; import java.util.stream.Collectors; -import org.jboss.pnc.api.dependencyanalyzer.dto.QualifiedVersion; import org.jboss.pnc.common.version.SuffixedVersion; import org.jboss.pnc.common.version.VersionParser; /** - * + * * @author Jozef Mrazek <jmrazek@redhat.com> * */ @@ -56,11 +55,11 @@ public Set prefetchGAs(Set gaToPrefetch) { } @Override - public boolean isBlocklisted(Set cache, org.jboss.da.model.rest.GA ga, QualifiedVersion version) { + public boolean isBlocklisted(Set cache, org.jboss.da.model.rest.GA ga, String version) { SuffixedVersion parsedVersion = versionParser.parse(version); GAV unsuffixedGAV = new GAV(ga, parsedVersion.unsuffixedVersion()); - GAV osgiGAV = new GAV(ga, VersionParser.getOSGiVersion(version.getVersion())); + GAV osgiGAV = new GAV(ga, VersionParser.getOSGiVersion(version)); return cache.contains(unsuffixedGAV) || cache.contains(osgiGAV); } diff --git a/reports-backend/src/main/java/org/jboss/da/products/api/ProductProvider.java b/reports-backend/src/main/java/org/jboss/da/products/api/ProductProvider.java index e91452e1e..11548e6e2 100644 --- a/reports-backend/src/main/java/org/jboss/da/products/api/ProductProvider.java +++ b/reports-backend/src/main/java/org/jboss/da/products/api/ProductProvider.java @@ -1,7 +1,6 @@ package org.jboss.da.products.api; import org.jboss.da.listings.model.ProductSupportStatus; -import org.jboss.pnc.api.dependencyanalyzer.dto.QualifiedVersion; import java.util.Map; import java.util.Set; @@ -73,7 +72,7 @@ public interface ProductProvider { * @param artifact artifact which name and type will be used for searching. * @return Set of products and their artifacts versions. */ - CompletableFuture>> getVersions(Artifact artifact); + CompletableFuture>> getVersions(Artifact artifact); /** * Get all artifacts versions with the same name and type as given artifact regardless if they are from product or @@ -82,5 +81,5 @@ public interface ProductProvider { * @param artifact artifact which name and type will be used for searching. * @return Set of artifacts versions. */ - CompletableFuture> getAllVersions(Artifact artifact); + CompletableFuture> getAllVersions(Artifact artifact); } diff --git a/reports-backend/src/main/java/org/jboss/da/products/impl/AbstractProductProvider.java b/reports-backend/src/main/java/org/jboss/da/products/impl/AbstractProductProvider.java index db4749eac..34d9097fc 100644 --- a/reports-backend/src/main/java/org/jboss/da/products/impl/AbstractProductProvider.java +++ b/reports-backend/src/main/java/org/jboss/da/products/impl/AbstractProductProvider.java @@ -22,7 +22,6 @@ import org.jboss.da.products.api.Product; import org.jboss.da.products.api.ProductArtifacts; import org.jboss.da.products.api.ProductProvider; -import org.jboss.pnc.api.dependencyanalyzer.dto.QualifiedVersion; import org.jboss.pnc.common.version.VersionParser; import org.jboss.pnc.enums.ArtifactQuality; import org.jboss.pnc.enums.BuildCategory; @@ -110,20 +109,19 @@ public CompletableFuture> getArtifacts(Artifact artifact, } @Override - public CompletableFuture>> getVersions(Artifact artifact) { + public CompletableFuture>> getVersions(Artifact artifact) { switch (artifact.getType()) { case MAVEN: { GA ga = ((MavenArtifact) artifact).getGav().getGA(); - CompletableFuture> versions = supplyAsync( - () -> getVersionsStreamMaven(ga).filter(v -> versionParser.parse(v.getVersion()).isSuffixed()) + CompletableFuture> versions = supplyAsync( + () -> getVersionsStreamMaven(ga).filter(v -> versionParser.parse(v).isSuffixed()) .distinct() .collect(Collectors.toSet())); return versions.thenApply(rv -> Collections.singletonMap(Product.UNKNOWN, rv)); } case NPM: { - CompletableFuture> versions = supplyAsync( - () -> getVersionsStreamNPM(artifact.getName()) - .filter(v -> versionParser.parse(v.getVersion()).isSuffixed()) + CompletableFuture> versions = supplyAsync( + () -> getVersionsStreamNPM(artifact.getName()).filter(v -> versionParser.parse(v).isSuffixed()) .distinct() .collect(Collectors.toSet())); return versions.thenApply(rv -> Collections.singletonMap(Product.UNKNOWN, rv)); @@ -135,7 +133,7 @@ public CompletableFuture>> getVersions(Artifa } @Override - public CompletableFuture> getAllVersions(Artifact artifact) { + public CompletableFuture> getAllVersions(Artifact artifact) { switch (artifact.getType()) { case MAVEN: { GA ga = ((MavenArtifact) artifact).getGav().getGA(); @@ -166,8 +164,7 @@ private CompletableFuture> getArtifacts0(Artifact artifact } private Set getArtifactsMaven(GA ga) { - Set allArtifacts = getVersionsStreamMaven(ga).map(QualifiedVersion::getVersion) - .filter(v -> versionParser.parse(v).isSuffixed()) + Set allArtifacts = getVersionsStreamMaven(ga).filter(v -> versionParser.parse(v).isSuffixed()) .distinct() .map(x -> new GAV(ga, x)) .map(MavenArtifact::new) @@ -181,7 +178,7 @@ private Set getArtifactsMaven(GA ga) { private Set getArtifactsNPM(String name) { Set allArtifacts = getVersionsStreamNPM(name).filter(v -> versionParser.parse(v).isSuffixed()) .distinct() - .map(v -> new NPMArtifact(name, v.getVersion())) + .map(v -> new NPMArtifact(name, v)) .collect(Collectors.toSet()); if (allArtifacts.isEmpty()) { return Collections.emptySet(); @@ -189,8 +186,8 @@ private Set getArtifactsNPM(String name) { return Collections.singleton(new ProductArtifacts(Product.UNKNOWN, allArtifacts)); } - abstract Stream getVersionsStreamMaven(GA ga); + abstract Stream getVersionsStreamMaven(GA ga); - abstract Stream getVersionsStreamNPM(String name); + abstract Stream getVersionsStreamNPM(String name); } diff --git a/reports-backend/src/main/java/org/jboss/da/products/impl/AggregatedProductProvider.java b/reports-backend/src/main/java/org/jboss/da/products/impl/AggregatedProductProvider.java index f74c47e59..daea78b93 100644 --- a/reports-backend/src/main/java/org/jboss/da/products/impl/AggregatedProductProvider.java +++ b/reports-backend/src/main/java/org/jboss/da/products/impl/AggregatedProductProvider.java @@ -8,7 +8,6 @@ import org.jboss.da.products.api.ProductProvider; import org.jboss.da.products.impl.RepositoryProductProvider.Repository; import org.jboss.da.products.impl.PncProductProvider.Pnc; -import org.jboss.pnc.api.dependencyanalyzer.dto.QualifiedVersion; import javax.annotation.Resource; import javax.enterprise.concurrent.ManagedScheduledExecutorService; @@ -107,12 +106,12 @@ public CompletableFuture> getArtifacts(Artifact artifact, } @Override - public CompletableFuture>> getVersions(Artifact artifact) { + public CompletableFuture>> getVersions(Artifact artifact) { return aggregate(x -> x.getVersions(artifact), new MapCol<>(AggregatedProductProvider::combineSets)); } @Override - public CompletableFuture> getAllVersions(Artifact artifact) { + public CompletableFuture> getAllVersions(Artifact artifact) { return aggregate(x -> x.getAllVersions(artifact), new SetCollector<>()); } diff --git a/reports-backend/src/main/java/org/jboss/da/products/impl/PncProductProvider.java b/reports-backend/src/main/java/org/jboss/da/products/impl/PncProductProvider.java index b0163a683..d37c82a6e 100644 --- a/reports-backend/src/main/java/org/jboss/da/products/impl/PncProductProvider.java +++ b/reports-backend/src/main/java/org/jboss/da/products/impl/PncProductProvider.java @@ -4,8 +4,6 @@ import org.jboss.da.communication.pnc.PncConnector; import org.jboss.da.model.rest.GA; import org.jboss.da.products.impl.PncProductProvider.Pnc; -import org.jboss.pnc.api.dependencyanalyzer.dto.QualifiedVersion; -import org.jboss.pnc.dto.requests.QValue; import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; @@ -16,7 +14,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.List; -import java.util.Set; import java.util.stream.Stream; import static java.lang.annotation.ElementType.FIELD; @@ -36,27 +33,16 @@ public class PncProductProvider extends AbstractProductProvider { @Inject private PncConnector pncConnector; - private Set qualifiers = Set.of(); - - /** - * Sets what qualifiers should be retrieved from PNC on a request. - * - * @param qualifiers to fetch - */ - public void setQualifiers(Set qualifiers) { - this.qualifiers = qualifiers; - } - @Override - Stream getVersionsStreamMaven(GA ga) { + Stream getVersionsStreamMaven(GA ga) { if (!ga.isValid()) { userLog.warn("Received nonvalid GA " + ga + ", using empty list of versions."); log.warn("Received nonvalid GA: " + ga); return Stream.empty(); } try { - List versionsOfGA; - versionsOfGA = pncConnector.getMavenVersions(ga, mode, qualifiers); + List versionsOfGA; + versionsOfGA = pncConnector.getMavenVersions(ga, mode); log.debug("Got versions of " + ga + " from PNC: " + versionsOfGA); return versionsOfGA.stream(); } catch (CommunicationException ex) { @@ -65,10 +51,10 @@ Stream getVersionsStreamMaven(GA ga) { } @Override - Stream getVersionsStreamNPM(String name) { + Stream getVersionsStreamNPM(String name) { try { - List versionsOfGA; - versionsOfGA = pncConnector.getNpmVersions(name, mode, qualifiers); + List versionsOfGA; + versionsOfGA = pncConnector.getNpmVersions(name, mode); log.debug("Got versions of " + name + " from PNC: " + versionsOfGA); return versionsOfGA.stream(); } catch (CommunicationException ex) { diff --git a/reports-backend/src/main/java/org/jboss/da/products/impl/RepositoryProductProvider.java b/reports-backend/src/main/java/org/jboss/da/products/impl/RepositoryProductProvider.java index af99c62f9..10633db6c 100644 --- a/reports-backend/src/main/java/org/jboss/da/products/impl/RepositoryProductProvider.java +++ b/reports-backend/src/main/java/org/jboss/da/products/impl/RepositoryProductProvider.java @@ -4,7 +4,6 @@ import org.jboss.da.communication.indy.api.IndyConnector; import org.jboss.da.model.rest.GA; import org.jboss.da.products.impl.RepositoryProductProvider.Repository; -import org.jboss.pnc.api.dependencyanalyzer.dto.QualifiedVersion; import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; @@ -36,7 +35,7 @@ public class RepositoryProductProvider extends AbstractProductProvider { private IndyConnector indyConnector; @Override - Stream getVersionsStreamMaven(GA ga) { + Stream getVersionsStreamMaven(GA ga) { if (!ga.isValid()) { userLog.warn("Received nonvalid GA " + ga + ", using empty list of versions."); log.warn("Received nonvalid GA: " + ga); @@ -46,19 +45,19 @@ Stream getVersionsStreamMaven(GA ga) { List versionsOfGA; versionsOfGA = indyConnector.getVersionsOfGA(ga); log.debug("Got versions of " + ga + " from repository: " + versionsOfGA); - return versionsOfGA.stream().map(QualifiedVersion::new); + return versionsOfGA.stream(); } catch (CommunicationException ex) { throw new ProductException(ex); } } @Override - Stream getVersionsStreamNPM(String name) { + Stream getVersionsStreamNPM(String name) { try { List versionsOfGA; versionsOfGA = indyConnector.getVersionsOfNpm(name); log.debug("Got versions of " + name + " from repository: " + versionsOfGA); - return versionsOfGA.stream().map(QualifiedVersion::new); + return versionsOfGA.stream(); } catch (CommunicationException ex) { throw new ProductException(ex); } diff --git a/reports-backend/src/main/java/org/jboss/da/reports/api/LookupGenerator.java b/reports-backend/src/main/java/org/jboss/da/reports/api/LookupGenerator.java index 3a2073edb..4dabb04a7 100644 --- a/reports-backend/src/main/java/org/jboss/da/reports/api/LookupGenerator.java +++ b/reports-backend/src/main/java/org/jboss/da/reports/api/LookupGenerator.java @@ -10,17 +10,13 @@ import org.jboss.da.lookup.model.NPMVersionsResult; import org.jboss.pnc.api.constants.versions.VersionDistanceRule; import org.jboss.pnc.api.constants.versions.VersionFilter; -import org.jboss.da.model.rest.Strategy; import org.jboss.da.model.rest.GAV; import org.jboss.da.model.rest.NPMPackage; public interface LookupGenerator { - Set lookupBestMatchMaven( - Set gavs, - String mode, - boolean brewPullActive, - Set strategies) throws CommunicationException; + Set lookupBestMatchMaven(Set gavs, String mode, boolean brewPullActive) + throws CommunicationException; Set lookupVersionsMaven( Set gavs, diff --git a/reports-backend/src/main/java/org/jboss/da/reports/impl/LookupGeneratorImpl.java b/reports-backend/src/main/java/org/jboss/da/reports/impl/LookupGeneratorImpl.java index 7670aaf37..481fa1e6c 100644 --- a/reports-backend/src/main/java/org/jboss/da/reports/impl/LookupGeneratorImpl.java +++ b/reports-backend/src/main/java/org/jboss/da/reports/impl/LookupGeneratorImpl.java @@ -1,8 +1,6 @@ package org.jboss.da.reports.impl; import org.jboss.da.common.CommunicationException; -import org.jboss.da.common.ScopedStrategy; -import org.jboss.da.common.ScopedGAVStrategy; import org.jboss.da.common.json.LookupMode; import org.jboss.da.common.util.Configuration; import org.jboss.da.common.util.ConfigurationParseException; @@ -14,7 +12,6 @@ import org.jboss.da.lookup.model.NPMVersionsResult; import org.jboss.pnc.api.constants.versions.VersionDistanceRule; import org.jboss.pnc.api.constants.versions.VersionFilter; -import org.jboss.da.model.rest.Strategy; import org.jboss.da.model.rest.GA; import org.jboss.da.model.rest.GAV; import org.jboss.da.model.rest.NPMPackage; @@ -26,25 +23,15 @@ import org.jboss.da.products.impl.PncProductProvider; import org.jboss.da.products.impl.RepositoryProductProvider; import org.jboss.da.reports.api.LookupGenerator; -import org.jboss.pnc.api.dependencyanalyzer.dto.QualifiedVersion; -import org.jboss.pnc.common.alignment.ranking.AlignmentPredicate; -import org.jboss.pnc.common.alignment.ranking.AlignmentRanking; -import org.jboss.pnc.common.alignment.ranking.VersionStrategy; -import org.jboss.pnc.common.alignment.ranking.exception.ValidationException; -import org.jboss.pnc.common.alignment.ranking.tokenizer.QualifierToken; -import org.jboss.pnc.common.alignment.ranking.tokenizer.Token; import org.jboss.pnc.common.version.VersionAnalyzer; -import org.jboss.pnc.dto.requests.QValue; import org.jboss.pnc.enums.ArtifactQuality; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import java.util.Collection; import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; @@ -84,47 +71,12 @@ public LookupGeneratorImpl(Configuration config) throws ConfigurationParseExcept } @Override - public Set lookupBestMatchMaven( - Set gavs, - String mode, - boolean brewPullActive, - Set strategies) throws CommunicationException, ValidationException { + public Set lookupBestMatchMaven(Set gavs, String mode, boolean brewPullActive) + throws CommunicationException { LookupMode lookupMode = getMode(mode, false); - Set compiledStrategies = compileMavenStrategies(strategies); - - ProductProvider productProvider = setupProductProvider( - brewPullActive, - lookupMode, - extractQualifiers(compiledStrategies)); - Map>> productArtifacts = getArtifactVersions( - productProvider, - gavs, - true); - return createLookupResult(gavs, lookupMode, productArtifacts, compiledStrategies); - } - - private static Set compileMavenStrategies(Set strategies) { - if (strategies == null) { - return Collections.emptySet(); - } - return strategies.stream().map(ScopedGAVStrategy::from).collect(Collectors.toSet()); - } - - private static Set extractQualifiers(Set> strategies) { - Set allTokens = new HashSet<>(); - for (var strategy : strategies) { - AlignmentRanking ranks = strategy.getRanks(); - AlignmentPredicate allow = strategy.getAllowList(); - AlignmentPredicate deny = strategy.getDenyList(); - allTokens.addAll(ranks.getRanksAsTokens().stream().flatMap(Collection::stream).collect(Collectors.toSet())); - allTokens.addAll(allow.getTokens()); - allTokens.addAll(deny.getTokens()); - } - return allTokens.stream() - .filter(token -> token instanceof QualifierToken) - .map(token -> (QualifierToken) token) - .map(qToken -> QValue.valueOf(qToken.toString())) - .collect(Collectors.toSet()); + ProductProvider productProvider = setupProductProvider(brewPullActive, lookupMode); + Map>> productArtifacts = getArtifactVersions(productProvider, gavs, true); + return createLookupResult(gavs, lookupMode, productArtifacts); } @Override @@ -136,8 +88,8 @@ public Set lookupVersionsMaven( boolean brewPullActive, boolean includeBad) throws CommunicationException { LookupMode lookupMode = getMode(mode, includeBad); - ProductProvider productProvider = setupProductProvider(brewPullActive, lookupMode, Set.of()); - Map>> productArtifacts = getArtifactVersions( + ProductProvider productProvider = setupProductProvider(brewPullActive, lookupMode); + Map>> productArtifacts = getArtifactVersions( productProvider, gavs, !includeBad); @@ -147,11 +99,8 @@ public Set lookupVersionsMaven( @Override public Set lookupLatestMaven(Set gavs, String mode) throws CommunicationException { LookupMode lookupMode = getMode(mode, true); - ProductProvider productProvider = setupProductProvider(true, lookupMode, Set.of()); - Map>> productArtifacts = getArtifactVersions( - productProvider, - gavs, - false); + ProductProvider productProvider = setupProductProvider(true, lookupMode); + Map>> productArtifacts = getArtifactVersions(productProvider, gavs, false); return createLatestResult(gavs, lookupMode, productArtifacts); } @@ -160,7 +109,7 @@ public Set lookupBestMatchNPM(Set packages, String throws CommunicationException { LookupMode lookupMode = getMode(mode, false); pncProductProvider.setLookupMode(lookupMode); - Map>> productArtifacts = getArtifactVersions(packages); + Map>> productArtifacts = getArtifactVersions(packages); return createLookupResultNpm(packages, lookupMode, productArtifacts); } @@ -173,13 +122,12 @@ public Set lookupVersionsNPM( boolean includeBad) throws CommunicationException { LookupMode lookupMode = getMode(mode, includeBad); pncProductProvider.setLookupMode(lookupMode); - Map>> productArtifacts = getArtifactVersions(packages); + Map>> productArtifacts = getArtifactVersions(packages); return createVersionsResultNpm(packages, lookupMode, vf, distanceRule, productArtifacts); } - private ProductProvider setupProductProvider(boolean brewPullActive, LookupMode mode, Set qualifiers) { + private ProductProvider setupProductProvider(boolean brewPullActive, LookupMode mode) { pncProductProvider.setLookupMode(mode); - pncProductProvider.setQualifiers(qualifiers); if (brewPullActive) { repositoryProductProvider.setLookupMode(mode); return aggProductProvider; @@ -188,16 +136,16 @@ private ProductProvider setupProductProvider(boolean brewPullActive, LookupMode } } - private Map>> getArtifactVersions( + private Map>> getArtifactVersions( ProductProvider productProvider, Set gavs, boolean filterBlacklisted) { - Map>> ret = new HashMap<>(); + Map>> ret = new HashMap<>(); Set distinctGAs = gavs.stream().map(GAV::getGA).collect(Collectors.toSet()); Set cache = blackArtifactService.prefetchGAs(distinctGAs); for (GA ga : distinctGAs) { MavenArtifact mavenArtifact = new MavenArtifact(new GAV(ga, "0.0.0")); - CompletableFuture> versions = productProvider.getAllVersions(mavenArtifact); + CompletableFuture> versions = productProvider.getAllVersions(mavenArtifact); if (filterBlacklisted) { versions = filterBlacklistedArtifacts(versions, cache, ga); } @@ -206,7 +154,7 @@ private Map>> getArtifactVersions( return ret; } - private Map>> getArtifactVersions(Set packages) { + private Map>> getArtifactVersions(Set packages) { return packages.stream() .map(NPMPackage::getName) .distinct() @@ -214,75 +162,39 @@ private Map>> getArtifactVersion .collect(Collectors.toMap(Artifact::getName, pncProductProvider::getAllVersions)); } - private CompletableFuture> filterBlacklistedArtifacts( - CompletableFuture> versions, + private CompletableFuture> filterBlacklistedArtifacts( + CompletableFuture> versions, Set cache, GA ga) { - Predicate isNotBlacklisted = version -> !blackArtifactService - .isBlocklisted(cache, ga, version); + Predicate isNotBlacklisted = version -> !blackArtifactService.isBlocklisted(cache, ga, version); return versions.thenApply(v -> v.stream().filter(isNotBlacklisted).collect(Collectors.toSet())); } private Set createLookupResult( Set gavs, LookupMode mode, - Map>> artifactsMap, - Set compiledStrategies) throws CommunicationException { + Map>> artifactsMap) throws CommunicationException { - Map, VersionAnalyzer> vas = compiledStrategies.stream() - .collect(Collectors.toMap(Function.identity(), con -> new VersionAnalyzer(mode.getSuffixes(), con))); - VersionAnalyzer def = new VersionAnalyzer(mode.getSuffixes(), VersionStrategy.none()); + VersionAnalyzer va = new VersionAnalyzer(mode.getSuffixes()); Set> futures = gavs.stream() - .map( - gav -> artifactsMap.get(gav.getGA()) - .thenApply(pas -> getLookupResult(chooseVa(gav, vas, def), gav, pas))) + .map(gav -> artifactsMap.get(gav.getGA()).thenApply(pas -> getLookupResult(va, gav, pas))) .collect(Collectors.toSet()); return joinFutures(futures); } - /** - * Returns VersionAnalyzer with the closest match based on artifact. If map is empty or there was no match - * (matchSignificance is 0), return a default VersionAnalyzer. - * - * @param artifact an artifact (GAV or NPM) - * @param vas Map of Strategies and VAs - * @param def default VA to return - * @return closest VA or default VA on empty map or no match - * @param GAV or NPM - */ - private VersionAnalyzer chooseVa(T artifact, Map, VersionAnalyzer> vas, VersionAnalyzer def) { - var max = vas.keySet().stream().max((cc1, cc2) -> { - int sim1 = cc1.matchSignificance(artifact); - int sim2 = cc2.matchSignificance(artifact); - return Integer.compare(sim1, sim2); - }); - - if (max.map(k -> k.matchSignificance(artifact)).orElse(0) != 0) { - return vas.get(max.get()); - } - - return def; - } - private Set createVersionsResult( Set gavs, LookupMode mode, VersionFilter vf, VersionDistanceRule distanceRule, - Map>> artifactsMap) throws CommunicationException { + Map>> artifactsMap) throws CommunicationException { VersionAnalyzer va = new VersionAnalyzer(mode.getSuffixes(), distanceRule); Set> futures = gavs.stream() - .map( - gav -> artifactsMap.get(gav.getGA()) - .thenApply( - pas -> pas.stream() - .map(QualifiedVersion::getVersion) - .collect(Collectors.toSet())) - .thenApply(pas -> getMatchingVersions(va, vf, gav, pas))) + .map(gav -> artifactsMap.get(gav.getGA()).thenApply(pas -> getMatchingVersions(va, vf, gav, pas))) .collect(Collectors.toSet()); return joinFutures(futures); @@ -291,7 +203,7 @@ private Set createVersionsResult( private Set createLatestResult( Set gavs, LookupMode mode, - Map>> artifactsMap) throws CommunicationException { + Map>> artifactsMap) throws CommunicationException { VersionAnalyzer va = new VersionAnalyzer(Collections.singletonList(mode.getIncrementSuffix())); @@ -305,7 +217,7 @@ private Set createLatestResult( private Set createLookupResultNpm( Set packages, LookupMode mode, - Map>> artifactsMap) throws CommunicationException { + Map>> artifactsMap) throws CommunicationException { VersionAnalyzer va = new VersionAnalyzer(mode.getSuffixes()); Set> futures = packages.stream() @@ -320,26 +232,22 @@ private Set createVersionsResultNpm( LookupMode mode, VersionFilter vf, VersionDistanceRule distanceRule, - Map>> artifactsMap) throws CommunicationException { + Map>> artifactsMap) throws CommunicationException { VersionAnalyzer va = new VersionAnalyzer(mode.getSuffixes(), distanceRule); Set> futures = packages.stream() - .map( - pkg -> artifactsMap.get(pkg.getName()) - .thenApply( - f -> f.stream().map(QualifiedVersion::getVersion).collect(Collectors.toSet())) - .thenApply(f -> getMatchingVersions(va, vf, pkg, f))) + .map(pkg -> artifactsMap.get(pkg.getName()).thenApply(f -> getMatchingVersions(va, vf, pkg, f))) .collect(Collectors.toSet()); return joinFutures(futures); } - private MavenLookupResult getLookupResult(VersionAnalyzer va, GAV gav, Set versions) { + private MavenLookupResult getLookupResult(VersionAnalyzer va, GAV gav, Set versions) { Optional bmv = va.findBiggestMatchingVersion(gav.getVersion(), versions); return new MavenLookupResult(gav, bmv.orElse(null)); } - private MavenLatestResult getLatestResult(VersionAnalyzer va, GAV gav, Set versions) { + private MavenLatestResult getLatestResult(VersionAnalyzer va, GAV gav, Set versions) { Optional bmv = va.findBiggestMatchingVersion(gav.getVersion(), versions); return new MavenLatestResult(gav, bmv.orElse(null)); } @@ -362,7 +270,7 @@ private NPMVersionsResult getMatchingVersions( return new NPMVersionsResult(pkg, availableVersions); } - private NPMLookupResult getLookupResult(VersionAnalyzer va, NPMPackage pkg, Set versions) { + private NPMLookupResult getLookupResult(VersionAnalyzer va, NPMPackage pkg, Set versions) { Optional bmv = va.findBiggestMatchingVersion(pkg.getVersion(), versions); return new NPMLookupResult(pkg, bmv.orElse(null)); } diff --git a/reports-backend/src/main/java/org/jboss/da/reports/impl/ReportsGeneratorImpl.java b/reports-backend/src/main/java/org/jboss/da/reports/impl/ReportsGeneratorImpl.java index 088e4187b..5afe9050b 100644 --- a/reports-backend/src/main/java/org/jboss/da/reports/impl/ReportsGeneratorImpl.java +++ b/reports-backend/src/main/java/org/jboss/da/reports/impl/ReportsGeneratorImpl.java @@ -19,7 +19,6 @@ import org.jboss.da.model.rest.GA; import org.jboss.da.model.rest.GAV; import org.jboss.da.model.rest.NPMPackage; -import org.jboss.da.products.api.Artifact; import org.jboss.da.products.api.MavenArtifact; import org.jboss.da.products.api.NPMArtifact; import org.jboss.da.products.api.Product; @@ -47,7 +46,6 @@ import org.jboss.da.reports.model.response.NPMVersionsReport; import org.jboss.da.scm.api.SCM; import org.jboss.da.scm.api.SCMType; -import org.jboss.pnc.api.dependencyanalyzer.dto.QualifiedVersion; import org.jboss.pnc.common.version.SuffixedVersion; import org.jboss.pnc.common.version.VersionAnalyzer; import org.jboss.pnc.common.version.VersionComparator; @@ -219,12 +217,10 @@ private CompletableFuture analyzeVersions( return availableArtifacts.thenApply(pas -> { List versions = pas.stream() .flatMap(as -> as.getArtifacts().stream()) - .map(Artifact::getVersion) + .map(a -> a.getVersion()) .collect(Collectors.toList()); - Optional bmv = va.findBiggestMatchingVersion( - version, - versions.stream().map(QualifiedVersion::new).collect(Collectors.toList())); + Optional bmv = va.findBiggestMatchingVersion(version, versions); List sortedVersions = va.sortVersions(version, versions); return new VersionAnalysisResult(bmv, sortedVersions); @@ -519,8 +515,7 @@ public List getVersionsReports(VersionsNPMRequest request) th Map>> artifactsMap = new HashMap<>(); for (String name : uniqueNames) { - CompletableFuture> artifacts = productProvider.getAllVersions(new NPMArtifact(name, "0.0.0")) - .thenApply(s -> s.stream().map(QualifiedVersion::getVersion).collect(Collectors.toSet())); + CompletableFuture> artifacts = productProvider.getAllVersions(new NPMArtifact(name, "0.0.0")); artifactsMap.put(name, artifacts); } diff --git a/reports-backend/src/test/java/org/jboss/da/reports/impl/LookupGeneratorTest.java b/reports-backend/src/test/java/org/jboss/da/reports/impl/LookupGeneratorTest.java index bd87cd372..c12a68cf9 100644 --- a/reports-backend/src/test/java/org/jboss/da/reports/impl/LookupGeneratorTest.java +++ b/reports-backend/src/test/java/org/jboss/da/reports/impl/LookupGeneratorTest.java @@ -17,7 +17,6 @@ import org.jboss.da.products.impl.PncProductProvider; import org.jboss.da.products.impl.RepositoryProductProvider; import org.jboss.da.reports.api.LookupGenerator; -import org.jboss.pnc.api.dependencyanalyzer.dto.QualifiedVersion; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,7 +31,6 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; -import static org.jboss.pnc.api.dependencyanalyzer.dto.QualifiedVersion.of; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.mockito.Matchers.eq; @@ -79,14 +77,14 @@ public static void initMocks() throws ConfigurationParseException { @Test public void testMaven() throws CommunicationException { GAV gav1 = new GAV("foo.bar", "baz", "1.0.0"); - preparePnc(gav1.getGA(), Arrays.asList(of("1.0.0.redhat-1"), of("1.2.3.redhat-4"), of("1.0.0.redhat-2"))); + preparePnc(gav1.getGA(), Arrays.asList("1.0.0.redhat-1", "1.2.3.redhat-4", "1.0.0.redhat-2")); GAV gav2 = new GAV("foo.bar", "buz", "2.3.4"); - preparePnc(gav2.getGA(), Arrays.asList(of("1.0.0.redhat-1"), of("1.2.3.redhat-4"), of("1.0.0.redhat-2"))); + preparePnc(gav2.getGA(), Arrays.asList("1.0.0.redhat-1", "1.2.3.redhat-4", "1.0.0.redhat-2")); Set gavs = new HashSet<>(); gavs.add(gav1); gavs.add(gav2); - Set results = lookupGenerator.lookupBestMatchMaven(gavs, PERSISTENT, false, Set.of()); + Set results = lookupGenerator.lookupBestMatchMaven(gavs, PERSISTENT, false); assertEquals(2, results.size()); MavenLookupResult result1 = results.stream().filter(r -> gav1.equals(r.getGav())).findFirst().get(); @@ -98,9 +96,9 @@ public void testMaven() throws CommunicationException { @Test public void testNpm() throws CommunicationException { NPMPackage gav1 = new NPMPackage("foo-bar", "1.0.0"); - preparePnc(gav1.getName(), Arrays.asList(of("1.0.0.redhat-1"), of("1.2.3.redhat-4"), of("1.0.0.redhat-2"))); + preparePnc(gav1.getName(), Arrays.asList("1.0.0.redhat-1", "1.2.3.redhat-4", "1.0.0.redhat-2")); NPMPackage gav2 = new NPMPackage("foo-baz", "2.3.4"); - preparePnc(gav2.getName(), Arrays.asList(of("1.0.0.redhat-1"), of("1.2.3.redhat-4"), of("1.0.0.redhat-2"))); + preparePnc(gav2.getName(), Arrays.asList("1.0.0.redhat-1", "1.2.3.redhat-4", "1.0.0.redhat-2")); Set gavs = new HashSet<>(); gavs.add(gav1); gavs.add(gav2); @@ -114,12 +112,12 @@ public void testNpm() throws CommunicationException { assertNull(result2.getBestMatchVersion()); } - private void preparePnc(GA ga, List versions) { + private void preparePnc(GA ga, List versions) { when(pncProductProvider.getAllVersions(eq(new MavenArtifact(new GAV(ga, "0.0.0"))))) .thenReturn(CompletableFuture.completedFuture(new HashSet<>(versions))); } - private void preparePnc(String name, List versions) { + private void preparePnc(String name, List versions) { when(pncProductProvider.getAllVersions(eq(new NPMArtifact(name, "0.0.0")))) .thenReturn(CompletableFuture.completedFuture(new HashSet<>(versions))); } diff --git a/reports-model/pom.xml b/reports-model/pom.xml index 456a755bc..947a16ba4 100644 --- a/reports-model/pom.xml +++ b/reports-model/pom.xml @@ -8,11 +8,6 @@ reports-model reports-model ejb - - - 1.8 - 1.8 - org.jboss.pnc diff --git a/reports-model/src/main/java/org/jboss/da/lookup/model/MavenLookupRequest.java b/reports-model/src/main/java/org/jboss/da/lookup/model/MavenLookupRequest.java index b167b3260..901cbf100 100644 --- a/reports-model/src/main/java/org/jboss/da/lookup/model/MavenLookupRequest.java +++ b/reports-model/src/main/java/org/jboss/da/lookup/model/MavenLookupRequest.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import org.jboss.da.model.rest.Strategy; import org.jboss.da.model.rest.GAV; import java.util.Set; @@ -25,8 +24,6 @@ public class MavenLookupRequest { @NonNull private final String mode; - private final Set strategies; - @JsonProperty(defaultValue = "false") private final boolean brewPullActive; diff --git a/reports-model/src/main/java/org/jboss/da/model/rest/GA.java b/reports-model/src/main/java/org/jboss/da/model/rest/GA.java index 33773a42e..6f8545924 100644 --- a/reports-model/src/main/java/org/jboss/da/model/rest/GA.java +++ b/reports-model/src/main/java/org/jboss/da/model/rest/GA.java @@ -13,9 +13,9 @@ @EqualsAndHashCode public class GA implements Comparable { - public static final Pattern GROUP_ID_PATTERN = Pattern.compile("(\\w[\\w-]*\\.)*\\w[\\w-]*"); + private static final Pattern GROUP_ID_PATTERN = Pattern.compile("(\\w[\\w-]*\\.)*\\w[\\w-]*"); - public static final Pattern ARTIFACT_ID_PATTERN = Pattern.compile("[a-zA-Z0-9_.-]+"); + private static final Pattern ARTIFACT_ID_PATTERN = Pattern.compile("[a-zA-Z0-9_.-]+"); @Getter @NonNull diff --git a/reports-model/src/main/java/org/jboss/da/model/rest/Strategy.java b/reports-model/src/main/java/org/jboss/da/model/rest/Strategy.java deleted file mode 100644 index b007742d2..000000000 --- a/reports-model/src/main/java/org/jboss/da/model/rest/Strategy.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.jboss.da.model.rest; - -import lombok.Builder; -import lombok.Value; -import lombok.extern.jackson.Jacksonized; - -import java.util.List; - -@Builder -@Jacksonized -@Value -public class Strategy { - - private final String artifactScope; - - private final List ranks; - - private final String denyList; - - private final String allowList; -} diff --git a/reports-rest/pom.xml b/reports-rest/pom.xml index 75a8963cf..75641d550 100644 --- a/reports-rest/pom.xml +++ b/reports-rest/pom.xml @@ -83,7 +83,6 @@ jackson-datatype-jsr310 provided - diff --git a/reports-rest/src/main/java/org/jboss/da/rest/LookupImpl.java b/reports-rest/src/main/java/org/jboss/da/rest/LookupImpl.java index 4f35d4c4b..2a39bbb84 100644 --- a/reports-rest/src/main/java/org/jboss/da/rest/LookupImpl.java +++ b/reports-rest/src/main/java/org/jboss/da/rest/LookupImpl.java @@ -37,11 +37,8 @@ public class LookupImpl implements Lookup { public Set lookupMaven(@SpanAttribute(value = "request") MavenLookupRequest request) throws CommunicationException { log.info("Incoming request to /lookup/maven. Payload: " + request.toString()); - Set result = lookupGenerator.lookupBestMatchMaven( - request.getArtifacts(), - request.getMode(), - request.isBrewPullActive(), - request.getStrategies()); + Set result = lookupGenerator + .lookupBestMatchMaven(request.getArtifacts(), request.getMode(), request.isBrewPullActive()); log.info("Request to /lookup/maven completed successfully. Payload: " + request.toString()); return result; } diff --git a/reports-rest/src/main/java/org/jboss/da/rest/exceptions/AllExceptionsMapper.java b/reports-rest/src/main/java/org/jboss/da/rest/exceptions/AllExceptionsMapper.java index 01aa5d5d6..28d6535c4 100644 --- a/reports-rest/src/main/java/org/jboss/da/rest/exceptions/AllExceptionsMapper.java +++ b/reports-rest/src/main/java/org/jboss/da/rest/exceptions/AllExceptionsMapper.java @@ -17,7 +17,6 @@ import static org.jboss.da.model.rest.ErrorMessage.ErrorType.COMMUNICATION_FAIL; import static org.jboss.da.model.rest.ErrorMessage.ErrorType.ILLEGAL_ARGUMENTS; -import static org.jboss.da.model.rest.ErrorMessage.ErrorType.INPUT_VALIDATION; import static org.jboss.da.model.rest.ErrorMessage.ErrorType.NO_RELATIONSHIP_FOUND; import static org.jboss.da.model.rest.ErrorMessage.ErrorType.POM_ANALYSIS; import static org.jboss.da.model.rest.ErrorMessage.ErrorType.SCM_ENDPOINT; @@ -31,8 +30,6 @@ public class AllExceptionsMapper implements ExceptionMapper { public Response toResponse(Exception e) { if (e instanceof ValidationException) { // order of tests is important return ((ValidationException) e).getResponse(); - } else if (e instanceof org.jboss.pnc.common.alignment.ranking.exception.ValidationException) { - return handleException("Constraint validation failed.", INPUT_VALIDATION, Response.Status.BAD_REQUEST, e); } else if (e instanceof NoSuchElementException) { return handleException("No relationship found", NO_RELATIONSHIP_FOUND, Response.Status.NOT_FOUND, e); } else if (e instanceof RepositoryException) { diff --git a/testsuite/pom.xml b/testsuite/pom.xml index b9cd504da..4048216bf 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -28,6 +28,10 @@ org.jboss.pnc.metrics pncmetrics + + org.commonjava.maven.atlas + atlas-identities +