Merge pull request spring-attic#18 from skuppa/master

Added xml formatting support

Author: jbrisbin

src/main/java/org/springframework/data/rest/shell/commands/HttpCommands.java

@@ -28,6 +28,8 @@
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.data.rest.shell.context.ResponseEvent;
+import org.springframework.data.rest.shell.formatter.FormatProvider;
+import org.springframework.data.rest.shell.formatter.Formatter;
 import org.springframework.hateoas.Link;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -79,6 +81,8 @@ public class HttpCommands implements CommandMarker, ApplicationEventPublisherAwa
   private ApplicationEventPublisher ctx;
   private Object                    lastResult;
   private URI                       requestUri;
+  @Autowired
+  private FormatProvider formatProvider;
 
   @Override public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
     this.ctx = applicationEventPublisher;
@@ -498,7 +502,8 @@ private void outputResponse(ResponseEntity<String> response, StringBuilder buffe
     }
     buffer.append("< ").append(OsUtils.LINE_SEPARATOR);
     if(null != response.getBody()) {
-      buffer.append(response.getBody());
+      final Formatter formatter = formatProvider.getFormatter(response.getHeaders().getContentType().getSubtype());
+      buffer.append(formatter.format(response.getBody()));
     }
   }
 

src/main/java/org/springframework/data/rest/shell/formatter/FormatProvider.java

@@ -0,0 +1,26 @@
+package org.springframework.data.rest.shell.formatter;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class FormatProvider {
+  private final Collection<Formatter> availableFormatter = new ArrayList<Formatter>();
+  private final NoOpFormatter noOpFormatter = new NoOpFormatter();
+
+  public FormatProvider() {
+    availableFormatter.add(new XmlFormatter());
+  }
+
+  public Formatter getFormatter(String contentType) {
+    for (Formatter formatter : availableFormatter) {
+      if(formatter.isSupported(contentType)) {
+        return formatter;
+      }
+    }
+
+    return noOpFormatter;
+  }
+}

src/main/java/org/springframework/data/rest/shell/formatter/Formatter.java

@@ -0,0 +1,6 @@
+package org.springframework.data.rest.shell.formatter;
+
+public interface Formatter {
+  boolean isSupported(String contentType);
+  String format(String nonFormattedString);
+}

src/main/java/org/springframework/data/rest/shell/formatter/FormatterSupport.java

@@ -0,0 +1,19 @@
+package org.springframework.data.rest.shell.formatter;
+
+import java.util.Collection;
+
+public abstract class FormatterSupport implements Formatter {
+  @Override
+  public boolean isSupported(String contentType) {
+    boolean supported = false;
+    for (String subType : getSupportedList()) {
+      supported = contentType.indexOf(subType) > 0;
+      if(supported) {
+        break;
+      }
+    }
+    return supported;
+  }
+
+  public abstract Collection<String> getSupportedList();
+}

src/main/java/org/springframework/data/rest/shell/formatter/NoOpFormatter.java

@@ -0,0 +1,13 @@
+package org.springframework.data.rest.shell.formatter;
+
+public class NoOpFormatter implements Formatter {
+  @Override
+  public boolean isSupported(String contentType) {
+    return true;
+  }
+
+  @Override
+  public String format(String nonFormattedString) {
+    return nonFormattedString;
+  }
+}

src/main/java/org/springframework/data/rest/shell/formatter/XmlFormatter.java

@@ -0,0 +1,41 @@
+package org.springframework.data.rest.shell.formatter;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+
+import org.xml.sax.InputSource;
+
+public class XmlFormatter extends FormatterSupport {
+  private final List<String> supportedContentTypes = Arrays.asList("xml");
+
+  @Override
+  public Collection<String> getSupportedList() {
+    return supportedContentTypes;
+  }
+
+  @Override
+  public String format(String nonFormattedString) {
+    try {
+      Transformer serializer = SAXTransformerFactory.newInstance().newTransformer();
+      serializer.setOutputProperty(OutputKeys.INDENT, "yes");
+      serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
+      Source xmlSource = new SAXSource(new InputSource(new ByteArrayInputStream(nonFormattedString.getBytes())));
+      StreamResult res = new StreamResult(new ByteArrayOutputStream());
+
+      serializer.transform(xmlSource, res);
+
+      return new String(((ByteArrayOutputStream) res.getOutputStream()).toByteArray());
+    } catch (Exception e) {
+      return nonFormattedString;
+    }
+  }
+}