From e2281aff41ee137fadc58254c62f37ac13b1dfbc Mon Sep 17 00:00:00 2001 From: roberto cirillo Date: Fri, 8 Jan 2021 17:20:17 +0100 Subject: [PATCH] clean code --- pom.xml | 31 ++----------------- .../transport/plugin/S3PluginManager.java | 9 ------ 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index 901fed3..5abec8e 100644 --- a/pom.xml +++ b/pom.xml @@ -27,43 +27,16 @@ org.gcube.contentmanagement storage-manager-wrapper - [2.5.3-SNAPSHOT, 3.0.0-SNAPSHOT) + [3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT) org.gcube.contentmanagement storage-manager-core - [2.10.0-SNAPSHOT, 3.0.0-SNAPSHOT) + [3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT) - - - - - - - - - - - - - - - - - - - software.amazon.awssdk s3 - - - - - - - - \ No newline at end of file diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/plugin/S3PluginManager.java b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/plugin/S3PluginManager.java index 86c6d23..9e87b7c 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/plugin/S3PluginManager.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/plugin/S3PluginManager.java @@ -42,13 +42,6 @@ public class S3PluginManager extends TransportManager { S3Client s3; private Logger logger = LoggerFactory.getLogger(S3PluginManager.class); -// -//// THE FOLLOWING FIELDS SHOULD BE RETRIEVED FROM SERVICEENDPOINT -// static final String ACCESS_KEY="UXMKEBMZBDROS5K9HREG"; -// static final String SECRET_ACCESS_KEY="0Mqu8gmzcZ09wuqqKZwNmuS5bYC549MlZhvfgv6W"; -// Region region = Region.EU_NORTH_1; -//// final String END_POINT = "https://s3.wasabisys.com"; -// static String bucket="g3-test1data"; // gcube-test;//"gcube-home-test-access"; private Region region; private String token; @@ -98,8 +91,6 @@ public class S3PluginManager extends TransportManager { if (!BucketOperator.isBucket(s3, bucketName)) BucketOperator.createBucketWaiter(s3, bucketName, region); File file= new File(upload.getResource().getLocalPath()); -// int hashcode=BucketOperator.getInstance(s3).putObject(bucketName, Utils.convertToS3Format(upload.getResource().getRemotePath()), file, upload.isReplaceOption()).hashCode(); -// return hashcode+""; return BucketOperator.getInstance(s3).putObject(bucketName, Utils.convertToS3Format(upload.getResource().getRemotePath()), file, upload.isReplaceOption()); }