MLE-26428 More sensible null handling for incremental write

Author: rjrudin

marklogic-client-api/src/main/java/com/marklogic/client/datamovement/filter/IncrementalWriteFilter.java

@@ -50,15 +50,21 @@ public static class Builder {
 		 * @param keyName the name of the MarkLogic metadata key that will hold the hash value; defaults to "incrementalWriteHash".
 		 */
 		public Builder hashKeyName(String keyName) {
-			this.hashKeyName = keyName;
+			// Don't let user shoot themselves in the foot with an empty key name.
+			if (keyName != null && !keyName.trim().isEmpty()) {
+				this.hashKeyName = keyName;
+			}
 			return this;
 		}
 
 		/**
 		 * @param keyName the name of the MarkLogic metadata key that will hold the timestamp value; defaults to "incrementalWriteTimestamp".
 		 */
 		public Builder timestampKeyName(String keyName) {
-			this.timestampKeyName = keyName;
+			// Don't let user shoot themselves in the foot with an empty key name.
+			if (keyName != null && !keyName.trim().isEmpty()) {
+				this.timestampKeyName = keyName;
+			}
 			return this;
 		}
 

marklogic-client-api/src/test/java/com/marklogic/client/datamovement/filter/IncrementalWriteTest.java

@@ -181,6 +181,43 @@ void noRangeIndexForFieldWithEval() {
 				"fail with a helpful error message. Actual message: " + message);
 	}
 
+	@Test
+	void customTimestampKeyName() {
+		filter = IncrementalWriteFilter.newBuilder()
+			.hashKeyName("incrementalWriteHash")
+			.timestampKeyName("myTimestamp")
+			.build();
+
+		writeTenDocuments();
+
+		DocumentMetadataHandle metadata = Common.client.newDocumentManager().readMetadata("/incremental/test/doc-1.xml",
+			new DocumentMetadataHandle());
+
+		assertNotNull(metadata.getMetadataValues().get("myTimestamp"));
+		assertNotNull(metadata.getMetadataValues().get("incrementalWriteHash"));
+		assertFalse(metadata.getMetadataValues().containsKey("incrementalWriteTimestamp"));
+	}
+
+	/**
+	 * The thought for this test is that if the user passes null in (which could happen via our Spark connector),
+	 * they're breaking the feature. So don't let them do that - ignore null and use the default values.
+	 */
+	@Test
+	void nullIsIgnoredForKeyNames() {
+		filter = IncrementalWriteFilter.newBuilder()
+			.hashKeyName(null)
+			.timestampKeyName(null)
+			.build();
+
+		writeTenDocuments();
+
+		DocumentMetadataHandle metadata = Common.client.newDocumentManager().readMetadata("/incremental/test/doc-1.xml",
+			new DocumentMetadataHandle());
+
+		assertNotNull(metadata.getMetadataValues().get("incrementalWriteHash"));
+		assertNotNull(metadata.getMetadataValues().get("incrementalWriteTimestamp"));
+	}
+
 	private void verifyIncrementalWriteWorks() {
 		writeTenDocuments();
 		verifyDocumentsHasHashInMetadataKey();