#338 Added XML support for unmarshalling XDBC/ODBC servers

Author: rjrudin

src/main/java/com/marklogic/appdeployer/command/AbstractCommand.java

@@ -160,8 +160,17 @@ protected SaveReceipt saveResource(ResourceManager mgr, CommandContext context,
 		String payload = readResourceFromFile(mgr, context, resourceFile);
 
 		if (payload != null && resourceMergingIsSupported(context)) {
-			storeResourceInCommandContextMap(context, resourceFile, payload);
-			return null;
+			try {
+				storeResourceInCommandContextMap(context, resourceFile, payload);
+				return null;
+			} catch (Exception ex) {
+				/**
+				 * As a worst case, if the payload cannot be unmarshalled (and converted if necessary) into an ObjectNode,
+				 * this warning will be logged and the resource will be saved immediately.
+				 */
+				logger.warn("Unable to store resource in context map so it can be merged (if needed) and " +
+					"saved later, so the resource will instead be saved immediately. Error cause: " + ex.getMessage());
+			}
 		}
 
 		return saveResource(mgr, context, payload);

src/main/java/com/marklogic/mgmt/api/server/HttpServer.java

@@ -0,0 +1,16 @@
+package com.marklogic.mgmt.api.server;
+
+import com.marklogic.mgmt.api.API;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "http-server-properties")
+public class HttpServer extends Server {
+
+	public HttpServer() {
+	}
+
+	public HttpServer(API api, String serverName) {
+		super(api, serverName);
+	}
+}

src/main/java/com/marklogic/mgmt/api/server/OdbcServer.java

@@ -0,0 +1,16 @@
+package com.marklogic.mgmt.api.server;
+
+import com.marklogic.mgmt.api.API;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "odbc-server-properties")
+public class OdbcServer extends Server {
+
+	public OdbcServer() {
+	}
+
+	public OdbcServer(API api, String serverName) {
+		super(api, serverName);
+	}
+}

src/main/java/com/marklogic/mgmt/api/server/Server.java

@@ -12,7 +12,6 @@
 import javax.xml.bind.annotation.*;
 import java.util.List;
 
-@XmlRootElement(name = "http-server-properties")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Server extends Resource {
 

src/main/java/com/marklogic/mgmt/api/server/XdbcServer.java

@@ -0,0 +1,16 @@
+package com.marklogic.mgmt.api.server;
+
+import com.marklogic.mgmt.api.API;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "xdbc-server-properties")
+public class XdbcServer extends Server {
+
+	public XdbcServer() {
+	}
+
+	public XdbcServer(API api, String serverName) {
+		super(api, serverName);
+	}
+}

src/main/java/com/marklogic/mgmt/mapper/DefaultResourceMapper.java

@@ -1,8 +1,12 @@
 package com.marklogic.mgmt.mapper;
 
+import com.marklogic.mgmt.PayloadParser;
 import com.marklogic.mgmt.api.API;
 import com.marklogic.mgmt.api.Resource;
-import com.marklogic.mgmt.api.security.Role;
+import com.marklogic.mgmt.api.server.HttpServer;
+import com.marklogic.mgmt.api.server.OdbcServer;
+import com.marklogic.mgmt.api.server.Server;
+import com.marklogic.mgmt.api.server.XdbcServer;
 
 import javax.xml.bind.JAXBContext;
 import java.io.StringReader;
@@ -17,6 +21,7 @@ public class DefaultResourceMapper implements ResourceMapper {
 
 	private API api;
 	private Map<Class<?>, JAXBContext> jaxbContextMap;
+	private PayloadParser payloadParser = new PayloadParser();
 
 	public DefaultResourceMapper() {
 		this.jaxbContextMap = new HashMap<>();
@@ -30,17 +35,43 @@ public DefaultResourceMapper(API api) {
 	@Override
 	public <T extends Resource> T readResource(String payload, Class<T> resourceType) {
 		try {
-			T resource = null;
-			if (isJsonPayload(payload)) {
+			T resource;
+			if (payloadParser.isJsonPayload(payload)) {
 				resource = api.getObjectMapper().readerFor(resourceType).readValue(payload);
-			}
-			else {
-				JAXBContext context = jaxbContextMap.get(resourceType);
+			} else {
+				JAXBContext context;
+
+				/**
+				 * Can't figure out how to use a JAXB ObjectFactory to support the 3 different kinds of servers, so using
+				 * this hacky approach.
+				 */
+				if (resourceType.equals(Server.class)) {
+					if (payload.contains("xdbc-server-properties")) {
+						context = jaxbContextMap.get(XdbcServer.class);
+					} else if (payload.contains("odbc-server-properties")) {
+						context = jaxbContextMap.get(OdbcServer.class);
+					} else {
+						context = jaxbContextMap.get(HttpServer.class);
+					}
+				} else {
+					context = jaxbContextMap.get(resourceType);
+				}
+
 				if (context == null) {
-					context = JAXBContext.newInstance(resourceType);
+					if (resourceType.equals(Server.class)) {
+						if (payload.contains("xdbc-server-properties")) {
+							context = JAXBContext.newInstance(XdbcServer.class);
+						} else if (payload.contains("odbc-server-properties")) {
+							context = JAXBContext.newInstance(OdbcServer.class);
+						} else {
+							context = JAXBContext.newInstance(HttpServer.class);
+						}
+					} else {
+						context = JAXBContext.newInstance(resourceType);
+					}
 					jaxbContextMap.put(resourceType, context);
 				}
-				resource = (T)context.createUnmarshaller().unmarshal(new StringReader(payload));
+				resource = (T) context.createUnmarshaller().unmarshal(new StringReader(payload));
 			}
 			if (api != null) {
 				resource.setApi(api);
@@ -52,14 +83,4 @@ public <T extends Resource> T readResource(String payload, Class<T> resourceType
 		}
 	}
 
-	/**
-	 * TODO Move this to util class?
-	 *
-	 * @param payload
-	 * @return
-	 */
-	protected boolean isJsonPayload(String payload) {
-		String s = payload.trim();
-		return s.startsWith("{") || s.startsWith("[");
-	}
 }

src/test/java/com/marklogic/mgmt/api/server/ServerTest.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.marklogic.mgmt.api.API;
+import com.marklogic.mgmt.mapper.DefaultResourceMapper;
 import com.marklogic.mgmt.util.ObjectMapperFactory;
 import org.junit.Assert;
 import org.junit.Test;
@@ -28,4 +29,26 @@ public void disableSslProperties() throws Exception {
 		assertTrue(node.get("ssl-disable-tlsv1-1").asBoolean());
 		assertTrue(node.get("ssl-disable-tlsv1-2").asBoolean());
 	}
+
+	@Test
+	public void xdbc() {
+		String xml = "<xdbc-server-properties xmlns=\"http://marklogic.com/manage\">\n" +
+			"  <server-name>example-xdbc</server-name>" +
+			"</xdbc-server-properties>";
+
+		Server s = new DefaultResourceMapper(new API(null)).readResource(xml, Server.class);
+		assertTrue(s instanceof XdbcServer);
+		assertEquals("example-xdbc", s.getServerName());
+	}
+
+	@Test
+	public void odbc() {
+		String xml = "<odbc-server-properties xmlns=\"http://marklogic.com/manage\">\n" +
+			"  <server-name>example-odbc</server-name>" +
+			"</odbc-server-properties>";
+
+		Server s = new DefaultResourceMapper(new API(null)).readResource(xml, Server.class);
+		assertTrue(s instanceof OdbcServer);
+		assertEquals("example-odbc", s.getServerName());
+	}
 }