rename JacksonPojoHandle to JacksonDatabindHandle to avoid confusion with the Pojo Facade

Author: sammefford

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

@@ -6,7 +6,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.marklogic.client.Page;
 import com.marklogic.client.impl.BasicPage;
-import com.marklogic.client.io.JacksonPojoHandle;
+import com.marklogic.client.io.JacksonDatabindHandle;
 import com.marklogic.client.document.DocumentPage;
 import com.marklogic.client.pojo.PojoPage;
 
@@ -36,7 +36,7 @@ public boolean hasNext() {
 
     @Override
     public T next() {
-        JacksonPojoHandle<T> handle = new JacksonPojoHandle<T>(entityClass);
+        JacksonDatabindHandle<T> handle = new JacksonDatabindHandle<T>(entityClass);
         handle.getMapper().enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.WRAPPER_OBJECT);
         return docPage.nextContent(handle).get();
     }

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

@@ -8,7 +8,7 @@
 import com.marklogic.client.document.DocumentPage;
 import com.marklogic.client.io.DocumentMetadataHandle;
 import com.marklogic.client.io.Format;
-import com.marklogic.client.io.JacksonPojoHandle;
+import com.marklogic.client.io.JacksonDatabindHandle;
 import com.marklogic.client.io.SearchHandle;
 import com.marklogic.client.io.marker.SearchReadHandle;
 import com.marklogic.client.pojo.PojoPage;
@@ -75,7 +75,7 @@ public void write(T entity, Transaction transaction) {
     }
     public void write(T entity, Transaction transaction, String... collections) {
         if ( entity == null ) return;
-        JacksonPojoHandle contentHandle = new JacksonPojoHandle(entity);
+        JacksonDatabindHandle contentHandle = new JacksonDatabindHandle(entity);
         contentHandle.getMapper().enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.WRAPPER_OBJECT); 
         DocumentMetadataHandle metadataHandle = new DocumentMetadataHandle();
         metadataHandle = metadataHandle.withCollections(entityClass.getName());

…rklogic/client/io/JacksonPojoHandle.java …gic/client/io/JacksonDatabindHandle.javasrc/main/java/com/marklogic/client/io/JacksonPojoHandle.java renamed to src/main/java/com/marklogic/client/io/JacksonDatabindHandle.java src/main/java/com/marklogic/client/io/JacksonPojoHandle.java renamed to src/main/java/com/marklogic/client/io/JacksonDatabindHandle.java

@@ -36,19 +36,19 @@
  * 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 JacksonPojoHandle<T>
