(merge 28f9395 plus minor modifications for this branch) issue #89 close input streams

Charles Greer · sammefford · commit 60cd20e5a45d · 2015-02-12T09:34:19.000-07:00
diff --git a/src/main/java/com/marklogic/client/example/handle/DOM4JHandle.java b/src/main/java/com/marklogic/client/example/handle/DOM4JHandle.java
@@ -149,7 +149,14 @@ protected void receiveContent(InputStream content) {
 			throw new MarkLogicIOException(e);
 		} catch (DocumentException e) {
 			throw new MarkLogicIOException(e);
+		} finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
 		}
+
 	}
 
 	@Override
diff --git a/src/main/java/com/marklogic/client/example/handle/JDOMHandle.java b/src/main/java/com/marklogic/client/example/handle/JDOMHandle.java
@@ -150,6 +150,12 @@ protected void receiveContent(InputStream content) {
 			throw new MarkLogicIOException(e);
 		} catch (IOException e) {
 			throw new MarkLogicIOException(e);
+		} finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
 		}
 	}
 
diff --git a/src/main/java/com/marklogic/client/example/handle/JacksonHandle.java b/src/main/java/com/marklogic/client/example/handle/JacksonHandle.java
@@ -137,6 +137,12 @@ protected void receiveContent(InputStream content) {
 			throw new MarkLogicIOException(e);
 		} catch (IOException e) {
 			throw new MarkLogicIOException(e);
+		} finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
 		}
 
 	}
diff --git a/src/main/java/com/marklogic/client/example/handle/XOMHandle.java b/src/main/java/com/marklogic/client/example/handle/XOMHandle.java
@@ -142,6 +142,12 @@ protected void receiveContent(InputStream content) {
 			throw new MarkLogicIOException(e);
 		} catch (IOException e) {
 			throw new MarkLogicIOException(e);
+		} finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
 		}
 	}
 
diff --git a/src/main/java/com/marklogic/client/io/DOMHandle.java b/src/main/java/com/marklogic/client/io/DOMHandle.java
@@ -225,13 +225,16 @@ protected void receiveContent(InputStream content) {
 			domInput.setByteStream(content);
 
 			this.content = parser.parse(domInput);
-			content.close();
-		} catch (IOException e) {
-			logger.error("Failed to parse DOM document from input stream",e);
-			throw new MarkLogicInternalException(e);
 		} catch (ParserConfigurationException e) {
 			logger.error("Failed to parse DOM document from input stream",e);
 			throw new MarkLogicInternalException(e);
+		} finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				//ignore
+			}
+			
 		}
 	}
 	@Override
diff --git a/src/main/java/com/marklogic/client/io/JAXBHandle.java b/src/main/java/com/marklogic/client/io/JAXBHandle.java
@@ -170,6 +170,12 @@ protected void receiveContent(InputStream content) {
 		} catch (UnsupportedEncodingException e) {
 			logger.error("Failed to unmarshall object read from database document",e);
 			throw new MarkLogicIOException(e);
+		}  finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
 		}
 	}
     @Override
