diff --git a/src/main/java/dev/dinauer/maven/app/ArtifactResource.java b/src/main/java/dev/dinauer/maven/app/ArtifactResource.java index ddf94b7..a327afa 100644 --- a/src/main/java/dev/dinauer/maven/app/ArtifactResource.java +++ b/src/main/java/dev/dinauer/maven/app/ArtifactResource.java @@ -53,10 +53,7 @@ public class ArtifactResource Map accounts = getAccounts(artifactIds); for (ArtifactId artifactId : artifactIds) { - for (ReleaseVersion releaseVersion : artifactId.getVersions()) - { - releaseVersion.setUploadAccount(accounts.get(releaseVersion.getUploadedBy())); - } + System.out.println("Skip setting user. Needs to be implemented"); } return artifactIds; } @@ -66,12 +63,8 @@ public class ArtifactResource List ids = new ArrayList<>(); for (ArtifactId artifactId : artifactIds) { - for (ReleaseVersion releaseVersion : artifactId.getVersions()) - { - ids.add(releaseVersion.getUploadedBy()); - } + System.out.println("Skip setting user. Needs to be implemented"); } - return userClient.get(ids); } } diff --git a/src/main/java/dev/dinauer/maven/maven/core/ArtifactId.java b/src/main/java/dev/dinauer/maven/maven/core/ArtifactId.java index d463f70..f208d9b 100644 --- a/src/main/java/dev/dinauer/maven/maven/core/ArtifactId.java +++ b/src/main/java/dev/dinauer/maven/maven/core/ArtifactId.java @@ -11,6 +11,7 @@ import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import java.util.stream.Stream; @Entity @Table(name = "artifact_id") @@ -89,9 +90,9 @@ public class ArtifactId return this; } - public List getVersions() + public List getVersions() { - return releaseVersions.stream().sorted(Comparator.comparing(version -> new DefaultArtifactVersion(version.getVersion()))).toList().reversed(); + return Stream.concat(snapshotVersions.stream(), releaseVersions.stream()).toList(); } public ArtifactId setVersions(List releaseVersions) diff --git a/src/main/java/dev/dinauer/maven/maven/core/Version.java b/src/main/java/dev/dinauer/maven/maven/core/Version.java index 191f6c1..92b65cd 100644 --- a/src/main/java/dev/dinauer/maven/maven/core/Version.java +++ b/src/main/java/dev/dinauer/maven/maven/core/Version.java @@ -2,5 +2,6 @@ package dev.dinauer.maven.maven.core; public interface Version { + String getVersion(); boolean isSnapshot(); } \ No newline at end of file