Skip to content

Commit

Permalink
Merge pull request Azure#179 from rpaquay/rename-pipeline
Browse files Browse the repository at this point in the history
Rename utility class
  • Loading branch information
loudej committed Dec 5, 2011
2 parents 8bdef57 + 5d0f1b3 commit 48904b8
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<String, String> 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<String, String> getMetadataFromHeaders(ClientResponse response) {
return JerseyHelpers.getMetadataFromHeaders(response);
return PipelineHelpers.getMetadataFromHeaders(response);
}

private WebResource addOptionalBlobListingIncludeQueryParam(ListBlobsOptions options, WebResource webResource) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<String, String> metadata) {
return JerseyHelpers.addOptionalMetadataHeader(builder, metadata);
return PipelineHelpers.addOptionalMetadataHeader(builder, metadata);
}

private HashMap<String, String> getMetadataFromHeaders(ClientResponse response) {
return JerseyHelpers.getMetadataFromHeaders(response);
return PipelineHelpers.getMetadataFromHeaders(response);
}

private WebResource getResource(QueueServiceOptions options) {
Expand Down

0 comments on commit 48904b8

Please sign in to comment.