Merge branch 'master' of github.com:SpringSource/rest-shell

Author: jbrisbin

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

@@ -229,7 +229,7 @@ public String put(
                  help = "The path to the resource.",
                  unspecifiedDefaultValue = "") PathOrRel path,
       @CliOption(key = "data",
-                 mandatory = true,
+                 mandatory = false,
                  help = "The JSON data to use as the resource.") String data,
       @CliOption(key = "from",
                  mandatory = false,
@@ -307,9 +307,13 @@ public String execute(final HttpMethod method,
                         final boolean follow,
                         final String outputPath) {
     final StringBuilder buffer = new StringBuilder();
+    MediaType contentType = configCmds.getHeaders().getContentType();
+    if(contentType == null) {
+      contentType = MediaType.APPLICATION_JSON;
+    }
 
     ResponseErrorHandler origErrHandler = restTemplate.getErrorHandler();
-    RequestHelper helper = (null == data ? new RequestHelper() : new RequestHelper(data, MediaType.APPLICATION_JSON));
+    RequestHelper helper = (null == data ? new RequestHelper() : new RequestHelper(data, contentType));
     ResponseEntity<String> response;
     try {
       restTemplate.setErrorHandler(new ResponseErrorHandler() {
@@ -380,14 +384,16 @@ private String readFileOrFiles(final HttpMethod method,
                                  final String fromPath,
                                  final boolean follow,
                                  final String outputPath) throws IOException {
-    final AtomicInteger numItems = new AtomicInteger(0);
+    String output = "";
 
     File fromFile = new File(fromPath);
     if(!fromFile.exists()) {
       throw new IllegalArgumentException("Path " + fromPath + " not found.");
     }
 
     if(fromFile.isDirectory()) {
+      final AtomicInteger numItems = new AtomicInteger(0);
+
       FilenameFilter jsonFilter = new FilenameFilter() {
         @Override public boolean accept(File file, String s) {
           return s.endsWith(".json");
@@ -405,19 +411,22 @@ private String readFileOrFiles(final HttpMethod method,
 
         numItems.incrementAndGet();
       }
+
+      output = numItems.get() + " files uploaded to the server using " + method;
     } else {
       Object body = readFile(fromFile);
-      String response = execute(HttpMethod.POST,
+      String response = execute(method,
                                 body,
                                 follow,
                                 outputPath);
       if(LOG.isDebugEnabled()) {
         LOG.debug(response);
       }
-      numItems.incrementAndGet();
+
+      output = response;
     }
 
-    return numItems.get() + " files uploaded to the server using " + method;
+    return output;
   }
 
   private Object readFile(File file) throws IOException {
@@ -607,5 +616,4 @@ private class SslAwareClientHttpRequestFactory extends SimpleClientHttpRequestFa
       super.prepareConnection(connection, httpMethod);
     }
   }
-
 }

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

@@ -26,6 +26,7 @@ public Collection<String> getSupportedList() {
   public String format(String nonFormattedString) {
     try {
       Transformer serializer = SAXTransformerFactory.newInstance().newTransformer();
+      serializer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
       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())));