Comments and test cases for Git issue 89

Author: Ajit George

test-complete/src/test/java/com/marklogic/javaclient/TestBulkReadWriteWithJacksonDataBind.java

@@ -5,6 +5,8 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.junit.After;
 import org.junit.AfterClass;
@@ -16,6 +18,7 @@
 import com.marklogic.client.DatabaseClientFactory;
 import com.marklogic.client.DatabaseClientFactory.Authentication;
 import com.marklogic.client.document.DocumentManager.Metadata;
+import com.marklogic.client.document.DocumentPage;
 import com.marklogic.client.document.DocumentRecord;
 import com.marklogic.client.document.DocumentWriteSet;
 import com.marklogic.client.document.JSONDocumentManager;
@@ -26,6 +29,7 @@
 import com.marklogic.client.io.DocumentMetadataHandle.DocumentProperties;
 import com.marklogic.client.io.Format;
 import com.marklogic.client.io.JacksonDatabindHandle;
+import com.marklogic.client.io.JacksonHandle;
 import com.marklogic.client.io.marker.ContentHandleFactory;
 
 /*
@@ -35,12 +39,25 @@
 
 public class TestBulkReadWriteWithJacksonDataBind extends
 		BasicJavaClientREST {	
-	private static final String DIRECTORY = "/bulkread/";
+	private static final String DIRECTORY = "/";
 	private static String dbName = "TestBulkJacksonDataBindDB";
 	private static String[] fNames = { "TestBulkJacksonDataBindDB-1" };
 	private static String restServerName = "REST-Java-Client-API-Server";
 	private static int restPort = 8011;
 	private DatabaseClient client;
+	
+	public static class ContentCheck
+	{
+		String content;
+
+		public String getContent() {
+			return content;
+		}
+
+		public void setContent(String content) {
+			this.content = content;
+		}
+	}
 
 	@BeforeClass
 	public static void setUp() throws Exception {
@@ -261,7 +278,7 @@ public void testWriteMultipleJSONDocsFromStrings() throws Exception {
 		docMgr.readMetadata(docId[2], mhRead);
 		validateMetadata(mhRead);					
 	}
-
+	
 	/*
 	 * Purpose: To test newFactory method with custom Pojo instances.
 	 */
@@ -351,21 +368,145 @@ public void testJacksonDataBindHandleFromFactory() throws Exception {
 		docMgr.readMetadata(docId[2], mhRead);
 		validateMetadata(mhRead);					
 	}
