kopia lustrzana https://github.com/gaul/s3proxy
Use getObject and generatePresignedUrl short forms
rodzic
940286b022
commit
82d95a2746
|
@ -51,8 +51,6 @@ import com.amazonaws.services.s3.model.CompleteMultipartUploadRequest;
|
||||||
import com.amazonaws.services.s3.model.CompleteMultipartUploadResult;
|
import com.amazonaws.services.s3.model.CompleteMultipartUploadResult;
|
||||||
import com.amazonaws.services.s3.model.CopyPartRequest;
|
import com.amazonaws.services.s3.model.CopyPartRequest;
|
||||||
import com.amazonaws.services.s3.model.CopyPartResult;
|
import com.amazonaws.services.s3.model.CopyPartResult;
|
||||||
import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
|
|
||||||
import com.amazonaws.services.s3.model.GetObjectRequest;
|
|
||||||
import com.amazonaws.services.s3.model.GroupGrantee;
|
import com.amazonaws.services.s3.model.GroupGrantee;
|
||||||
import com.amazonaws.services.s3.model.InitiateMultipartUploadRequest;
|
import com.amazonaws.services.s3.model.InitiateMultipartUploadRequest;
|
||||||
import com.amazonaws.services.s3.model.InitiateMultipartUploadResult;
|
import com.amazonaws.services.s3.model.InitiateMultipartUploadResult;
|
||||||
|
@ -142,8 +140,7 @@ public final class S3AwsSdkTest {
|
||||||
client.putObject(containerName, "foo", BYTE_SOURCE.openStream(),
|
client.putObject(containerName, "foo", BYTE_SOURCE.openStream(),
|
||||||
metadata);
|
metadata);
|
||||||
|
|
||||||
S3Object object = client.getObject(new GetObjectRequest(containerName,
|
S3Object object = client.getObject(containerName, "foo");
|
||||||
"foo"));
|
|
||||||
assertThat(object.getObjectMetadata().getContentLength()).isEqualTo(
|
assertThat(object.getObjectMetadata().getContentLength()).isEqualTo(
|
||||||
BYTE_SOURCE.size());
|
BYTE_SOURCE.size());
|
||||||
try (InputStream actual = object.getObjectContent();
|
try (InputStream actual = object.getObjectContent();
|
||||||
|
@ -162,8 +159,7 @@ public final class S3AwsSdkTest {
|
||||||
client.putObject(containerName, "foo",
|
client.putObject(containerName, "foo",
|
||||||
BYTE_SOURCE.openStream(), metadata);
|
BYTE_SOURCE.openStream(), metadata);
|
||||||
|
|
||||||
S3Object object = client.getObject(new GetObjectRequest(containerName,
|
S3Object object = client.getObject(containerName, "foo");
|
||||||
"foo"));
|
|
||||||
assertThat(object.getObjectMetadata().getContentLength()).isEqualTo(
|
assertThat(object.getObjectMetadata().getContentLength()).isEqualTo(
|
||||||
BYTE_SOURCE.size());
|
BYTE_SOURCE.size());
|
||||||
try (InputStream actual = object.getObjectContent();
|
try (InputStream actual = object.getObjectContent();
|
||||||
|
@ -184,8 +180,7 @@ public final class S3AwsSdkTest {
|
||||||
client.putObject(containerName, "foo",
|
client.putObject(containerName, "foo",
|
||||||
BYTE_SOURCE.openStream(), metadata);
|
BYTE_SOURCE.openStream(), metadata);
|
||||||
|
|
||||||
S3Object object = client.getObject(new GetObjectRequest(containerName,
|
S3Object object = client.getObject(containerName, "foo");
|
||||||
"foo"));
|
|
||||||
assertThat(object.getObjectMetadata().getContentLength()).isEqualTo(
|
assertThat(object.getObjectMetadata().getContentLength()).isEqualTo(
|
||||||
BYTE_SOURCE.size());
|
BYTE_SOURCE.size());
|
||||||
try (InputStream actual = object.getObjectContent();
|
try (InputStream actual = object.getObjectContent();
|
||||||
|
@ -245,12 +240,8 @@ public final class S3AwsSdkTest {
|
||||||
|
|
||||||
Date expiration = new Date(System.currentTimeMillis() +
|
Date expiration = new Date(System.currentTimeMillis() +
|
||||||
TimeUnit.HOURS.toMillis(1));
|
TimeUnit.HOURS.toMillis(1));
|
||||||
GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(
|
URL url = client.generatePresignedUrl(containerName, blobName,
|
||||||
containerName, blobName);
|
expiration, HttpMethod.GET);
|
||||||
request.setMethod(HttpMethod.GET);
|
|
||||||
request.setExpiration(expiration);
|
|
||||||
|
|
||||||
URL url = client.generatePresignedUrl(request);
|
|
||||||
try (InputStream actual = url.openStream();
|
try (InputStream actual = url.openStream();
|
||||||
InputStream expected = BYTE_SOURCE.openStream()) {
|
InputStream expected = BYTE_SOURCE.openStream()) {
|
||||||
assertThat(actual).hasContentEqualTo(expected);
|
assertThat(actual).hasContentEqualTo(expected);
|
||||||
|
@ -269,12 +260,8 @@ public final class S3AwsSdkTest {
|
||||||
|
|
||||||
Date expiration = new Date(System.currentTimeMillis() +
|
Date expiration = new Date(System.currentTimeMillis() +
|
||||||
TimeUnit.HOURS.toMillis(1));
|
TimeUnit.HOURS.toMillis(1));
|
||||||
GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(
|
URL url = client.generatePresignedUrl(containerName, blobName,
|
||||||
containerName, blobName);
|
expiration, HttpMethod.GET);
|
||||||
request.setMethod(HttpMethod.GET);
|
|
||||||
request.setExpiration(expiration);
|
|
||||||
|
|
||||||
URL url = client.generatePresignedUrl(request);
|
|
||||||
try (InputStream actual = url.openStream();
|
try (InputStream actual = url.openStream();
|
||||||
InputStream expected = BYTE_SOURCE.openStream()) {
|
InputStream expected = BYTE_SOURCE.openStream()) {
|
||||||
assertThat(actual).hasContentEqualTo(expected);
|
assertThat(actual).hasContentEqualTo(expected);
|
||||||
|
@ -317,8 +304,7 @@ public final class S3AwsSdkTest {
|
||||||
CompleteMultipartUploadResult completeUploadResponse =
|
CompleteMultipartUploadResult completeUploadResponse =
|
||||||
client.completeMultipartUpload(completeRequest);
|
client.completeMultipartUpload(completeRequest);
|
||||||
|
|
||||||
S3Object object = client.getObject(new GetObjectRequest(containerName,
|
S3Object object = client.getObject(containerName, targetBlobName);
|
||||||
targetBlobName));
|
|
||||||
assertThat(object.getObjectMetadata().getContentLength()).isEqualTo(
|
assertThat(object.getObjectMetadata().getContentLength()).isEqualTo(
|
||||||
BYTE_SOURCE.size());
|
BYTE_SOURCE.size());
|
||||||
try (InputStream actual = object.getObjectContent();
|
try (InputStream actual = object.getObjectContent();
|
||||||
|
@ -372,8 +358,7 @@ public final class S3AwsSdkTest {
|
||||||
uploadPartResult2.getPartETag()));
|
uploadPartResult2.getPartETag()));
|
||||||
client.completeMultipartUpload(completeRequest);
|
client.completeMultipartUpload(completeRequest);
|
||||||
|
|
||||||
S3Object object = client.getObject(new GetObjectRequest(containerName,
|
S3Object object = client.getObject(containerName, key);
|
||||||
key));
|
|
||||||
assertThat(object.getObjectMetadata().getContentLength()).isEqualTo(
|
assertThat(object.getObjectMetadata().getContentLength()).isEqualTo(
|
||||||
size);
|
size);
|
||||||
try (InputStream actual = object.getObjectContent();
|
try (InputStream actual = object.getObjectContent();
|
||||||
|
@ -444,8 +429,7 @@ public final class S3AwsSdkTest {
|
||||||
client.abortMultipartUpload(new AbortMultipartUploadRequest(
|
client.abortMultipartUpload(new AbortMultipartUploadRequest(
|
||||||
containerName, key, uploadId));
|
containerName, key, uploadId));
|
||||||
|
|
||||||
S3Object object = client.getObject(new GetObjectRequest(containerName,
|
S3Object object = client.getObject(containerName, key);
|
||||||
key));
|
|
||||||
assertThat(object.getObjectMetadata().getContentLength()).isEqualTo(
|
assertThat(object.getObjectMetadata().getContentLength()).isEqualTo(
|
||||||
BYTE_SOURCE.size());
|
BYTE_SOURCE.size());
|
||||||
try (InputStream actual = object.getObjectContent();
|
try (InputStream actual = object.getObjectContent();
|
||||||
|
|
Ładowanie…
Reference in New Issue