initial working implementation of the pojo facade

Author: sammefford

src/main/java/com/marklogic/client/DatabaseClient.java

@@ -16,6 +16,7 @@
 package com.marklogic.client;
 
 import java.io.OutputStream;
+import java.io.Serializable;
 
 import com.marklogic.client.admin.ServerConfigurationManager;
 import com.marklogic.client.document.BinaryDocumentManager;
@@ -28,6 +29,7 @@
 import com.marklogic.client.query.QueryManager;
 import com.marklogic.client.alerting.RuleManager;
 import com.marklogic.client.util.RequestLogger;
+import com.marklogic.client.pojo.PojoRepository;
 
 /**
  * A Database Client instantiates document and query managers and other objects
@@ -110,6 +112,14 @@ public interface DatabaseClient {
      */
     public ServerConfigurationManager newServerConfigManager();
 
+    /**
+     * Creates a PojoRepository specific to the specified class and id types. 
+     * The PojoRepository provides a facade for persisting, retrieving, and
+     * querying data contained in Java objects.  Annotations are required to
+     * identify the id field and any fields for which you wish to create indexes.
+     **/
+    public <T, ID extends Serializable> PojoRepository<T, ID> newPojoRepository(Class<T> clazz, Class<ID> idClass);
+
     /**
      * Initializes a manager for a extension resource.
      * 

src/main/java/com/marklogic/client/document/DocumentManager.java

@@ -30,6 +30,7 @@
 import com.marklogic.client.io.marker.DocumentPatchHandle;
 import com.marklogic.client.io.marker.SearchReadHandle;
 import com.marklogic.client.query.QueryDefinition;
+import com.marklogic.client.query.QueryManager.QueryView;
 
 /**
  * A Document Manager provides database operations on a document.
@@ -387,6 +388,14 @@ public <T extends R> T read(DocumentDescriptor desc, DocumentMetadataReadHandle
 
     public void setPageLength(long length);
 
+    public Format getResponseFormat();
+
+    public void setResponseFormat(Format format);
+
+    public QueryView getSearchView();
+
+    public void setSearchView(QueryView view);
+
     public DocumentWriteSet newWriteSet();
 
     public void write(DocumentWriteSet writeSet);

src/main/java/com/marklogic/client/impl/BasicPage.java

@@ -25,6 +25,9 @@ public class BasicPage<T> implements Page<T> {
     private long pageSize;
     private long totalSize;
 
+    protected BasicPage(Class<T> type) {
+    }
+
     public BasicPage(Iterable<T> iterable, long start, long pageSize, long totalSize) {
         this.iterable = iterable;
         this.start = start;

src/main/java/com/marklogic/client/impl/DatabaseClientImpl.java

@@ -16,6 +16,7 @@
 package com.marklogic.client.impl;
 
 import java.io.OutputStream;
+import java.io.Serializable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,6 +37,8 @@
 import com.marklogic.client.document.TextDocumentManager;
 import com.marklogic.client.Transaction;
 import com.marklogic.client.document.XMLDocumentManager;
+import com.marklogic.client.pojo.PojoRepository;
+import com.marklogic.client.impl.PojoRepositoryImpl;
 
 public class DatabaseClientImpl implements DatabaseClient {
 	static final private Logger logger = LoggerFactory.getLogger(DatabaseClientImpl.class);
@@ -120,6 +123,11 @@ public ServerConfigurationManager newServerConfigManager() {
 		configMgr.setHandleRegistry(getHandleRegistry());
 		return configMgr;
 	}
+	@Override
+	public <T, ID extends Serializable> PojoRepository<T, ID> newPojoRepository(Class<T> clazz, Class<ID> idClass) {
+		return new PojoRepositoryImpl<T, ID>(this, clazz, idClass);
+
+	}
 
 	@Override
 	public RequestLogger newLogger(OutputStream out) {

src/main/java/com/marklogic/client/io/JacksonHandle.java

@@ -16,43 +16,31 @@
 package com.marklogic.client.io;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+
 import com.marklogic.client.MarkLogicIOException;
-import com.marklogic.client.io.BaseHandle;
-import com.marklogic.client.io.Format;
-import com.marklogic.client.io.OutputStreamSender;
-import com.marklogic.client.io.marker.BufferableHandle;
 import com.marklogic.client.io.marker.ContentHandle;
 import com.marklogic.client.io.marker.ContentHandleFactory;
-import com.marklogic.client.io.marker.JSONReadHandle;
-import com.marklogic.client.io.marker.JSONWriteHandle;
-import com.marklogic.client.io.marker.StructureReadHandle;
-import com.marklogic.client.io.marker.StructureWriteHandle;
+import com.marklogic.client.impl.JacksonBaseHandle;
 
 /**
  * An adapter for using the Jackson Open Source library for JSON; represents 
  * JSON content as a Jackson JsonNode for reading or writing.  Enables reading and 
  * writing JSON documents, JSON structured search, and other JSON input and output.  
  */
 public class JacksonHandle
