Merge pull request #499 from kumarks1122/release-5.0.1-cloud-storage-signedurlv2

Gloud signed url support changes added

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>

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) {

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));
   }
 }