The Unified and Autonomous Development Platform
Fix issue #1108 - Sort by name in build artifact list
Robin Shenf98cac37ee40
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 94c2cef973..01af1c5a1d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -4,14 +4,7 @@ import java.io.File;import java.io.ObjectStreamException;import java.io.Serializable;import java.nio.file.Files;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashMap;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.Optional;-import java.util.Set;+import java.util.*;import java.util.concurrent.Callable;import java.util.concurrent.atomic.AtomicInteger;import java.util.stream.Collectors;@@ -29,6 +22,7 @@ import javax.persistence.criteria.Root;import javax.persistence.criteria.Selection;import javax.ws.rs.core.MediaType;+import edu.emory.mathcs.backport.java.util.Collections;import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.ObjectId;import org.hibernate.Session;@@ -1065,6 +1059,16 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buifile.isFile()? file.length(): -1, file.lastModified()));}}++ Collections.sort(files, (Comparator<FileInfo>) (o1, o2) -> {+ if (o1.isFile() && o2.isFile() || !o1.isFile() && !o2.isFile())+ return o1.getPath().compareTo(o2.getPath());+ else if (o1.isFile())+ return 1;+ else+ return -1;+ });+return files;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.javaindex a7073ef93a..4b02619b8a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java@@ -1,11 +1,20 @@package io.onedev.server.web.page.project.builds.detail.artifacts;-import java.util.ArrayList;-import java.util.Comparator;-import java.util.Date;-import java.util.Iterator;-import java.util.List;-+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.model.Build;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.DateUtils;+import io.onedev.server.util.FileInfo;+import io.onedev.server.web.behavior.NoRecordsBehavior;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.svg.SpriteImage;+import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;+import io.onedev.server.web.resource.ArtifactResource;+import io.onedev.server.web.resource.ArtifactResourceReference;+import io.onedev.server.web.util.ConfirmClickModifier;import org.apache.commons.io.FileUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -32,22 +41,10 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.model.Build;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;-import io.onedev.server.util.FileInfo;-import io.onedev.server.web.behavior.NoRecordsBehavior;-import io.onedev.server.web.component.modal.ModalLink;-import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.svg.SpriteImage;-import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;-import io.onedev.server.web.resource.ArtifactResource;-import io.onedev.server.web.resource.ArtifactResourceReference;-import io.onedev.server.web.util.ConfirmClickModifier;+import java.util.ArrayList;+import java.util.Date;+import java.util.Iterator;+import java.util.List;@SuppressWarnings("serial")public class BuildArtifactsPage extends BuildDetailPage {@@ -152,21 +149,7 @@ public class BuildArtifactsPage extends BuildDetailPage {@Overridepublic Iterator<? extends FileInfo> getChildren(FileInfo node) {String artifactPath = node != null? node.getPath(): null;- List<FileInfo> files = getBuildManager().listArtifacts(getBuild(), artifactPath);- Collections.sort(files, new Comparator<FileInfo>() {-- @Override- public int compare(FileInfo o1, FileInfo o2) {- if (o1.isFile() && o2.isFile() || !o1.isFile() && !o2.isFile())- return o1.getPath().compareTo(o2.getPath());- else if (o1.isFile())- return 1;- else- return -1;- }-- });- return files.iterator();+ return getBuildManager().listArtifacts(getBuild(), artifactPath).iterator();}@Override