Author: tomekr Date: Mon Aug 6 16:41:05 2018 New Revision: 1837542 URL: http://svn.apache.org/viewvc?rev=1837542&view=rev Log: OAK-6922: Azure support for the segment-tar
- ignore empty connection string Modified: jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreService.java jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/Configuration.java Modified: jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreService.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreService.java?rev=1837542&r1=1837541&r2=1837542&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreService.java (original) +++ jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreService.java Mon Aug 6 16:41:05 2018 @@ -36,7 +36,6 @@ import java.net.URISyntaxException; import java.security.InvalidKeyException; import java.util.Properties; - @Component( configurationPolicy = ConfigurationPolicy.REQUIRE, configurationPid = {Configuration.PID}) @@ -70,14 +69,14 @@ public class AzureSegmentStoreService { private static SegmentNodeStorePersistence createAzurePersistence(Configuration configuration) throws IOException { try { StringBuilder connectionString = new StringBuilder(); - if (configuration.connectionURL() != null && !configuration.connectionURL().isEmpty()) { - connectionString.append(configuration.connectionURL()); - } else { + if (configuration.connectionURL() == null || configuration.connectionURL().trim().isEmpty()) { connectionString.append("DefaultEndpointsProtocol=https;"); connectionString.append("AccountName=").append(configuration.accountName()).append(';'); connectionString.append("AccountKey=").append(configuration.accessKey()).append(';'); + } else { + connectionString.append(configuration.connectionURL()); } - log.info("Connection string: {}", connectionString.toString()); + log.info("Connection string: '{}'", connectionString.toString()); CloudStorageAccount cloud = CloudStorageAccount.parse(connectionString.toString()); CloudBlobContainer container = cloud.createCloudBlobClient().getContainerReference(configuration.containerName()); container.createIfNotExists(); Modified: jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/Configuration.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/Configuration.java?rev=1837542&r1=1837541&r2=1837542&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/Configuration.java (original) +++ jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/Configuration.java Mon Aug 6 16:41:05 2018 @@ -52,8 +52,8 @@ import static org.apache.jackrabbit.oak. String rootPath() default AzureSegmentStoreService.DEFAULT_ROOT_PATH; @AttributeDefinition( - name = "Azure connection URL (optional)", - description = "Connection URL to be used to connect to the Azure Storage. " + - "Setting it will override the accountName, containerName and accessKey properties.") + name = "Azure connection string (optional)", + description = "Connection string to be used to connect to the Azure Storage. " + + "Setting it will override the accountName and accessKey properties.") String connectionURL() default ""; } \ No newline at end of file