upgraded to version 1.0.0-SNAPSHOT;
putObject return the remote key
This commit is contained in:
parent
4240de609b
commit
abc78f1803
2
pom.xml
2
pom.xml
|
@ -7,7 +7,7 @@
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.gcube.contentmanagement</groupId>
|
<groupId>org.gcube.contentmanagement</groupId>
|
||||||
<artifactId>storage-manager-s3-plugin</artifactId>
|
<artifactId>storage-manager-s3-plugin</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
<description>A plugin for storage-manager-core library</description>
|
<description>A plugin for storage-manager-core library</description>
|
||||||
<properties>
|
<properties>
|
||||||
<aws.java.sdk.version>2.13.7</aws.java.sdk.version>
|
<aws.java.sdk.version>2.13.7</aws.java.sdk.version>
|
||||||
|
|
|
@ -212,7 +212,7 @@ public class BucketOperator {
|
||||||
* @param replace
|
* @param replace
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static S3Response putObject(String bucket, String key, File file, boolean replace) {
|
public static S3Response putObjectOld(String bucket, String key, File file, boolean replace) {
|
||||||
if(!replace) {
|
if(!replace) {
|
||||||
GetObjectRequest getObjectRequest = GetObjectRequest.builder()
|
GetObjectRequest getObjectRequest = GetObjectRequest.builder()
|
||||||
.bucket(bucket)
|
.bucket(bucket)
|
||||||
|
@ -232,7 +232,37 @@ public class BucketOperator {
|
||||||
return client.putObject(objectRequest, RequestBody.fromFile(file));
|
return client.putObject(objectRequest, RequestBody.fromFile(file));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param bucket
|
||||||
|
* @param key
|
||||||
|
* @param file
|
||||||
|
* @param replace
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static String putObject(String bucket, String key, File file, boolean replace) {
|
||||||
|
if(!replace) {
|
||||||
|
GetObjectRequest getObjectRequest = GetObjectRequest.builder()
|
||||||
|
.bucket(bucket)
|
||||||
|
.key(key)
|
||||||
|
.build();
|
||||||
|
try {
|
||||||
|
client.getObject(getObjectRequest).response();
|
||||||
|
|
||||||
|
}catch (NoSuchKeyException e) {
|
||||||
|
|
||||||
|
}
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
PutObjectRequest objectRequest = PutObjectRequest.builder()
|
||||||
|
.bucket(bucket)
|
||||||
|
.key(key)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
client.putObject(objectRequest, RequestBody.fromFile(file));
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|
|
@ -98,8 +98,9 @@ public class S3PluginManager extends TransportManager {
|
||||||
if (!BucketOperator.isBucket(s3, bucketName))
|
if (!BucketOperator.isBucket(s3, bucketName))
|
||||||
BucketOperator.createBucketWaiter(s3, bucketName, region);
|
BucketOperator.createBucketWaiter(s3, bucketName, region);
|
||||||
File file= new File(upload.getResource().getLocalPath());
|
File file= new File(upload.getResource().getLocalPath());
|
||||||
int hashcode=BucketOperator.getInstance(s3).putObject(bucketName, Utils.convertToS3Format(upload.getResource().getRemotePath()), file, upload.isReplaceOption()).hashCode();
|
// int hashcode=BucketOperator.getInstance(s3).putObject(bucketName, Utils.convertToS3Format(upload.getResource().getRemotePath()), file, upload.isReplaceOption()).hashCode();
|
||||||
return hashcode+"";
|
// return hashcode+"";
|
||||||
|
return BucketOperator.getInstance(s3).putObject(bucketName, Utils.convertToS3Format(upload.getResource().getRemotePath()), file, upload.isReplaceOption());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -252,3 +253,4 @@ public class S3PluginManager extends TransportManager {
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue