Compat with old build.xml files

jenkinsci · Nov 6, 2018 · f0ff86d · f0ff86d
1 parent 8500985
commit f0ff86d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/AzureBlobAction.java b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/AzureBlobAction.java
@@ -155,9 +155,9 @@ public void doProcessDownloadRequest(
     }
 
     private String generateSASURL(StorageAccountInfo storageAccountInfo, String fileName) throws Exception {
-        if (storageType.equalsIgnoreCase(Constants.BLOB_STORAGE)) {
+        if (getStorageType().equalsIgnoreCase(Constants.BLOB_STORAGE)) {
             return AzureUtils.generateBlobSASURL(storageAccountInfo, containerName, fileName);
-        } else if (storageType.equalsIgnoreCase(Constants.FILE_STORAGE)) {
+        } else if (getStorageType().equalsIgnoreCase(Constants.FILE_STORAGE)) {
             return AzureUtils.generateFileSASURL(storageAccountInfo, fileShareName, fileName);
         }
 
@@ -171,4 +171,11 @@ public boolean isAnonymousAccess(Authentication auth) {
     public Api getApi() {
         return new Api(this);
     }
+
+    public String getStorageType() {
+        if (Constants.FILE_STORAGE.equals(storageType)) {
+            return storageType;
+        }
+        return Constants.BLOB_STORAGE;
+    }
 }
diff --git a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/AzureStorageBuilder.java b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/AzureStorageBuilder.java
@@ -121,7 +121,7 @@ public void setIncludeArchiveZips(boolean includeArchiveZips) {
 
     @DataBoundSetter
     public void setContainerName(String containerName) {
-        if (downloadType.equals(DOWNLOAD_TYPE_CONTAINER)) {
+        if (getDownloadType().equals(DOWNLOAD_TYPE_CONTAINER)) {
             this.containerName = containerName;
         }
     }
@@ -133,14 +133,14 @@ public void setFileShare(String fileShare) {
 
     @DataBoundSetter
     public void setBuildSelector(BuildSelector buildSelector) {
-        if (downloadType.equals(DOWNLOAD_TYPE_PROJECT)) {
+        if (getDownloadType().equals(DOWNLOAD_TYPE_PROJECT)) {
             this.buildSelector = buildSelector;
         }
     }
 
     @DataBoundSetter
     public void setProjectName(String projectName) {
-        if (downloadType.equals(DOWNLOAD_TYPE_PROJECT)) {
+        if (getDownloadType().equals(DOWNLOAD_TYPE_PROJECT)) {
             this.projectName = projectName;
         }
     }
@@ -175,7 +175,10 @@ public String getStorageAccName(Item owner) {
     }
 
     public String getDownloadType() {
-        return downloadType;
+        if (DOWNLOAD_TYPE_FILE_SHARE.equals(downloadType) || DOWNLOAD_TYPE_PROJECT.equals(downloadType)) {
+            return downloadType;
+        }
+        return DOWNLOAD_TYPE_CONTAINER;
     }
 
     public String getContainerName() {
@@ -286,7 +289,7 @@ public synchronized void perform(
             builderServiceData.setFileShare(expShareName);
             builderServiceData.setFlattenDirectories(flattenDirectories);
             builderServiceData.setDeleteFromAzureAfterDownload(deleteFromAzureAfterDownload);
-            builderServiceData.setDownloadType(downloadType);
+            builderServiceData.setDownloadType(getDownloadType());
             builderServiceData.setProjectName(Util.replaceMacro(projectName, envVars));
             builderServiceData.setBuildSelector(buildSelector);
 
@@ -306,7 +309,7 @@ public synchronized void perform(
     }
 
     private StoragePluginService getDownloadService(DownloadServiceData data) {
-        switch (this.downloadType) {
+        switch (getDownloadType()) {
             case DOWNLOAD_TYPE_FILE_SHARE:
                 return new DownloadFromFileService(data);
             case DOWNLOAD_TYPE_PROJECT:

diff --git a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/WAStoragePublisher.java b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/WAStoragePublisher.java
@@ -440,7 +440,7 @@ public synchronized void perform(
                 if (existAction != null) {
                     existAction.getIndividualBlobs().addAll(individualBlobs);
                 } else {
-                    run.addAction(new AzureBlobAction(expContainerName, expShareName, storageType,
+                    run.addAction(new AzureBlobAction(expContainerName, expShareName, getStorageType(),
                             individualBlobs, zipArchiveBlob, allowAnonymousAccess,
                             getStorageCredentialId()));
                 }