-		extends BaseHandle<InputStream, OutputStreamSender>
-		implements OutputStreamSender, BufferableHandle, ContentHandle<JsonNode>,
-			JSONReadHandle, JSONWriteHandle,
-			StructureReadHandle, StructureWriteHandle
+		extends JacksonBaseHandle
+		implements ContentHandle<JsonNode>
 {
 	private JsonNode content;
-	private ObjectMapper mapper;
 
 	/**
 	 * Creates a factory to create a JacksonHandle instance for a JSON node.
@@ -83,7 +71,6 @@ public <C> ContentHandle<C> newHandle(Class<C> type) {
 	 */
 	public JacksonHandle() {
 		super();
-		super.setFormat(Format.JSON);
    		setResendable(true);
 	}
 	/**
@@ -95,16 +82,6 @@ public JacksonHandle(JsonNode content) {
 		set(content);
 	}
 
-	/**
-	 * Returns the mapper used to construct node objects from JSON.
-	 * @return	the JSON mapper.
-	 */
-	public ObjectMapper getMapper() {
-		if (mapper == null)
-			mapper = new ObjectMapper();
-		return mapper;
-	}
-
 	/**
 	 * Returns the root node of the JSON tree.
 	 * @return	the JSON root node.
@@ -131,63 +108,22 @@ public JacksonHandle with(JsonNode content) {
 		return this;
 	}
 
-	/**
-	 * Restricts the format to JSON.
-	 */
-	@Override
-	public void setFormat(Format format) {
-		if (format != Format.JSON)
-			throw new IllegalArgumentException(
-					"JacksonHandle supports the JSON format only");
-	}
-
 	@Override
 	public void fromBuffer(byte[] buffer) {
 		if (buffer == null || buffer.length == 0)
-			content = null;
+			set(null);
 		else
 			receiveContent(new ByteArrayInputStream(buffer));
 	}
 	@Override
-	public byte[] toBuffer() {
-		try {
-			if (content == null)
-				return null;
-
-			ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-			write(buffer);
-
-			return buffer.toByteArray();
-		} catch (IOException e) {
-			throw new MarkLogicIOException(e);
-		}
-	}
-
-	/**
-	 * Returns the JSON tree as a string.
-	 */
-	@Override
-	public String toString() {
-		try {
-			return new String(toBuffer(),"UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			throw new MarkLogicIOException(e);
-		}
-	}
-
-	@Override
-	protected Class<InputStream> receiveAs() {
-		return InputStream.class;
-	}
-	@Override
 	protected void receiveContent(InputStream content) {
 		if (content == null)
 			return;
 
 		try {
-			this.content = getMapper().readValue(
+			set( getMapper().readValue(
 					new InputStreamReader(content, "UTF-8"), JsonNode.class
-					);
+			));
 		} catch (JsonParseException e) {
 			throw new MarkLogicIOException(e);
 		} catch (JsonMappingException e) {
@@ -198,14 +134,11 @@ protected void receiveContent(InputStream content) {
 
 	}
 	@Override
-	protected OutputStreamSender sendContent() {
-		if (content == null) {
-			throw new IllegalStateException("No document to write");
-		}
-		return this;
+	protected boolean hasContent() {
+		return content != null;
 	}
 	@Override
 	public void write(OutputStream out) throws IOException {
-		getMapper().writeValue(new OutputStreamWriter(out, "UTF-8"), content);
+		getMapper().writeValue(new OutputStreamWriter(out, "UTF-8"), get());
 	}
 }

src/main/java/com/marklogic/client/query/StructuredQueryBuilder.java

@@ -146,9 +146,9 @@ public interface ElementAttribute extends RangeIndex, TextIndex {
     public interface Field extends RangeIndex, TextIndex {
     }
     /**
-     * A JSONKey represents a key in JSON database documents.
+     * A JSONProperty represents a key in JSON database documents.
      */
-    public interface JSONKey extends ContainerIndex, RangeIndex, TextIndex {
+    public interface JSONProperty extends Element, ContainerIndex, RangeIndex, TextIndex {
     }
     /**
      * A PathIndex represents an index defined with an XPath
@@ -614,8 +614,8 @@ public Field field(String name) {
      * @param name	the name of the JSON key
      * @return	the identifier for the JSON key
      */
-    public JSONKey jsonKey(String name) {
-    	return new JSONKeyImpl(name);
+    public JSONProperty jsonProperty(String name) {
+    	return new JSONPropertyImpl(name);
     }
     /**
      * Identifies a path index to match with a query.
@@ -1814,14 +1814,14 @@ void innerSerialize(XMLStreamWriter serializer) throws Exception {
         	serializer.writeEndElement();
         }
     }
-    class JSONKeyImpl extends IndexImpl implements JSONKey {
+    class JSONPropertyImpl extends IndexImpl implements JSONProperty {
     	String name;
-    	JSONKeyImpl(String name) {
+    	JSONPropertyImpl(String name) {
     		this.name = name;
     	}
         @Override
         void innerSerialize(XMLStreamWriter serializer) throws Exception {
-    		writeText(serializer, "json-key", name);
+    		writeText(serializer, "json-property", name);
         }
     }
     class PathIndexImpl extends IndexImpl implements PathIndex {