From 9b94bffff0ce14cde2741e920239e1d9c43e592f Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Thu, 23 Jun 2022 20:18:00 +0800 Subject: [PATCH] fixed bug with compression format --- .../woggioni/jpacrepo/service/PacmanWebService.java | 11 +++++++---- .../woggioni/jpacrepo/version/PkgIdComparator.java | 3 ++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/woggioni/jpacrepo/service/PacmanWebService.java b/src/main/java/net/woggioni/jpacrepo/service/PacmanWebService.java index 20f733f..d319ea6 100644 --- a/src/main/java/net/woggioni/jpacrepo/service/PacmanWebService.java +++ b/src/main/java/net/woggioni/jpacrepo/service/PacmanWebService.java @@ -2,6 +2,7 @@ package net.woggioni.jpacrepo.service; import lombok.SneakyThrows; import lombok.val; +import net.woggioni.jpacrepo.api.model.CompressionFormat; import net.woggioni.jpacrepo.api.model.PkgData; import net.woggioni.jpacrepo.api.model.PkgId; import net.woggioni.jpacrepo.api.service.PacmanServiceLocal; @@ -107,7 +108,7 @@ public class PacmanWebService { if (result == null) { EntityManager em = emf.createEntityManager(); TypedQuery query = em.createQuery( - "SELECT pkg.id.name, pkg.id.version, pkg.id.arch, pkg.fileName, pkg.size, pkg.md5sum " + + "SELECT pkg.id.name, pkg.id.version, pkg.id.arch, pkg.id.compressionFormat, pkg.fileName, pkg.size, pkg.md5sum " + "FROM PkgData pkg ORDER BY pkg.id.name, pkg.id.version, pkg.id.arch", Object[].class); cachedMap = query.getResultStream() @@ -115,9 +116,10 @@ public class PacmanWebService { String name = (String) pkg[0]; String version = (String) pkg[1]; String arch = (String) pkg[2]; - String filename = (String) pkg[3]; - long size = (long) pkg[4]; - String md5sum = (String) pkg[5]; + CompressionFormat compressionFormat = (CompressionFormat) pkg[3]; + String filename = (String) pkg[4]; + long size = (long) pkg[5]; + String md5sum = (String) pkg[6]; PkgTuple tuple = new PkgTuple(); tuple.setFilename(filename); tuple.setSize(size); @@ -126,6 +128,7 @@ public class PacmanWebService { id.setName(name); id.setVersion(version); id.setArch(arch); + id.setCompressionFormat(compressionFormat); return Tuple2.newInstance(id, tuple); }).collect( CollectionUtils.toUnmodifiableTreeMap( diff --git a/src/main/java/net/woggioni/jpacrepo/version/PkgIdComparator.java b/src/main/java/net/woggioni/jpacrepo/version/PkgIdComparator.java index 54d1b28..c57bd7f 100644 --- a/src/main/java/net/woggioni/jpacrepo/version/PkgIdComparator.java +++ b/src/main/java/net/woggioni/jpacrepo/version/PkgIdComparator.java @@ -14,6 +14,7 @@ public class PkgIdComparator { static { comparator = Comparator.comparing(PkgId::getName) .thenComparing(PkgId::getVersion, VersionComparator.getInstance()) - .thenComparing(PkgId::getArch); + .thenComparing(PkgId::getArch) + .thenComparing(PkgId::getCompressionFormat); } }