diff --git a/src/main/java/com/emc/rest/smart/OctetStreamXmlProvider.java b/src/main/java/com/emc/rest/smart/OctetStreamXmlProvider.java new file mode 100644 index 0000000..55e084d --- /dev/null +++ b/src/main/java/com/emc/rest/smart/OctetStreamXmlProvider.java @@ -0,0 +1,67 @@ +/* + * 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.sun.jersey.core.impl.provider.entity.XMLRootElementProvider; +import com.sun.jersey.spi.inject.Injectable; + +import javax.ws.rs.Consumes; +import javax.ws.rs.Produces; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.ext.MessageBodyReader; +import javax.ws.rs.ext.Providers; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.parsers.SAXParserFactory; +import java.io.IOException; +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; + +@Produces("application/octet-stream") +@Consumes("application/octet-stream") +public class OctetStreamXmlProvider implements MessageBodyReader { + private MessageBodyReader delegate; + + public OctetStreamXmlProvider(@Context Injectable spf, @Context Providers ps) { + this.delegate = new XMLRootElementProvider.General(spf, ps); + } + + @Override + public boolean isReadable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { + return (type.getAnnotation(XmlRootElement.class) != null || type.getAnnotation(XmlType.class) != null) + && mediaType.equals(MediaType.APPLICATION_OCTET_STREAM_TYPE); + } + + @Override + public Object readFrom(Class type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap httpHeaders, InputStream entityStream) throws IOException, WebApplicationException { + return delegate.readFrom(type, genericType, annotations, mediaType, httpHeaders, entityStream); + } +} diff --git a/src/main/java/com/emc/rest/smart/SmartClientFactory.java b/src/main/java/com/emc/rest/smart/SmartClientFactory.java index 951c3da..44eaffe 100644 --- a/src/main/java/com/emc/rest/smart/SmartClientFactory.java +++ b/src/main/java/com/emc/rest/smart/SmartClientFactory.java @@ -102,6 +102,9 @@ public static Client createStandardClient(SmartConfig smartConfig, clientConfig.getClasses().add(FileProvider.class); clientConfig.getClasses().add(InputStreamProvider.class); + // add support for XML with no content-type + clientConfig.getClasses().add(OctetStreamXmlProvider.class); + // build Jersey client return new Client(clientHandler, clientConfig); } diff --git a/src/main/java/com/emc/rest/smart/ecs/Vdc.java b/src/main/java/com/emc/rest/smart/ecs/Vdc.java index d115375..dbcb85e 100644 --- a/src/main/java/com/emc/rest/smart/ecs/Vdc.java +++ b/src/main/java/com/emc/rest/smart/ecs/Vdc.java @@ -89,6 +89,18 @@ public int hashCode() { return getName().hashCode(); } + @Override + public String toString() { + String hostsString = ""; + if (hosts != null) { + for (Host host : hosts) { + if (hostsString.length() > 0) hostsString += ","; + hostsString += host.getName(); + } + } + return name + '(' + hostsString + ')'; + } + public String getName() { return name; }