+public class JacksonDatabindHandle<T>
         extends JacksonBaseHandle<T>
         implements ContentHandle<T>
 {
     private Class contentClass;
     private T content;
 
     /**
-     * Specify the type of content this JacksonPojoHandle will manage.
+     * Specify the type of content this JacksonDatabindHandle will manage.
      * 
-     * @param contentClass either JsonNode.class or the class of your custom Pojo for databinding
+     * @param contentClass the class of your custom Pojo for databinding
      */
-    public JacksonPojoHandle(Class<T> contentClass) {
+    public JacksonDatabindHandle(Class<T> contentClass) {
         super();
         this.contentClass = contentClass;
            setResendable(true);
@@ -57,7 +57,7 @@ public JacksonPojoHandle(Class<T> contentClass) {
      * Provides a handle on JSON content as a Jackson tree.
      * @param content    the JSON root node of the tree.
      */
-    public JacksonPojoHandle(T content) {
+    public JacksonDatabindHandle(T content) {
         this((Class<T>) content.getClass());
         set(content);
     }
@@ -68,7 +68,7 @@ public JacksonPojoHandle(T content) {
      * @param format	the format of the content
      * @return	this handle
      */
-    public JacksonPojoHandle withFormat(Format format) {
+    public JacksonDatabindHandle withFormat(Format format) {
         setFormat(format);
         return this;
     }
@@ -82,8 +82,8 @@ public T get() {
         return content;
     }
     /**
-     * Assigns either a JsonNode or your custom Pojo as the content.
-     * @param content    the JSON root node or your custom Pojo
+     * Assigns your custom Pojo as the content.
+     * @param content your custom Pojo
      */
     @Override
     public void set(T content) {
@@ -94,7 +94,7 @@ public void set(T content) {
      * @param content    the JSON root node.
      * @return    the handle on the JSON tree.
      */
-    public JacksonPojoHandle<T> with(T content) {
+    public JacksonDatabindHandle<T> with(T content) {
         set(content);
         return this;
     }
@@ -125,10 +125,10 @@ public void write(OutputStream out) throws IOException {
         getMapper().writeValue(new OutputStreamWriter(out, "UTF-8"), get());
     }
 
-    static private class JacksonPojoHandleFactory implements ContentHandleFactory {
+    static private class JacksonDatabindHandleFactory implements ContentHandleFactory {
         private Class<?> contentClass;
 
-        private JacksonPojoHandleFactory(Class<?> contentClass) {
+        private JacksonDatabindHandleFactory(Class<?> contentClass) {
             super();
             this.contentClass = contentClass;
         }
@@ -145,7 +145,7 @@ public boolean isHandled(Class<?> type) {
         public <C> ContentHandle<C> newHandle(Class<C> type) {
             @SuppressWarnings("unchecked")
             ContentHandle<C> handle = isHandled(type) ?
-                (ContentHandle<C>) new JacksonPojoHandle<C>(type) : null;
+                (ContentHandle<C>) new JacksonDatabindHandle<C>(type) : null;
             return handle;
         }
     }

src/test/java/com/marklogic/client/test/JacksonDatabindTest.java

@@ -43,7 +43,7 @@
 import com.marklogic.client.document.JSONDocumentManager;
 import com.marklogic.client.document.XMLDocumentManager;
 import com.marklogic.client.io.Format;
-import com.marklogic.client.io.JacksonPojoHandle;
+import com.marklogic.client.io.JacksonDatabindHandle;
 import com.marklogic.client.query.DeleteQueryDefinition;
 import com.marklogic.client.query.QueryManager;
 import com.marklogic.client.test.Common;
@@ -69,7 +69,7 @@ public static void afterClass() {
     }
 
     /** Here we're trying to keep it simple and demonstrate how you would use Jackson
-     * via JacksonPojoHandle to do the most common-case databinding to serialize your 
+     * via JacksonDatabindHandle to do the most common-case databinding to serialize your 
      * pojos to json.  To reuse existing code we're letting BulkReadWriteTest load 
      * records from a csv file and populate our City pojos.  We just manage the 
      * serialization and persistence logic.
@@ -81,8 +81,8 @@ public class JsonCityWriter implements CityWriter {
 
         public void addCity(City city) {
             if ( numCities >= MAX_TO_WRITE ) return;
-            // instantiate a JacksonPojoHandle ready to serialize this city to json
-            JacksonPojoHandle handle = new JacksonPojoHandle(city);
+            // instantiate a JacksonDatabindHandle ready to serialize this city to json
+            JacksonDatabindHandle handle = new JacksonDatabindHandle(city);
             // demonstrate our ability to set advanced configuration on the mapper
             // in this case, we're saying wrap our serialization with the name of the pojo class
             handle.getMapper().enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.WRAPPER_OBJECT); 
@@ -110,7 +110,7 @@ public void testDatabind() throws Exception {
 
     /** We're going to demonstrate the versitility of Jackson by using and XmlMapper
      * to serialize instead of the default JsonMapper to serialize to json.  Most 
-     * importantly, this points to the ability with JacksonHandle or JacksonPojoHandle
+     * importantly, this points to the ability with JacksonHandle or JacksonDatabindHandle
      * to bring your own mapper and all the power that comes with it.
      **/
     public static class XmlCityWriter implements CityWriter {
@@ -125,7 +125,7 @@ public static class XmlCityWriter implements CityWriter {
 
         public void addCity(City city) {
             if ( numCities >= MAX_TO_WRITE ) return;
-            JacksonPojoHandle handle = new JacksonPojoHandle(city);
+            JacksonDatabindHandle handle = new JacksonDatabindHandle(city);
             // NOTICE: We've set the mapper to an XmlMapper, showing the versitility of Jackson
             handle.setMapper(mapper);
             handle.setFormat(Format.XML);
@@ -166,7 +166,7 @@ class ToponymMixIn2 {
 
     /** Demonstrate using Jackson's CSV mapper directly to simplify reading in data, populating a 
      * third-party pojo (one we cannot annotate) then writing it out
-     * via JacksonPojoHandle with configuration provided by mix-in annotations.
+     * via JacksonDatabindHandle with configuration provided by mix-in annotations.
      **/
     @Test
     public void testDatabindingThirdPartyPojoWithMixinAnnotations() throws JsonProcessingException, IOException {
@@ -201,7 +201,7 @@ public void testDatabindingThirdPartyPojoWithMixinAnnotations() throws JsonProce
         String line = null;
         for (int numWritten = 0; numWritten < MAX_TO_WRITE && (line = cityReader.readLine()) != null; numWritten++ ) {
             Toponym city = reader.readValue(line);
-            JacksonPojoHandle handle = new JacksonPojoHandle(city);
+            JacksonDatabindHandle handle = new JacksonDatabindHandle(city);
             handle.getMapper().addMixInAnnotations(Toponym.class, ToponymMixIn2.class);
             set.add(DIRECTORY + "/thirdPartyJsonCities/" + city.getGeoNameId() + ".json", handle);
         }