From 5d0f1b3b340564e5134e03faa5566f54616a1a38 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Mon, 5 Dec 2011 13:41:33 -0800 Subject: [PATCH] Rename utility class --- .../blob/implementation/BlobRestProxy.java | 22 +++++++++---------- .../HttpURLConnectionClientHandler.java | 2 +- ...erseyHelpers.java => PipelineHelpers.java} | 2 +- .../queue/implementation/QueueRestProxy.java | 12 +++++----- 4 files changed, 19 insertions(+), 19 deletions(-) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/{JerseyHelpers.java => PipelineHelpers.java} (99%) 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 3c462a01b857e..3907ac20db407 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 @@ -71,8 +71,8 @@ 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.core.utils.pipeline.JerseyHelpers.EnumCommaStringBuilder; +import com.microsoft.windowsazure.services.core.utils.pipeline.PipelineHelpers; +import com.microsoft.windowsazure.services.core.utils.pipeline.PipelineHelpers.EnumCommaStringBuilder; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; import com.sun.jersey.api.client.WebResource.Builder; @@ -119,39 +119,39 @@ public BlobContract withFilter(ServiceFilter filter) { } private void ThrowIfError(ClientResponse r) { - JerseyHelpers.ThrowIfError(r); + PipelineHelpers.ThrowIfError(r); } private WebResource addOptionalQueryParam(WebResource webResource, String key, Object value) { - return JerseyHelpers.addOptionalQueryParam(webResource, key, value); + return PipelineHelpers.addOptionalQueryParam(webResource, key, value); } private WebResource addOptionalQueryParam(WebResource webResource, String key, int value, int defaultValue) { - return JerseyHelpers.addOptionalQueryParam(webResource, key, value, defaultValue); + return PipelineHelpers.addOptionalQueryParam(webResource, key, value, defaultValue); } private Builder addOptionalHeader(Builder builder, String name, Object value) { - return JerseyHelpers.addOptionalHeader(builder, name, value); + return PipelineHelpers.addOptionalHeader(builder, name, value); } private Builder addOptionalMetadataHeader(Builder builder, Map metadata) { - return JerseyHelpers.addOptionalMetadataHeader(builder, metadata); + return PipelineHelpers.addOptionalMetadataHeader(builder, metadata); } private Builder addOptionalRangeHeader(Builder builder, Long rangeStart, Long rangeEnd) { - return JerseyHelpers.addOptionalRangeHeader(builder, rangeStart, rangeEnd); + return PipelineHelpers.addOptionalRangeHeader(builder, rangeStart, rangeEnd); } private Builder addOptionalAccessContitionHeader(Builder builder, AccessCondition accessCondition) { - return JerseyHelpers.addOptionalAccessContitionHeader(builder, accessCondition); + return PipelineHelpers.addOptionalAccessContitionHeader(builder, accessCondition); } private Builder addOptionalSourceAccessContitionHeader(Builder builder, AccessCondition accessCondition) { - return JerseyHelpers.addOptionalSourceAccessContitionHeader(builder, accessCondition); + return PipelineHelpers.addOptionalSourceAccessContitionHeader(builder, accessCondition); } private HashMap getMetadataFromHeaders(ClientResponse response) { - return JerseyHelpers.getMetadataFromHeaders(response); + return PipelineHelpers.getMetadataFromHeaders(response); } private WebResource addOptionalBlobListingIncludeQueryParam(ListBlobsOptions options, WebResource webResource) { diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/HttpURLConnectionClientHandler.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/HttpURLConnectionClientHandler.java index e8eba599def27..0610eb8d7bc94 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/HttpURLConnectionClientHandler.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/HttpURLConnectionClientHandler.java @@ -27,7 +27,7 @@ import javax.ws.rs.core.MultivaluedMap; -import com.microsoft.windowsazure.services.core.utils.pipeline.JerseyHelpers.EnumCommaStringBuilder; +import com.microsoft.windowsazure.services.core.utils.pipeline.PipelineHelpers.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/services/core/utils/pipeline/JerseyHelpers.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/PipelineHelpers.java similarity index 99% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/JerseyHelpers.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/PipelineHelpers.java index 909daeacc3580..95fce9e9dbeb2 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/JerseyHelpers.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/PipelineHelpers.java @@ -26,7 +26,7 @@ import com.sun.jersey.api.client.WebResource; import com.sun.jersey.api.client.WebResource.Builder; -public class JerseyHelpers { +public class PipelineHelpers { public static void ThrowIfError(ClientResponse r) { if (r.getStatus() >= 300) { throw new UniformInterfaceException(r); 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 fa115bf4c86ba..4677d0431b818 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 @@ -26,7 +26,7 @@ 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.core.utils.pipeline.PipelineHelpers; import com.microsoft.windowsazure.services.queue.QueueConfiguration; import com.microsoft.windowsazure.services.queue.QueueContract; import com.microsoft.windowsazure.services.queue.models.CreateMessageOptions; @@ -88,23 +88,23 @@ public QueueContract withFilter(ServiceFilter filter) { } private void ThrowIfError(ClientResponse r) { - JerseyHelpers.ThrowIfError(r); + PipelineHelpers.ThrowIfError(r); } private WebResource addOptionalQueryParam(WebResource webResource, String key, Object value) { - return JerseyHelpers.addOptionalQueryParam(webResource, key, value); + return PipelineHelpers.addOptionalQueryParam(webResource, key, value); } private WebResource addOptionalQueryParam(WebResource webResource, String key, int value, int defaultValue) { - return JerseyHelpers.addOptionalQueryParam(webResource, key, value, defaultValue); + return PipelineHelpers.addOptionalQueryParam(webResource, key, value, defaultValue); } private Builder addOptionalMetadataHeader(Builder builder, Map metadata) { - return JerseyHelpers.addOptionalMetadataHeader(builder, metadata); + return PipelineHelpers.addOptionalMetadataHeader(builder, metadata); } private HashMap getMetadataFromHeaders(ClientResponse response) { - return JerseyHelpers.getMetadataFromHeaders(response); + return PipelineHelpers.getMetadataFromHeaders(response); } private WebResource getResource(QueueServiceOptions options) {