+
+	/*
+	 * Purpose: To test Git Issue # 89.
+	 * Issue Description: If you read more than 100 JSON objects, the Client API stops reading them.
+	 * 
+	 * Use one Jackson Handles instance.
+	 */
+	@Test
+	public void testSingleJacksonHandlerHundredJsonDocs() throws Exception {
+		
+		JacksonHandle jh = new JacksonHandle();
+		jh.withFormat(Format.JSON);
+		JSONDocumentManager docMgr = client.newJSONDocumentManager();
+		docMgr.setMetadataCategories(Metadata.ALL);
+		docMgr.setNonDocumentFormat(Format.JSON);
+		DocumentWriteSet writeset = docMgr.newWriteSet();
+		// put meta-data
+		DocumentMetadataHandle mh = setMetadata();
+		writeset.addDefault(mh);
+		
+		JacksonDatabindHandle<String> handle1 = new JacksonDatabindHandle<String>(String.class);
+
+		Map<String, String> jsonMap = new HashMap<String, String>();
+		String[] uris = new String[150];
+				
+		String dir = new String("/");
+		String mapDocId = null;
+		StringBuffer mapDocContent = new StringBuffer();
+		for (int i=0;i<102;i++)
+		{
+			mapDocId = dir + Integer.toString(i);
+			mapDocContent.append("{\"content\":\"");
+			mapDocContent.append(Integer.toString(i));
+			mapDocContent.append("\"}");
+			
+			jsonMap.put(mapDocId, mapDocContent.toString());
+			
+			handle1.set(mapDocContent.toString());
+			writeset.add(mapDocId, handle1);
+			
+			uris[i] = mapDocId;
+						
+			mapDocContent.setLength(0);
+			mapDocId = null;
+			docMgr.write(writeset);
+			writeset.clear();
+		}
+		
+		int count=0;
+		
+		 DocumentPage page = docMgr.read(uris);
+		 DocumentRecord rec;
+				  
+		 while(page.hasNext()){
+	    rec = page.next();
+	    
+	    assertNotNull("DocumentRecord should never be null", rec);
+		assertNotNull("Document uri should never be null", rec.getUri());
+		assertTrue("Document uri should start with " + DIRECTORY, rec.getUri().startsWith(DIRECTORY));
+	    
+		rec.getContent(jh);
+		//Verify the contents: comparing Map with JacksonHandle's.
+	    assertEquals("Comparing the content :",jsonMap.get(rec.getUri()),jh.get().toString());
+	    count++;
+	  }
+     assertEquals("document count", 102,count);
+							
+	}
+	/*
+	 * Purpose: To test Git Issue # 89.
+	 * Issue Description: If you read more than 100 JSON objects, the Client API stops reading them.
+	 * 
+	 * Use multiple Jackson Handle instances.
+	 */
+	@Test
+	public void testMultipleJacksonHandleHundredJsonDocs1() throws Exception {
+		
+		JSONDocumentManager docMgr = client.newJSONDocumentManager();
+		docMgr.setMetadataCategories(Metadata.ALL);
+		docMgr.setNonDocumentFormat(Format.JSON);
+		DocumentWriteSet writeset = docMgr.newWriteSet();
+		// put meta-data
+		DocumentMetadataHandle mh = setMetadata();
+		writeset.addDefault(mh);
+		
+		JacksonDatabindHandle<String> handle1 = new JacksonDatabindHandle<String>(String.class);
+
+		Map<String, String> jsonMap = new HashMap<String, String>();
+		String[] uris = new String[150];
+				
+		String dir = new String("/");
+		String mapDocId = null;
+		StringBuffer mapDocContent = new StringBuffer();
+		for (int i=0;i<102;i++)
+		{
+			mapDocId = dir + Integer.toString(i);
+			mapDocContent.append("{\"content\":\"");
+			mapDocContent.append(Integer.toString(i));
+			mapDocContent.append("\"}");
+			
+			jsonMap.put(mapDocId, mapDocContent.toString());
+			
+			handle1.set(mapDocContent.toString());
+			writeset.add(mapDocId, handle1);
+			
+			uris[i] = mapDocId;
+						
+			mapDocContent.setLength(0);
+			mapDocId = null;
+			docMgr.write(writeset);
+			writeset.clear();
+		}
+		
+		int count=0;
+		
+		 DocumentPage page = docMgr.read(uris);
+		 DocumentRecord rec;
+		 
+		 JacksonHandle jh = new JacksonHandle();
+		 jh.withFormat(Format.JSON);
+		 while(page.hasNext()){
+	    rec = page.next();
+	    
+	    assertNotNull("DocumentRecord should never be null", rec);
+		assertNotNull("Document uri should never be null", rec.getUri());
+		assertTrue("Document uri should start with " + DIRECTORY, rec.getUri().startsWith(DIRECTORY));
+	    
+		rec.getContent(jh);
+		//Verify the contents: comparing Map with JacksonHandle's.
+	    assertEquals("Comparing the content :",jsonMap.get(rec.getUri()),jh.get().toString());
+	    count++;
+	  }
+     assertEquals("document count", 102,count);
+							
+	}
 
 	@AfterClass
 	public static void tearDown() throws Exception {
 		System.out.println("In tear down");
 		tearDownJavaRESTServer(dbName, fNames, restServerName);
 	}
-
-	public void validateRecord(DocumentRecord record, Format type) {
-
-		assertNotNull("DocumentRecord should never be null", record);
-		assertNotNull("Document uri should never be null", record.getUri());
-		assertTrue("Document uri should start with " + DIRECTORY, record
-				.getUri().startsWith(DIRECTORY));
-		assertEquals("All records are expected to be in same format", type,
-				record.getFormat());
-
-	}
 }

test-complete/src/test/java/com/marklogic/javaclient/TestPOJOWithDocsStoredByOthers.java

@@ -541,7 +541,7 @@ public void testPOJOWriteReadDiffAccessSpecifiers() throws Exception {
 	}
 
 	/*
-	 * Purpose : This test is to validate creating an sub class which is references by a Super class variable type.
+	 * Purpose : This test is to validate creating an sub class which is referenced by a Super class variable type.
 	 * Both SmallArtifactIdInSuper and SmallArtifactNoId classes are used.
 	 * POJO repository cannot read back the sub class.
 	 * 
@@ -569,7 +569,7 @@ public void testPOJOSubObjReferencedBySuperClassVariable() throws Exception {
 	}
 
 	/*
-	 * Purpose : This test is to validate creating an sub class which is references by a Super class variable type.
+	 * Purpose : This test is to validate creating an sub class which is referenced by a Super class variable type.
 	 * Both SmallArtifactIdInSuper and SmallArtifactNoId classes are used.
 	 * This is a variation of testPOJOSubObjReferencedBySuperClassVariable()
 	 *