Support update for output entry format, API v6 #1

src/main/java/org/rundeck/api/RundeckClient.java

@@ -2526,7 +2526,7 @@ public class RundeckClient implements Serializable {
                                                                                       .param("lastlines", lastlines)
                                                                                       .param("lastmod", lastmod)
                                                                                       .param("maxlines", maxlines),
-                                     new OutputParser("result/output"));
+                                     new OutputParser("result/output", createOutputEntryParser()));
     }
 
     
@@ -2549,7 +2549,15 @@ public class RundeckClient implements Serializable {
         return new ApiCall(this).get(new ApiPathBuilder("/execution/", executionId.toString(), "/output.xml").param("offset", offset)
                                                                                       .param("lastmod", lastmod)
                                                                                       .param("maxlines", maxlines),
-                                     new OutputParser("result/output"));
+                                     new OutputParser("result/output", createOutputEntryParser()));
+    }
+
+    private OutputEntryParser createOutputEntryParser() {
+        if (getApiVersion() <= Version.V5.versionNumber) {
+            return new OutputEntryParserV5();
+        }else{
+            return new OutputEntryParser();
+        }
     }
 
     

src/main/java/org/rundeck/api/parser/OutputEntryParser.java

@@ -6,6 +6,9 @@ import org.dom4j.Node;
 import org.rundeck.api.domain.RundeckOutputEntry;
 import org.rundeck.api.domain.RundeckOutputEntry.RundeckLogLevel;
 
+/**
+ * Parses output message content for API v6
+ */
 public class OutputEntryParser implements XmlNodeParser<RundeckOutputEntry> {
 
 
@@ -39,9 +42,16 @@ public class OutputEntryParser implements XmlNodeParser<RundeckOutputEntry> {
         outputEntry.setUser(StringUtils.trimToNull(entryNode.valueOf("@user")));
         outputEntry.setCommand(StringUtils.trimToNull(entryNode.valueOf("@command")));
         outputEntry.setNode(StringUtils.trimToNull(entryNode.valueOf("@node")));
-        outputEntry.setMessage(StringUtils.trimToNull(entryNode.getStringValue()));
+        outputEntry.setMessage(parseMessage(entryNode));
         
         return outputEntry;
     }
 
+    /**
+     * Parse the message content
+     */
+    protected String parseMessage(Node entryNode) {
+        return StringUtils.trimToNull(entryNode.valueOf("@log"));
+    }
+
 }

src/main/java/org/rundeck/api/parser/OutputEntryParserV5.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2013 DTO Labs, Inc. (http://dtolabs.com)
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+ 
+/*
+ * OutputEntryParserV5.java
+ * 
+ * User: Greg Schueler <a href="mailto:greg@dtosolutions.com">greg@dtosolutions.com</a>
+ * Created: 1/2/13 5:33 PM
+ * 
+ */
+package org.rundeck.api.parser;
+
+import org.apache.commons.lang.StringUtils;
+import org.dom4j.Node;
+import org.rundeck.api.domain.RundeckOutputEntry;
+
+
+/**
+ * OutputEntryParserV5 parses message entry for API v5
+ *
+ * @author Greg Schueler <a href="mailto:greg@dtosolutions.com">greg@dtosolutions.com</a>
+ */
+public class OutputEntryParserV5 extends OutputEntryParser implements XmlNodeParser<RundeckOutputEntry>{
+    public OutputEntryParserV5() {
+    }
+
+    public OutputEntryParserV5(String xpath) {
+        super(xpath);
+    }
+
+    @Override
+    protected String parseMessage(Node entryNode) {
+        return StringUtils.trimToNull(entryNode.getStringValue());
+    }
+}

src/main/java/org/rundeck/api/parser/OutputParser.java

@@ -1,30 +1,25 @@
 package org.rundeck.api.parser;
 
-import java.util.List;
 import org.apache.commons.lang.StringUtils;
 import org.dom4j.Node;
-
+import org.rundeck.api.domain.RundeckExecution;
 import org.rundeck.api.domain.RundeckOutput;
 import org.rundeck.api.domain.RundeckOutputEntry;
-import org.rundeck.api.domain.RundeckExecution;
+
-import org.rundeck.api.domain.RundeckExecution.ExecutionStatus;
+import java.util.List;
 
 
 public class OutputParser implements XmlNodeParser<RundeckOutput> {
 
 
     private String xpath;
+    XmlNodeParser<RundeckOutputEntry> parser;
 
-    public OutputParser() {
+    public OutputParser(String xpath, XmlNodeParser<RundeckOutputEntry> parser) {
-        super();
-    }
-
-    /**
-     * @param xpath of the event element if it is not the root node
-     */
-    public OutputParser(String xpath) {
-        super();
         this.xpath = xpath;
+        if (null != parser) {
+            this.parser = parser;
+        }
     }
 
     @Override
@@ -54,7 +49,8 @@ public class OutputParser implements XmlNodeParser<RundeckOutput> {
         output.setHasFailedNodes(Boolean.valueOf(entryNode.valueOf("hasFailedNodes")));
 
         try {
-    		output.setStatus(RundeckExecution.ExecutionStatus.valueOf(StringUtils.upperCase(entryNode.valueOf("execState"))));
+            output.setStatus(RundeckExecution.ExecutionStatus
+                                 .valueOf(StringUtils.upperCase(entryNode.valueOf("execState"))));
         } catch (IllegalArgumentException e) {
             output.setStatus(null);
         }
@@ -88,10 +84,9 @@ public class OutputParser implements XmlNodeParser<RundeckOutput> {
         if (entriesListNode != null) {
             @SuppressWarnings("unchecked")
             List<Node> entries = entriesListNode.selectNodes("entry");
-        	OutputEntryParser entryParser = new OutputEntryParser();
 
             for (Node logEntryNode : entries) {
-            	RundeckOutputEntry outputEntry = entryParser.parseXmlNode(logEntryNode);
+                RundeckOutputEntry outputEntry = parser.parseXmlNode(logEntryNode);
                 output.addLogEntry(outputEntry);
             }
         }