From bbcc073e2ee62562806dc61bf0b148df0428321b Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Mon, 28 Nov 2011 11:54:56 -0800 Subject: [PATCH 1/5] Changing maven config to target version 1.6 --- microsoft-azure-api/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/microsoft-azure-api/pom.xml b/microsoft-azure-api/pom.xml index 29cefdc5b0b4a..39842eb617425 100644 --- a/microsoft-azure-api/pom.xml +++ b/microsoft-azure-api/pom.xml @@ -76,6 +76,14 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + org.jvnet.jaxb2.maven2 maven-jaxb2-plugin From 851fa093c037fdf0bc6e4b7221473e07deb952b0 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Mon, 28 Nov 2011 11:58:29 -0800 Subject: [PATCH 2/5] Rename ".common" to ".services.core" --- .../windowsazure/services/blob/BlobContract.java | 4 ++-- .../windowsazure/services/blob/BlobService.java | 6 +++--- .../microsoft/windowsazure/services/blob/Exports.java | 2 +- .../blob/implementation/BlobExceptionProcessor.java | 4 ++-- .../services/blob/implementation/BlobRestProxy.java | 4 ++-- .../{common => services/core}/Builder.java | 2 +- .../{common => services/core}/Configuration.java | 2 +- .../core}/ConfigurationException.java | 2 +- .../{common => services/core}/DefaultBuilder.java | 2 +- .../core}/ExponentialRetryPolicy.java | 4 ++-- .../{common => services/core}/FilterableService.java | 2 +- .../{common => services/core}/RetryPolicy.java | 4 ++-- .../{common => services/core}/RetryPolicyFilter.java | 2 +- .../{common => services/core}/ServiceException.java | 2 +- .../{common => services/core}/ServiceFilter.java | 2 +- .../microsoft/windowsazure/services/queue/Exports.java | 2 +- .../windowsazure/services/queue/QueueContract.java | 4 ++-- .../windowsazure/services/queue/QueueService.java | 6 +++--- .../queue/implementation/QueueExceptionProcessor.java | 4 ++-- .../services/queue/implementation/QueueRestProxy.java | 4 ++-- .../windowsazure/services/serviceBus/Exports.java | 2 +- .../services/serviceBus/ServiceBusConfiguration.java | 2 +- .../services/serviceBus/ServiceBusContract.java | 4 ++-- .../services/serviceBus/ServiceBusService.java | 2 +- .../windowsazure/services/serviceBus/Util.java | 2 +- .../services/serviceBus/implementation/Exports.java | 2 +- .../implementation/ServiceBusExceptionProcessor.java | 4 ++-- .../serviceBus/implementation/ServiceBusRestProxy.java | 4 ++-- .../serviceBus/implementation/WrapContract.java | 2 +- .../services/serviceBus/implementation/WrapFilter.java | 2 +- .../serviceBus/implementation/WrapRestProxy.java | 2 +- .../serviceBus/implementation/WrapTokenManager.java | 2 +- .../java/com/microsoft/windowsazure/utils/Exports.java | 2 +- .../windowsazure/utils/ServiceExceptionFactory.java | 2 +- .../windowsazure/utils/jersey/ClientFilterAdapter.java | 6 +++--- .../microsoft/windowsazure/utils/jersey/Exports.java | 4 ++-- .../builder/AlterClassWithProperties.java | 2 +- .../configuration/builder/DefaultBuilderTest.java | 2 +- .../services/blob/BlobServiceIntegrationTest.java | 10 +++++----- .../services/blob/IntegrationTestBase.java | 2 +- .../services/queue/IntegrationTestBase.java | 2 +- .../services/queue/QueueServiceIntegrationTest.java | 2 +- .../serviceBus/ServiceBusConfigurationTest.java | 2 +- .../services/serviceBus/ServiceBusCreationTest.java | 2 +- .../services/serviceBus/ServiceBusIntegrationTest.java | 8 ++++---- .../implementation/WrapRestProxyIntegrationTest.java | 2 +- .../WrapTokenManagerIntegrationTest.java | 2 +- .../implementation/WrapTokenManagerTest.java | 2 +- .../utils/ServiceExceptionFactoryTest.java | 2 +- 49 files changed, 74 insertions(+), 74 deletions(-) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{common => services/core}/Builder.java (93%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{common => services/core}/Configuration.java (98%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{common => services/core}/ConfigurationException.java (90%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{common => services/core}/DefaultBuilder.java (99%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{common => services/core}/ExponentialRetryPolicy.java (94%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{common => services/core}/FilterableService.java (62%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{common => services/core}/RetryPolicy.java (79%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{common => services/core}/RetryPolicyFilter.java (97%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{common => services/core}/ServiceException.java (98%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{common => services/core}/ServiceFilter.java (95%) diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobContract.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobContract.java index e34ad58ce00ec..9aead4567bc7f 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobContract.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobContract.java @@ -3,8 +3,6 @@ import java.io.InputStream; import java.util.HashMap; -import com.microsoft.windowsazure.common.FilterableService; -import com.microsoft.windowsazure.common.ServiceException; import com.microsoft.windowsazure.services.blob.models.AcquireLeaseOptions; import com.microsoft.windowsazure.services.blob.models.AcquireLeaseResult; import com.microsoft.windowsazure.services.blob.models.BlobServiceOptions; @@ -45,6 +43,8 @@ import com.microsoft.windowsazure.services.blob.models.SetBlobPropertiesOptions; import com.microsoft.windowsazure.services.blob.models.SetBlobPropertiesResult; import com.microsoft.windowsazure.services.blob.models.SetContainerMetadataOptions; +import com.microsoft.windowsazure.services.core.FilterableService; +import com.microsoft.windowsazure.services.core.ServiceException; public interface BlobContract extends FilterableService { GetServicePropertiesResult getServiceProperties() throws ServiceException; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobService.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobService.java index b5b68aa4f2715..76ca645dbcb3e 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobService.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobService.java @@ -5,9 +5,6 @@ import javax.inject.Inject; -import com.microsoft.windowsazure.common.Configuration; -import com.microsoft.windowsazure.common.ServiceException; -import com.microsoft.windowsazure.common.ServiceFilter; import com.microsoft.windowsazure.services.blob.models.AcquireLeaseOptions; import com.microsoft.windowsazure.services.blob.models.AcquireLeaseResult; import com.microsoft.windowsazure.services.blob.models.BlobServiceOptions; @@ -48,6 +45,9 @@ import com.microsoft.windowsazure.services.blob.models.SetBlobPropertiesOptions; import com.microsoft.windowsazure.services.blob.models.SetBlobPropertiesResult; import com.microsoft.windowsazure.services.blob.models.SetContainerMetadataOptions; +import com.microsoft.windowsazure.services.core.Configuration; +import com.microsoft.windowsazure.services.core.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceFilter; public class BlobService implements BlobContract { final BlobContract next; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/Exports.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/Exports.java index 8238988aedb25..0012e70497d92 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/Exports.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/Exports.java @@ -1,10 +1,10 @@ package com.microsoft.windowsazure.services.blob; -import com.microsoft.windowsazure.common.Builder; import com.microsoft.windowsazure.services.blob.implementation.BlobExceptionProcessor; import com.microsoft.windowsazure.services.blob.implementation.BlobRestProxy; import com.microsoft.windowsazure.services.blob.implementation.SharedKeyFilter; import com.microsoft.windowsazure.services.blob.implementation.SharedKeyLiteFilter; +import com.microsoft.windowsazure.services.core.Builder; public class Exports implements Builder.Exports { public void register(Builder.Registry registry) { diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobExceptionProcessor.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobExceptionProcessor.java index b0f630844a79e..9d93d37138f01 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobExceptionProcessor.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobExceptionProcessor.java @@ -8,8 +8,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.microsoft.windowsazure.common.ServiceException; -import com.microsoft.windowsazure.common.ServiceFilter; import com.microsoft.windowsazure.services.blob.BlobContract; import com.microsoft.windowsazure.services.blob.models.AcquireLeaseOptions; import com.microsoft.windowsazure.services.blob.models.AcquireLeaseResult; @@ -51,6 +49,8 @@ import com.microsoft.windowsazure.services.blob.models.SetBlobPropertiesOptions; import com.microsoft.windowsazure.services.blob.models.SetBlobPropertiesResult; import com.microsoft.windowsazure.services.blob.models.SetContainerMetadataOptions; +import com.microsoft.windowsazure.services.core.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceFilter; import com.microsoft.windowsazure.utils.ServiceExceptionFactory; import com.sun.jersey.api.client.ClientHandlerException; import com.sun.jersey.api.client.UniformInterfaceException; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobRestProxy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobRestProxy.java index bc522234f974a..93f010524c7e4 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobRestProxy.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobRestProxy.java @@ -8,8 +8,6 @@ import javax.inject.Inject; import javax.inject.Named; -import com.microsoft.windowsazure.common.ServiceException; -import com.microsoft.windowsazure.common.ServiceFilter; import com.microsoft.windowsazure.services.blob.BlobConfiguration; import com.microsoft.windowsazure.services.blob.BlobContract; import com.microsoft.windowsazure.services.blob.models.AccessCondition; @@ -55,6 +53,8 @@ import com.microsoft.windowsazure.services.blob.models.SetBlobPropertiesOptions; import com.microsoft.windowsazure.services.blob.models.SetBlobPropertiesResult; import com.microsoft.windowsazure.services.blob.models.SetContainerMetadataOptions; +import com.microsoft.windowsazure.services.core.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceFilter; import com.microsoft.windowsazure.utils.jersey.ClientFilterAdapter; import com.microsoft.windowsazure.utils.jersey.HttpURLConnectionClient; import com.microsoft.windowsazure.utils.jersey.JerseyHelpers; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/Builder.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/Builder.java similarity index 93% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/Builder.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/Builder.java index 4fe8de2011e5c..487efc61dca4a 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/Builder.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/Builder.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.common; +package com.microsoft.windowsazure.services.core; import java.util.Map; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/Configuration.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/Configuration.java similarity index 98% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/Configuration.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/Configuration.java index 323a0c6f44d8a..5080e89484308 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/Configuration.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/Configuration.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.common; +package com.microsoft.windowsazure.services.core; import java.io.IOException; import java.io.InputStream; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/ConfigurationException.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ConfigurationException.java similarity index 90% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/ConfigurationException.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ConfigurationException.java index b21d4b5147ad6..b97325d27d0e2 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/ConfigurationException.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ConfigurationException.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.common; +package com.microsoft.windowsazure.services.core; public class ConfigurationException extends RuntimeException { diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/DefaultBuilder.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/DefaultBuilder.java similarity index 99% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/DefaultBuilder.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/DefaultBuilder.java index 5d65f4f8170a3..3cbc1e340bf01 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/DefaultBuilder.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/DefaultBuilder.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.common; +package com.microsoft.windowsazure.services.core; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/ExponentialRetryPolicy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ExponentialRetryPolicy.java similarity index 94% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/ExponentialRetryPolicy.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ExponentialRetryPolicy.java index ba6f5722efd8a..56aa4c59fb7c3 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/ExponentialRetryPolicy.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ExponentialRetryPolicy.java @@ -1,9 +1,9 @@ -package com.microsoft.windowsazure.common; +package com.microsoft.windowsazure.services.core; import java.util.Arrays; import java.util.Random; -import com.microsoft.windowsazure.common.ServiceFilter.Response; +import com.microsoft.windowsazure.services.core.ServiceFilter.Response; public class ExponentialRetryPolicy extends RetryPolicy { private final int deltaBackoffIntervalInMs; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/FilterableService.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/FilterableService.java similarity index 62% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/FilterableService.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/FilterableService.java index d60ce20225bf0..673139986edb1 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/FilterableService.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/FilterableService.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.common; +package com.microsoft.windowsazure.services.core; public interface FilterableService { diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/RetryPolicy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RetryPolicy.java similarity index 79% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/RetryPolicy.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RetryPolicy.java index c8d1fdee04742..4731f6700bea2 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/RetryPolicy.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RetryPolicy.java @@ -1,6 +1,6 @@ -package com.microsoft.windowsazure.common; +package com.microsoft.windowsazure.services.core; -import com.microsoft.windowsazure.common.ServiceFilter.Response; +import com.microsoft.windowsazure.services.core.ServiceFilter.Response; public abstract class RetryPolicy { public static final int DEFAULT_CLIENT_BACKOFF = 1000 * 30; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/RetryPolicyFilter.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RetryPolicyFilter.java similarity index 97% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/RetryPolicyFilter.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RetryPolicyFilter.java index a4f63de45e533..0824852e2d0c8 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/RetryPolicyFilter.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RetryPolicyFilter.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.common; +package com.microsoft.windowsazure.services.core; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/ServiceException.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ServiceException.java similarity index 98% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/ServiceException.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ServiceException.java index ed0518534fbc0..487e73fe6bd55 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/ServiceException.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ServiceException.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.common; +package com.microsoft.windowsazure.services.core; import java.util.HashMap; import java.util.Map; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/ServiceFilter.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ServiceFilter.java similarity index 95% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/ServiceFilter.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ServiceFilter.java index 5538d7be6ddba..5b5de010eb791 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/common/ServiceFilter.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ServiceFilter.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.common; +package com.microsoft.windowsazure.services.core; import java.io.InputStream; import java.net.URI; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/Exports.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/Exports.java index a86d091f21aa9..c460c56b12d7d 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/Exports.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/Exports.java @@ -1,6 +1,6 @@ package com.microsoft.windowsazure.services.queue; -import com.microsoft.windowsazure.common.Builder; +import com.microsoft.windowsazure.services.core.Builder; import com.microsoft.windowsazure.services.queue.implementation.QueueExceptionProcessor; import com.microsoft.windowsazure.services.queue.implementation.QueueRestProxy; import com.microsoft.windowsazure.services.queue.implementation.SharedKeyFilter; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueContract.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueContract.java index 6ac72ebc2ff9b..615245ac6075f 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueContract.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueContract.java @@ -2,8 +2,8 @@ import java.util.HashMap; -import com.microsoft.windowsazure.common.FilterableService; -import com.microsoft.windowsazure.common.ServiceException; +import com.microsoft.windowsazure.services.core.FilterableService; +import com.microsoft.windowsazure.services.core.ServiceException; import com.microsoft.windowsazure.services.queue.models.CreateMessageOptions; import com.microsoft.windowsazure.services.queue.models.CreateQueueOptions; import com.microsoft.windowsazure.services.queue.models.GetQueueMetadataResult; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueService.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueService.java index 8767bd9c03716..fb2b697b207d6 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueService.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueService.java @@ -4,9 +4,9 @@ import javax.inject.Inject; -import com.microsoft.windowsazure.common.Configuration; -import com.microsoft.windowsazure.common.ServiceException; -import com.microsoft.windowsazure.common.ServiceFilter; +import com.microsoft.windowsazure.services.core.Configuration; +import com.microsoft.windowsazure.services.core.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceFilter; import com.microsoft.windowsazure.services.queue.models.CreateMessageOptions; import com.microsoft.windowsazure.services.queue.models.CreateQueueOptions; import com.microsoft.windowsazure.services.queue.models.GetQueueMetadataResult; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueExceptionProcessor.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueExceptionProcessor.java index a81a34e76296e..c0bfa50890d5a 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueExceptionProcessor.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueExceptionProcessor.java @@ -7,8 +7,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.microsoft.windowsazure.common.ServiceException; -import com.microsoft.windowsazure.common.ServiceFilter; +import com.microsoft.windowsazure.services.core.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceFilter; import com.microsoft.windowsazure.services.queue.QueueContract; import com.microsoft.windowsazure.services.queue.models.CreateMessageOptions; import com.microsoft.windowsazure.services.queue.models.CreateQueueOptions; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueRestProxy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueRestProxy.java index 76c004da179d7..3b34b99e44bea 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueRestProxy.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueRestProxy.java @@ -7,9 +7,9 @@ import javax.inject.Inject; import javax.inject.Named; -import com.microsoft.windowsazure.common.ServiceException; -import com.microsoft.windowsazure.common.ServiceFilter; import com.microsoft.windowsazure.services.blob.implementation.RFC1123DateConverter; +import com.microsoft.windowsazure.services.core.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceFilter; import com.microsoft.windowsazure.services.queue.QueueConfiguration; import com.microsoft.windowsazure.services.queue.QueueContract; import com.microsoft.windowsazure.services.queue.models.CreateMessageOptions; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Exports.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Exports.java index 375f565c6e030..532fcedffb177 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Exports.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Exports.java @@ -2,7 +2,7 @@ import java.util.Map; -import com.microsoft.windowsazure.common.Builder; +import com.microsoft.windowsazure.services.core.Builder; import com.microsoft.windowsazure.services.serviceBus.implementation.BrokerPropertiesMapper; import com.microsoft.windowsazure.services.serviceBus.implementation.EntryModelProvider; import com.microsoft.windowsazure.services.serviceBus.implementation.MarshallerProvider; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusConfiguration.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusConfiguration.java index cf1f3877a26bd..f714875cf78cf 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusConfiguration.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusConfiguration.java @@ -1,6 +1,6 @@ package com.microsoft.windowsazure.services.serviceBus; -import com.microsoft.windowsazure.common.Configuration; +import com.microsoft.windowsazure.services.core.Configuration; /** * Provides functionality to create a service bus configuration. diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusContract.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusContract.java index 24dd540529b64..a432480f413c6 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusContract.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusContract.java @@ -1,7 +1,7 @@ package com.microsoft.windowsazure.services.serviceBus; -import com.microsoft.windowsazure.common.FilterableService; -import com.microsoft.windowsazure.common.ServiceException; +import com.microsoft.windowsazure.services.core.FilterableService; +import com.microsoft.windowsazure.services.core.ServiceException; import com.microsoft.windowsazure.services.serviceBus.models.BrokeredMessage; import com.microsoft.windowsazure.services.serviceBus.models.CreateQueueResult; import com.microsoft.windowsazure.services.serviceBus.models.CreateRuleResult; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusService.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusService.java index 3569050fc3e0d..1ae1e8437b3a6 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusService.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusService.java @@ -1,6 +1,6 @@ package com.microsoft.windowsazure.services.serviceBus; -import com.microsoft.windowsazure.common.Configuration; +import com.microsoft.windowsazure.services.core.Configuration; /** * diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Util.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Util.java index 321e5948cc31f..9183a3d84e8b5 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Util.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Util.java @@ -1,6 +1,6 @@ package com.microsoft.windowsazure.services.serviceBus; -import com.microsoft.windowsazure.common.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceException; import com.microsoft.windowsazure.services.serviceBus.models.QueueInfo; import com.microsoft.windowsazure.services.serviceBus.models.TopicInfo; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/Exports.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/Exports.java index 00ae004267fe5..170d0832825a1 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/Exports.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/Exports.java @@ -1,6 +1,6 @@ package com.microsoft.windowsazure.services.serviceBus.implementation; -import com.microsoft.windowsazure.common.Builder; +import com.microsoft.windowsazure.services.core.Builder; public class Exports implements Builder.Exports { diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusExceptionProcessor.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusExceptionProcessor.java index e3938f664a108..2705ed461614a 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusExceptionProcessor.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusExceptionProcessor.java @@ -5,8 +5,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.microsoft.windowsazure.common.ServiceException; -import com.microsoft.windowsazure.common.ServiceFilter; +import com.microsoft.windowsazure.services.core.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceFilter; import com.microsoft.windowsazure.services.serviceBus.ServiceBusContract; import com.microsoft.windowsazure.services.serviceBus.models.BrokeredMessage; import com.microsoft.windowsazure.services.serviceBus.models.CreateQueueResult; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusRestProxy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusRestProxy.java index 30a8a0390997e..c06336160a0aa 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusRestProxy.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusRestProxy.java @@ -12,8 +12,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.microsoft.windowsazure.common.ServiceException; -import com.microsoft.windowsazure.common.ServiceFilter; +import com.microsoft.windowsazure.services.core.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceFilter; import com.microsoft.windowsazure.services.serviceBus.ServiceBusContract; import com.microsoft.windowsazure.services.serviceBus.models.AbstractListOptions; import com.microsoft.windowsazure.services.serviceBus.models.BrokeredMessage; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapContract.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapContract.java index 8b46999949f2a..ba57840a73474 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapContract.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapContract.java @@ -1,6 +1,6 @@ package com.microsoft.windowsazure.services.serviceBus.implementation; -import com.microsoft.windowsazure.common.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceException; public interface WrapContract { WrapAccessTokenResult wrapAccessToken(String uri, String name, String password, String scope) diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapFilter.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapFilter.java index cc6054c021d93..00683e93f2307 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapFilter.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapFilter.java @@ -1,6 +1,6 @@ package com.microsoft.windowsazure.services.serviceBus.implementation; -import com.microsoft.windowsazure.common.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceException; import com.sun.jersey.api.client.ClientHandlerException; import com.sun.jersey.api.client.ClientRequest; import com.sun.jersey.api.client.ClientResponse; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxy.java index c4a5262c43585..462c1b409ee34 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxy.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxy.java @@ -6,7 +6,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.microsoft.windowsazure.common.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceException; import com.microsoft.windowsazure.utils.ServiceExceptionFactory; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.UniformInterfaceException; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManager.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManager.java index 2e0ad35343a45..28bd3f78b4c69 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManager.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManager.java @@ -6,7 +6,7 @@ import javax.inject.Named; import javax.management.timer.Timer; -import com.microsoft.windowsazure.common.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceException; import com.microsoft.windowsazure.utils.DateFactory; public class WrapTokenManager { diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/Exports.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/Exports.java index a18deb52bd4ae..7face53bfb103 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/Exports.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/Exports.java @@ -1,6 +1,6 @@ package com.microsoft.windowsazure.utils; -import com.microsoft.windowsazure.common.Builder; +import com.microsoft.windowsazure.services.core.Builder; public class Exports implements Builder.Exports { public void register(Builder.Registry registry) { diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/ServiceExceptionFactory.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/ServiceExceptionFactory.java index 51b8eec3a23a7..840182f440f2b 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/ServiceExceptionFactory.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/ServiceExceptionFactory.java @@ -1,6 +1,6 @@ package com.microsoft.windowsazure.utils; -import com.microsoft.windowsazure.common.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceException; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; import com.sun.jersey.api.client.UniformInterfaceException; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/ClientFilterAdapter.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/ClientFilterAdapter.java index 60706db8a584b..b27261b10835d 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/ClientFilterAdapter.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/ClientFilterAdapter.java @@ -6,9 +6,9 @@ import javax.ws.rs.core.MultivaluedMap; -import com.microsoft.windowsazure.common.ServiceFilter; -import com.microsoft.windowsazure.common.ServiceFilter.Request; -import com.microsoft.windowsazure.common.ServiceFilter.Response; +import com.microsoft.windowsazure.services.core.ServiceFilter; +import com.microsoft.windowsazure.services.core.ServiceFilter.Request; +import com.microsoft.windowsazure.services.core.ServiceFilter.Response; import com.sun.jersey.api.client.ClientHandlerException; import com.sun.jersey.api.client.ClientRequest; import com.sun.jersey.api.client.ClientResponse; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/Exports.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/Exports.java index 004a9dde17e8f..85d231989caf6 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/Exports.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/Exports.java @@ -3,8 +3,8 @@ import java.util.Map; import java.util.Map.Entry; -import com.microsoft.windowsazure.common.Builder; -import com.microsoft.windowsazure.common.Builder.Registry; +import com.microsoft.windowsazure.services.core.Builder; +import com.microsoft.windowsazure.services.core.Builder.Registry; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.config.ClientConfig; import com.sun.jersey.api.client.config.DefaultClientConfig; diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/configuration/builder/AlterClassWithProperties.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/configuration/builder/AlterClassWithProperties.java index 5a85851c8308d..cf4e3e4bac6d6 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/configuration/builder/AlterClassWithProperties.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/configuration/builder/AlterClassWithProperties.java @@ -2,7 +2,7 @@ import java.util.Map; -import com.microsoft.windowsazure.common.Builder; +import com.microsoft.windowsazure.services.core.Builder; public class AlterClassWithProperties implements Builder.Alteration { diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/configuration/builder/DefaultBuilderTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/configuration/builder/DefaultBuilderTest.java index ec629888f0713..dda2c4ca45e04 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/configuration/builder/DefaultBuilderTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/configuration/builder/DefaultBuilderTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; -import com.microsoft.windowsazure.common.DefaultBuilder; +import com.microsoft.windowsazure.services.core.DefaultBuilder; public class DefaultBuilderTest { diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/blob/BlobServiceIntegrationTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/blob/BlobServiceIntegrationTest.java index 89288c84eb78f..02d2b0389093f 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/blob/BlobServiceIntegrationTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/blob/BlobServiceIntegrationTest.java @@ -23,11 +23,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.microsoft.windowsazure.common.Configuration; -import com.microsoft.windowsazure.common.ExponentialRetryPolicy; -import com.microsoft.windowsazure.common.RetryPolicyFilter; -import com.microsoft.windowsazure.common.ServiceException; -import com.microsoft.windowsazure.common.ServiceFilter; import com.microsoft.windowsazure.services.blob.models.AccessCondition; import com.microsoft.windowsazure.services.blob.models.BlobProperties; import com.microsoft.windowsazure.services.blob.models.BlockList; @@ -57,6 +52,11 @@ import com.microsoft.windowsazure.services.blob.models.SetBlobMetadataResult; import com.microsoft.windowsazure.services.blob.models.SetBlobPropertiesOptions; import com.microsoft.windowsazure.services.blob.models.SetBlobPropertiesResult; +import com.microsoft.windowsazure.services.core.Configuration; +import com.microsoft.windowsazure.services.core.ExponentialRetryPolicy; +import com.microsoft.windowsazure.services.core.RetryPolicyFilter; +import com.microsoft.windowsazure.services.core.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceFilter; public class BlobServiceIntegrationTest extends IntegrationTestBase { private static final String testContainersPrefix = "sdktest-"; diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/blob/IntegrationTestBase.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/blob/IntegrationTestBase.java index 7d552254ecde7..39dc038410a31 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/blob/IntegrationTestBase.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/blob/IntegrationTestBase.java @@ -5,7 +5,7 @@ import org.junit.Before; import org.junit.BeforeClass; -import com.microsoft.windowsazure.common.Configuration; +import com.microsoft.windowsazure.services.core.Configuration; public abstract class IntegrationTestBase { protected static Configuration createConfiguration() { diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/queue/IntegrationTestBase.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/queue/IntegrationTestBase.java index 0154fda420244..7f055859a616d 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/queue/IntegrationTestBase.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/queue/IntegrationTestBase.java @@ -5,7 +5,7 @@ import org.junit.Before; import org.junit.BeforeClass; -import com.microsoft.windowsazure.common.Configuration; +import com.microsoft.windowsazure.services.core.Configuration; public abstract class IntegrationTestBase { protected static Configuration createConfiguration() { diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/queue/QueueServiceIntegrationTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/queue/QueueServiceIntegrationTest.java index 447acf7bafe30..8301ddab56e43 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/queue/QueueServiceIntegrationTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/queue/QueueServiceIntegrationTest.java @@ -13,7 +13,7 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.microsoft.windowsazure.common.Configuration; +import com.microsoft.windowsazure.services.core.Configuration; import com.microsoft.windowsazure.services.queue.models.CreateQueueOptions; import com.microsoft.windowsazure.services.queue.models.GetQueueMetadataResult; import com.microsoft.windowsazure.services.queue.models.ListMessagesOptions; diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusConfigurationTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusConfigurationTest.java index 32546aeb201ad..3be67b31ece10 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusConfigurationTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusConfigurationTest.java @@ -4,7 +4,7 @@ import org.junit.Test; -import com.microsoft.windowsazure.common.Configuration; +import com.microsoft.windowsazure.services.core.Configuration; import com.microsoft.windowsazure.services.serviceBus.ServiceBusConfiguration; public class ServiceBusConfigurationTest { diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusCreationTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusCreationTest.java index 05fe729f3e1a4..e31cf1db576ab 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusCreationTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusCreationTest.java @@ -4,7 +4,7 @@ import org.junit.Test; -import com.microsoft.windowsazure.common.Configuration; +import com.microsoft.windowsazure.services.core.Configuration; public class ServiceBusCreationTest { @Test diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusIntegrationTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusIntegrationTest.java index 2d1b232bb9b2f..7a09bcc66bb56 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusIntegrationTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusIntegrationTest.java @@ -10,10 +10,10 @@ import org.junit.Before; import org.junit.Test; -import com.microsoft.windowsazure.common.ServiceException; -import com.microsoft.windowsazure.common.ServiceFilter; -import com.microsoft.windowsazure.common.ServiceFilter.Request; -import com.microsoft.windowsazure.common.ServiceFilter.Response; +import com.microsoft.windowsazure.services.core.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceFilter; +import com.microsoft.windowsazure.services.core.ServiceFilter.Request; +import com.microsoft.windowsazure.services.core.ServiceFilter.Response; import com.microsoft.windowsazure.services.serviceBus.models.BrokeredMessage; import com.microsoft.windowsazure.services.serviceBus.models.ListQueuesResult; import com.microsoft.windowsazure.services.serviceBus.models.ListRulesResult; diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxyIntegrationTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxyIntegrationTest.java index 3248d743e147c..03efe51854d76 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxyIntegrationTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxyIntegrationTest.java @@ -4,7 +4,7 @@ import org.junit.Test; -import com.microsoft.windowsazure.common.Configuration; +import com.microsoft.windowsazure.services.core.Configuration; import com.microsoft.windowsazure.services.serviceBus.ServiceBusConfiguration; import com.sun.jersey.api.client.Client; diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManagerIntegrationTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManagerIntegrationTest.java index 8c2420b8cc9f5..f5ade3677e5cb 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManagerIntegrationTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManagerIntegrationTest.java @@ -4,7 +4,7 @@ import org.junit.Test; -import com.microsoft.windowsazure.common.Configuration; +import com.microsoft.windowsazure.services.core.Configuration; public class WrapTokenManagerIntegrationTest { @Test diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManagerTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManagerTest.java index c7c30e602bef4..0864f7ac64180 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManagerTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManagerTest.java @@ -12,7 +12,7 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import com.microsoft.windowsazure.common.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceException; import com.microsoft.windowsazure.utils.DateFactory; public class WrapTokenManagerTest { diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/utils/ServiceExceptionFactoryTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/utils/ServiceExceptionFactoryTest.java index f561b553362fb..97a7f2645dc15 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/utils/ServiceExceptionFactoryTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/utils/ServiceExceptionFactoryTest.java @@ -6,7 +6,7 @@ import org.junit.Test; -import com.microsoft.windowsazure.common.ServiceException; +import com.microsoft.windowsazure.services.core.ServiceException; import com.microsoft.windowsazure.utils.ServiceExceptionFactory; import com.sun.jersey.api.client.ClientHandlerException; import com.sun.jersey.api.client.ClientResponse; From 0704189b261ecb24cfcd0726d784dd1f8dfa2ba0 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Mon, 28 Nov 2011 12:00:04 -0800 Subject: [PATCH 3/5] Rename ".utils" to ".services.core.utils" --- .../services/blob/implementation/BlobExceptionProcessor.java | 2 +- .../windowsazure/{ => services/core}/utils/DateFactory.java | 2 +- .../{ => services/core}/utils/DefaultDateFactory.java | 2 +- .../windowsazure/{ => services/core}/utils/Exports.java | 2 +- .../{ => services/core}/utils/ServiceExceptionFactory.java | 2 +- .../queue/implementation/QueueExceptionProcessor.java | 2 +- .../implementation/ServiceBusExceptionProcessor.java | 2 +- .../services/serviceBus/implementation/WrapRestProxy.java | 2 +- .../services/serviceBus/implementation/WrapTokenManager.java | 2 +- .../com.microsoft.windowsazure.common.Builder$Exports | 4 ++-- .../serviceBus/implementation/WrapTokenManagerTest.java | 2 +- .../windowsazure/utils/ServiceExceptionFactoryTest.java | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{ => services/core}/utils/DateFactory.java (58%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{ => services/core}/utils/DefaultDateFactory.java (72%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{ => services/core}/utils/Exports.java (80%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{ => services/core}/utils/ServiceExceptionFactory.java (98%) diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobExceptionProcessor.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobExceptionProcessor.java index 9d93d37138f01..4688c3394ea3d 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobExceptionProcessor.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobExceptionProcessor.java @@ -51,7 +51,7 @@ import com.microsoft.windowsazure.services.blob.models.SetContainerMetadataOptions; import com.microsoft.windowsazure.services.core.ServiceException; import com.microsoft.windowsazure.services.core.ServiceFilter; -import com.microsoft.windowsazure.utils.ServiceExceptionFactory; +import com.microsoft.windowsazure.services.core.utils.ServiceExceptionFactory; import com.sun.jersey.api.client.ClientHandlerException; import com.sun.jersey.api.client.UniformInterfaceException; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/DateFactory.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/DateFactory.java similarity index 58% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/DateFactory.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/DateFactory.java index 9998578fc5809..02af75c7fe6c0 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/DateFactory.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/DateFactory.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.utils; +package com.microsoft.windowsazure.services.core.utils; import java.util.Date; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/DefaultDateFactory.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/DefaultDateFactory.java similarity index 72% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/DefaultDateFactory.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/DefaultDateFactory.java index 4677c6291f366..d98d63ff1c16c 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/DefaultDateFactory.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/DefaultDateFactory.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.utils; +package com.microsoft.windowsazure.services.core.utils; import java.util.Date; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/Exports.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/Exports.java similarity index 80% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/Exports.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/Exports.java index 7face53bfb103..af68b89242d18 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/Exports.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/Exports.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.utils; +package com.microsoft.windowsazure.services.core.utils; import com.microsoft.windowsazure.services.core.Builder; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/ServiceExceptionFactory.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/ServiceExceptionFactory.java similarity index 98% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/ServiceExceptionFactory.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/ServiceExceptionFactory.java index 840182f440f2b..56fa8b8bd4869 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/ServiceExceptionFactory.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/ServiceExceptionFactory.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.utils; +package com.microsoft.windowsazure.services.core.utils; import com.microsoft.windowsazure.services.core.ServiceException; import com.sun.jersey.api.client.ClientResponse; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueExceptionProcessor.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueExceptionProcessor.java index c0bfa50890d5a..e2708da0dfc17 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueExceptionProcessor.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueExceptionProcessor.java @@ -9,6 +9,7 @@ import com.microsoft.windowsazure.services.core.ServiceException; import com.microsoft.windowsazure.services.core.ServiceFilter; +import com.microsoft.windowsazure.services.core.utils.ServiceExceptionFactory; import com.microsoft.windowsazure.services.queue.QueueContract; import com.microsoft.windowsazure.services.queue.models.CreateMessageOptions; import com.microsoft.windowsazure.services.queue.models.CreateQueueOptions; @@ -23,7 +24,6 @@ import com.microsoft.windowsazure.services.queue.models.QueueServiceOptions; import com.microsoft.windowsazure.services.queue.models.ServiceProperties; import com.microsoft.windowsazure.services.queue.models.UpdateMessageResult; -import com.microsoft.windowsazure.utils.ServiceExceptionFactory; import com.sun.jersey.api.client.ClientHandlerException; import com.sun.jersey.api.client.UniformInterfaceException; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusExceptionProcessor.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusExceptionProcessor.java index 2705ed461614a..5138a0ad23ff9 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusExceptionProcessor.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusExceptionProcessor.java @@ -7,6 +7,7 @@ import com.microsoft.windowsazure.services.core.ServiceException; import com.microsoft.windowsazure.services.core.ServiceFilter; +import com.microsoft.windowsazure.services.core.utils.ServiceExceptionFactory; import com.microsoft.windowsazure.services.serviceBus.ServiceBusContract; import com.microsoft.windowsazure.services.serviceBus.models.BrokeredMessage; import com.microsoft.windowsazure.services.serviceBus.models.CreateQueueResult; @@ -33,7 +34,6 @@ import com.microsoft.windowsazure.services.serviceBus.models.RuleInfo; import com.microsoft.windowsazure.services.serviceBus.models.SubscriptionInfo; import com.microsoft.windowsazure.services.serviceBus.models.TopicInfo; -import com.microsoft.windowsazure.utils.ServiceExceptionFactory; import com.sun.jersey.api.client.ClientHandlerException; import com.sun.jersey.api.client.UniformInterfaceException; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxy.java index 462c1b409ee34..824f00e230ab4 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxy.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxy.java @@ -7,7 +7,7 @@ import org.apache.commons.logging.LogFactory; import com.microsoft.windowsazure.services.core.ServiceException; -import com.microsoft.windowsazure.utils.ServiceExceptionFactory; +import com.microsoft.windowsazure.services.core.utils.ServiceExceptionFactory; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.UniformInterfaceException; import com.sun.jersey.api.representation.Form; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManager.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManager.java index 28bd3f78b4c69..1ae1cf8fac7d2 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManager.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManager.java @@ -7,7 +7,7 @@ import javax.management.timer.Timer; import com.microsoft.windowsazure.services.core.ServiceException; -import com.microsoft.windowsazure.utils.DateFactory; +import com.microsoft.windowsazure.services.core.utils.DateFactory; public class WrapTokenManager { diff --git a/microsoft-azure-api/src/main/resources/META-INF/services/com.microsoft.windowsazure.common.Builder$Exports b/microsoft-azure-api/src/main/resources/META-INF/services/com.microsoft.windowsazure.common.Builder$Exports index ee6898cc76eec..bbe057ada1b5b 100644 --- a/microsoft-azure-api/src/main/resources/META-INF/services/com.microsoft.windowsazure.common.Builder$Exports +++ b/microsoft-azure-api/src/main/resources/META-INF/services/com.microsoft.windowsazure.common.Builder$Exports @@ -2,5 +2,5 @@ com.microsoft.windowsazure.services.blob.Exports com.microsoft.windowsazure.services.queue.Exports com.microsoft.windowsazure.services.serviceBus.Exports com.microsoft.windowsazure.services.serviceBus.implementation.Exports -com.microsoft.windowsazure.utils.Exports -com.microsoft.windowsazure.utils.jersey.Exports +com.microsoft.windowsazure.services.core.utils.Exports +com.microsoft.windowsazure.services.core.utils.jersey.Exports diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManagerTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManagerTest.java index 0864f7ac64180..7119b7acd88df 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManagerTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManagerTest.java @@ -13,7 +13,7 @@ import org.mockito.stubbing.Answer; import com.microsoft.windowsazure.services.core.ServiceException; -import com.microsoft.windowsazure.utils.DateFactory; +import com.microsoft.windowsazure.services.core.utils.DateFactory; public class WrapTokenManagerTest { private WrapContract contract; diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/utils/ServiceExceptionFactoryTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/utils/ServiceExceptionFactoryTest.java index 97a7f2645dc15..24a54a91dd516 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/utils/ServiceExceptionFactoryTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/utils/ServiceExceptionFactoryTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import com.microsoft.windowsazure.services.core.ServiceException; -import com.microsoft.windowsazure.utils.ServiceExceptionFactory; +import com.microsoft.windowsazure.services.core.utils.ServiceExceptionFactory; import com.sun.jersey.api.client.ClientHandlerException; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.UniformInterfaceException; From bb3001ce66e155fe10585ed55be34abdf7921cd1 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Mon, 28 Nov 2011 12:01:20 -0800 Subject: [PATCH 4/5] Rename ".utils" to ".services.core.utils" --- .../services/blob/implementation/BlobRestProxy.java | 8 ++++---- .../services/blob/implementation/SharedKeyFilter.java | 2 +- .../services/blob/implementation/SharedKeyLiteFilter.java | 2 +- .../windowsazure/services/blob/models/BlockList.java | 2 +- .../services/blob/models/ListBlobBlocksResult.java | 2 +- .../core/utils/pipeline}/Base64StringAdapter.java | 2 +- .../core/utils/pipeline}/ClientFilterAdapter.java | 2 +- .../core/utils/pipeline}/EntityStreamingListener.java | 2 +- .../jersey => services/core/utils/pipeline}/Exports.java | 2 +- .../core/utils/pipeline}/HttpURLConnectionClient.java | 2 +- .../utils/pipeline}/HttpURLConnectionClientHandler.java | 4 ++-- .../core/utils/pipeline}/JerseyHelpers.java | 2 +- .../services/queue/implementation/QueueRestProxy.java | 6 +++--- .../serviceBus/implementation/ServiceBusRestProxy.java | 2 +- .../com.microsoft.windowsazure.common.Builder$Exports | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{utils/jersey => services/core/utils/pipeline}/Base64StringAdapter.java (88%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{utils/jersey => services/core/utils/pipeline}/ClientFilterAdapter.java (98%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{utils/jersey => services/core/utils/pipeline}/EntityStreamingListener.java (87%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{utils/jersey => services/core/utils/pipeline}/Exports.java (96%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{utils/jersey => services/core/utils/pipeline}/HttpURLConnectionClient.java (90%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{utils/jersey => services/core/utils/pipeline}/HttpURLConnectionClientHandler.java (98%) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/{utils/jersey => services/core/utils/pipeline}/JerseyHelpers.java (98%) diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobRestProxy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobRestProxy.java index 93f010524c7e4..6b6d70f073ddb 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobRestProxy.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobRestProxy.java @@ -55,10 +55,10 @@ import com.microsoft.windowsazure.services.blob.models.SetContainerMetadataOptions; import com.microsoft.windowsazure.services.core.ServiceException; import com.microsoft.windowsazure.services.core.ServiceFilter; -import com.microsoft.windowsazure.utils.jersey.ClientFilterAdapter; -import com.microsoft.windowsazure.utils.jersey.HttpURLConnectionClient; -import com.microsoft.windowsazure.utils.jersey.JerseyHelpers; -import com.microsoft.windowsazure.utils.jersey.JerseyHelpers.EnumCommaStringBuilder; +import com.microsoft.windowsazure.services.core.utils.pipeline.ClientFilterAdapter; +import com.microsoft.windowsazure.services.core.utils.pipeline.HttpURLConnectionClient; +import com.microsoft.windowsazure.services.core.utils.pipeline.JerseyHelpers; +import com.microsoft.windowsazure.services.core.utils.pipeline.JerseyHelpers.EnumCommaStringBuilder; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; import com.sun.jersey.api.client.WebResource.Builder; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/SharedKeyFilter.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/SharedKeyFilter.java index e2879ee5976c4..5b8cc02551b46 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/SharedKeyFilter.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/SharedKeyFilter.java @@ -12,7 +12,7 @@ import com.microsoft.windowsazure.services.blob.BlobConfiguration; import com.microsoft.windowsazure.services.blob.implementation.SharedKeyUtils.QueryParam; -import com.microsoft.windowsazure.utils.jersey.EntityStreamingListener; +import com.microsoft.windowsazure.services.core.utils.pipeline.EntityStreamingListener; import com.sun.jersey.api.client.ClientHandlerException; import com.sun.jersey.api.client.ClientRequest; import com.sun.jersey.api.client.ClientResponse; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/SharedKeyLiteFilter.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/SharedKeyLiteFilter.java index 4173055e93aa8..3671f51877455 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/SharedKeyLiteFilter.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/SharedKeyLiteFilter.java @@ -10,7 +10,7 @@ import com.microsoft.windowsazure.services.blob.BlobConfiguration; import com.microsoft.windowsazure.services.blob.implementation.SharedKeyUtils.QueryParam; -import com.microsoft.windowsazure.utils.jersey.EntityStreamingListener; +import com.microsoft.windowsazure.services.core.utils.pipeline.EntityStreamingListener; import com.sun.jersey.api.client.ClientHandlerException; import com.sun.jersey.api.client.ClientRequest; import com.sun.jersey.api.client.ClientResponse; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/BlockList.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/BlockList.java index e3da496648545..39ae94c6da571 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/BlockList.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/BlockList.java @@ -10,7 +10,7 @@ import javax.xml.bind.annotation.XmlValue; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import com.microsoft.windowsazure.utils.jersey.Base64StringAdapter; +import com.microsoft.windowsazure.services.core.utils.pipeline.Base64StringAdapter; @XmlRootElement(name = "BlockList") public class BlockList { diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListBlobBlocksResult.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListBlobBlocksResult.java index 1181bb108b69b..c15b6a2b8ac22 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListBlobBlocksResult.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListBlobBlocksResult.java @@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import com.microsoft.windowsazure.utils.jersey.Base64StringAdapter; +import com.microsoft.windowsazure.services.core.utils.pipeline.Base64StringAdapter; @XmlRootElement(name = "BlockList") public class ListBlobBlocksResult { diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/Base64StringAdapter.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/Base64StringAdapter.java similarity index 88% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/Base64StringAdapter.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/Base64StringAdapter.java index f9386afe00add..1d45b330e3438 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/Base64StringAdapter.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/Base64StringAdapter.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.utils.jersey; +package com.microsoft.windowsazure.services.core.utils.pipeline; import javax.xml.bind.annotation.adapters.XmlAdapter; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/ClientFilterAdapter.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/ClientFilterAdapter.java similarity index 98% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/ClientFilterAdapter.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/ClientFilterAdapter.java index b27261b10835d..d7e147d1cd59d 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/ClientFilterAdapter.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/ClientFilterAdapter.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.utils.jersey; +package com.microsoft.windowsazure.services.core.utils.pipeline; import java.io.InputStream; import java.net.URI; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/EntityStreamingListener.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/EntityStreamingListener.java similarity index 87% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/EntityStreamingListener.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/EntityStreamingListener.java index 64e37e7cf87bb..8ab28a121804d 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/EntityStreamingListener.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/EntityStreamingListener.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.utils.jersey; +package com.microsoft.windowsazure.services.core.utils.pipeline; import com.sun.jersey.api.client.ClientRequest; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/Exports.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/Exports.java similarity index 96% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/Exports.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/Exports.java index 85d231989caf6..27349a7775f0d 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/Exports.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/Exports.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.utils.jersey; +package com.microsoft.windowsazure.services.core.utils.pipeline; import java.util.Map; import java.util.Map.Entry; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/HttpURLConnectionClient.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/HttpURLConnectionClient.java similarity index 90% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/HttpURLConnectionClient.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/HttpURLConnectionClient.java index ee8c27cf541e6..2b02799f75c13 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/HttpURLConnectionClient.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/HttpURLConnectionClient.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.utils.jersey; +package com.microsoft.windowsazure.services.core.utils.pipeline; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.config.ClientConfig; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/HttpURLConnectionClientHandler.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/HttpURLConnectionClientHandler.java similarity index 98% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/HttpURLConnectionClientHandler.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/HttpURLConnectionClientHandler.java index 75d89e257aebf..450f917e4c375 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/HttpURLConnectionClientHandler.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/HttpURLConnectionClientHandler.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.utils.jersey; +package com.microsoft.windowsazure.services.core.utils.pipeline; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -13,7 +13,7 @@ import javax.ws.rs.core.MultivaluedMap; -import com.microsoft.windowsazure.utils.jersey.JerseyHelpers.EnumCommaStringBuilder; +import com.microsoft.windowsazure.services.core.utils.pipeline.JerseyHelpers.EnumCommaStringBuilder; import com.sun.jersey.api.client.ClientHandlerException; import com.sun.jersey.api.client.ClientRequest; import com.sun.jersey.api.client.ClientResponse; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/JerseyHelpers.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/JerseyHelpers.java similarity index 98% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/JerseyHelpers.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/JerseyHelpers.java index 9b66713ce92b2..712640f16fbf8 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/utils/jersey/JerseyHelpers.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/JerseyHelpers.java @@ -1,4 +1,4 @@ -package com.microsoft.windowsazure.utils.jersey; +package com.microsoft.windowsazure.services.core.utils.pipeline; import java.util.HashMap; import java.util.List; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueRestProxy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueRestProxy.java index 3b34b99e44bea..c130bb605cfcf 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueRestProxy.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueRestProxy.java @@ -10,6 +10,9 @@ import com.microsoft.windowsazure.services.blob.implementation.RFC1123DateConverter; import com.microsoft.windowsazure.services.core.ServiceException; import com.microsoft.windowsazure.services.core.ServiceFilter; +import com.microsoft.windowsazure.services.core.utils.pipeline.ClientFilterAdapter; +import com.microsoft.windowsazure.services.core.utils.pipeline.HttpURLConnectionClient; +import com.microsoft.windowsazure.services.core.utils.pipeline.JerseyHelpers; import com.microsoft.windowsazure.services.queue.QueueConfiguration; import com.microsoft.windowsazure.services.queue.QueueContract; import com.microsoft.windowsazure.services.queue.models.CreateMessageOptions; @@ -25,9 +28,6 @@ import com.microsoft.windowsazure.services.queue.models.QueueServiceOptions; import com.microsoft.windowsazure.services.queue.models.ServiceProperties; import com.microsoft.windowsazure.services.queue.models.UpdateMessageResult; -import com.microsoft.windowsazure.utils.jersey.ClientFilterAdapter; -import com.microsoft.windowsazure.utils.jersey.HttpURLConnectionClient; -import com.microsoft.windowsazure.utils.jersey.JerseyHelpers; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; import com.sun.jersey.api.client.WebResource.Builder; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusRestProxy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusRestProxy.java index c06336160a0aa..ec63bde251f69 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusRestProxy.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusRestProxy.java @@ -14,6 +14,7 @@ import com.microsoft.windowsazure.services.core.ServiceException; import com.microsoft.windowsazure.services.core.ServiceFilter; +import com.microsoft.windowsazure.services.core.utils.pipeline.ClientFilterAdapter; import com.microsoft.windowsazure.services.serviceBus.ServiceBusContract; import com.microsoft.windowsazure.services.serviceBus.models.AbstractListOptions; import com.microsoft.windowsazure.services.serviceBus.models.BrokeredMessage; @@ -41,7 +42,6 @@ import com.microsoft.windowsazure.services.serviceBus.models.RuleInfo; import com.microsoft.windowsazure.services.serviceBus.models.SubscriptionInfo; import com.microsoft.windowsazure.services.serviceBus.models.TopicInfo; -import com.microsoft.windowsazure.utils.jersey.ClientFilterAdapter; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; diff --git a/microsoft-azure-api/src/main/resources/META-INF/services/com.microsoft.windowsazure.common.Builder$Exports b/microsoft-azure-api/src/main/resources/META-INF/services/com.microsoft.windowsazure.common.Builder$Exports index bbe057ada1b5b..cc7087393981f 100644 --- a/microsoft-azure-api/src/main/resources/META-INF/services/com.microsoft.windowsazure.common.Builder$Exports +++ b/microsoft-azure-api/src/main/resources/META-INF/services/com.microsoft.windowsazure.common.Builder$Exports @@ -3,4 +3,4 @@ com.microsoft.windowsazure.services.queue.Exports com.microsoft.windowsazure.services.serviceBus.Exports com.microsoft.windowsazure.services.serviceBus.implementation.Exports com.microsoft.windowsazure.services.core.utils.Exports -com.microsoft.windowsazure.services.core.utils.jersey.Exports +com.microsoft.windowsazure.services.core.utils.pipeline.Exports From d93a12470d580ce2d80743f61326b8712d2b61bb Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Mon, 28 Nov 2011 12:16:34 -0800 Subject: [PATCH 5/5] Apply code cleanup and formatting settings --- .../services/blob/BlobContract.java | 71 ++++++++++------ .../services/blob/BlobService.java | 83 ++++++++++++------- .../BlobExceptionProcessor.java | 83 ++++++++++++------- .../services/blob/models/AccessCondition.java | 6 +- .../services/blob/models/BlockList.java | 3 +- .../blob/models/GetBlobMetadataOptions.java | 1 - .../services/blob/models/GetBlobOptions.java | 1 - .../blob/models/GetBlobPropertiesOptions.java | 1 - .../blob/models/ListBlobRegionsOptions.java | 1 - .../services/blob/models/ListBlobsResult.java | 3 +- .../blob/models/ListContainersOptions.java | 1 - .../blob/models/SetBlobMetadataOptions.java | 1 - .../models/SetContainerMetadataOptions.java | 1 - .../services/core/ExponentialRetryPolicy.java | 3 +- .../services/core/FilterableService.java | 1 - .../services/core/RetryPolicyFilter.java | 3 +- .../services/queue/QueueContract.java | 14 ++-- .../services/queue/QueueService.java | 17 ++-- .../QueueExceptionProcessor.java | 20 +++-- .../services/serviceBus/Util.java | 6 +- .../BrokerPropertiesMapper.java | 3 +- .../implementation/EntryModelProvider.java | 33 +++----- .../serviceBus/implementation/WrapFilter.java | 6 +- .../implementation/WrapRestProxy.java | 10 ++- .../implementation/WrapTokenManager.java | 4 +- .../serviceBus/models/CreateQueueResult.java | 54 ++++++------ .../serviceBus/models/CreateRuleResult.java | 54 ++++++------ .../models/CreateSubscriptionResult.java | 36 ++++---- .../serviceBus/models/CreateTopicResult.java | 54 ++++++------ .../serviceBus/models/GetQueueResult.java | 54 ++++++------ .../serviceBus/models/GetRuleResult.java | 54 ++++++------ .../models/GetSubscriptionResult.java | 60 +++++++------- .../serviceBus/models/GetTopicResult.java | 54 ++++++------ .../serviceBus/models/ListQueuesResult.java | 40 ++++----- .../serviceBus/models/ListRulesResult.java | 26 +++--- .../models/ListSubscriptionsResult.java | 26 +++--- .../serviceBus/models/ListTopicsResult.java | 28 +++---- .../serviceBus/models/SubscriptionInfo.java | 1 - 38 files changed, 487 insertions(+), 430 deletions(-) diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobContract.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobContract.java index 9aead4567bc7f..4e7a4104bbe5c 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobContract.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobContract.java @@ -15,6 +15,7 @@ import com.microsoft.windowsazure.services.blob.models.CreateBlobPagesOptions; import com.microsoft.windowsazure.services.blob.models.CreateBlobPagesResult; import com.microsoft.windowsazure.services.blob.models.CreateBlobSnapshotOptions; +import com.microsoft.windowsazure.services.blob.models.CreateBlobSnapshotResult; import com.microsoft.windowsazure.services.blob.models.CreateContainerOptions; import com.microsoft.windowsazure.services.blob.models.DeleteBlobOptions; import com.microsoft.windowsazure.services.blob.models.DeleteContainerOptions; @@ -24,7 +25,6 @@ import com.microsoft.windowsazure.services.blob.models.GetBlobPropertiesOptions; import com.microsoft.windowsazure.services.blob.models.GetBlobPropertiesResult; import com.microsoft.windowsazure.services.blob.models.GetBlobResult; -import com.microsoft.windowsazure.services.blob.models.CreateBlobSnapshotResult; import com.microsoft.windowsazure.services.blob.models.GetContainerACLResult; import com.microsoft.windowsazure.services.blob.models.GetContainerPropertiesResult; import com.microsoft.windowsazure.services.blob.models.GetServicePropertiesResult; @@ -69,11 +69,13 @@ public interface BlobContract extends FilterableService { GetContainerPropertiesResult getContainerProperties(String container) throws ServiceException; - GetContainerPropertiesResult getContainerProperties(String container, BlobServiceOptions options) throws ServiceException; + GetContainerPropertiesResult getContainerProperties(String container, BlobServiceOptions options) + throws ServiceException; GetContainerPropertiesResult getContainerMetadata(String container) throws ServiceException; - GetContainerPropertiesResult getContainerMetadata(String container, BlobServiceOptions options) throws ServiceException; + GetContainerPropertiesResult getContainerMetadata(String container, BlobServiceOptions options) + throws ServiceException; GetContainerACLResult getContainerACL(String container) throws ServiceException; @@ -85,7 +87,8 @@ public interface BlobContract extends FilterableService { void setContainerMetadata(String container, HashMap metadata) throws ServiceException; - void setContainerMetadata(String container, HashMap metadata, SetContainerMetadataOptions options) throws ServiceException; + void setContainerMetadata(String container, HashMap metadata, SetContainerMetadataOptions options) + throws ServiceException; ListBlobsResult listBlobs(String container) throws ServiceException; @@ -97,50 +100,62 @@ public interface BlobContract extends FilterableService { void createBlockBlob(String container, String blob, InputStream contentStream) throws ServiceException; - void createBlockBlob(String container, String blob, InputStream contentStream, CreateBlobOptions options) throws ServiceException; + void createBlockBlob(String container, String blob, InputStream contentStream, CreateBlobOptions options) + throws ServiceException; CreateBlobPagesResult clearBlobPages(String container, String blob, PageRange range) throws ServiceException; - CreateBlobPagesResult clearBlobPages(String container, String blob, PageRange range, CreateBlobPagesOptions options) throws ServiceException; + CreateBlobPagesResult clearBlobPages(String container, String blob, PageRange range, CreateBlobPagesOptions options) + throws ServiceException; - CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length, InputStream contentStream) throws ServiceException; + CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length, + InputStream contentStream) throws ServiceException; - CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length, InputStream contentStream, CreateBlobPagesOptions options) - throws ServiceException; + CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length, + InputStream contentStream, CreateBlobPagesOptions options) throws ServiceException; - void createBlobBlock(String container, String blob, String blockId, InputStream contentStream) throws ServiceException; + void createBlobBlock(String container, String blob, String blockId, InputStream contentStream) + throws ServiceException; - void createBlobBlock(String container, String blob, String blockId, InputStream contentStream, CreateBlobBlockOptions options) throws ServiceException; + void createBlobBlock(String container, String blob, String blockId, InputStream contentStream, + CreateBlobBlockOptions options) throws ServiceException; void commitBlobBlocks(String container, String blob, BlockList blockList) throws ServiceException; - void commitBlobBlocks(String container, String blob, BlockList blockList, CommitBlobBlocksOptions options) throws ServiceException; + void commitBlobBlocks(String container, String blob, BlockList blockList, CommitBlobBlocksOptions options) + throws ServiceException; ListBlobBlocksResult listBlobBlocks(String container, String blob) throws ServiceException; - ListBlobBlocksResult listBlobBlocks(String container, String blob, ListBlobBlocksOptions options) throws ServiceException; + ListBlobBlocksResult listBlobBlocks(String container, String blob, ListBlobBlocksOptions options) + throws ServiceException; GetBlobPropertiesResult getBlobProperties(String container, String blob) throws ServiceException; - GetBlobPropertiesResult getBlobProperties(String container, String blob, GetBlobPropertiesOptions options) throws ServiceException; + GetBlobPropertiesResult getBlobProperties(String container, String blob, GetBlobPropertiesOptions options) + throws ServiceException; GetBlobMetadataResult getBlobMetadata(String container, String blob) throws ServiceException; - GetBlobMetadataResult getBlobMetadata(String container, String blob, GetBlobMetadataOptions options) throws ServiceException; + GetBlobMetadataResult getBlobMetadata(String container, String blob, GetBlobMetadataOptions options) + throws ServiceException; ListBlobRegionsResult listBlobRegions(String container, String blob) throws ServiceException; - ListBlobRegionsResult listBlobRegions(String container, String blob, ListBlobRegionsOptions options) throws ServiceException; + ListBlobRegionsResult listBlobRegions(String container, String blob, ListBlobRegionsOptions options) + throws ServiceException; SetBlobPropertiesResult setBlobProperties(String container, String blob) throws ServiceException; - SetBlobPropertiesResult setBlobProperties(String container, String blob, SetBlobPropertiesOptions options) throws ServiceException; - - SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap metadata) throws ServiceException; + SetBlobPropertiesResult setBlobProperties(String container, String blob, SetBlobPropertiesOptions options) + throws ServiceException; - SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap metadata, SetBlobMetadataOptions options) + SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap metadata) throws ServiceException; + SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap metadata, + SetBlobMetadataOptions options) throws ServiceException; + GetBlobResult getBlob(String container, String blob) throws ServiceException; GetBlobResult getBlob(String container, String blob, GetBlobOptions options) throws ServiceException; @@ -151,24 +166,28 @@ SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap metad next.setContainerMetadata(container, metadata); } - public void setContainerMetadata(String container, HashMap metadata, SetContainerMetadataOptions options) throws ServiceException { + public void setContainerMetadata(String container, HashMap metadata, + SetContainerMetadataOptions options) throws ServiceException { next.setContainerMetadata(container, metadata, options); } @@ -169,7 +173,8 @@ public void createPageBlob(String container, String blob, int length) throws Ser next.createPageBlob(container, blob, length); } - public void createPageBlob(String container, String blob, int length, CreateBlobOptions options) throws ServiceException { + public void createPageBlob(String container, String blob, int length, CreateBlobOptions options) + throws ServiceException { next.createPageBlob(container, blob, length, options); } @@ -177,7 +182,8 @@ public void createBlockBlob(String container, String blob, InputStream contentSt next.createBlockBlob(container, blob, contentStream); } - public void createBlockBlob(String container, String blob, InputStream contentStream, CreateBlobOptions options) throws ServiceException { + public void createBlockBlob(String container, String blob, InputStream contentStream, CreateBlobOptions options) + throws ServiceException { next.createBlockBlob(container, blob, contentStream, options); } @@ -185,26 +191,28 @@ public CreateBlobPagesResult clearBlobPages(String container, String blob, PageR return next.clearBlobPages(container, blob, range); } - public CreateBlobPagesResult clearBlobPages(String container, String blob, PageRange range, CreateBlobPagesOptions options) throws ServiceException { + public CreateBlobPagesResult clearBlobPages(String container, String blob, PageRange range, + CreateBlobPagesOptions options) throws ServiceException { return next.clearBlobPages(container, blob, range, options); } - public CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length, InputStream contentStream) - throws ServiceException { + public CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length, + InputStream contentStream) throws ServiceException { return next.createBlobPages(container, blob, range, length, contentStream); } - public CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length, InputStream contentStream, - CreateBlobPagesOptions options) throws ServiceException { + public CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length, + InputStream contentStream, CreateBlobPagesOptions options) throws ServiceException { return next.createBlobPages(container, blob, range, length, contentStream, options); } - public void createBlobBlock(String container, String blob, String blockId, InputStream contentStream) throws ServiceException { + public void createBlobBlock(String container, String blob, String blockId, InputStream contentStream) + throws ServiceException { next.createBlobBlock(container, blob, blockId, contentStream); } - public void createBlobBlock(String container, String blob, String blockId, InputStream contentStream, CreateBlobBlockOptions options) - throws ServiceException { + public void createBlobBlock(String container, String blob, String blockId, InputStream contentStream, + CreateBlobBlockOptions options) throws ServiceException { next.createBlobBlock(container, blob, blockId, contentStream, options); } @@ -212,7 +220,8 @@ public void commitBlobBlocks(String container, String blob, BlockList blockList) next.commitBlobBlocks(container, blob, blockList); } - public void commitBlobBlocks(String container, String blob, BlockList blockList, CommitBlobBlocksOptions options) throws ServiceException { + public void commitBlobBlocks(String container, String blob, BlockList blockList, CommitBlobBlocksOptions options) + throws ServiceException { next.commitBlobBlocks(container, blob, blockList, options); } @@ -220,7 +229,8 @@ public ListBlobBlocksResult listBlobBlocks(String container, String blob) throws return next.listBlobBlocks(container, blob); } - public ListBlobBlocksResult listBlobBlocks(String container, String blob, ListBlobBlocksOptions options) throws ServiceException { + public ListBlobBlocksResult listBlobBlocks(String container, String blob, ListBlobBlocksOptions options) + throws ServiceException { return next.listBlobBlocks(container, blob, options); } @@ -228,7 +238,8 @@ public GetBlobPropertiesResult getBlobProperties(String container, String blob) return next.getBlobProperties(container, blob); } - public GetBlobPropertiesResult getBlobProperties(String container, String blob, GetBlobPropertiesOptions options) throws ServiceException { + public GetBlobPropertiesResult getBlobProperties(String container, String blob, GetBlobPropertiesOptions options) + throws ServiceException { return next.getBlobProperties(container, blob, options); } @@ -236,7 +247,8 @@ public GetBlobMetadataResult getBlobMetadata(String container, String blob) thro return next.getBlobMetadata(container, blob); } - public GetBlobMetadataResult getBlobMetadata(String container, String blob, GetBlobMetadataOptions options) throws ServiceException { + public GetBlobMetadataResult getBlobMetadata(String container, String blob, GetBlobMetadataOptions options) + throws ServiceException { return next.getBlobMetadata(container, blob, options); } @@ -244,7 +256,8 @@ public ListBlobRegionsResult listBlobRegions(String container, String blob) thro return next.listBlobRegions(container, blob); } - public ListBlobRegionsResult listBlobRegions(String container, String blob, ListBlobRegionsOptions options) throws ServiceException { + public ListBlobRegionsResult listBlobRegions(String container, String blob, ListBlobRegionsOptions options) + throws ServiceException { return next.listBlobRegions(container, blob, options); } @@ -252,16 +265,18 @@ public SetBlobPropertiesResult setBlobProperties(String container, String blob) return next.setBlobProperties(container, blob); } - public SetBlobPropertiesResult setBlobProperties(String container, String blob, SetBlobPropertiesOptions options) throws ServiceException { + public SetBlobPropertiesResult setBlobProperties(String container, String blob, SetBlobPropertiesOptions options) + throws ServiceException { return next.setBlobProperties(container, blob, options); } - public SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap metadata) throws ServiceException { + public SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap metadata) + throws ServiceException { return next.setBlobMetadata(container, blob, metadata); } - public SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap metadata, SetBlobMetadataOptions options) - throws ServiceException { + public SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap metadata, + SetBlobMetadataOptions options) throws ServiceException { return next.setBlobMetadata(container, blob, metadata, options); } @@ -285,16 +300,18 @@ public CreateBlobSnapshotResult createBlobSnapshot(String container, String blob return next.createBlobSnapshot(container, blob); } - public CreateBlobSnapshotResult createBlobSnapshot(String container, String blob, CreateBlobSnapshotOptions options) throws ServiceException { + public CreateBlobSnapshotResult createBlobSnapshot(String container, String blob, CreateBlobSnapshotOptions options) + throws ServiceException { return next.createBlobSnapshot(container, blob, options); } - public void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, String sourceBlob) throws ServiceException { + public void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, String sourceBlob) + throws ServiceException { next.copyBlob(destinationContainer, destinationBlob, sourceContainer, sourceBlob); } - public void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, String sourceBlob, CopyBlobOptions options) - throws ServiceException { + public void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, + String sourceBlob, CopyBlobOptions options) throws ServiceException { next.copyBlob(destinationContainer, destinationBlob, sourceContainer, sourceBlob, options); } @@ -302,7 +319,8 @@ public AcquireLeaseResult acquireLease(String container, String blob) throws Ser return next.acquireLease(container, blob); } - public AcquireLeaseResult acquireLease(String container, String blob, AcquireLeaseOptions options) throws ServiceException { + public AcquireLeaseResult acquireLease(String container, String blob, AcquireLeaseOptions options) + throws ServiceException { return next.acquireLease(container, blob, options); } @@ -310,7 +328,8 @@ public AcquireLeaseResult renewLease(String container, String blob, String lease return next.renewLease(container, blob, leaseId); } - public AcquireLeaseResult renewLease(String container, String blob, String leaseId, BlobServiceOptions options) throws ServiceException { + public AcquireLeaseResult renewLease(String container, String blob, String leaseId, BlobServiceOptions options) + throws ServiceException { return next.renewLease(container, blob, leaseId, options); } @@ -318,7 +337,8 @@ public void releaseLease(String container, String blob, String leaseId) throws S next.releaseLease(container, blob, leaseId); } - public void releaseLease(String container, String blob, String leaseId, BlobServiceOptions options) throws ServiceException { + public void releaseLease(String container, String blob, String leaseId, BlobServiceOptions options) + throws ServiceException { next.releaseLease(container, blob, leaseId, options); } @@ -326,7 +346,8 @@ public void breakLease(String container, String blob, String leaseId) throws Ser next.breakLease(container, blob, leaseId); } - public void breakLease(String container, String blob, String leaseId, BlobServiceOptions options) throws ServiceException { + public void breakLease(String container, String blob, String leaseId, BlobServiceOptions options) + throws ServiceException { next.breakLease(container, blob, leaseId, options); } } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobExceptionProcessor.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobExceptionProcessor.java index 4688c3394ea3d..297ba2e8db758 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobExceptionProcessor.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobExceptionProcessor.java @@ -101,7 +101,8 @@ public GetServicePropertiesResult getServiceProperties(BlobServiceOptions option } } - public void setServiceProperties(ServiceProperties serviceProperties, BlobServiceOptions options) throws ServiceException { + public void setServiceProperties(ServiceProperties serviceProperties, BlobServiceOptions options) + throws ServiceException { try { service.setServiceProperties(serviceProperties, options); } @@ -209,7 +210,8 @@ public GetContainerPropertiesResult getContainerProperties(String container) thr } } - public GetContainerPropertiesResult getContainerProperties(String container, BlobServiceOptions options) throws ServiceException { + public GetContainerPropertiesResult getContainerProperties(String container, BlobServiceOptions options) + throws ServiceException { try { return service.getContainerProperties(container, options); } @@ -233,7 +235,8 @@ public GetContainerPropertiesResult getContainerMetadata(String container) throw } } - public GetContainerPropertiesResult getContainerMetadata(String container, BlobServiceOptions options) throws ServiceException { + public GetContainerPropertiesResult getContainerMetadata(String container, BlobServiceOptions options) + throws ServiceException { try { return service.getContainerMetadata(container, options); } @@ -305,7 +308,8 @@ public void setContainerMetadata(String container, HashMap metad } } - public void setContainerMetadata(String container, HashMap metadata, SetContainerMetadataOptions options) throws ServiceException { + public void setContainerMetadata(String container, HashMap metadata, + SetContainerMetadataOptions options) throws ServiceException { try { service.setContainerMetadata(container, metadata, options); } @@ -353,7 +357,8 @@ public void createPageBlob(String container, String blob, int length) throws Ser } } - public void createPageBlob(String container, String blob, int length, CreateBlobOptions options) throws ServiceException { + public void createPageBlob(String container, String blob, int length, CreateBlobOptions options) + throws ServiceException { try { service.createPageBlob(container, blob, length, options); } @@ -377,7 +382,8 @@ public void createBlockBlob(String container, String blob, InputStream contentSt } } - public void createBlockBlob(String container, String blob, InputStream contentStream, CreateBlobOptions options) throws ServiceException { + public void createBlockBlob(String container, String blob, InputStream contentStream, CreateBlobOptions options) + throws ServiceException { try { service.createBlockBlob(container, blob, contentStream, options); } @@ -401,7 +407,8 @@ public CreateBlobPagesResult clearBlobPages(String container, String blob, PageR } } - public CreateBlobPagesResult clearBlobPages(String container, String blob, PageRange range, CreateBlobPagesOptions options) throws ServiceException { + public CreateBlobPagesResult clearBlobPages(String container, String blob, PageRange range, + CreateBlobPagesOptions options) throws ServiceException { try { return service.clearBlobPages(container, blob, range, options); } @@ -413,8 +420,8 @@ public CreateBlobPagesResult clearBlobPages(String container, String blob, PageR } } - public CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length, InputStream contentStream) - throws ServiceException { + public CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length, + InputStream contentStream) throws ServiceException { try { return service.createBlobPages(container, blob, range, length, contentStream); } @@ -426,8 +433,8 @@ public CreateBlobPagesResult createBlobPages(String container, String blob, Page } } - public CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length, InputStream contentStream, - CreateBlobPagesOptions options) throws ServiceException { + public CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length, + InputStream contentStream, CreateBlobPagesOptions options) throws ServiceException { try { return service.createBlobPages(container, blob, range, length, contentStream, options); } @@ -439,7 +446,8 @@ public CreateBlobPagesResult createBlobPages(String container, String blob, Page } } - public void createBlobBlock(String container, String blob, String blockId, InputStream contentStream) throws ServiceException { + public void createBlobBlock(String container, String blob, String blockId, InputStream contentStream) + throws ServiceException { try { service.createBlobBlock(container, blob, blockId, contentStream); } @@ -451,8 +459,8 @@ public void createBlobBlock(String container, String blob, String blockId, Input } } - public void createBlobBlock(String container, String blob, String blockId, InputStream contentStream, CreateBlobBlockOptions options) - throws ServiceException { + public void createBlobBlock(String container, String blob, String blockId, InputStream contentStream, + CreateBlobBlockOptions options) throws ServiceException { try { service.createBlobBlock(container, blob, blockId, contentStream, options); } @@ -476,7 +484,8 @@ public void commitBlobBlocks(String container, String blob, BlockList blockList) } } - public void commitBlobBlocks(String container, String blob, BlockList blockList, CommitBlobBlocksOptions options) throws ServiceException { + public void commitBlobBlocks(String container, String blob, BlockList blockList, CommitBlobBlocksOptions options) + throws ServiceException { try { service.commitBlobBlocks(container, blob, blockList, options); } @@ -500,7 +509,8 @@ public ListBlobBlocksResult listBlobBlocks(String container, String blob) throws } } - public ListBlobBlocksResult listBlobBlocks(String container, String blob, ListBlobBlocksOptions options) throws ServiceException { + public ListBlobBlocksResult listBlobBlocks(String container, String blob, ListBlobBlocksOptions options) + throws ServiceException { try { return service.listBlobBlocks(container, blob, options); } @@ -524,7 +534,8 @@ public GetBlobPropertiesResult getBlobProperties(String container, String blob) } } - public GetBlobPropertiesResult getBlobProperties(String container, String blob, GetBlobPropertiesOptions options) throws ServiceException { + public GetBlobPropertiesResult getBlobProperties(String container, String blob, GetBlobPropertiesOptions options) + throws ServiceException { try { return service.getBlobProperties(container, blob, options); } @@ -548,7 +559,8 @@ public GetBlobMetadataResult getBlobMetadata(String container, String blob) thro } } - public GetBlobMetadataResult getBlobMetadata(String container, String blob, GetBlobMetadataOptions options) throws ServiceException { + public GetBlobMetadataResult getBlobMetadata(String container, String blob, GetBlobMetadataOptions options) + throws ServiceException { try { return service.getBlobMetadata(container, blob, options); } @@ -572,7 +584,8 @@ public ListBlobRegionsResult listBlobRegions(String container, String blob) thro } } - public ListBlobRegionsResult listBlobRegions(String container, String blob, ListBlobRegionsOptions options) throws ServiceException { + public ListBlobRegionsResult listBlobRegions(String container, String blob, ListBlobRegionsOptions options) + throws ServiceException { try { return service.listBlobRegions(container, blob, options); } @@ -584,7 +597,8 @@ public ListBlobRegionsResult listBlobRegions(String container, String blob, List } } - public SetBlobPropertiesResult setBlobProperties(String container, String blob, SetBlobPropertiesOptions options) throws ServiceException { + public SetBlobPropertiesResult setBlobProperties(String container, String blob, SetBlobPropertiesOptions options) + throws ServiceException { try { return service.setBlobProperties(container, blob, options); } @@ -608,7 +622,8 @@ public SetBlobPropertiesResult setBlobProperties(String container, String blob) } } - public SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap metadata) throws ServiceException { + public SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap metadata) + throws ServiceException { try { return service.setBlobMetadata(container, blob, metadata); } @@ -620,8 +635,8 @@ public SetBlobMetadataResult setBlobMetadata(String container, String blob, Hash } } - public SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap metadata, SetBlobMetadataOptions options) - throws ServiceException { + public SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap metadata, + SetBlobMetadataOptions options) throws ServiceException { try { return service.setBlobMetadata(container, blob, metadata, options); } @@ -693,7 +708,8 @@ public CreateBlobSnapshotResult createBlobSnapshot(String container, String blob } } - public CreateBlobSnapshotResult createBlobSnapshot(String container, String blob, CreateBlobSnapshotOptions options) throws ServiceException { + public CreateBlobSnapshotResult createBlobSnapshot(String container, String blob, CreateBlobSnapshotOptions options) + throws ServiceException { try { return service.createBlobSnapshot(container, blob, options); } @@ -705,7 +721,8 @@ public CreateBlobSnapshotResult createBlobSnapshot(String container, String blob } } - public void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, String sourceBlob) throws ServiceException { + public void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, String sourceBlob) + throws ServiceException { try { service.copyBlob(destinationContainer, destinationBlob, sourceContainer, sourceBlob); } @@ -717,8 +734,8 @@ public void copyBlob(String destinationContainer, String destinationBlob, String } } - public void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, String sourceBlob, CopyBlobOptions options) - throws ServiceException { + public void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, + String sourceBlob, CopyBlobOptions options) throws ServiceException { try { service.copyBlob(destinationContainer, destinationBlob, sourceContainer, sourceBlob, options); } @@ -742,7 +759,8 @@ public AcquireLeaseResult acquireLease(String container, String blob) throws Ser } } - public AcquireLeaseResult acquireLease(String container, String blob, AcquireLeaseOptions options) throws ServiceException { + public AcquireLeaseResult acquireLease(String container, String blob, AcquireLeaseOptions options) + throws ServiceException { try { return service.acquireLease(container, blob, options); } @@ -766,7 +784,8 @@ public AcquireLeaseResult renewLease(String container, String blob, String lease } } - public AcquireLeaseResult renewLease(String container, String blob, String leaseId, BlobServiceOptions options) throws ServiceException { + public AcquireLeaseResult renewLease(String container, String blob, String leaseId, BlobServiceOptions options) + throws ServiceException { try { return service.renewLease(container, blob, leaseId, options); } @@ -790,7 +809,8 @@ public void releaseLease(String container, String blob, String leaseId) throws S } } - public void releaseLease(String container, String blob, String leaseId, BlobServiceOptions options) throws ServiceException { + public void releaseLease(String container, String blob, String leaseId, BlobServiceOptions options) + throws ServiceException { try { service.releaseLease(container, blob, leaseId, options); } @@ -814,7 +834,8 @@ public void breakLease(String container, String blob, String leaseId) throws Ser } } - public void breakLease(String container, String blob, String leaseId, BlobServiceOptions options) throws ServiceException { + public void breakLease(String container, String blob, String leaseId, BlobServiceOptions options) + throws ServiceException { try { service.breakLease(container, blob, leaseId, options); } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/AccessCondition.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/AccessCondition.java index c53b2e6fdf792..31879b4dfd622 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/AccessCondition.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/AccessCondition.java @@ -53,7 +53,8 @@ public static AccessCondition ifMatch(String etag) { * @return An AccessCondition object that represents the If-Modified-Since condition. */ public static AccessCondition ifModifiedSince(Date lastMotified) { - return new AccessCondition(AccessConditionHeaderType.IF_MODIFIED_SINCE, new RFC1123DateConverter().format(lastMotified)); + return new AccessCondition(AccessConditionHeaderType.IF_MODIFIED_SINCE, + new RFC1123DateConverter().format(lastMotified)); } /** @@ -93,7 +94,8 @@ public static AccessCondition ifNoneMatch(String etag) { * @return An AccessCondition object that represents the If-Unmodified-Since condition. */ public static AccessCondition ifNotModifiedSince(Date lastMotified) { - return new AccessCondition(AccessConditionHeaderType.IF_UNMODIFIED_SINCE, new RFC1123DateConverter().format(lastMotified)); + return new AccessCondition(AccessConditionHeaderType.IF_UNMODIFIED_SINCE, + new RFC1123DateConverter().format(lastMotified)); } /** diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/BlockList.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/BlockList.java index 39ae94c6da571..06e49f74c0d58 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/BlockList.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/BlockList.java @@ -37,7 +37,8 @@ public BlockList addLatestEntry(String blockId) { return this; } - @XmlElementRefs({ @XmlElementRef(name = "Committed", type = CommittedEntry.class), @XmlElementRef(name = "Uncommitted", type = UncommittedEntry.class), + @XmlElementRefs({ @XmlElementRef(name = "Committed", type = CommittedEntry.class), + @XmlElementRef(name = "Uncommitted", type = UncommittedEntry.class), @XmlElementRef(name = "Latest", type = LatestEntry.class) }) @XmlMixed public List getEntries() { diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/GetBlobMetadataOptions.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/GetBlobMetadataOptions.java index 1adf62fffc0ba..14044ffaec541 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/GetBlobMetadataOptions.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/GetBlobMetadataOptions.java @@ -1,6 +1,5 @@ package com.microsoft.windowsazure.services.blob.models; - public class GetBlobMetadataOptions extends BlobServiceOptions { private String snapshot; private String leaseId; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/GetBlobOptions.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/GetBlobOptions.java index b7d87465cb422..56a55fe6a6001 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/GetBlobOptions.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/GetBlobOptions.java @@ -1,6 +1,5 @@ package com.microsoft.windowsazure.services.blob.models; - public class GetBlobOptions extends BlobServiceOptions { private String snapshot; private String leaseId; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/GetBlobPropertiesOptions.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/GetBlobPropertiesOptions.java index b4a4181b3c07f..7e70cf5192320 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/GetBlobPropertiesOptions.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/GetBlobPropertiesOptions.java @@ -1,6 +1,5 @@ package com.microsoft.windowsazure.services.blob.models; - public class GetBlobPropertiesOptions extends BlobServiceOptions { private String snapshot; private String leaseId; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListBlobRegionsOptions.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListBlobRegionsOptions.java index 263f1a3266020..dfb99b5158d93 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListBlobRegionsOptions.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListBlobRegionsOptions.java @@ -1,6 +1,5 @@ package com.microsoft.windowsazure.services.blob.models; - public class ListBlobRegionsOptions extends BlobServiceOptions { private String leaseId; private String snapshot; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListBlobsResult.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListBlobsResult.java index 4e038f16154eb..ff7edfbce5d14 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListBlobsResult.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListBlobsResult.java @@ -26,7 +26,8 @@ public class ListBlobsResult { private int maxResults; @XmlElementWrapper(name = "Blobs") - @XmlElementRefs({ @XmlElementRef(name = "BlobPrefix", type = BlobPrefixEntry.class), @XmlElementRef(name = "Blob", type = BlobEntry.class) }) + @XmlElementRefs({ @XmlElementRef(name = "BlobPrefix", type = BlobPrefixEntry.class), + @XmlElementRef(name = "Blob", type = BlobEntry.class) }) public List getEntries() { ArrayList result = new ArrayList(); result.addAll(this.blobPrefixes); diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListContainersOptions.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListContainersOptions.java index 6b3bf57b9eef2..0b4f74d686a9c 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListContainersOptions.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListContainersOptions.java @@ -1,6 +1,5 @@ package com.microsoft.windowsazure.services.blob.models; - public class ListContainersOptions extends BlobServiceOptions { private String prefix; private String marker; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/SetBlobMetadataOptions.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/SetBlobMetadataOptions.java index b09ae1027d9d9..9fe24273ae53f 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/SetBlobMetadataOptions.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/SetBlobMetadataOptions.java @@ -1,6 +1,5 @@ package com.microsoft.windowsazure.services.blob.models; - public class SetBlobMetadataOptions extends BlobServiceOptions { private String leaseId; private AccessCondition accessCondition; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/SetContainerMetadataOptions.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/SetContainerMetadataOptions.java index 9d856e97c88ea..237f3991c7aed 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/SetContainerMetadataOptions.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/SetContainerMetadataOptions.java @@ -1,6 +1,5 @@ package com.microsoft.windowsazure.services.blob.models; - public class SetContainerMetadataOptions extends BlobServiceOptions { private AccessCondition accessCondition; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ExponentialRetryPolicy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ExponentialRetryPolicy.java index 56aa4c59fb7c3..821b59118c811 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ExponentialRetryPolicy.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ExponentialRetryPolicy.java @@ -46,7 +46,8 @@ public int calculateBackoff(int currentRetryCount, Response response, Exception // exponential int incrementDelta = (int) (Math.pow(2, currentRetryCount) - 1); int boundedRandDelta = (int) (this.deltaBackoffIntervalInMs * 0.8) - + this.randRef.nextInt((int) (this.deltaBackoffIntervalInMs * 1.2) - (int) (this.deltaBackoffIntervalInMs * 0.8)); + + this.randRef.nextInt((int) (this.deltaBackoffIntervalInMs * 1.2) + - (int) (this.deltaBackoffIntervalInMs * 0.8)); incrementDelta *= boundedRandDelta; // Enforce max / min backoffs diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/FilterableService.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/FilterableService.java index 673139986edb1..0cdc06d020e17 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/FilterableService.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/FilterableService.java @@ -1,6 +1,5 @@ package com.microsoft.windowsazure.services.core; - public interface FilterableService { T withFilter(ServiceFilter filter); } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RetryPolicyFilter.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RetryPolicyFilter.java index 0824852e2d0c8..1ecce3a22a210 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RetryPolicyFilter.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RetryPolicyFilter.java @@ -36,7 +36,8 @@ public Response handle(Request request, Next next) throws Exception { } int backoffTime = retryPolicy.calculateBackoff(retryCount, response, error); - log.info(String.format("Request failed. Backing off for %1s milliseconds before retrying (retryCount=%2d)", backoffTime, retryCount)); + log.info(String.format("Request failed. Backing off for %1s milliseconds before retrying (retryCount=%2d)", + backoffTime, retryCount)); backoff(backoffTime); } } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueContract.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueContract.java index 615245ac6075f..0a43084629d3e 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueContract.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueContract.java @@ -45,21 +45,23 @@ public interface QueueContract extends FilterableService { void setQueueMetadata(String queue, HashMap metadata) throws ServiceException; - void setQueueMetadata(String queue, HashMap metadata, QueueServiceOptions options) throws ServiceException; + void setQueueMetadata(String queue, HashMap metadata, QueueServiceOptions options) + throws ServiceException; void createMessage(String queue, String messageText) throws ServiceException; void createMessage(String queue, String messageText, CreateMessageOptions options) throws ServiceException; - UpdateMessageResult updateMessage(String queue, String messageId, String popReceipt, String messageText, int visibilityTimeoutInSeconds) - throws ServiceException; + UpdateMessageResult updateMessage(String queue, String messageId, String popReceipt, String messageText, + int visibilityTimeoutInSeconds) throws ServiceException; - UpdateMessageResult updateMessage(String queue, String messageId, String popReceipt, String messageText, int visibilityTimeoutInSeconds, - QueueServiceOptions options) throws ServiceException; + UpdateMessageResult updateMessage(String queue, String messageId, String popReceipt, String messageText, + int visibilityTimeoutInSeconds, QueueServiceOptions options) throws ServiceException; void deleteMessage(String queue, String messageId, String popReceipt) throws ServiceException; - void deleteMessage(String queue, String messageId, String popReceipt, QueueServiceOptions options) throws ServiceException; + void deleteMessage(String queue, String messageId, String popReceipt, QueueServiceOptions options) + throws ServiceException; ListMessagesResult listMessages(String queue) throws ServiceException; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueService.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueService.java index fb2b697b207d6..119ae12615eb9 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueService.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/QueueService.java @@ -61,7 +61,8 @@ public void setServiceProperties(ServiceProperties serviceProperties) throws Ser next.setServiceProperties(serviceProperties); } - public void setServiceProperties(ServiceProperties serviceProperties, QueueServiceOptions options) throws ServiceException { + public void setServiceProperties(ServiceProperties serviceProperties, QueueServiceOptions options) + throws ServiceException { next.setServiceProperties(serviceProperties, options); } @@ -101,7 +102,8 @@ public void setQueueMetadata(String queue, HashMap metadata) thr next.setQueueMetadata(queue, metadata); } - public void setQueueMetadata(String queue, HashMap metadata, QueueServiceOptions options) throws ServiceException { + public void setQueueMetadata(String queue, HashMap metadata, QueueServiceOptions options) + throws ServiceException { next.setQueueMetadata(queue, metadata, options); } @@ -113,13 +115,13 @@ public void createMessage(String queue, String messageText, CreateMessageOptions next.createMessage(queue, messageText, options); } - public UpdateMessageResult updateMessage(String queue, String messageId, String popReceipt, String messageText, int visibilityTimeoutInSeconds) - throws ServiceException { + public UpdateMessageResult updateMessage(String queue, String messageId, String popReceipt, String messageText, + int visibilityTimeoutInSeconds) throws ServiceException { return next.updateMessage(queue, messageId, popReceipt, messageText, visibilityTimeoutInSeconds); } - public UpdateMessageResult updateMessage(String queue, String messageId, String popReceipt, String messageText, int visibilityTimeoutInSeconds, - QueueServiceOptions options) throws ServiceException { + public UpdateMessageResult updateMessage(String queue, String messageId, String popReceipt, String messageText, + int visibilityTimeoutInSeconds, QueueServiceOptions options) throws ServiceException { return next.updateMessage(queue, messageId, popReceipt, messageText, visibilityTimeoutInSeconds, options); } @@ -127,7 +129,8 @@ public void deleteMessage(String queue, String messageId, String popReceipt) thr next.deleteMessage(queue, messageId, popReceipt); } - public void deleteMessage(String queue, String messageId, String popReceipt, QueueServiceOptions options) throws ServiceException { + public void deleteMessage(String queue, String messageId, String popReceipt, QueueServiceOptions options) + throws ServiceException { next.deleteMessage(queue, messageId, popReceipt, options); } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueExceptionProcessor.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueExceptionProcessor.java index e2708da0dfc17..a113b4f29a51b 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueExceptionProcessor.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/implementation/QueueExceptionProcessor.java @@ -85,7 +85,8 @@ public void setServiceProperties(ServiceProperties serviceProperties) throws Ser } } - public void setServiceProperties(ServiceProperties serviceProperties, QueueServiceOptions options) throws ServiceException { + public void setServiceProperties(ServiceProperties serviceProperties, QueueServiceOptions options) + throws ServiceException { try { service.setServiceProperties(serviceProperties, options); } @@ -205,7 +206,8 @@ public void setQueueMetadata(String queue, HashMap metadata) thr } } - public void setQueueMetadata(String queue, HashMap metadata, QueueServiceOptions options) throws ServiceException { + public void setQueueMetadata(String queue, HashMap metadata, QueueServiceOptions options) + throws ServiceException { try { service.setQueueMetadata(queue, metadata, options); } @@ -241,8 +243,8 @@ public void createMessage(String queue, String messageText, CreateMessageOptions } } - public UpdateMessageResult updateMessage(String queue, String messageId, String popReceipt, String messageText, int visibilityTimeoutInSeconds) - throws ServiceException { + public UpdateMessageResult updateMessage(String queue, String messageId, String popReceipt, String messageText, + int visibilityTimeoutInSeconds) throws ServiceException { try { return service.updateMessage(queue, messageId, popReceipt, messageText, visibilityTimeoutInSeconds); } @@ -254,10 +256,11 @@ public UpdateMessageResult updateMessage(String queue, String messageId, String } } - public UpdateMessageResult updateMessage(String queue, String messageId, String popReceipt, String messageText, int visibilityTimeoutInSeconds, - QueueServiceOptions options) throws ServiceException { + public UpdateMessageResult updateMessage(String queue, String messageId, String popReceipt, String messageText, + int visibilityTimeoutInSeconds, QueueServiceOptions options) throws ServiceException { try { - return service.updateMessage(queue, messageId, popReceipt, messageText, visibilityTimeoutInSeconds, options); + return service + .updateMessage(queue, messageId, popReceipt, messageText, visibilityTimeoutInSeconds, options); } catch (UniformInterfaceException e) { throw processCatch(new ServiceException(e)); @@ -327,7 +330,8 @@ public void deleteMessage(String queue, String messageId, String popReceipt) thr } } - public void deleteMessage(String queue, String messageId, String popReceipt, QueueServiceOptions options) throws ServiceException { + public void deleteMessage(String queue, String messageId, String popReceipt, QueueServiceOptions options) + throws ServiceException { try { service.deleteMessage(queue, messageId, popReceipt, options); } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Util.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Util.java index 9183a3d84e8b5..2409039ebee3b 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Util.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Util.java @@ -5,14 +5,12 @@ import com.microsoft.windowsazure.services.serviceBus.models.TopicInfo; public class Util { - public static Iterable iterateQueues(ServiceBusContract service) - throws ServiceException { + public static Iterable iterateQueues(ServiceBusContract service) throws ServiceException { // TODO: iterate over link rel=next pagination return service.listQueues().getItems(); } - public static Iterable iterateTopics(ServiceBusContract service) - throws ServiceException { + public static Iterable iterateTopics(ServiceBusContract service) throws ServiceException { // TODO: iterate over link rel=next pagination return service.listTopics().getItems(); } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/BrokerPropertiesMapper.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/BrokerPropertiesMapper.java index d443289f1a164..fe3d5b5e7c3d5 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/BrokerPropertiesMapper.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/BrokerPropertiesMapper.java @@ -11,8 +11,7 @@ public class BrokerPropertiesMapper { - public BrokerProperties fromString(String value) - throws IllegalArgumentException { + public BrokerProperties fromString(String value) throws IllegalArgumentException { ObjectMapper mapper = new ObjectMapper(); try { return mapper.readValue(value.getBytes(), BrokerProperties.class); diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/EntryModelProvider.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/EntryModelProvider.java index 17569830549b3..4053a779a8c9a 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/EntryModelProvider.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/EntryModelProvider.java @@ -17,8 +17,7 @@ import com.sun.jersey.core.provider.AbstractMessageReaderWriterProvider; import com.sun.jersey.spi.MessageBodyWorkers; -public class EntryModelProvider extends - AbstractMessageReaderWriterProvider> { +public class EntryModelProvider extends AbstractMessageReaderWriterProvider> { MessageBodyWorkers workers; @@ -26,21 +25,18 @@ public EntryModelProvider(@Context MessageBodyWorkers workers) { this.workers = workers; } - public boolean isReadable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) { + public boolean isReadable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { return EntryModel.class.isAssignableFrom(type); } - public EntryModel readFrom(Class> type, Type genericType, - Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, InputStream entityStream) + public EntryModel readFrom(Class> type, Type genericType, Annotation[] annotations, + MediaType mediaType, MultivaluedMap httpHeaders, InputStream entityStream) throws IOException, WebApplicationException { - MessageBodyReader reader = workers.getMessageBodyReader( - Entry.class, Entry.class, annotations, mediaType); + MessageBodyReader reader = workers + .getMessageBodyReader(Entry.class, Entry.class, annotations, mediaType); - Entry entry = reader.readFrom(Entry.class, Entry.class, annotations, - mediaType, httpHeaders, entityStream); + Entry entry = reader.readFrom(Entry.class, Entry.class, annotations, mediaType, httpHeaders, entityStream); // these exceptions are masked as a RuntimeException because they cannot // be thrown by this override @@ -61,21 +57,18 @@ public EntryModel readFrom(Class> type, Type genericType, } } - public boolean isWriteable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) { + public boolean isWriteable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { return EntryModel.class.isAssignableFrom(type); } - public void writeTo(EntryModel t, Class type, Type genericType, - Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, - OutputStream entityStream) throws IOException, - WebApplicationException { + public void writeTo(EntryModel t, Class type, Type genericType, Annotation[] annotations, + MediaType mediaType, MultivaluedMap httpHeaders, OutputStream entityStream) + throws IOException, WebApplicationException { Entry entry = t.getEntry(); - MessageBodyWriter writer = workers.getMessageBodyWriter( - Entry.class, Entry.class, annotations, mediaType); + MessageBodyWriter writer = workers + .getMessageBodyWriter(Entry.class, Entry.class, annotations, mediaType); writer.writeTo(entry, Entry.class, genericType, annotations, mediaType, httpHeaders, entityStream); } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapFilter.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapFilter.java index 00683e93f2307..5a2356990c638 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapFilter.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapFilter.java @@ -14,8 +14,7 @@ public WrapFilter(WrapTokenManager tokenManager) { } @Override - public ClientResponse handle(ClientRequest cr) - throws ClientHandlerException { + public ClientResponse handle(ClientRequest cr) throws ClientHandlerException { String accessToken; try { @@ -26,8 +25,7 @@ public ClientResponse handle(ClientRequest cr) throw new ClientHandlerException(e); } - cr.getHeaders().add("Authorization", - "WRAP access_token=\"" + accessToken + "\""); + cr.getHeaders().add("Authorization", "WRAP access_token=\"" + accessToken + "\""); return this.getNext().handle(cr); } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxy.java index 824f00e230ab4..51180a8aa23c6 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxy.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapRestProxy.java @@ -22,7 +22,8 @@ public WrapRestProxy(Client channel) { this.channel = channel; } - public WrapAccessTokenResult wrapAccessToken(String uri, String name, String password, String scope) throws ServiceException { + public WrapAccessTokenResult wrapAccessToken(String uri, String name, String password, String scope) + throws ServiceException { Form requestForm = new Form(); requestForm.add("wrap_name", name); requestForm.add("wrap_password", password); @@ -30,12 +31,13 @@ public WrapAccessTokenResult wrapAccessToken(String uri, String name, String pas Form responseForm; try { - responseForm = channel.resource(uri).accept(MediaType.APPLICATION_FORM_URLENCODED).type(MediaType.APPLICATION_FORM_URLENCODED) - .post(Form.class, requestForm); + responseForm = channel.resource(uri).accept(MediaType.APPLICATION_FORM_URLENCODED) + .type(MediaType.APPLICATION_FORM_URLENCODED).post(Form.class, requestForm); } catch (UniformInterfaceException e) { log.warn("WRAP server returned error acquiring access_token", e); - throw ServiceExceptionFactory.process("WRAP", new ServiceException("WRAP server returned error acquiring access_token", e)); + throw ServiceExceptionFactory.process("WRAP", new ServiceException( + "WRAP server returned error acquiring access_token", e)); } WrapAccessTokenResult response = new WrapAccessTokenResult(); diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManager.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManager.java index 1ae1cf8fac7d2..4789c26c3a641 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManager.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/WrapTokenManager.java @@ -21,8 +21,8 @@ public class WrapTokenManager { private ActiveToken activeToken; @Inject - public WrapTokenManager(WrapContract contract, DateFactory dateFactory, @Named("wrap.uri") String uri, @Named("wrap.scope") String scope, - @Named("wrap.name") String name, @Named("wrap.password") String password) { + public WrapTokenManager(WrapContract contract, DateFactory dateFactory, @Named("wrap.uri") String uri, + @Named("wrap.scope") String scope, @Named("wrap.name") String name, @Named("wrap.password") String password) { this.contract = contract; this.dateFactory = dateFactory; this.uri = uri; diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateQueueResult.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateQueueResult.java index 71a2f7b2ddc90..e7f29c15a0d09 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateQueueResult.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateQueueResult.java @@ -5,35 +5,35 @@ */ public class CreateQueueResult { - private QueueInfo value; + private QueueInfo value; - /** - * Creates an instance of the CreateQueueResult class. - * - * @param value - * A {@link QueueInfo} object assigned as the value of the result. - */ - public CreateQueueResult(QueueInfo value) { - this.setValue(value); - } + /** + * Creates an instance of the CreateQueueResult class. + * + * @param value + * A {@link QueueInfo} object assigned as the value of the result. + */ + public CreateQueueResult(QueueInfo value) { + this.setValue(value); + } - /** - * Specfies the value of the result. - * - * @param value - * A {@link QueueInfo} object assigned as the value of the result. - */ - public void setValue(QueueInfo value) { - this.value = value; - } + /** + * Specfies the value of the result. + * + * @param value + * A {@link QueueInfo} object assigned as the value of the result. + */ + public void setValue(QueueInfo value) { + this.value = value; + } - /** - * Returns the value of the result. - * - * @return A {@link QueueInfo} object that represents the value of the result. - */ - public QueueInfo getValue() { - return value; - } + /** + * Returns the value of the result. + * + * @return A {@link QueueInfo} object that represents the value of the result. + */ + public QueueInfo getValue() { + return value; + } } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateRuleResult.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateRuleResult.java index 26811f17116b3..3e7bac017081b 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateRuleResult.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateRuleResult.java @@ -5,35 +5,35 @@ */ public class CreateRuleResult { - private RuleInfo value; + private RuleInfo value; - /** - * Creates an instance of the CreateRuleResult class. - * - * @param value - * A {@link RuleInfo} object assigned as the value of the result. - */ - public CreateRuleResult(RuleInfo value) { - this.setValue(value); - } + /** + * Creates an instance of the CreateRuleResult class. + * + * @param value + * A {@link RuleInfo} object assigned as the value of the result. + */ + public CreateRuleResult(RuleInfo value) { + this.setValue(value); + } - /** - * Specfies the value of the result. - * - * @param value - * A {@link RuleInfo} object assigned as the value of the result. - */ - public void setValue(RuleInfo value) { - this.value = value; - } + /** + * Specfies the value of the result. + * + * @param value + * A {@link RuleInfo} object assigned as the value of the result. + */ + public void setValue(RuleInfo value) { + this.value = value; + } - /** - * Returns the value of the result. - * - * @return A {@link RuleInfo} object that represents the value of the result. - */ - public RuleInfo getValue() { - return value; - } + /** + * Returns the value of the result. + * + * @return A {@link RuleInfo} object that represents the value of the result. + */ + public RuleInfo getValue() { + return value; + } } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateSubscriptionResult.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateSubscriptionResult.java index 87b495c4aaebe..7dd0df52e7140 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateSubscriptionResult.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateSubscriptionResult.java @@ -7,32 +7,32 @@ public class CreateSubscriptionResult { private SubscriptionInfo value; - /** - * Creates an instance of the CreateSubscriptionResult class. - * - * @param value - * A {@link SubscriptionInfo} object assigned as the value of the result. - */ + /** + * Creates an instance of the CreateSubscriptionResult class. + * + * @param value + * A {@link SubscriptionInfo} object assigned as the value of the result. + */ public CreateSubscriptionResult(SubscriptionInfo value) { this.setValue(value); } - /** - * Specfies the value of the result. - * - * @param value - * A {@link SubscriptionInfo} object assigned as the value of the - * result. - */ + /** + * Specfies the value of the result. + * + * @param value + * A {@link SubscriptionInfo} object assigned as the value of the + * result. + */ public void setValue(SubscriptionInfo value) { this.value = value; } - /** - * Returns the value of the result. - * - * @return A {@link SubscriptionInfo} object that represents the value of the result. - */ + /** + * Returns the value of the result. + * + * @return A {@link SubscriptionInfo} object that represents the value of the result. + */ public SubscriptionInfo getValue() { return value; } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateTopicResult.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateTopicResult.java index 263eb7b3e0d1d..11e1dfa0b9022 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateTopicResult.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/CreateTopicResult.java @@ -5,35 +5,35 @@ */ public class CreateTopicResult { - private TopicInfo value; + private TopicInfo value; - /** - * Creates an instance of the CreateTopicResult class. - * - * @param value - * A {@link TopicInfo} object assigned as the value of the result. - */ - public CreateTopicResult(TopicInfo value) { - this.setValue(value); - } + /** + * Creates an instance of the CreateTopicResult class. + * + * @param value + * A {@link TopicInfo} object assigned as the value of the result. + */ + public CreateTopicResult(TopicInfo value) { + this.setValue(value); + } - /** - * Specfies the value of the result. - * - * @param value - * A {@link TopicInfo} object assigned as the value of the result. - */ - public void setValue(TopicInfo value) { - this.value = value; - } + /** + * Specfies the value of the result. + * + * @param value + * A {@link TopicInfo} object assigned as the value of the result. + */ + public void setValue(TopicInfo value) { + this.value = value; + } - /** - * Returns the value of the result. - * - * @return A {@link TopicInfo} object that represents the value of the result. - */ - public TopicInfo getValue() { - return value; - } + /** + * Returns the value of the result. + * + * @return A {@link TopicInfo} object that represents the value of the result. + */ + public TopicInfo getValue() { + return value; + } } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetQueueResult.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetQueueResult.java index ddb5da06d5a11..c625bb7e7d9eb 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetQueueResult.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetQueueResult.java @@ -5,35 +5,35 @@ */ public class GetQueueResult { - private QueueInfo value; + private QueueInfo value; - /** - * Creates an instance of the GetQueueResult class. - * - * @param value - * A {@link QueueInfo} object assigned as the value of the result. - */ - public GetQueueResult(QueueInfo value) { - this.setValue(value); - } + /** + * Creates an instance of the GetQueueResult class. + * + * @param value + * A {@link QueueInfo} object assigned as the value of the result. + */ + public GetQueueResult(QueueInfo value) { + this.setValue(value); + } - /** - * Specfies the value of the result. - * - * @param value - * A {@link QueueInfo} object assigned as the value of the result. - */ - public void setValue(QueueInfo value) { - this.value = value; - } + /** + * Specfies the value of the result. + * + * @param value + * A {@link QueueInfo} object assigned as the value of the result. + */ + public void setValue(QueueInfo value) { + this.value = value; + } - /** - * Returns the value of the result. - * - * @return A {@link QueueInfo} object that represents the value of the result. - */ - public QueueInfo getValue() { - return value; - } + /** + * Returns the value of the result. + * + * @return A {@link QueueInfo} object that represents the value of the result. + */ + public QueueInfo getValue() { + return value; + } } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetRuleResult.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetRuleResult.java index b45b4f4c5722b..2a9217f7137fe 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetRuleResult.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetRuleResult.java @@ -5,35 +5,35 @@ */ public class GetRuleResult { - private RuleInfo value; + private RuleInfo value; - /** - * Creates an instance of the GetRuleResult class. - * - * @param value - * A {@link RuleInfo} object assigned as the value of the result. - */ - public GetRuleResult(RuleInfo value) { - this.setValue(value); - } + /** + * Creates an instance of the GetRuleResult class. + * + * @param value + * A {@link RuleInfo} object assigned as the value of the result. + */ + public GetRuleResult(RuleInfo value) { + this.setValue(value); + } - /** - * Specfies the value of the result. - * - * @param value - * A {@link RuleInfo} object assigned as the value of the result. - */ - public void setValue(RuleInfo value) { - this.value = value; - } + /** + * Specfies the value of the result. + * + * @param value + * A {@link RuleInfo} object assigned as the value of the result. + */ + public void setValue(RuleInfo value) { + this.value = value; + } - /** - * Returns the value of the result. - * - * @return A {@link RuleInfo} object that represents the value of the result. - */ - public RuleInfo getValue() { - return value; - } + /** + * Returns the value of the result. + * + * @return A {@link RuleInfo} object that represents the value of the result. + */ + public RuleInfo getValue() { + return value; + } } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetSubscriptionResult.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetSubscriptionResult.java index b8519fd8150ca..15a897f07e8f0 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetSubscriptionResult.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetSubscriptionResult.java @@ -5,38 +5,38 @@ */ public class GetSubscriptionResult { - private SubscriptionInfo value; + private SubscriptionInfo value; - /** - * Creates an instance of the GetSubscriptionResult class. - * - * @param value - * A {@link SubscriptionInfo} object assigned as the value of the - * result. - */ - public GetSubscriptionResult(SubscriptionInfo value) { - this.setValue(value); - } + /** + * Creates an instance of the GetSubscriptionResult class. + * + * @param value + * A {@link SubscriptionInfo} object assigned as the value of the + * result. + */ + public GetSubscriptionResult(SubscriptionInfo value) { + this.setValue(value); + } - /** - * Specfies the value of the result. - * - * @param value - * A {@link SubscriptionInfo} object assigned as the value of the - * result. - */ - public void setValue(SubscriptionInfo value) { - this.value = value; - } + /** + * Specfies the value of the result. + * + * @param value + * A {@link SubscriptionInfo} object assigned as the value of the + * result. + */ + public void setValue(SubscriptionInfo value) { + this.value = value; + } - /** - * Returns the value of the result. - * - * @return A {@link SubscriptionInfo} object that represents the value of the - * result. - */ - public SubscriptionInfo getValue() { - return value; - } + /** + * Returns the value of the result. + * + * @return A {@link SubscriptionInfo} object that represents the value of the + * result. + */ + public SubscriptionInfo getValue() { + return value; + } } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetTopicResult.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetTopicResult.java index bce289b148853..8a8fbeaeb9be5 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetTopicResult.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/GetTopicResult.java @@ -5,35 +5,35 @@ */ public class GetTopicResult { - private TopicInfo value; + private TopicInfo value; - /** - * Creates an instance of the GetTopicResult class. - * - * @param value - * A {@link TopicInfo} object assigned as the value of the result. - */ - public GetTopicResult(TopicInfo value) { - this.setValue(value); - } + /** + * Creates an instance of the GetTopicResult class. + * + * @param value + * A {@link TopicInfo} object assigned as the value of the result. + */ + public GetTopicResult(TopicInfo value) { + this.setValue(value); + } - /** - * Specfies the value of the result. - * - * @param value - * A {@link TopicInfo} object assigned as the value of the result. - */ - public void setValue(TopicInfo value) { - this.value = value; - } + /** + * Specfies the value of the result. + * + * @param value + * A {@link TopicInfo} object assigned as the value of the result. + */ + public void setValue(TopicInfo value) { + this.value = value; + } - /** - * Returns the value of the result. - * - * @return A {@link TopicInfo} object that represents the value of the result. - */ - public TopicInfo getValue() { - return value; - } + /** + * Returns the value of the result. + * + * @return A {@link TopicInfo} object that represents the value of the result. + */ + public TopicInfo getValue() { + return value; + } } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListQueuesResult.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListQueuesResult.java index 877e0f105bae5..e7ee67a9f3a45 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListQueuesResult.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListQueuesResult.java @@ -7,26 +7,26 @@ */ public class ListQueuesResult { - private List items; + private List items; - /** - * Returns the items in the result list. - * - * @return A List of {@link QueueInfo} objects that represent the - * items in the result list. - */ - public List getItems() { - return items; - } + /** + * Returns the items in the result list. + * + * @return A List of {@link QueueInfo} objects that represent the + * items in the result list. + */ + public List getItems() { + return items; + } - /** - * Specfies the items in the result list. - * - * @param value - * A List object that contains the {@link QueueInfo} - * objects assigned as the value of the result. - */ - public void setItems(List items) { - this.items = items; - } + /** + * Specfies the items in the result list. + * + * @param value + * A List object that contains the {@link QueueInfo} objects assigned as the value of the + * result. + */ + public void setItems(List items) { + this.items = items; + } } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListRulesResult.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListRulesResult.java index 61db6d2fea0a1..0766e3896d78a 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListRulesResult.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListRulesResult.java @@ -9,23 +9,23 @@ public class ListRulesResult { private List items; - /** - * Returns the items in the result list. - * - * @return A List of {@link RuleInfo} objects that represent the - * items in the result list. - */ + /** + * Returns the items in the result list. + * + * @return A List of {@link RuleInfo} objects that represent the + * items in the result list. + */ public List getItems() { return items; } - /** - * Specfies the items in the result list. - * - * @param value - * A List object that contains the {@link RuleInfo} - * objects assigned as the value of the result. - */ + /** + * Specfies the items in the result list. + * + * @param value + * A List object that contains the {@link RuleInfo} objects assigned as the value of the + * result. + */ public void setItems(List items) { this.items = items; } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListSubscriptionsResult.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListSubscriptionsResult.java index 574bb74fa826e..9ea13c690bd6c 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListSubscriptionsResult.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListSubscriptionsResult.java @@ -9,23 +9,23 @@ public class ListSubscriptionsResult { private List items; - /** - * Returns the items in the result list. - * - * @return A List of {@link SubscriptionInfo} objects that represent the - * items in the result list. - */ + /** + * Returns the items in the result list. + * + * @return A List of {@link SubscriptionInfo} objects that represent the + * items in the result list. + */ public List getItems() { return items; } - /** - * Specfies the items in the result list. - * - * @param value - * A List object that contains the {@link SubscriptionInfo} - * objects assigned as the value of the result. - */ + /** + * Specfies the items in the result list. + * + * @param value + * A List object that contains the {@link SubscriptionInfo} objects assigned as the value of + * the result. + */ public void setItems(List items) { this.items = items; } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListTopicsResult.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListTopicsResult.java index b8eddf1960185..efe91c422362b 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListTopicsResult.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/ListTopicsResult.java @@ -9,23 +9,23 @@ public class ListTopicsResult { private List items; - /** - * Returns the items in the result list. - * - * @return A List of {@link TopicInfo} objects that represent the - * items in the result list. - */ + /** + * Returns the items in the result list. + * + * @return A List of {@link TopicInfo} objects that represent the + * items in the result list. + */ public List getItems() { return items; } - - /** - * Specfies the items in the result list. - * - * @param value - * A List object that contains the {@link TopicInfo} - * objects assigned as the value of the result. - */ + + /** + * Specfies the items in the result list. + * + * @param value + * A List object that contains the {@link TopicInfo} objects assigned as the value of the + * result. + */ public void setItems(List items) { this.items = items; } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/SubscriptionInfo.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/SubscriptionInfo.java index 3c9aec8974c3a..7dea0733c7857 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/SubscriptionInfo.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/models/SubscriptionInfo.java @@ -209,7 +209,6 @@ public Long getMessageCount() { return getModel().getMessageCount(); } - /** * Returns the maximum delivery count for the subscription. *