diff --git a/src/main/java/com/marklogic/client/io/QueryOptionsHandle.java b/src/main/java/com/marklogic/client/io/QueryOptionsHandle.java
@@ -1037,7 +1037,13 @@ protected void receiveContent(InputStream content) {
         } catch (UnsupportedEncodingException e) {
             // This can't actually happen...stupid checked exceptions
             throw new MarkLogicBindingException(e);
-        }
+        } finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
+		}
 	}
 	
 	protected OutputStreamSender sendContent() {
diff --git a/src/main/java/com/marklogic/client/io/TuplesHandle.java b/src/main/java/com/marklogic/client/io/TuplesHandle.java
@@ -15,6 +15,7 @@
  */
 package com.marklogic.client.io;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
@@ -24,19 +25,19 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
-import com.marklogic.client.query.AggregateResult;
-import com.marklogic.client.query.ValuesMetrics;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.marklogic.client.MarkLogicBindingException;
 import com.marklogic.client.MarkLogicIOException;
-import com.marklogic.client.query.Tuple;
 import com.marklogic.client.impl.TuplesBuilder;
-import com.marklogic.client.query.TuplesResults;
-import com.marklogic.client.query.ValuesDefinition;
 import com.marklogic.client.io.marker.OperationNotSupported;
 import com.marklogic.client.io.marker.TuplesReadHandle;
+import com.marklogic.client.query.AggregateResult;
+import com.marklogic.client.query.Tuple;
+import com.marklogic.client.query.TuplesResults;
+import com.marklogic.client.query.ValuesDefinition;
+import com.marklogic.client.query.ValuesMetrics;
 
 /**
  * A TuplesHandle represents a set of tuples returned by a query on the server.
@@ -109,7 +110,13 @@ protected void receiveContent(InputStream content) {
         } catch (JAXBException e) {
 			logger.error("Failed to unmarshall tuples",e);
 			throw new MarkLogicIOException(e);
-        }
+        } finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
+		}
     }
 
     /**
diff --git a/src/main/java/com/marklogic/client/io/ValuesHandle.java b/src/main/java/com/marklogic/client/io/ValuesHandle.java
@@ -15,6 +15,7 @@
  */
 package com.marklogic.client.io;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
@@ -24,19 +25,19 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
-import com.marklogic.client.query.AggregateResult;
-import com.marklogic.client.query.ValuesMetrics;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.marklogic.client.MarkLogicBindingException;
 import com.marklogic.client.MarkLogicIOException;
-import com.marklogic.client.query.CountedDistinctValue;
 import com.marklogic.client.impl.ValuesBuilder;
-import com.marklogic.client.query.ValuesDefinition;
-import com.marklogic.client.query.ValuesResults;
 import com.marklogic.client.io.marker.OperationNotSupported;
 import com.marklogic.client.io.marker.ValuesReadHandle;
+import com.marklogic.client.query.AggregateResult;
+import com.marklogic.client.query.CountedDistinctValue;
+import com.marklogic.client.query.ValuesDefinition;
+import com.marklogic.client.query.ValuesMetrics;
+import com.marklogic.client.query.ValuesResults;
 
 /**
  * A ValuesHandle represents a list of values or of tuples
@@ -114,7 +115,13 @@ protected void receiveContent(InputStream content) {
         } catch (JAXBException e) {
 			logger.error("Failed to unmarshall values",e);
 			throw new MarkLogicIOException(e);
-        }
+        } finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
+		}
     }
 
     /**
diff --git a/src/main/java/com/marklogic/client/io/ValuesListHandle.java b/src/main/java/com/marklogic/client/io/ValuesListHandle.java
@@ -15,6 +15,7 @@
  */
 package com.marklogic.client.io;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
@@ -30,9 +31,9 @@
 import com.marklogic.client.MarkLogicBindingException;
 import com.marklogic.client.MarkLogicIOException;
 import com.marklogic.client.impl.ValuesListBuilder;
-import com.marklogic.client.query.ValuesListResults;
 import com.marklogic.client.io.marker.OperationNotSupported;
 import com.marklogic.client.io.marker.ValuesListReadHandle;
+import com.marklogic.client.query.ValuesListResults;
 
 public class ValuesListHandle
 	extends BaseHandle<InputStream, OperationNotSupported>
@@ -123,7 +124,14 @@ protected void receiveContent(InputStream content) {
         } catch (JAXBException e) {
 			logger.error("Failed to unmarshall values list",e);
 			throw new MarkLogicIOException(e);
-        }
+        } finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
+		}
+
     }
 
     /**
diff --git a/src/test/java/com/marklogic/client/test/JacksonHandleTest.java b/src/test/java/com/marklogic/client/test/JacksonHandleTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2012-2014 MarkLogic Corporation
+ *
+ * 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.
+ */
+package com.marklogic.client.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.marklogic.client.document.JSONDocumentManager;
+import com.marklogic.client.example.handle.JacksonHandle;
+import com.marklogic.client.io.SearchHandle;
+import com.marklogic.client.query.MatchDocumentSummary;
+import com.marklogic.client.query.MatchLocation;
+import com.marklogic.client.query.QueryDefinition;
+import com.marklogic.client.query.QueryManager;
+import com.marklogic.client.query.StringQueryDefinition;
+import com.marklogic.client.query.StructuredQueryBuilder;
+import com.marklogic.client.test.Common;
+
+public class JacksonHandleTest {
+	@BeforeClass
+	public static void beforeClass() {
+		Common.connect();
+	}
+	@AfterClass
+	public static void afterClass() {
+		Common.release();
+	}
+
+	@Test
+	public void testReadWrite() {
+		// create an identifier for the database document
+		String docId = "/example/jackson-test.json";
+
+		// create a manager for JSON documents
+		JSONDocumentManager docMgr = Common.client.newJSONDocumentManager();
+
+		// construct a Jackson JSON structure
+		ObjectMapper mapper = new ObjectMapper();
+		ObjectNode childObj = mapper.createObjectNode();
+		childObj.put("key", "value");
+		ArrayNode childArray = mapper.createArrayNode();
+		childArray.add("item1");
+		childArray.add("item2");
+		ObjectNode writeRoot = mapper.createObjectNode();
+		writeRoot.put("object", childObj);
+		writeRoot.put("array",  childArray);
+
+		// create a handle for the JSON structure
+		JacksonHandle writeHandle = new JacksonHandle(writeRoot);
+
+		// write the document to the database
+		docMgr.write(docId, writeHandle);
+
+		// create a handle to receive the database content as a Jackson structure
+		JacksonHandle readHandle = new JacksonHandle();
+
+		// read the document content from the database as a Jackson structure
+		docMgr.read(docId, readHandle);
+
+		// access the document content
+		JsonNode readRoot = readHandle.get();
+		assertNotNull("Wrote null Jackson JSON structure", readRoot);
+		assertTrue("Jackson JSON structures not equal",
+				readRoot.equals(writeRoot));
+
+		// delete the document
+		docMgr.delete(docId);
+	}
+
+	@Test
+	public void test105Searches() throws IOException {
+		QueryManager queryMgr = Common.client.newQueryManager();
+		StringQueryDefinition stringQuery = queryMgr.newStringDefinition();
+		stringQuery.setCriteria("leaf3");
+		
+		for (int i=0;i<105;i++) {
+			for (QueryDefinition t : new QueryDefinition[] { stringQuery }) {
+				JacksonHandle results = queryMgr.search(t, new JacksonHandle());
+				assertNotNull(results);
+				JsonNode jsonResults =results.get();
+				@SuppressWarnings("unused")
+				String resultString = results.getMapper().writeValueAsString(jsonResults);
+				// ignore.
+			}
+		}
+	}	
+
+}
+

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,14 @@ protected void receiveContent(InputStream content) {`
`149`	`149`	`throw new MarkLogicIOException(e);`
`150`	`150`	`} catch (DocumentException e) {`
`151`	`151`	`throw new MarkLogicIOException(e);`
	`152`	`+ } finally {`
	`153`	`+ try {`
	`154`	`+ content.close();`
	`155`	`+ } catch (IOException e) {`
	`156`	`+ // ignore.`
	`157`	`+ }`
`152`	`158`	`}`
	`159`	`+`
`153`	`160`	`}`
`154`	`161`
`155`	`162`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,12 @@ protected void receiveContent(InputStream content) {`
`150`	`150`	`throw new MarkLogicIOException(e);`
`151`	`151`	`} catch (IOException e) {`
`152`	`152`	`throw new MarkLogicIOException(e);`
	`153`	`+ } finally {`
	`154`	`+ try {`
	`155`	`+ content.close();`
	`156`	`+ } catch (IOException e) {`
	`157`	`+ // ignore.`
	`158`	`+ }`
`153`	`159`	`}`
`154`	`160`	`}`
`155`	`161`
Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,12 @@ protected void receiveContent(InputStream content) {`
`137`	`137`	`throw new MarkLogicIOException(e);`
`138`	`138`	`} catch (IOException e) {`
`139`	`139`	`throw new MarkLogicIOException(e);`
	`140`	`+ } finally {`
	`141`	`+ try {`
	`142`	`+ content.close();`
	`143`	`+ } catch (IOException e) {`
	`144`	`+ // ignore.`
	`145`	`+ }`
`140`	`146`	`}`
`141`	`147`
`142`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,12 @@ protected void receiveContent(InputStream content) {`
`142`	`142`	`throw new MarkLogicIOException(e);`
`143`	`143`	`} catch (IOException e) {`
`144`	`144`	`throw new MarkLogicIOException(e);`
	`145`	`+ } finally {`
	`146`	`+ try {`
	`147`	`+ content.close();`
	`148`	`+ } catch (IOException e) {`
	`149`	`+ // ignore.`
	`150`	`+ }`
`145`	`151`	`}`
`146`	`152`	`}`
`147`	`153`
Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,12 @@ protected void receiveContent(InputStream content) {`
`170`	`170`	`} catch (UnsupportedEncodingException e) {`
`171`	`171`	`logger.error("Failed to unmarshall object read from database document",e);`
`172`	`172`	`throw new MarkLogicIOException(e);`
	`173`	`+ } finally {`
	`174`	`+ try {`
	`175`	`+ content.close();`
	`176`	`+ } catch (IOException e) {`
	`177`	`+ // ignore.`
	`178`	`+ }`
`173`	`179`	`}`
`174`	`180`	`}`
`175`	`181`	`@Override`