Skip to content

Commit

Permalink
v1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Stu Arnett committed May 14, 2015
1 parent 729cc35 commit d606477
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 1 deletion.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ description = 'Smart REST Client - JAX-RS (Jersey) REST client that provides cli
ext.githubProjectName = 'smart-client-java'

buildscript {
ext.commonBuildVersion = '1.2'
ext.commonBuildVersion = '1.3.1'
ext.commonBuildDir = "https://raw.githubusercontent.com/emcvipr/ecs-common-build/v$commonBuildVersion"
apply from: "$commonBuildDir/ecs-publish.buildscript.gradle", to: buildscript
}
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/com/emc/rest/smart/SizeOverrideWriter.java
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,13 @@ public InputStream() {
super(delegate);
}
}

@Produces({"application/octet-stream", "*/*"})
public static class SizedInputStream extends SizeOverrideWriter<com.emc.rest.util.SizedInputStream> {
private static final SizedInputStreamWriter delegate = new SizedInputStreamWriter();

public SizedInputStream() {
super(delegate);
}
}
}
58 changes: 58 additions & 0 deletions src/main/java/com/emc/rest/smart/SizedInputStreamWriter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
* Copyright (c) 2015, EMC Corporation.
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* + Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* + Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* + The name of EMC Corporation may not be used to endorse or promote
* products derived from this software without specific prior written
* permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package com.emc.rest.smart;

import com.emc.rest.util.SizedInputStream;
import com.sun.jersey.core.util.ReaderWriter;

import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
import java.io.IOException;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;

@Produces({"application/octet-stream", "*/*"})
public class SizedInputStreamWriter implements MessageBodyWriter<SizedInputStream> {
@Override
public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
return SizedInputStream.class.isAssignableFrom(type);
}

@Override
public long getSize(SizedInputStream sizedInputStream, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
return sizedInputStream.getSize();
}

@Override
public void writeTo(SizedInputStream sizedInputStream, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
ReaderWriter.writeTo(sizedInputStream, entityStream);
}
}
1 change: 1 addition & 0 deletions src/main/java/com/emc/rest/smart/SmartClientFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public static Client createStandardClient(SmartConfig smartConfig,
clientConfig.getClasses().remove(InputStreamProvider.class);
clientConfig.getClasses().add(SizeOverrideWriter.ByteArray.class);
clientConfig.getClasses().add(SizeOverrideWriter.File.class);
clientConfig.getClasses().add(SizeOverrideWriter.SizedInputStream.class);
clientConfig.getClasses().add(SizeOverrideWriter.InputStream.class);
clientConfig.getClasses().add(ByteArrayProvider.class);
clientConfig.getClasses().add(FileProvider.class);
Expand Down

0 comments on commit d606477

Please sign in to comment.