Skip to content

The Unified and Autonomous Development Platform

Refactor of stream read/write

Robin Shen212af6845802
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.java
index c465272955..20f0112537 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
@@ -330,10 +330,11 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT
@Override
public void write(OutputStream output) throws IOException {
- try (
- InputStream is = new BufferedInputStream(attachmentStream, BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(output, BUFFER_SIZE);) {
- IOUtils.copy(is, os);
+ try {
+ IOUtils.copy(attachmentStream, output, BUFFER_SIZE);
+ } finally {
+ attachmentStream.close();
+ output.close();
}
}
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.java
index 9cf544456f..a43bf4e97f 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
@@ -1,38 +1,6 @@
package io.onedev.server.cluster;
-import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-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.apache.shiro.authz.UnauthorizedException;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
-
import com.google.common.collect.Sets;
-
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.server.attachment.AttachmentManager;
@@ -53,6 +21,23 @@ import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.concurrent.PrioritizedRunnable;
import io.onedev.server.util.concurrent.WorkExecutor;
import io.onedev.server.util.patternset.PatternSet;
+import org.apache.commons.compress.utils.IOUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
+import java.io.*;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+
+import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
@Api(internal=true)
@Path("/cluster")
@@ -130,11 +115,10 @@ public class ClusterResource {
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);
+ try (InputStream is = new FileInputStream(artifactFile)) {
+ IOUtils.copy(is, output, BUFFER_SIZE);
+ } finally {
+ output.close();
}
return null;
}
@@ -159,12 +143,10 @@ public class ClusterResource {
@Override
public void write(OutputStream output) throws IOException {
Repository repository = projectManager.getRepository(projectId);
- try (
- InputStream is = new BufferedInputStream(
- GitUtils.getInputStream(repository, ObjectId.fromString(revId), path),
- BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(output, BUFFER_SIZE)) {
- IOUtils.copy(is, os);
+ try (InputStream is = GitUtils.getInputStream(repository, ObjectId.fromString(revId), path)) {
+ IOUtils.copy(is, output, BUFFER_SIZE);
+ } finally {
+ output.close();
}
}
@@ -188,10 +170,10 @@ public class ClusterResource {
@Override
public Void call() throws Exception {
File file = new File(storageManager.getProjectSiteDir(projectId), filePath);
- try (
- InputStream is = new BufferedInputStream(new FileInputStream(file), BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(output, BUFFER_SIZE)) {
- IOUtils.copy(is, os);
+ try (InputStream is = new FileInputStream(file)) {
+ IOUtils.copy(is, output, BUFFER_SIZE);
+ } finally {
+ output.close();
}
return null;
}
@@ -306,12 +288,10 @@ public class ClusterResource {
@Override
public void write(OutputStream output) throws IOException {
- try (
- InputStream is = new BufferedInputStream(
- new LfsObject(projectId, objectId).getInputStream(),
- BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(output, BUFFER_SIZE);) {
- IOUtils.copy(is, os);
+ try (InputStream is = new LfsObject(projectId, objectId).getInputStream()) {
+ IOUtils.copy(is, output, BUFFER_SIZE);
+ } finally {
+ output.close();
}
}
@@ -327,14 +307,15 @@ public class ClusterResource {
if (!SecurityUtils.getUser().isSystem())
throw new UnauthorizedException("This api can only be accessed via cluster credential");
- try (
- InputStream is = new BufferedInputStream(input, BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(
- new LfsObject(projectId, objectId).getOutputStream(),
- BUFFER_SIZE);) {
- IOUtils.copy(is, os);
+ try (OutputStream os = new LfsObject(projectId, objectId).getOutputStream()) {
+ IOUtils.copy(input, os, BUFFER_SIZE);
} catch (IOException e) {
throw new RuntimeException(e);
+ } finally {
+ try {
+ input.close();
+ } catch (IOException ignore) {
+ }
}
return Response.ok().build();
}
@@ -388,12 +369,12 @@ public class ClusterResource {
storageManager.initArtifactsDir(projectId, buildNumber);
File artifactFile = new File(Build.getArtifactsDir(projectId, buildNumber), artifactPath);
FileUtils.createDir(artifactFile.getParentFile());
- try (
- InputStream is = new BufferedInputStream(input, BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(new FileOutputStream(artifactFile), BUFFER_SIZE);) {
- IOUtils.copy(is, os);
+ try (OutputStream os = new FileOutputStream(artifactFile)) {
+ IOUtils.copy(input, os, BUFFER_SIZE);
} catch (IOException e) {
throw new RuntimeException(e);
+ } finally {
+ input.close();
}
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.java
index d0f6a2f2a7..c9ed006f8f 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java
@@ -1,50 +1,6 @@
package io.onedev.server.git;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-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 io.onedev.server.util.ExceptionUtils;
-import org.apache.commons.compress.utils.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.eclipse.jgit.http.server.GitSmartHttpTools;
-import org.eclipse.jgit.http.server.ServletUtils;
-import org.eclipse.jgit.transport.PacketLineOut;
-import org.glassfish.jersey.client.ClientProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.google.common.base.Preconditions;
-
-import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterManager;
@@ -60,11 +16,42 @@ import io.onedev.server.persistence.SessionManager;
import io.onedev.server.security.CodePullAuthorizationSource;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.storage.StorageManager;
+import io.onedev.server.util.ExceptionUtils;
import io.onedev.server.util.InputStreamWrapper;
import io.onedev.server.util.OutputStreamWrapper;
import io.onedev.server.util.concurrent.PrioritizedRunnable;
import io.onedev.server.util.concurrent.WorkExecutor;
import io.onedev.server.util.facade.ProjectFacade;
+import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.eclipse.jgit.http.server.GitSmartHttpTools;
+import org.eclipse.jgit.http.server.ServletUtils;
+import org.eclipse.jgit.transport.PacketLineOut;
+import org.glassfish.jersey.client.ClientProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+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.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+
+import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
@Singleton
public class GitFilter implements Filter {
@@ -358,11 +345,10 @@ public class GitFilter implements Filter {
KubernetesHelper.BEARER + " " + clusterManager.getCredentialValue());
try (Response gitResponse = builder.get()) {
KubernetesHelper.checkStatus(gitResponse);
- try (
- InputStream is = new BufferedInputStream(
- gitResponse.readEntity(InputStream.class), BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(output, BUFFER_SIZE);) {
- IOUtils.copy(is, os);
+ try (InputStream is = gitResponse.readEntity(InputStream.class)) {
+ IOUtils.copy(is, output, BUFFER_SIZE);
+ } finally {
+ output.close();
}
}
} finally {
diff --git a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
index 2cb35e8397..8d487223c1 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
@@ -37,7 +37,9 @@ 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.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
@@ -156,9 +158,9 @@ public class GitLfsFilter implements Filter {
}
if (storageServerUUID == null) {
try (
- InputStream is = new BufferedInputStream(lfsObject.getInputStream(), BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(httpResponse.getOutputStream(), BUFFER_SIZE);) {
- IOUtils.copy(is, os);
+ InputStream is = lfsObject.getInputStream();
+ OutputStream os = httpResponse.getOutputStream()) {
+ IOUtils.copy(is, os, BUFFER_SIZE);
}
} else {
Client client = ClientBuilder.newClient();
@@ -174,11 +176,9 @@ public class GitLfsFilter implements Filter {
try (Response lfsResponse = builder.get()){
KubernetesHelper.checkStatus(lfsResponse);
try (
- InputStream is = new BufferedInputStream(
- lfsResponse.readEntity(InputStream.class), BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(
- httpResponse.getOutputStream(), BUFFER_SIZE);) {
- IOUtils.copy(is, os);
+ InputStream is = lfsResponse.readEntity(InputStream.class);
+ OutputStream os = httpResponse.getOutputStream()) {
+ IOUtils.copy(is, os, BUFFER_SIZE);
}
}
} finally {
@@ -216,11 +216,9 @@ public class GitLfsFilter implements Filter {
if (storageServerUUID == null) {
try (
HashingInputStream is = new HashingInputStream(
- Hashing.sha256(),
- new BufferedInputStream(httpRequest.getInputStream(), BUFFER_SIZE));
- OutputStream os = new BufferedOutputStream(
- lfsObject.getOutputStream(), BUFFER_SIZE);) {
- IOUtils.copy(is, os);
+ Hashing.sha256(), httpRequest.getInputStream());
+ OutputStream os = lfsObject.getOutputStream()) {
+ IOUtils.copy(is, os, BUFFER_SIZE);
hash.set(Hex.encodeHexString(is.hash().asBytes()));
}
} else {
@@ -240,13 +238,12 @@ public class GitLfsFilter implements Filter {
@Override
public void write(OutputStream output) throws IOException {
- try (
- HashingInputStream is = new HashingInputStream(
- Hashing.sha256(),
- new BufferedInputStream(httpRequest.getInputStream(), BUFFER_SIZE));
- OutputStream os = new BufferedOutputStream(output, BUFFER_SIZE);) {
- IOUtils.copy(is, os);
+ try (HashingInputStream is = new HashingInputStream(
+ Hashing.sha256(), httpRequest.getInputStream())) {
+ IOUtils.copy(is, output, BUFFER_SIZE);
hash.set(Hex.encodeHexString(is.hash().asBytes()));
+ } finally {
+ output.close();
}
}
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.java
index 212b916c03..f4012e7cb1 100644
--- a/server-core/src/main/java/io/onedev/server/rest/ArtifactResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/ArtifactResource.java
@@ -23,7 +23,9 @@ 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.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.UUID;
import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
@@ -101,11 +103,10 @@ public class ArtifactResource {
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);
+ try (InputStream is = response.readEntity(InputStream.class)) {
+ IOUtils.copy(is, output, BUFFER_SIZE);
+ } finally {
+ output.close();
}
}
} finally {
@@ -146,10 +147,11 @@ public class ArtifactResource {
@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 {
+ IOUtils.copy(input, output, BUFFER_SIZE);
+ } finally {
+ input.close();
+ output.close();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.java
index 237102ef02..8f1326fd9b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.java
@@ -1,29 +1,17 @@
package io.onedev.server.web.page.project.builds.detail.artifacts;
-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.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-
-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 io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.LockUtils;
+import io.onedev.k8shelper.KubernetesHelper;
+import io.onedev.server.OneDev;
+import io.onedev.server.cluster.ClusterManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Build;
+import io.onedev.server.storage.StorageManager;
+import io.onedev.server.util.FilenameUtils;
+import io.onedev.server.web.component.dropzonefield.DropzoneField;
+import io.onedev.server.web.util.FileUpload;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -37,18 +25,18 @@ import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.util.lang.Bytes;
import org.glassfish.jersey.client.ClientProperties;
-import io.onedev.commons.utils.FileUtils;
-import io.onedev.commons.utils.LockUtils;
-import io.onedev.k8shelper.KubernetesHelper;
-import io.onedev.server.OneDev;
-import io.onedev.server.cluster.ClusterManager;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.Build;
-import io.onedev.server.storage.StorageManager;
-import io.onedev.server.util.FilenameUtils;
-import io.onedev.server.web.component.dropzonefield.DropzoneField;
-import io.onedev.server.web.util.FileUpload;
+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.UUID;
+import java.util.concurrent.Callable;
+
+import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
@SuppressWarnings("serial")
public abstract class ArtifactUploadPanel extends Panel {
@@ -130,7 +118,7 @@ public abstract class ArtifactUploadPanel extends Panel {
FileUtils.createDir(file.getParentFile());
try ( InputStream is = upload.getInputStream();
OutputStream os = new FileOutputStream(file)) {
- IOUtils.copy(is, os);
+ IOUtils.copy(is, os, BUFFER_SIZE);
} finally {
upload.release();
}
@@ -159,10 +147,10 @@ public abstract class ArtifactUploadPanel extends Panel {
@Override
public void write(OutputStream output) throws IOException {
- try (
- InputStream is = new BufferedInputStream(upload.getInputStream(), BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(output, BUFFER_SIZE);) {
- IOUtils.copy(is, os);
+ try (InputStream is = upload.getInputStream()) {
+ IOUtils.copy(is, output, BUFFER_SIZE);
+ } finally {
+ output.close();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/ArchiveResource.java b/server-core/src/main/java/io/onedev/server/web/resource/ArchiveResource.java
index ac171a14ad..93d85e64bd 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/ArchiveResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/ArchiveResource.java
@@ -1,24 +1,12 @@
package io.onedev.server.web.resource;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.UUID;
-
-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 static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
-
+import io.onedev.k8shelper.KubernetesHelper;
+import io.onedev.server.OneDev;
+import io.onedev.server.cluster.ClusterManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.security.SecurityUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.UnauthorizedException;
@@ -35,13 +23,21 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
-import io.onedev.k8shelper.KubernetesHelper;
-import io.onedev.server.OneDev;
-import io.onedev.server.cluster.ClusterManager;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
+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.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.UUID;
+
+import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
public class ArchiveResource extends AbstractResource {
@@ -138,9 +134,9 @@ public class ArchiveResource extends AbstractResource {
try (Response response = builder.get()) {
KubernetesHelper.checkStatus(response);
try (
- InputStream is = new BufferedInputStream(response.readEntity(InputStream.class), BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(attributes.getResponse().getOutputStream(), BUFFER_SIZE)) {
- IOUtils.copy(is, os);
+ InputStream is = response.readEntity(InputStream.class);
+ OutputStream os = attributes.getResponse().getOutputStream()) {
+ IOUtils.copy(is, os, BUFFER_SIZE);
}
}
} finally {
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.java
index 1752476fff..7cd86c985a 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
@@ -1,41 +1,7 @@
package io.onedev.server.web.resource;
-import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-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 io.onedev.server.util.artifact.FileInfo;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.apache.tika.io.IOUtils;
-import org.apache.tika.mime.MimeTypes;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.AbstractResource;
-
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
-
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.StringUtils;
@@ -48,7 +14,31 @@ 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.IOUtils;
+import io.onedev.server.util.artifact.FileInfo;
import io.onedev.server.web.util.MimeUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.apache.tika.mime.MimeTypes;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.AbstractResource;
+
+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;
+
+import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
public class ArtifactResource extends AbstractResource {
@@ -133,11 +123,9 @@ public class ArtifactResource extends AbstractResource {
public Void call() throws Exception {
File artifactFile = new File(Build.getArtifactsDir(projectId, buildNumber), artifactPath);
try (
- InputStream is = new BufferedInputStream(
- new FileInputStream(artifactFile), BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(
- attributes.getResponse().getOutputStream(), BUFFER_SIZE);) {
- IOUtils.copy(is, os);
+ InputStream is = new FileInputStream(artifactFile);
+ OutputStream os = attributes.getResponse().getOutputStream()) {
+ IOUtils.copy(is, os, BUFFER_SIZE);
}
return null;
}
@@ -159,9 +147,9 @@ public class ArtifactResource extends AbstractResource {
try (Response response = builder.get()) {
KubernetesHelper.checkStatus(response);
try (
- InputStream is = new BufferedInputStream(response.readEntity(InputStream.class), BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(attributes.getResponse().getOutputStream(), BUFFER_SIZE)) {
- IOUtils.copy(is, os);
+ InputStream is = response.readEntity(InputStream.class);
+ OutputStream os = attributes.getResponse().getOutputStream()) {
+ IOUtils.copy(is, os, BUFFER_SIZE);
}
}
} finally {
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java
index 2b6d320708..6010d93e0a 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java
@@ -1,51 +1,38 @@
package io.onedev.server.web.resource;
-import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.UUID;
-
-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.commons.codec.binary.Base64;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.apache.tika.io.IOUtils;
-import org.apache.tika.mime.MimeTypes;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.AbstractResource;
-
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentManager;
import io.onedev.server.cluster.ClusterManager;
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.entitymanager.CodeCommentManager;
-import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.*;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.CryptoUtils;
+import io.onedev.server.util.IOUtils;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.apache.tika.mime.MimeTypes;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.AbstractResource;
+
+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.UUID;
+
+import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
public class AttachmentResource extends AbstractResource {
@@ -122,11 +109,9 @@ public class AttachmentResource extends AbstractResource {
if (storageServerUUID.equals(clusterManager.getLocalServerUUID())) {
File attachmentFile = new File(getAttachmentManager().getAttachmentGroupDirLocal(projectId, attachmentGroup), attachment);
try (
- InputStream is = new BufferedInputStream(
- new FileInputStream(attachmentFile), BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(
- attributes.getResponse().getOutputStream(), BUFFER_SIZE);) {
- IOUtils.copy(is, os);
+ InputStream is = new FileInputStream(attachmentFile);
+ OutputStream os = attributes.getResponse().getOutputStream()) {
+ IOUtils.copy(is, os, BUFFER_SIZE);
}
} else {
Client client = ClientBuilder.newClient();
@@ -144,11 +129,9 @@ public class AttachmentResource extends AbstractResource {
try (Response response = builder.get()) {
KubernetesHelper.checkStatus(response);
try (
- InputStream is = new BufferedInputStream(
- response.readEntity(InputStream.class), BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(
- attributes.getResponse().getOutputStream(), BUFFER_SIZE)) {
- IOUtils.copy(is, os);
+ InputStream is = response.readEntity(InputStream.class);
+ OutputStream os = attributes.getResponse().getOutputStream()) {
+ IOUtils.copy(is, os, BUFFER_SIZE);
}
}
} finally {
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/BuildLogResource.java b/server-core/src/main/java/io/onedev/server/web/resource/BuildLogResource.java
index 930ddaecd9..8afdfaaa16 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/BuildLogResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/BuildLogResource.java
@@ -1,32 +1,5 @@
package io.onedev.server.web.resource;
-import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.UUID;
-
-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.tika.io.IOUtils;
-import org.apache.tika.mime.MimeTypes;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.AbstractResource;
-
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterManager;
@@ -37,6 +10,29 @@ 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.IOUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.apache.tika.mime.MimeTypes;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.AbstractResource;
+
+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.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.UUID;
+
+import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
public class BuildLogResource extends AbstractResource {
@@ -90,9 +86,9 @@ public class BuildLogResource extends AbstractResource {
LogManager logManager = OneDev.getInstance(LogManager.class);
if (storageServerUUID.equals(clusterManager.getLocalServerUUID())) {
try (
- InputStream is = new BufferedInputStream(logManager.openLogStream(projectId, buildNumber), BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(attributes.getResponse().getOutputStream(), BUFFER_SIZE)) {
- IOUtils.copy(is, os);
+ InputStream is = logManager.openLogStream(projectId, buildNumber);
+ OutputStream os = attributes.getResponse().getOutputStream()) {
+ IOUtils.copy(is, os, BUFFER_SIZE);
}
} else {
Client client = ClientBuilder.newClient();
@@ -110,11 +106,9 @@ public class BuildLogResource extends AbstractResource {
try (Response response = builder.get()) {
KubernetesHelper.checkStatus(response);
try (
- InputStream is = new BufferedInputStream(
- response.readEntity(InputStream.class), BUFFER_SIZE);
- OutputStream os = new BufferedOutputStream(
- attributes.getResponse().getOutputStream(), BUFFER_SIZE)) {
- IOUtils.copy(is, os);
+ InputStream is = response.readEntity(InputStream.class);
+ OutputStream os = attributes.getResponse().getOutputStream()) {
+ IOUtils.copy(is, os, BUFFER_SIZE);
}
}
} finally {