The Unified and Autonomous Development Platform
Fix issue #1111 - Upload artifacts via RESTful API
Robin Shend1e4e85fdbce
diff --git a/server-core/src/main/java/io/onedev/server/attachment/AttachmentManager.java b/server-core/src/main/java/io/onedev/server/attachment/AttachmentManager.javaindex edc4b1f534..a96486921e 100644--- a/server-core/src/main/java/io/onedev/server/attachment/AttachmentManager.java+++ b/server-core/src/main/java/io/onedev/server/attachment/AttachmentManager.java@@ -1,11 +1,11 @@package io.onedev.server.attachment;+import io.onedev.server.util.artifact.FileInfo;+import java.io.File;import java.io.InputStream;import java.util.List;-import io.onedev.server.util.FileInfo;-public interface AttachmentManager {File getAttachmentGroupDirLocal(Long projectId, String attachmentGroup);diff --git a/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.java b/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.javaindex ece5a771bf..c465272955 100644--- a/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.java+++ b/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.java@@ -1,40 +1,5 @@package io.onedev.server.attachment;-import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;--import java.io.BufferedInputStream;-import java.io.BufferedOutputStream;-import java.io.File;-import java.io.FileOutputStream;-import java.io.IOException;-import java.io.InputStream;-import java.io.ObjectStreamException;-import java.io.OutputStream;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.List;-import java.util.UUID;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Entity;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.StreamingOutput;--import org.apache.commons.compress.utils.IOUtils;-import org.glassfish.jersey.client.ClientProperties;-import org.quartz.CronScheduleBuilder;-import org.quartz.ScheduleBuilder;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.ExceptionUtils;@@ -56,9 +21,30 @@ import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.AttachmentTooLargeException;-import io.onedev.server.util.FileInfo;+import io.onedev.server.util.artifact.FileInfo;import io.onedev.server.util.schedule.SchedulableTask;import io.onedev.server.util.schedule.TaskScheduler;+import org.apache.commons.compress.utils.IOUtils;+import org.glassfish.jersey.client.ClientProperties;+import org.quartz.CronScheduleBuilder;+import org.quartz.ScheduleBuilder;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.ws.rs.client.*;+import javax.ws.rs.core.HttpHeaders;+import javax.ws.rs.core.MediaType;+import javax.ws.rs.core.Response;+import javax.ws.rs.core.StreamingOutput;+import java.io.*;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;+import java.util.UUID;++import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;@Singletonpublic class DefaultAttachmentManager implements AttachmentManager, SchedulableTask, Serializable {@@ -423,7 +409,7 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableTFile attachmentFile = new File(getAttachmentGroupDirLocal(projectId, attachmentGroup), attachment);if (!attachmentFile.exists())throw new RuntimeException("Attachment not found: " + attachment);- return new FileInfo(attachment, attachmentFile.length(), attachmentFile.lastModified());+ return new FileInfo(attachment, attachmentFile.lastModified(), attachmentFile.length(), null);}});@@ -458,7 +444,7 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableTFile attachmentGroupDir = getAttachmentGroupDirLocal(projectId, attachmentGroup);if (attachmentGroupDir.exists()) {for (File file: attachmentGroupDir.listFiles())- attachments.add(new FileInfo(file.getName(), file.length(), file.lastModified()));+ attachments.add(new FileInfo(file.getName(), file.lastModified(), file.length(), null));}return attachments;}diff --git a/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.java b/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.javaindex 5140956060..9cf544456f 100644--- a/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.java+++ b/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.java@@ -110,6 +110,41 @@ public class ClusterResource {};return Response.ok(os).build();}++ @Path("/artifact")+ @Produces(MediaType.APPLICATION_OCTET_STREAM)+ @GET+ public Response downloadArtifact(@QueryParam("projectId") Long projectId,+ @QueryParam("buildNumber") Long buildNumber,+ @QueryParam("artifactPath") String artifactPath) {+ if (!SecurityUtils.getUser().isSystem())+ throw new UnauthorizedException("This api can only be accessed via cluster credential");++ StreamingOutput os = new StreamingOutput() {++ @Override+ public void write(OutputStream output) throws IOException {+ LockUtils.read(Build.getArtifactsLockName(projectId, buildNumber), new Callable<Void>() {++ @Override+ public Void call() throws Exception {+ File artifactsDir = Build.getArtifactsDir(projectId, buildNumber);+ File artifactFile = new File(artifactsDir, artifactPath);+ try (+ InputStream is = new BufferedInputStream(new FileInputStream(artifactFile),+ BUFFER_SIZE);+ OutputStream os = new BufferedOutputStream(output, BUFFER_SIZE);) {+ IOUtils.copy(is, os);+ }+ return null;+ }++ });+ }++ };+ return Response.ok(os).build();+ }@Path("/blob")@Produces(MediaType.APPLICATION_OCTET_STREAM)diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex 2247dfc7d4..cccb679c0d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -7,6 +7,7 @@ import java.util.Optional;import javax.annotation.Nullable;+import io.onedev.server.util.artifact.ArtifactInfo;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.model.Agent;@@ -15,8 +16,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.FileInfo;-import io.onedev.server.util.MimeFileInfo;import io.onedev.server.util.ProjectBuildStats;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.StatusInfo;@@ -90,10 +89,9 @@ public interface BuildManager extends EntityManager<Build> {List<ProjectBuildStats> queryStats(Collection<Project> projects);- MimeFileInfo getArtifactInfo(Build build, String artifactPath);-- void deleteArtifact(Build build, String artifactPath);+ @Nullable+ ArtifactInfo getArtifactInfo(Build build, @Nullable String artifactPath);- List<FileInfo> listArtifacts(Build build, @Nullable String artifactPath);+ void deleteArtifact(Build build, @Nullable String artifactPath);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.javaindex 511dfaabee..9f46d1ded8 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java@@ -14,6 +14,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.cluster.ProjectServer;import io.onedev.server.model.support.code.GitPackConfig;+import io.onedev.server.util.artifact.FileInfo;import org.apache.shiro.authz.Permission;import org.eclipse.jgit.lib.Repository;@@ -21,7 +22,6 @@ import io.onedev.server.cluster.ClusterTask;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.MimeFileInfo;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.util.facade.ProjectFacade;@@ -97,7 +97,7 @@ public interface ProjectManager extends EntityManager<Project> {Collection<String> getReservedNames();- MimeFileInfo getSiteFileInfo(Long projectId, String siteFilePath);+ FileInfo getSiteFileInfo(Long projectId, String siteFilePath);void checkGitConfig(Long projectId, GitPackConfig gitPackConfig);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 01af1c5a1d..1fa68250b9 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@@ -1,45 +1,9 @@package io.onedev.server.entitymanager.impl;-import java.io.File;-import java.io.ObjectStreamException;-import java.io.Serializable;-import java.nio.file.Files;-import java.util.*;-import java.util.concurrent.Callable;-import java.util.concurrent.atomic.AtomicInteger;-import java.util.stream.Collectors;--import javax.annotation.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;-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;-import org.hibernate.criterion.Criterion;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;-import org.hibernate.query.Query;-import org.quartz.CronScheduleBuilder;-import org.quartz.ScheduleBuilder;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import com.google.common.base.Preconditions;import com.google.common.collect.Sets;import com.hazelcast.core.HazelcastInstance;-+import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;@@ -47,29 +11,14 @@ import io.onedev.commons.utils.LockUtils;import io.onedev.server.OneDev;import io.onedev.server.cluster.ClusterManager;import io.onedev.server.cluster.ClusterTask;-import io.onedev.server.entitymanager.BuildDependenceManager;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.BuildParamManager;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.*;import io.onedev.server.event.Listen;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;import io.onedev.server.git.service.GitService;-import io.onedev.server.model.Agent;-import io.onedev.server.model.Build;+import io.onedev.server.model.*;import io.onedev.server.model.Build.Status;-import io.onedev.server.model.BuildDependence;-import io.onedev.server.model.BuildParam;-import io.onedev.server.model.Group;-import io.onedev.server.model.GroupAuthorization;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.Role;-import io.onedev.server.model.User;-import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.support.build.BuildPreservation;import io.onedev.server.persistence.SequenceGenerator;import io.onedev.server.persistence.SessionManager;@@ -86,15 +35,42 @@ import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessBuild;import io.onedev.server.security.permission.JobPermission;-import io.onedev.server.util.FileInfo;-import io.onedev.server.util.MimeFileInfo;import io.onedev.server.util.ProjectBuildStats;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.StatusInfo;+import io.onedev.server.util.artifact.ArtifactInfo;+import io.onedev.server.util.artifact.DirectoryInfo;+import io.onedev.server.util.artifact.FileInfo;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.facade.BuildFacade;import io.onedev.server.util.schedule.SchedulableTask;import io.onedev.server.util.schedule.TaskScheduler;+import org.apache.commons.lang3.StringUtils;+import org.eclipse.jgit.lib.ObjectId;+import org.hibernate.Session;+import org.hibernate.criterion.Criterion;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;+import org.hibernate.query.Query;+import org.quartz.CronScheduleBuilder;+import org.quartz.ScheduleBuilder;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;+import javax.persistence.criteria.*;+import javax.ws.rs.core.MediaType;+import java.io.File;+import java.io.ObjectStreamException;+import java.io.Serializable;+import java.nio.file.Files;+import java.util.*;+import java.util.concurrent.Callable;+import java.util.concurrent.atomic.AtomicInteger;+import java.util.stream.Collectors;@Singletonpublic class DefaultBuildManager extends BaseEntityManager<Build> implements BuildManager, SchedulableTask, Serializable {@@ -977,36 +953,63 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui}@Override- public MimeFileInfo getArtifactInfo(Build build, String artifactPath) {+ @Nullable+ public ArtifactInfo getArtifactInfo(Build build, @Nullable String artifactPath) {Long projectId = build.getProject().getId();Long buildNumber = build.getNumber();- return projectManager.runOnProjectServer(projectId, new ClusterTask<MimeFileInfo>() {+ return projectManager.runOnProjectServer(projectId, new ClusterTask<ArtifactInfo>() {private static final long serialVersionUID = 1L;@Override- public MimeFileInfo call() throws Exception {+ public ArtifactInfo call() throws Exception {File artifactsDir = Build.getArtifactsDir(projectId, buildNumber);- File artifactFile = new File(artifactsDir, artifactPath);+ File artifactFile;+ if (artifactPath != null)+ artifactFile = new File(artifactsDir, artifactPath);+ else+ artifactFile = artifactsDir;- if (artifactFile.exists() && artifactFile.isFile()) {- String mimeType = Files.probeContentType(artifactFile.toPath());- if (mimeType == null)- mimeType = MediaType.APPLICATION_OCTET_STREAM;- return new MimeFileInfo(artifactPath, artifactFile.length(),- artifactFile.lastModified(), mimeType);+ if (artifactFile.exists()) {+ if (artifactFile.isFile()) {+ String mediaType = Files.probeContentType(artifactFile.toPath());+ if (mediaType == null)+ mediaType = MediaType.APPLICATION_OCTET_STREAM;+ return new FileInfo(artifactPath, artifactFile.lastModified(),+ artifactFile.length(), mediaType);+ } else {+ List<ArtifactInfo> children = new ArrayList<>();+ int baseLen = artifactsDir.getAbsolutePath().length() + 1;+ for (File child: artifactFile.listFiles()) {+ var relativePath = child.getAbsolutePath().substring(baseLen);+ if (child.isFile()) {+ children.add(new FileInfo(relativePath, child.lastModified(),+ child.length(), null));+ } else {+ children.add(new DirectoryInfo(relativePath, child.lastModified(), null));+ }+ }+ Collections.sort(children, (Comparator<ArtifactInfo>) (o1, o2) -> {+ if (o1 instanceof FileInfo && o2 instanceof FileInfo+ || (o1 instanceof DirectoryInfo) && (o2 instanceof DirectoryInfo)) {+ return o1.getPath().compareTo(o2.getPath());+ } else if (o1 instanceof FileInfo) {+ return 1;+ } else {+ return -1;+ }+ });+ return new DirectoryInfo(artifactPath, artifactFile.lastModified(), children);+ }} else {- String errorMessage = String.format(- "Specified artifact path does not exist or is a directory (project: %s, build number: %d, path: %s)",- projectId, buildNumber, artifactPath);- throw new ExplicitException(errorMessage);+ return null;}}});}-+@Override- public void deleteArtifact(Build build, String artifactPath) {+ public void deleteArtifact(Build build, @Nullable String artifactPath) {Long projectId = build.getProject().getId();Long buildNumber = build.getNumber();projectManager.runOnProjectServer(projectId, new ClusterTask<Void>() {@@ -1020,56 +1023,23 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui@Overridepublic Void call() throws Exception {File artifactsDir = Build.getArtifactsDir(projectId, buildNumber);- File artifactFile = new File(artifactsDir, artifactPath);- FileUtils.forceDelete(artifactFile);- return null;- }-- });- }-- });- }-- @Override- public List<FileInfo> listArtifacts(Build build, String artifactPath) {- Long projectId = build.getProject().getId();- Long buildNumber = build.getNumber();- return projectManager.runOnProjectServer(projectId, new ClusterTask<List<FileInfo>>() {-- private static final long serialVersionUID = 1L;-- @Override- public List<FileInfo> call() throws Exception {- return LockUtils.read(Build.getArtifactsLockName(projectId, buildNumber), new Callable<List<FileInfo>>() {-- @Override- public List<FileInfo> call() throws Exception {- List<FileInfo> files = new ArrayList<>();- File artifactsDir = Build.getArtifactsDir(projectId, buildNumber);-- File directory = artifactsDir;- if (artifactPath != null)- directory = new File(artifactsDir, artifactPath);-- if (directory.exists()) {- int baseLen = artifactsDir.getAbsolutePath().length() + 1;- for (File file: directory.listFiles()) {- files.add(new FileInfo(file.getAbsolutePath().substring(baseLen),- file.isFile()? file.length(): -1, file.lastModified()));+ if (artifactPath != null) {+ File artifactFile = new File(artifactsDir, artifactPath);+ if (artifactFile.exists()) {+ if (artifactFile.isFile())+ FileUtils.deleteFile(artifactFile);+ else+ FileUtils.deleteDir(artifactsDir);+ } else {+ String errorMessage = String.format(+ "Unable to find specified artifact (project: %s, build number: %d, artifact path: %s)",+ projectId, buildNumber, artifactPath);+ throw new ExplicitException(errorMessage);}+ } else {+ FileUtils.cleanDir(artifactsDir);}-- 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;+ return null;}});diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 61a721d028..6e9fea90d0 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -56,8 +56,8 @@ import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.storage.StorageManager;-import io.onedev.server.util.MimeFileInfo;import io.onedev.server.util.ProjectNameReservation;+import io.onedev.server.util.artifact.FileInfo;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.util.facade.ProjectFacade;@@ -1086,22 +1086,22 @@ public class DefaultProjectManager extends BaseEntityManager<Project>}@Override- public MimeFileInfo getSiteFileInfo(Long projectId, String filePath) {- return runOnProjectServer(projectId, new ClusterTask<MimeFileInfo>() {+ public FileInfo getSiteFileInfo(Long projectId, String filePath) {+ return runOnProjectServer(projectId, new ClusterTask<FileInfo>() {private static final long serialVersionUID = 1L;@Override- public MimeFileInfo call() throws Exception {- return LockUtils.read(Project.getSiteLockName(projectId), new Callable<MimeFileInfo>() {-+ public FileInfo call() throws Exception {+ return LockUtils.read(Project.getSiteLockName(projectId), new Callable<FileInfo>() {+@Override- public MimeFileInfo call() throws Exception {+ public FileInfo call() throws Exception {File siteFile = new File(storageManager.getProjectSiteDir(projectId), filePath);- String mimeType = Files.probeContentType(siteFile.toPath());- if (mimeType == null)- mimeType = MediaType.APPLICATION_OCTET_STREAM;- return new MimeFileInfo(filePath, siteFile.length(), siteFile.lastModified(), mimeType);+ String mediaType = Files.probeContentType(siteFile.toPath());+ if (mediaType == null)+ mediaType = MediaType.APPLICATION_OCTET_STREAM;+ return new FileInfo(filePath, siteFile.length(), siteFile.lastModified(), mediaType);}});diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex c51a13a1c9..c17800d824 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -43,6 +43,9 @@ import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.UniqueConstraint;+import io.onedev.server.util.artifact.ArtifactInfo;+import io.onedev.server.util.artifact.DirectoryInfo;+import io.onedev.server.util.validation.annotation.Directory;import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;@@ -83,7 +86,6 @@ import io.onedev.server.storage.StorageManager;import io.onedev.server.util.CollectionUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.Day;-import io.onedev.server.util.FileInfo;import io.onedev.server.util.Input;import io.onedev.server.util.JobSecretAuthorizationContext;import io.onedev.server.util.MatrixRunner;@@ -373,7 +375,7 @@ public class Build extends ProjectBelongingprivate transient JobSecretAuthorizationContext jobSecretAuthorizationContext;- private transient List<FileInfo> rootArtifacts;+ private transient List<ArtifactInfo> rootArtifacts;public Project getNumberScope() {return numberScope;@@ -995,9 +997,15 @@ public class Build extends ProjectBelongingreturn "build-" + buildId + "-serial";}- public List<FileInfo> getRootArtifacts() {- if (rootArtifacts == null)- rootArtifacts = OneDev.getInstance(BuildManager.class).listArtifacts(this, null);+ public List<ArtifactInfo> getRootArtifacts() {+ if (rootArtifacts == null) {+ DirectoryInfo directory = (DirectoryInfo) getBuildManager()+ .getArtifactInfo(this, null);+ if (directory != null)+ rootArtifacts = directory.getChildren();+ else+ rootArtifacts = new ArrayList<>();+ }return rootArtifacts;}diff --git a/server-core/src/main/java/io/onedev/server/rest/ArtifactResource.java b/server-core/src/main/java/io/onedev/server/rest/ArtifactResource.javanew file mode 100644index 0000000000..212b916c03--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/rest/ArtifactResource.java@@ -0,0 +1,182 @@+package io.onedev.server.rest;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.commons.utils.StringUtils;+import io.onedev.k8shelper.KubernetesHelper;+import io.onedev.server.cluster.ClusterManager;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Build;+import io.onedev.server.rest.annotation.Api;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.artifact.ArtifactInfo;+import org.apache.commons.compress.utils.IOUtils;+import org.apache.shiro.authz.UnauthorizedException;+import org.glassfish.jersey.client.ClientProperties;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;+import javax.ws.rs.*;+import javax.ws.rs.client.*;+import javax.ws.rs.core.HttpHeaders;+import javax.ws.rs.core.MediaType;+import javax.ws.rs.core.Response;+import javax.ws.rs.core.StreamingOutput;+import java.io.*;+import java.util.UUID;++import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;++@Api(order=4100, description="In most cases, artifact resource is operated with build id, which is different from build number. "+ + "To get build id of a particular build number, use the <a href='/~help/api/io.onedev.server.rest.BuildResource/queryBasicInfo'>Query Basic Info</a> operation with query for "+ + "instance <code>"Number" is "projectName#100"</code>")+@Path("/artifacts")+@Consumes(MediaType.APPLICATION_JSON)+@Produces(MediaType.APPLICATION_JSON)+@Singleton+public class ArtifactResource {++ private final ProjectManager projectManager;++ private final BuildManager buildManager;++ private final ClusterManager clusterManager;++ @Inject+ public ArtifactResource(ProjectManager projectManager, BuildManager buildManager,+ ClusterManager clusterManager) {+ this.projectManager = projectManager;+ this.buildManager = buildManager;+ this.clusterManager = clusterManager;+ }++ @Nullable+ private String normalizeArtifactPath(@Nullable String artifactPath) {+ if (StringUtils.isNotBlank(artifactPath)) {+ artifactPath = StringUtils.stripStart(artifactPath, "/");+ if (StringUtils.isNotBlank(artifactPath)) {+ if (artifactPath.contains(".."))+ throw new ExplicitException("Invalid artifact path");+ return artifactPath;+ }+ }+ return null;+ }++ @Api(order=100, description = "Get artifact info of specified path")+ @Path("/{buildId}/infos{artifactPath:(/.*)?}")+ @GET+ public ArtifactInfo getArtifactInfo(@PathParam("buildId") Long buildId,+ @PathParam("artifactPath") @Api(example = "/path/to/directoryOrFile") String artifactPath) {+ Build build = buildManager.load(buildId);+ if (!SecurityUtils.canAccess(build))+ throw new UnauthorizedException();+ return buildManager.getArtifactInfo(build, normalizeArtifactPath(artifactPath));+ }++ @Api(order=200, description = "Download artifact of specified path")+ @Path("/{buildId}/contents/{artifactPath:(.*)}")+ @GET+ @Produces(MediaType.APPLICATION_OCTET_STREAM)+ public StreamingOutput downloadArtifact(@PathParam("buildId") Long buildId,+ @PathParam("artifactPath") @Api(example = "path/to/file") String artifactPath) {+ Build build = buildManager.load(buildId);+ if (!SecurityUtils.canAccess(build))+ throw new UnauthorizedException();++ return output -> {+ UUID storageServerUUID = projectManager.getStorageServerUUID(+ build.getProject().getId(), true);+ String serverUrl = clusterManager.getServerUrl(storageServerUUID);+ Client client = ClientBuilder.newClient();+ try {+ WebTarget target = client.target(serverUrl).path("~api/cluster/artifact")+ .queryParam("projectId", build.getProject().getId())+ .queryParam("buildNumber", build.getNumber())+ .queryParam("artifactPath", normalizeArtifactPath(artifactPath));+ Invocation.Builder builder = target.request();+ builder.header(HttpHeaders.AUTHORIZATION, KubernetesHelper.BEARER + " "+ + clusterManager.getCredentialValue());++ try (Response response = builder.get()) {+ KubernetesHelper.checkStatus(response);+ try (+ InputStream is = new BufferedInputStream(+ response.readEntity(InputStream.class), BUFFER_SIZE);+ OutputStream os1 = new BufferedOutputStream(output, BUFFER_SIZE);) {+ IOUtils.copy(is, os1);+ }+ }+ } finally {+ client.close();+ }+ };+ }++ @Api(order=300, description = "Upload artifact to specified path")+ @Path("/{buildId}/{artifactPath:(.*)}")+ @POST+ @Consumes(MediaType.APPLICATION_OCTET_STREAM)+ public Response uploadArtifact(+ @PathParam("buildId") Long buildId,+ @PathParam("artifactPath") @Api(example = "path/to/file") String artifactPath,+ InputStream input) {+ Build build = buildManager.load(buildId);+ if (!SecurityUtils.canManage(build))+ throw new UnauthorizedException();++ UUID storageServerUUID = projectManager.getStorageServerUUID(+ build.getProject().getId(), true);+ String serverUrl = clusterManager.getServerUrl(storageServerUUID);++ Client client = ClientBuilder.newClient();+ client.property(ClientProperties.REQUEST_ENTITY_PROCESSING, "CHUNKED");+ try {+ WebTarget target = client.target(serverUrl)+ .path("~api/cluster/artifact")+ .queryParam("projectId", build.getProject().getId())+ .queryParam("buildNumber", build.getNumber())+ .queryParam("artifactPath", normalizeArtifactPath(artifactPath));+ Invocation.Builder builder = target.request();+ builder.header(HttpHeaders.AUTHORIZATION,+ KubernetesHelper.BEARER + " " + clusterManager.getCredentialValue());++ StreamingOutput os = new StreamingOutput() {++ @Override+ public void write(OutputStream output) throws IOException {+ try (+ InputStream is = new BufferedInputStream(input, BUFFER_SIZE);+ OutputStream os = new BufferedOutputStream(output, BUFFER_SIZE);) {+ IOUtils.copy(is, os);+ }+ }++ };++ try (Response response = builder.post(Entity.entity(os, MediaType.APPLICATION_OCTET_STREAM))) {+ KubernetesHelper.checkStatus(response);+ }+ } finally {+ client.close();+ }+ return Response.ok().build();+ }++ @Api(order=400, description = "Delete artifact of specified path, or delete all artifacts " ++ "if artifact path is not specified")+ @Path("/{buildId}{artifactPath:(/.*)?}")+ @DELETE+ public Response deleteArtifact(+ @PathParam("buildId") Long buildId,+ @PathParam("artifactPath") @Api(example = "/path/to/directoryOrFile") String artifactPath) {+ Build build = buildManager.load(buildId);+ if (!SecurityUtils.canManage(build))+ throw new UnauthorizedException();++ buildManager.deleteArtifact(build, normalizeArtifactPath(artifactPath));+ return Response.ok().build();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/BeanUtils.java b/server-core/src/main/java/io/onedev/server/util/BeanUtils.javaindex 3343a5ae49..88778e9762 100644--- a/server-core/src/main/java/io/onedev/server/util/BeanUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/BeanUtils.java@@ -1,5 +1,10 @@package io.onedev.server.util;+import com.google.common.base.Preconditions;+import io.onedev.commons.utils.StringUtils;+import io.onedev.commons.utils.WordUtils;++import javax.annotation.Nullable;import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Field;import java.lang.reflect.Method;@@ -9,11 +14,6 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import com.google.common.base.Preconditions;--import io.onedev.commons.utils.StringUtils;-import io.onedev.commons.utils.WordUtils;-public class BeanUtils {/**@@ -64,6 +64,7 @@ public class BeanUtils {return new ArrayList<Field>(fields.values());}+ @Nullable/*** Get suffix of accessor method name for specified property. For instance,* getter suffix for property "value" would be "Value".diff --git a/server-core/src/main/java/io/onedev/server/util/FileInfo.java b/server-core/src/main/java/io/onedev/server/util/FileInfo.javadeleted file mode 100644index b93f7c1442..0000000000--- a/server-core/src/main/java/io/onedev/server/util/FileInfo.java+++ /dev/null@@ -1,56 +0,0 @@-package io.onedev.server.util;--import java.io.Serializable;--import org.apache.commons.lang3.builder.HashCodeBuilder;--public class FileInfo implements Serializable {-- private static final long serialVersionUID = 1L;-- private final String path;-- private final long length;-- private final long lastModified;-- public FileInfo(String path, long length, long lastModified) {- this.path = path;- this.length = length;- this.lastModified = lastModified;- }-- public String getPath() {- return path;- }-- public long getLength() {- return length;- }-- public long getLastModified() {- return lastModified;- }-- public boolean isFile() {- return length >= 0;- }-- @Override- public boolean equals(Object obj) {- if (obj == this) {- return true;- } else if (obj instanceof FileInfo) {- FileInfo otherInfo = (FileInfo) obj;- return otherInfo.getPath().equals(path);- } else {- return false;- }- }-- @Override- public int hashCode() {- return new HashCodeBuilder(17, 37).append(path).toHashCode();- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/MimeFileInfo.java b/server-core/src/main/java/io/onedev/server/util/MimeFileInfo.javadeleted file mode 100644index ecc97cb427..0000000000--- a/server-core/src/main/java/io/onedev/server/util/MimeFileInfo.java+++ /dev/null@@ -1,18 +0,0 @@-package io.onedev.server.util;--public class MimeFileInfo extends FileInfo {-- private static final long serialVersionUID = 1L;-- private final String mediaType;-- public MimeFileInfo(String path, long length, long lastModified, String mediaType) {- super(path, length, lastModified);- this.mediaType = mediaType;- }-- public String getMediaType() {- return mediaType;- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/artifact/ArtifactInfo.java b/server-core/src/main/java/io/onedev/server/util/artifact/ArtifactInfo.javanew file mode 100644index 0000000000..69658fe259--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/artifact/ArtifactInfo.java@@ -0,0 +1,61 @@+package io.onedev.server.util.artifact;++import io.onedev.server.rest.ArtifactResource;+import io.onedev.server.rest.annotation.Api;+import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;++import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;+import java.util.Objects;++@Api(exampleProvider = "getExample")+public abstract class ArtifactInfo implements Serializable {++ private static final long serialVersionUID = 1L;++ private final String path;++ private final long lastModified;++ public ArtifactInfo(@Nullable String path, long lastModified) {+ this.path = path;+ this.lastModified = lastModified;+ }++ private static ArtifactInfo getExample() {+ List<ArtifactInfo> children = new ArrayList<>();+ children.add(new DirectoryInfo("directory/sub-directory", 1, null));+ children.add(new FileInfo("directory/file", 1, 1000, null));+ return new DirectoryInfo("directory", 1, children);+ }++ @Nullable+ public String getPath() {+ return path;+ }++ public long getLastModified() {+ return lastModified;+ }++ @Override+ public boolean equals(Object obj) {+ if (obj == this) {+ return true;+ } else if (obj instanceof ArtifactInfo) {+ ArtifactInfo otherInfo = (ArtifactInfo) obj;+ return Objects.equals(path, otherInfo.path);+ } else {+ return false;+ }+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37).append(path).toHashCode();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/artifact/DirectoryInfo.java b/server-core/src/main/java/io/onedev/server/util/artifact/DirectoryInfo.javanew file mode 100644index 0000000000..eb7bfa9505--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/artifact/DirectoryInfo.java@@ -0,0 +1,21 @@+package io.onedev.server.util.artifact;++import javax.annotation.Nullable;+import java.util.List;++public class DirectoryInfo extends ArtifactInfo {++ private static final long serialVersionUID = 1L;++ private final List<ArtifactInfo> children;++ public DirectoryInfo(@Nullable String path, long lastModified, @Nullable List<ArtifactInfo> children) {+ super(path, lastModified);+ this.children = children;+ }++ @Nullable+ public List<ArtifactInfo> getChildren() {+ return children;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/util/artifact/FileInfo.java b/server-core/src/main/java/io/onedev/server/util/artifact/FileInfo.javanew file mode 100644index 0000000000..a18f0fc29c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/artifact/FileInfo.java@@ -0,0 +1,27 @@+package io.onedev.server.util.artifact;++import javax.annotation.Nullable;++public class FileInfo extends ArtifactInfo {++ private static final long serialVersionUID = 1L;++ private final long length;++ private final String mediaType;++ public FileInfo(@Nullable String path, long lastModified, long length, @Nullable String mediaType) {+ super(path, lastModified);+ this.length = length;+ this.mediaType = mediaType;+ }++ public long getLength() {+ return length;+ }++ @Nullable+ public String getMediaType() {+ return mediaType;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.javaindex 163f82347a..c666a989c9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java@@ -1,34 +1,8 @@package io.onedev.server.web.page.help;-import java.io.Serializable;-import java.lang.reflect.Field;-import java.lang.reflect.InvocationTargetException;-import java.lang.reflect.Method;-import java.lang.reflect.Modifier;-import java.lang.reflect.Type;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Comparator;-import java.util.Date;-import java.util.EnumSet;-import java.util.HashMap;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.Set;--import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.OneToOne;-import javax.persistence.Transient;--import org.objenesis.ObjenesisStd;-import com.fasterxml.jackson.annotation.JsonIgnore;import com.fasterxml.jackson.annotation.JsonProperty;import com.google.common.collect.Sets;-import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.loader.ImplementationRegistry;import io.onedev.server.OneDev;@@ -41,6 +15,12 @@ import io.onedev.server.web.page.layout.AdministrationSettingContribution;import io.onedev.server.web.page.layout.ContributedAdministrationSetting;import io.onedev.server.web.page.project.setting.ContributedProjectSetting;import io.onedev.server.web.page.project.setting.ProjectSettingContribution;+import org.objenesis.ObjenesisStd;++import javax.persistence.*;+import java.io.Serializable;+import java.lang.reflect.*;+import java.util.*;public class ApiHelpUtils {diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.javaindex 101918f46c..e9e45ed55f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java@@ -1,27 +1,20 @@package io.onedev.server.web.page.help;-import java.io.Serializable;-import java.lang.reflect.Field;-import java.lang.reflect.Method;-import java.lang.reflect.Modifier;-import java.lang.reflect.Type;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Date;-import java.util.EnumSet;-import java.util.HashMap;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;-import java.util.concurrent.atomic.AtomicReference;-import java.util.regex.Pattern;--import javax.annotation.Nullable;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.ws.rs.GET;-import javax.ws.rs.Path;-+import com.fasterxml.jackson.annotation.JsonTypeInfo;+import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.databind.ObjectMapper;+import io.onedev.commons.utils.StringUtils;+import io.onedev.commons.utils.WordUtils;+import io.onedev.server.OneDev;+import io.onedev.server.model.AbstractEntity;+import io.onedev.server.rest.annotation.Api;+import io.onedev.server.rest.annotation.EntityCreate;+import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.menu.MenuItem;+import io.onedev.server.web.component.menu.MenuLink;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -41,22 +34,19 @@ import org.apache.wicket.util.visit.IVisit;import org.apache.wicket.util.visit.IVisitor;import org.glassfish.jersey.server.ResourceConfig;-import com.fasterxml.jackson.annotation.JsonTypeInfo;-import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.databind.ObjectMapper;--import io.onedev.commons.utils.StringUtils;-import io.onedev.commons.utils.WordUtils;-import io.onedev.server.OneDev;-import io.onedev.server.model.AbstractEntity;-import io.onedev.server.rest.annotation.Api;-import io.onedev.server.rest.annotation.EntityCreate;-import io.onedev.server.util.ReflectionUtils;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.menu.MenuItem;-import io.onedev.server.web.component.menu.MenuLink;+import javax.annotation.Nullable;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.ws.rs.GET;+import javax.ws.rs.Path;+import java.io.Serializable;+import java.lang.reflect.Field;+import java.lang.reflect.Method;+import java.lang.reflect.Modifier;+import java.lang.reflect.Type;+import java.util.*;+import java.util.concurrent.atomic.AtomicReference;+import java.util.regex.Pattern;@SuppressWarnings("serial")public class ExampleValuePanel extends Panel {@@ -488,29 +478,31 @@ public class ExampleValuePanel extends Panel {List<MenuItem> items = new ArrayList<>();for (Class<?> clazz: ApiHelpUtils.getImplementations(getDeclaredClass())) {- items.add(new MenuItem() {-- @Override- public String getLabel() {- return clazz.getSimpleName();- }-- @Override- public WebMarkupContainer newLink(String id) {- return new AjaxLink<Void>(id) {-- @Override- public void onClick(AjaxRequestTarget target) {- Serializable newValue = ApiHelpUtils.getExampleValue(clazz, getValueOrigin());- valueModel.setObject(newValue);- target.add(ExampleValuePanel.this);- send(getPage(), Broadcast.BREADTH, new ExampleValueChanged(target));- }-- };- }-- });+ if (clazz != getValue().getClass()) {+ items.add(new MenuItem() {++ @Override+ public String getLabel() {+ return clazz.getSimpleName();+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return new AjaxLink<Void>(id) {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Serializable newValue = ApiHelpUtils.getExampleValue(clazz, getValueOrigin());+ valueModel.setObject(newValue);+ target.add(ExampleValuePanel.this);+ send(getPage(), Broadcast.BREADTH, new ExampleValueChanged(target));+ }++ };+ }++ });+ }}return items;}@@ -553,6 +545,7 @@ public class ExampleValuePanel extends Panel {}};+item.add(new ExampleValuePanel("value", new IModel<Serializable>() {@Override@@ -567,7 +560,7 @@ public class ExampleValuePanel extends Panel {return (Serializable) field.get(getValue());} catch (IllegalArgumentException | IllegalAccessException e) {throw new RuntimeException(e);- }+ }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.htmlindex 3db2c7e459..298de38595 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.html@@ -50,14 +50,16 @@</table></dd></wicket:enclosure>- <wicket:enclosure child="requestBodyExample">+ <wicket:enclosure child="contentType"><dt>Request Body</dt><dd><dl><dt>Content Type</dt>- <dd>application/json</dd>- <dt>Example <a wicket:id="copyRequestBodyExample" class="ml-1" title="Copy to clipboard"><wicket:svg href="copy" class="icon icon-sm"/></a></dt>- <dd wicket:id="requestBodyExample"></dd>+ <dd wicket:id="contentType">application/json</dd>+ <wicket:enclosure child="requestBodyExample">+ <dt>Example <a wicket:id="copyRequestBodyExample" class="ml-1" title="Copy to clipboard"><wicket:svg href="copy" class="icon icon-sm"/></a></dt>+ <dd wicket:id="requestBodyExample"></dd>+ </wicket:enclosure></dl></dd></wicket:enclosure>@@ -100,9 +102,11 @@<wicket:fragment wicket:id="hasResponseBodyFrag"><dl><dt>Content Type</dt>- <dd>application/json</dd>- <dt>Example <a wicket:id="copyExample" class="ml-1" title="Copy to clipboard"><wicket:svg href="copy" class="icon icon-sm"/></a></dt>- <dd wicket:id="example"></dd>+ <dd wicket:id="contentType">application/json</dd>+ <wicket:enclosure child="example">+ <dt>Example <a wicket:id="copyExample" class="ml-1" title="Copy to clipboard"><wicket:svg href="copy" class="icon icon-sm"/></a></dt>+ <dd wicket:id="example"></dd>+ </wicket:enclosure></dl></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.javaindex e4b8299206..3b2cf6e1c6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java@@ -1,20 +1,16 @@package io.onedev.server.web.page.help;-import java.io.Serializable;-import java.lang.reflect.Method;-import java.lang.reflect.Parameter;-import java.util.ArrayList;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;--import javax.annotation.Nullable;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.Context;-import javax.ws.rs.core.Response;-+import io.onedev.commons.utils.ExplicitException;+import io.onedev.commons.utils.StringUtils;+import io.onedev.commons.utils.WordUtils;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.rest.TriggerJobResource;+import io.onedev.server.rest.annotation.Api;+import io.onedev.server.rest.jersey.ParamCheckFilter;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;+import io.onedev.server.web.util.TextUtils;import org.apache.wicket.Component;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -28,17 +24,23 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.commons.utils.StringUtils;-import io.onedev.commons.utils.WordUtils;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.rest.TriggerJobResource;-import io.onedev.server.rest.annotation.Api;-import io.onedev.server.rest.jersey.ParamCheckFilter;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;-import io.onedev.server.web.util.TextUtils;+import javax.annotation.Nullable;+import javax.ws.rs.Path;+import javax.ws.rs.PathParam;+import javax.ws.rs.QueryParam;+import javax.ws.rs.core.Context;+import javax.ws.rs.core.MediaType;+import javax.ws.rs.core.Response;+import javax.ws.rs.core.StreamingOutput;+import java.io.InputStream;+import java.io.Serializable;+import java.lang.reflect.Method;+import java.lang.reflect.Parameter;+import java.util.ArrayList;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.regex.Matcher;@SuppressWarnings("serial")public class MethodDetailPage extends ApiHelpPage {@@ -118,53 +120,63 @@ public class MethodDetailPage extends ApiHelpPage {Parameter param = getRequestBodyParam();- if (param != null) {- Serializable exampleValue = new ExampleProvider(resourceClass, param.getAnnotation(Api.class)).getExample();- if (exampleValue == null)- exampleValue = ApiHelpUtils.getExampleValue(param.getParameterizedType(), ValueInfo.Origin.REQUEST_BODY);- requestBodyClass = exampleValue.getClass();- IModel<ValueInfo> valueInfoModel = new LoadableDetachableModel<ValueInfo>() {-- @Override- protected ValueInfo load() {- return new ValueInfo(ValueInfo.Origin.REQUEST_BODY,- getRequestBodyParam().getParameterizedType(), null);- }-- };-- Model<Serializable> valueModel = Model.of(exampleValue);-- ExampleValuePanel valuePanel = new ExampleValuePanel("requestBodyExample", valueModel,- valueInfoModel, requestBodyClass);- add(valuePanel);-- add(new CopyToClipboardLink("copyRequestBodyExample", new LoadableDetachableModel<String>() {+ if (param != null) {+ if (InputStream.class.isAssignableFrom(param.getType())) {+ add(new Label("contentType", MediaType.APPLICATION_OCTET_STREAM));+ add(new WebMarkupContainer("requestBodyExample").setVisible(false));+ add(new WebMarkupContainer("copyRequestBodyExample").setVisible(false));+ requestBodyClass = InputStream.class;+ } else {+ add(new Label("contentType", MediaType.APPLICATION_JSON));+ Serializable exampleValue = new ExampleProvider(resourceClass, param.getAnnotation(Api.class)).getExample();+ if (exampleValue == null)+ exampleValue = ApiHelpUtils.getExampleValue(param.getParameterizedType(), ValueInfo.Origin.REQUEST_BODY);+ requestBodyClass = exampleValue.getClass();+ IModel<ValueInfo> valueInfoModel = new LoadableDetachableModel<ValueInfo>() {- @Override- protected String load() {- return valuePanel.getValueAsJson();- }-- }) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!valuePanel.isScalarValue());- }+ @Override+ protected ValueInfo load() {+ return new ValueInfo(ValueInfo.Origin.REQUEST_BODY,+ getRequestBodyParam().getParameterizedType(), null);+ }- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);- if (event.getPayload() instanceof ExampleValueChanged)- ((ExampleValueChanged)event.getPayload()).getHandler().add(this);- }-- }.setOutputMarkupId(true));+ };++ Model<Serializable> valueModel = Model.of(exampleValue);++ ExampleValuePanel valuePanel = new ExampleValuePanel("requestBodyExample", valueModel,+ valueInfoModel, requestBodyClass);+ add(valuePanel);++ add(new CopyToClipboardLink("copyRequestBodyExample", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return valuePanel.getValueAsJson();+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!valuePanel.isScalarValue());+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);+ if (event.getPayload() instanceof ExampleValueChanged)+ ((ExampleValueChanged)event.getPayload()).getHandler().add(this);+ }++ }.setOutputMarkupId(true));+ }} else {requestBodyClass = null;+ add(new WebMarkupContainer("contentType").setVisible(false));add(new WebMarkupContainer("requestBodyExample").setVisible(false));+ add(new WebMarkupContainer("copyRequestBodyExample").setVisible(false));}String resourcePathValue = resourceClass.getAnnotation(Path.class).value();@@ -280,51 +292,60 @@ public class MethodDetailPage extends ApiHelpPage {});if (method.getReturnType() == Response.class) {- add(new Label("successResponseBody", "No response body if successful; error"));+ add(new Label("successResponseBody", "No response body"));} else {Fragment fragment = new Fragment("successResponseBody", "hasResponseBodyFrag", MethodDetailPage.this);- Serializable exampleValue = new ExampleProvider(resourceClass, method.getAnnotation(Api.class)).getExample();- if (exampleValue == null)- exampleValue = ApiHelpUtils.getExampleValue(method.getGenericReturnType(), ValueInfo.Origin.RESPONSE_BODY);- IModel<ValueInfo> valueInfoModel = new LoadableDetachableModel<ValueInfo>() {-- @Override- protected ValueInfo load() {- return new ValueInfo(ValueInfo.Origin.RESPONSE_BODY,- getResourceMethod().getGenericReturnType(), null);- }+ if (StreamingOutput.class.isAssignableFrom(method.getReturnType())) {+ fragment.add(new Label("contentType", MediaType.APPLICATION_OCTET_STREAM));+ fragment.add(new WebMarkupContainer("example").setVisible(false));+ fragment.add(new WebMarkupContainer("copyExample").setVisible(false));+ } else {+ fragment.add(new Label("contentType", MediaType.APPLICATION_JSON));- };-- IModel<Serializable> valueModel = Model.of(exampleValue);+ Serializable exampleValue = new ExampleProvider(resourceClass, method.getAnnotation(Api.class)).getExample();+ if (exampleValue == null)+ exampleValue = ApiHelpUtils.getExampleValue(method.getGenericReturnType(), ValueInfo.Origin.RESPONSE_BODY);- ExampleValuePanel valuePanel = new ExampleValuePanel("example", valueModel, valueInfoModel, requestBodyClass);- fragment.add(valuePanel);-- fragment.add(new CopyToClipboardLink("copyExample", new LoadableDetachableModel<String>() {+ IModel<ValueInfo> valueInfoModel = new LoadableDetachableModel<ValueInfo>() {- @Override- protected String load() {- return valuePanel.getValueAsJson();- }-- }) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!valuePanel.isScalarValue());- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);- if (event.getPayload() instanceof ExampleValueChanged)- ((ExampleValueChanged)event.getPayload()).getHandler().add(this);- }-- }.setOutputMarkupPlaceholderTag(true));+ @Override+ protected ValueInfo load() {+ return new ValueInfo(ValueInfo.Origin.RESPONSE_BODY,+ getResourceMethod().getGenericReturnType(), null);+ }++ };++ IModel<Serializable> valueModel = Model.of(exampleValue);++ ExampleValuePanel valuePanel = new ExampleValuePanel("example", valueModel, valueInfoModel, requestBodyClass);+ fragment.add(valuePanel);++ fragment.add(new CopyToClipboardLink("copyExample", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return valuePanel.getValueAsJson();+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!valuePanel.isScalarValue());+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);+ if (event.getPayload() instanceof ExampleValueChanged)+ ((ExampleValueChanged)event.getPayload()).getHandler().add(this);+ }++ }.setOutputMarkupPlaceholderTag(true));+ }add(fragment);}@@ -335,7 +356,9 @@ public class MethodDetailPage extends ApiHelpPage {Serializable exampleValue = new ExampleProvider(getResourceMethod().getDeclaringClass(), api).getExample();if (exampleValue == null)exampleValue = ApiHelpUtils.getExampleValue(pathParam.getParameterizedType(), ValueInfo.Origin.PATH_PLACEHOLDER);- endPoint = endPoint.replace("{" + pathParam.getAnnotation(PathParam.class).value() + "}", String.valueOf(exampleValue));+ endPoint = endPoint.replaceFirst(+ "\\{" + pathParam.getAnnotation(PathParam.class).value() + ".*?\\}",+ Matcher.quoteReplacement(String.valueOf(exampleValue)));}}@@ -361,20 +384,25 @@ public class MethodDetailPage extends ApiHelpPage {if (!queryParams.isEmpty())curlExample.append("-G ");+ if (StreamingOutput.class.isAssignableFrom(method.getReturnType()))+ curlExample.append("-O ");- switch (getHttpMethod(method)) {+ switch (httpMethod) {case "DELETE":curlExample.append("-X DELETE ");break;case "PUT":- curlExample.append("-X PUT [email protected] -H \"Content-Type: application/json\" ");- break;case "POST":- if (resourceClass != TriggerJobResource.class)- curlExample.append("[email protected] -H \"Content-Type: application/json\" ");- else- curlExample.append("-X POST -H \"Content-Type: application/json\" ");-+ if (resourceClass == TriggerJobResource.class) {+ curlExample.append(String.format("-X %s -H \"Content-Type: %s\" ",+ httpMethod, MediaType.APPLICATION_JSON));+ } else if (InputStream.class.isAssignableFrom(requestBodyClass)) {+ curlExample.append(String.format("-X %s --data-binary \"@upload-file\" -H \"Content-Type: %s\" ",+ httpMethod, MediaType.APPLICATION_OCTET_STREAM));+ } else {+ curlExample.append(String.format("-X %s [email protected] -H \"Content-Type: %s\" ",+ httpMethod, MediaType.APPLICATION_JSON));+ }break;}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 4b02619b8a..1cf3a3c551 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@@ -6,7 +6,9 @@ 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.util.artifact.ArtifactInfo;+import io.onedev.server.util.artifact.DirectoryInfo;+import io.onedev.server.util.artifact.FileInfo;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;@@ -90,35 +92,38 @@ public class BuildArtifactsPage extends BuildDetailPage {});- List<IColumn<FileInfo, Void>> columns = new ArrayList<>();+ List<IColumn<ArtifactInfo, Void>> columns = new ArrayList<>();- columns.add(new TreeColumn<FileInfo, Void>(Model.of("Name")));- columns.add(new AbstractColumn<FileInfo, Void>(Model.of("Size")) {+ columns.add(new TreeColumn<ArtifactInfo, Void>(Model.of("Name")));+ columns.add(new AbstractColumn<ArtifactInfo, Void>(Model.of("Size")) {@Override- public void populateItem(Item<ICellPopulator<FileInfo>> cellItem, String componentId, IModel<FileInfo> rowModel) {- FileInfo file = rowModel.getObject();- if (!file.isFile())+ public void populateItem(Item<ICellPopulator<ArtifactInfo>> cellItem, String componentId, IModel<ArtifactInfo> rowModel) {+ ArtifactInfo artifact = rowModel.getObject();+ if (artifact instanceof DirectoryInfo) {cellItem.add(new Label(componentId, ""));- else- cellItem.add(new Label(componentId, FileUtils.byteCountToDisplaySize(file.getLength())));+ } else {+ cellItem.add(new Label(+ componentId,+ FileUtils.byteCountToDisplaySize(((FileInfo) artifact).getLength())));+ }}});- columns.add(new AbstractColumn<FileInfo, Void>(Model.of("Last Modified")) {+ columns.add(new AbstractColumn<ArtifactInfo, Void>(Model.of("Last Modified")) {@Override- public void populateItem(Item<ICellPopulator<FileInfo>> cellItem, String componentId, IModel<FileInfo> rowModel) {- FileInfo file = rowModel.getObject();- cellItem.add(new Label(componentId, DateUtils.formatAge(new Date(file.getLastModified()))));+ public void populateItem(Item<ICellPopulator<ArtifactInfo>> cellItem, String componentId, IModel<ArtifactInfo> rowModel) {+ ArtifactInfo artifact = rowModel.getObject();+ cellItem.add(new Label(componentId, DateUtils.formatAge(new Date(artifact.getLastModified()))));}});if (SecurityUtils.canManage(getBuild())) {- columns.add(new AbstractColumn<FileInfo, Void>(Model.of("")) {+ columns.add(new AbstractColumn<ArtifactInfo, Void>(Model.of("")) {@Override- public void populateItem(Item<ICellPopulator<FileInfo>> cellItem, String componentId, IModel<FileInfo> rowModel) {+ public void populateItem(Item<ICellPopulator<ArtifactInfo>> cellItem, String componentId, IModel<ArtifactInfo> rowModel) {Fragment fragment = new Fragment(componentId, "deleteFrag", BuildArtifactsPage.this);AjaxLink<?> link = new AjaxLink<Void>("link") {@@ -129,7 +134,7 @@ public class BuildArtifactsPage extends BuildDetailPage {}};- if (!rowModel.getObject().isFile())+ if (rowModel.getObject() instanceof DirectoryInfo)link.add(new ConfirmClickModifier("Do you really want to delete this directory?"));elselink.add(new ConfirmClickModifier("Do you really want to delete this file?"));@@ -140,36 +145,38 @@ public class BuildArtifactsPage extends BuildDetailPage {});}- ITreeProvider<FileInfo> dataProvider = new ITreeProvider<FileInfo>() {+ ITreeProvider<ArtifactInfo> dataProvider = new ITreeProvider<ArtifactInfo>() {@Overridepublic void detach() {}@Override- public Iterator<? extends FileInfo> getChildren(FileInfo node) {+ public Iterator<? extends ArtifactInfo> getChildren(ArtifactInfo node) {String artifactPath = node != null? node.getPath(): null;- return getBuildManager().listArtifacts(getBuild(), artifactPath).iterator();+ DirectoryInfo directory = ((DirectoryInfo)getBuildManager()+ .getArtifactInfo(getBuild(), artifactPath));+ return directory.getChildren().iterator();}@Override- public Iterator<? extends FileInfo> getRoots() {+ public Iterator<? extends ArtifactInfo> getRoots() {return getBuild().getRootArtifacts().iterator();}@Override- public boolean hasChildren(FileInfo node) {- return !node.isFile() && getChildren(node).hasNext();+ public boolean hasChildren(ArtifactInfo node) {+ return node instanceof DirectoryInfo && getChildren(node).hasNext();}@Override- public IModel<FileInfo> model(FileInfo object) {+ public IModel<ArtifactInfo> model(ArtifactInfo object) {return Model.of(object);}};- add(new TableTree<FileInfo, Void>("artifacts", columns, dataProvider, Integer.MAX_VALUE) {+ add(new TableTree<ArtifactInfo, Void>("artifacts", columns, dataProvider, Integer.MAX_VALUE) {@Overrideprotected void onInitialize() {@@ -190,34 +197,38 @@ public class BuildArtifactsPage extends BuildDetailPage {}@Override- protected Item<FileInfo> newRowItem(String id, int index, IModel<FileInfo> model) {- return new OddEvenItem<FileInfo>(id, index, model);+ protected Item<ArtifactInfo> newRowItem(String id, int index, IModel<ArtifactInfo> model) {+ return new OddEvenItem<ArtifactInfo>(id, index, model);}@Override- public void expand(FileInfo file) {- super.expand(file);+ public void expand(ArtifactInfo artifact) {+ super.expand(artifact);- String artifactPath = file != null? file.getPath(): null;- List<FileInfo> files = getBuildManager().listArtifacts(getBuild(), artifactPath);- if (files.size() == 1 && !files.get(0).isFile())- expand(files.get(0));+ String artifactPath = artifact != null? artifact.getPath(): null;+ DirectoryInfo directory = ((DirectoryInfo) getBuildManager()+ .getArtifactInfo(getBuild(), artifactPath));+ if (directory != null+ && directory.getChildren().size() == 1+ && directory.getChildren().get(0) instanceof DirectoryInfo) {+ expand(directory.getChildren().get(0));+ }}@Override- protected Component newContentComponent(String id, IModel<FileInfo> model) {+ protected Component newContentComponent(String id, IModel<ArtifactInfo> model) {Fragment fragment = new Fragment(id, "artifactFrag", BuildArtifactsPage.this);- FileInfo file = model.getObject();+ ArtifactInfo artifact = model.getObject();WebMarkupContainer link;- if (!file.isFile()) {+ if (artifact instanceof DirectoryInfo) {link = new AjaxLink<Void>("link") {@Overridepublic void onClick(AjaxRequestTarget target) {- if (getState(file) == State.EXPANDED)- collapse(file);+ if (getState(artifact) == State.EXPANDED)+ collapse(artifact);else- expand(file);+ expand(artifact);}};@@ -225,12 +236,12 @@ public class BuildArtifactsPage extends BuildDetailPage {link.add(AttributeAppender.append("class", "folder"));} else {PageParameters params = ArtifactResource.paramsOf(- getBuild().getProject().getId(), getBuild().getNumber(), file.getPath());+ getBuild().getProject().getId(), getBuild().getNumber(), artifact.getPath());link = new ResourceLink<Void>("link", new ArtifactResourceReference(), params);link.add(new SpriteImage("icon", "file"));link.add(AttributeAppender.append("class", "file"));}- String fileName = file.getPath();+ String fileName = artifact.getPath();if (fileName.contains("/"))fileName = StringUtils.substringAfterLast(fileName, "/");link.add(new Label("label", fileName));diff --git a/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java b/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.javaindex 1391f051ff..1752476fff 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java@@ -25,6 +25,7 @@ import javax.ws.rs.client.WebTarget;import javax.ws.rs.core.HttpHeaders;import javax.ws.rs.core.Response;+import io.onedev.server.util.artifact.FileInfo;import org.apache.shiro.authz.UnauthorizedException;import org.apache.tika.io.IOUtils;import org.apache.tika.mime.MimeTypes;@@ -47,7 +48,6 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.MimeFileInfo;import io.onedev.server.web.util.MimeUtils;public class ArtifactResource extends AbstractResource {@@ -66,7 +66,7 @@ public class ArtifactResource extends AbstractResource {Long buildNumber = params.get(PARAM_BUILD).toOptionalLong();if (buildNumber == null)- throw new IllegalArgumentException("build number has to be specified");+ throw new IllegalArgumentException("Build number has to be specified");List<String> pathSegments = new ArrayList<>();@@ -81,7 +81,7 @@ public class ArtifactResource extends AbstractResource {String artifactPath = Joiner.on("/").join(pathSegments);- MimeFileInfo fileInfo = null;+ FileInfo fileInfo = null;if (!SecurityUtils.getUserId().equals(User.SYSTEM_ID)) {Project project = OneDev.getInstance(ProjectManager.class).load(projectId);@@ -96,7 +96,7 @@ public class ArtifactResource extends AbstractResource {if (!SecurityUtils.canAccess(build))throw new UnauthorizedException();- fileInfo = getBuildManager().getArtifactInfo(build, artifactPath);+ fileInfo = (FileInfo) getBuildManager().getArtifactInfo(build, artifactPath);}ResourceResponse response = new ResourceResponse();diff --git a/server-core/src/main/java/io/onedev/server/web/resource/SiteFileResource.java b/server-core/src/main/java/io/onedev/server/web/resource/SiteFileResource.javaindex f7d0f35ffe..022a5527bb 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/SiteFileResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/SiteFileResource.java@@ -1,35 +1,7 @@package io.onedev.server.web.resource;-import java.io.File;-import java.io.FileInputStream;-import java.io.IOException;-import java.io.InputStream;-import java.io.UnsupportedEncodingException;-import java.net.URLEncoder;-import java.nio.charset.StandardCharsets;-import java.util.ArrayList;-import java.util.List;-import java.util.UUID;-import java.util.concurrent.Callable;--import javax.persistence.EntityNotFoundException;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.Response;--import org.apache.shiro.authz.UnauthorizedException;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.apache.wicket.request.resource.AbstractResource;-import org.eclipse.jetty.io.EofException;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import com.google.common.base.Joiner;import com.google.common.base.Splitter;-import io.onedev.commons.utils.LockUtils;import io.onedev.k8shelper.KubernetesHelper;import io.onedev.server.OneDev;@@ -42,9 +14,30 @@ import io.onedev.server.storage.StorageManager;import io.onedev.server.util.ExceptionUtils;import io.onedev.server.util.IOUtils;import io.onedev.server.util.LongRange;-import io.onedev.server.util.MimeFileInfo;+import io.onedev.server.util.artifact.FileInfo;import io.onedev.server.web.mapper.ProjectMapperUtils;import io.onedev.server.web.util.WicketUtils;+import org.apache.shiro.authz.UnauthorizedException;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.request.resource.AbstractResource;+import org.eclipse.jetty.io.EofException;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import javax.persistence.EntityNotFoundException;+import javax.ws.rs.client.Client;+import javax.ws.rs.client.ClientBuilder;+import javax.ws.rs.client.Invocation;+import javax.ws.rs.client.WebTarget;+import javax.ws.rs.core.HttpHeaders;+import javax.ws.rs.core.Response;+import java.io.*;+import java.net.URLEncoder;+import java.nio.charset.StandardCharsets;+import java.util.ArrayList;+import java.util.List;+import java.util.UUID;+import java.util.concurrent.Callable;public class SiteFileResource extends AbstractResource {@@ -82,10 +75,10 @@ public class SiteFileResource extends AbstractResource {ResourceResponse response = new ResourceResponse();response.setAcceptRange(ContentRangeType.BYTES);- MimeFileInfo mimeFileInfo = getProjectManager().getSiteFileInfo(projectId, filePath);- response.setContentType(mimeFileInfo.getMediaType());+ FileInfo fileInfo = getProjectManager().getSiteFileInfo(projectId, filePath);+ response.setContentType(fileInfo.getMediaType());- response.setContentLength(mimeFileInfo.getLength());+ response.setContentLength(fileInfo.getLength());try {response.setFileName(URLEncoder.encode(filePath, StandardCharsets.UTF_8.name()));@@ -105,7 +98,7 @@ public class SiteFileResource extends AbstractResource {@Overridepublic void writeData(Attributes attributes) throws IOException {- LongRange range = WicketUtils.getRequestContentRange(mimeFileInfo.getLength());+ LongRange range = WicketUtils.getRequestContentRange(fileInfo.getLength());UUID storageServerUUID = getProjectManager().getStorageServerUUID(projectId, true);if (storageServerUUID.equals(getClusterManager().getLocalServerUUID())) {