svn commit: r1862113 - in /jackrabbit/oak/trunk/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage: AzureBlobStoreBackend.java AzureConstants.java

[tomekr]

Author: tomekr
Date: Wed Jun 26 09:12:20 2019
New Revision: 1862113

URL: http://svn.apache.org/viewvc?rev=1862113&view=rev
Log:
OAK-8438: Allow not to create blob container in AzureDataStore

Modified:
    
jackrabbit/oak/trunk/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java
    
jackrabbit/oak/trunk/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureConstants.java

Modified: 
jackrabbit/oak/trunk/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java?rev=1862113&r1=1862112&r2=1862113&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java
 Wed Jun 26 09:12:20 2019
@@ -113,6 +113,7 @@ public class AzureBlobStoreBackend exten
     private Integer requestTimeout;
     private int httpDownloadURIExpirySeconds = 0; // disabled by default
     private int httpUploadURIExpirySeconds = 0; // disabled by default
+    private boolean createBlobContainer = true;
 
     private Cache<DataIdentifier, URI> httpDownloadURICache;
 
@@ -154,6 +155,7 @@ public class AzureBlobStoreBackend exten
             try {
                 Utils.setProxyIfNeeded(properties);
                 containerName = (String) 
properties.get(AzureConstants.AZURE_BLOB_CONTAINER_NAME);
+                createBlobContainer = 
PropertiesUtil.toBoolean(AzureConstants.AZURE_CREATE_CONTAINER, true);
                 connectionString = 
Utils.getConnectionStringFromProperties(properties);
                 concurrentRequestCount = 
PropertiesUtil.toInteger(properties.get(AzureConstants.AZURE_BLOB_CONCURRENT_REQUESTS_PER_OPERATION),
 1);
                 LOG.info("Using concurrentRequestsPerOperation={}", 
concurrentRequestCount);
@@ -164,7 +166,7 @@ public class AzureBlobStoreBackend exten
 
                 CloudBlobContainer azureContainer = getAzureContainer();
 
-                if (azureContainer.createIfNotExists()) {
+                if (createBlobContainer && azureContainer.createIfNotExists()) 
{
                     LOG.info("New container created. containerName={}", 
containerName);
                 } else {
                     LOG.info("Reusing existing container. containerName={}", 
containerName);

Modified: 
jackrabbit/oak/trunk/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureConstants.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureConstants.java?rev=1862113&r1=1862112&r2=1862113&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureConstants.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureConstants.java
 Wed Jun 26 09:12:20 2019
@@ -51,6 +51,11 @@ public final class AzureConstants {
     public static final String AZURE_BLOB_CONTAINER_NAME = "container";
 
     /**
+     * Azure create container if doesn't exist
+     */
+    public static final String AZURE_CREATE_CONTAINER = "azureCreateContainer";
+
+    /**
      * Azure blob storage request timeout
      */
     public static final String AZURE_BLOB_REQUEST_TIMEOUT = "socketTimeout";