diff --git a/course-mw/sunbird-util/sunbird-platform-core/common-util/pom.xml b/course-mw/sunbird-util/sunbird-platform-core/common-util/pom.xml index d42c3775964b5afaea8bad61404d22c4d61e647e..d4a6ddc3f251a894c25aaa1df11a9479a44abdcd 100644 --- a/course-mw/sunbird-util/sunbird-platform-core/common-util/pom.xml +++ b/course-mw/sunbird-util/sunbird-platform-core/common-util/pom.xml @@ -219,7 +219,7 @@ <dependency> <groupId>org.sunbird</groupId> <artifactId>cloud-store-sdk</artifactId> - <version>1.4.3</version> + <version>1.4.4</version> <exclusions> <exclusion> <groupId>com.sun.jersey</groupId> diff --git a/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/util/CloudStorageUtil.java b/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/util/CloudStorageUtil.java index 7455b612619e1f445361583916e1728e383a1e4c..288930091450d01cc9464f0cabec122a356e39fa 100644 --- a/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/util/CloudStorageUtil.java +++ b/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/util/CloudStorageUtil.java @@ -41,16 +41,8 @@ public class CloudStorageUtil { BaseStorageService storageService, String container, String objectKey, String cloudType) { - int timeoutInSeconds = getTimeoutInSeconds(); - String signUrl = ""; - if (JsonKey.GCP.equalsIgnoreCase(cloudType)) { - signUrl = storageService.getPutSignedURL(container, objectKey, Some.apply(getTimeoutInSeconds()), - Some.apply("r"), Some.apply("application/pdf")); - } else { - signUrl = storageService.getSignedURL( - container, objectKey, Some.apply(timeoutInSeconds), Some.apply("r")); - } - return signUrl; + return storageService.getSignedURLV2(container, objectKey, Some.apply(getTimeoutInSeconds()), + Some.apply("r"), Some.apply("application/pdf")); } private static BaseStorageService getStorageService(String storageType) { diff --git a/course-mw/sunbird-util/sunbird-platform-core/common-util/src/test/java/org/sunbird/common/util/CloudStorageUtilTest.java b/course-mw/sunbird-util/sunbird-platform-core/common-util/src/test/java/org/sunbird/common/util/CloudStorageUtilTest.java index 3eaac37b251c3f596750081ef8fa6d2f1cf49dcc..8cfc1f886c4c8ff76812d565567dc1ebf9d6291a 100644 --- a/course-mw/sunbird-util/sunbird-platform-core/common-util/src/test/java/org/sunbird/common/util/CloudStorageUtilTest.java +++ b/course-mw/sunbird-util/sunbird-platform-core/common-util/src/test/java/org/sunbird/common/util/CloudStorageUtilTest.java @@ -60,6 +60,20 @@ public class CloudStorageUtilTest { Mockito.any(Option.class), Mockito.any(Option.class))) .thenReturn(PUT_SIGNED_URL); + when(service.getSignedURLV2( + Mockito.eq("azurecontainer"), + Mockito.anyString(), + Mockito.any(Option.class), + Mockito.any(Option.class), + Mockito.any(Option.class))) + .thenReturn(SIGNED_URL); + when(service.getSignedURLV2( + Mockito.eq("gcpcontainer"), + Mockito.anyString(), + Mockito.any(Option.class), + Mockito.any(Option.class), + Mockito.any(Option.class))) + .thenReturn(PUT_SIGNED_URL); } catch (Exception e) { Assert.fail(e.getMessage()); @@ -75,13 +89,13 @@ public class CloudStorageUtilTest { @Test public void testGetSignedUrlSuccess() { - String signedUrl = CloudStorageUtil.getSignedUrl("azure", "container", "key"); + String signedUrl = CloudStorageUtil.getSignedUrl("azure", "azurecontainer", "key"); assertTrue(SIGNED_URL.equals(signedUrl)); } @Test public void testGetSignedUrlGCPSuccess() { - String signedUrl = CloudStorageUtil.getSignedUrl(JsonKey.GCP, "container", "key"); + String signedUrl = CloudStorageUtil.getSignedUrl(JsonKey.GCP, "gcpcontainer", "key"); assertTrue(PUT_SIGNED_URL.equals(signedUrl)); } }