MLE-26427 Fixing Polaris issues

Most of these already existed in OkHttpServices, but Polaris decided to report them recently

Author: rjrudin

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

@@ -83,8 +83,11 @@ private static void removeNodeAtPointer(String uri, JsonNode rootNode, String js
 		JsonNode parentNode = rootNode.at(parentPointer);
 
 		if (parentNode.isObject()) {
-			String fieldName = pointer.last().getMatchingProperty();
-			((ObjectNode) parentNode).remove(fieldName);
+			JsonPointer lastSegment = pointer.last();
+			if (lastSegment != null) {
+				String fieldName = lastSegment.getMatchingProperty();
+				((ObjectNode) parentNode).remove(fieldName);
+			}
 		} else if (parentNode.isArray()) {
 			logger.warn("Array element exclusion not supported for JSONPointer '{}'. " +
 				"Consider excluding the entire array property instead.", jsonPointer);

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

@@ -152,7 +152,15 @@ protected final DocumentWriteSet filterDocuments(Context context, Function<Strin
 				continue;
 			}
 
-			final String contentHash = computeHash(serializeContent(doc));
+			final String serializedContent = serializeContent(doc);
+			if (serializedContent == null) {
+				// Not sure if the doc can have null content - possibly for a naked properties document? - but if it
+				// does, just include it in the write set.
+				newWriteSet.add(doc);
+				continue;
+			}
+
+			final String contentHash = computeHash(serializedContent);
 			final String existingHash = hashRetriever.apply(doc.getUri());
 			if (logger.isTraceEnabled()) {
 				logger.trace("URI: {}, existing Hash: {}, new Hash: {}", doc.getUri(), existingHash, contentHash);
@@ -171,7 +179,7 @@ protected final DocumentWriteSet filterDocuments(Context context, Function<Strin
 			}
 		}
 
-		if (!skippedDocuments.isEmpty()) {
+		if (!skippedDocuments.isEmpty() && skippedDocumentsConsumer != null) {
 			skippedDocumentsConsumer.accept(skippedDocuments.toArray(new DocumentWriteOperation[0]));
 		}
 

marklogic-client-api/src/main/java/com/marklogic/client/impl/OkHttpServices.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+ * Copyright (c) 2010-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
  */
 package com.marklogic.client.impl;
 
@@ -619,7 +619,7 @@ public Response apply(Request.Builder funcBuilder) {
 		};
 		Response response = sendRequestWithRetry(requestBldr, (transaction == null), doGetFunction, null);
 
-		int status = response.code();
+		int status = response != null ? response.code() : 0;
 		if (status == STATUS_NOT_FOUND) {
 			throw new ResourceNotFoundException(
 				"Could not read non-existent document",
@@ -648,18 +648,20 @@ public Response apply(Request.Builder funcBuilder) {
 
 		HandleImplementation handleBase = HandleAccessor.as(handle);
 
-		Headers responseHeaders = response.headers();
-		if (isExternalDescriptor(desc)) {
-			updateVersion(desc, responseHeaders);
-			updateDescriptor(desc, responseHeaders);
-			copyDescriptor(desc, handleBase);
-		} else {
-			updateDescriptor(handleBase, responseHeaders);
+		if (response != null) {
+			Headers responseHeaders = response.headers();
+			if (isExternalDescriptor(desc)) {
+				updateVersion(desc, responseHeaders);
+				updateDescriptor(desc, responseHeaders);
+				copyDescriptor(desc, handleBase);
+			} else {
+				updateDescriptor(handleBase, responseHeaders);
+			}
 		}
 
 		Class as = handleBase.receiveAs();
-		ResponseBody body = response.body();
-		Object entity = body.contentLength() != 0 ? getEntity(body, as) : null;
+		ResponseBody body = response != null ? response.body() : null;
+		Object entity = (body != null && body.contentLength() != 0) ? getEntity(body, as) : null;
 
 		if (entity == null || (!InputStream.class.isAssignableFrom(as) && !Reader.class.isAssignableFrom(as))) {
 			closeResponse(response);
@@ -841,7 +843,7 @@ private OkHttpResultIterator getBulkDocumentsImpl(RequestLogger reqlog, long ser
 			if (searchHandle != null) {
 				updateServerTimestamp(handleBase, response.headers());
 				ResponseBody body = response.body();
-				if (body.contentLength() != 0) {
+				if (body != null && body.contentLength() != 0) {
 					entity = getEntity(body, MimeMultipart.class);
 					if (entity != null) {
 						List<BodyPart> partList = getPartList(entity);
@@ -895,7 +897,7 @@ public Response apply(Request.Builder funcBuilder) {
 			}
 		};
 		Response response = sendRequestWithRetry(requestBldr, (transaction == null), doGetFunction, null);
-		int status = response.code();
+		int status = response != null ? response.code() : 0;
 		if (status == STATUS_NOT_FOUND) {
 			throw new ResourceNotFoundException(
 				"Could not read non-existent document",
@@ -921,8 +923,8 @@ public Response apply(Request.Builder funcBuilder) {
 			uri, (transaction != null) ? transaction.getTransactionId() : "no", stringJoin(categories, ", ", "no"));
 
 		try {
-			ResponseBody body = response.body();
-			MimeMultipart entity = body.contentLength() != 0 ?
+			ResponseBody body = response != null ? response.body() : null;
+			MimeMultipart entity = (body != null && body.contentLength() != 0) ?
 				getEntity(body, MimeMultipart.class) : null;
 			if (entity == null) return false;
 
@@ -940,15 +942,17 @@ public Response apply(Request.Builder funcBuilder) {
 
 			BodyPart contentPart = partList.get(1);
 
-			Headers responseHeaders = response.headers();
-			if (isExternalDescriptor(desc)) {
-				updateVersion(desc, responseHeaders);
-				updateFormat(desc, responseHeaders);
-				updateMimetype(desc, getHeaderMimetype(getHeader(contentPart, HEADER_CONTENT_TYPE)));
-				updateLength(desc, getHeaderLength(getHeader(contentPart, HEADER_CONTENT_LENGTH)));
-				copyDescriptor(desc, contentBase);
-			} else {
-				updateDescriptor(contentBase, responseHeaders);
+			if (response != null) {
+				Headers responseHeaders = response.headers();
+				if (isExternalDescriptor(desc)) {
+					updateVersion(desc, responseHeaders);
+					updateFormat(desc, responseHeaders);
+					updateMimetype(desc, getHeaderMimetype(getHeader(contentPart, HEADER_CONTENT_TYPE)));
+					updateLength(desc, getHeaderLength(getHeader(contentPart, HEADER_CONTENT_LENGTH)));
+					copyDescriptor(desc, contentBase);
+				} else {
+					updateDescriptor(contentBase, responseHeaders);
+				}
 			}
 
 			metadataBase.receiveContent(getEntity(partList.get(0),
@@ -1501,7 +1505,7 @@ public Response apply(Request.Builder funcBuilder) {
 			}
 		};
 		Response response = sendRequestWithRetry(requestBldr, doPostFunction, null);
-		int status = response.code();
+		int status = response != null ? response.code() : 0;
 		if (status == STATUS_FORBIDDEN) {
 			throw new ForbiddenUserException("User is not allowed to open transactions", extractErrorFields(response));
 		}
@@ -1510,12 +1514,16 @@ public Response apply(Request.Builder funcBuilder) {
 				getReasonPhrase(response), extractErrorFields(response));
 		}
 
-		String location = response.headers().get("Location");
-		List<ClientCookie> cookies = new ArrayList<>();
-		for (String setCookie : response.headers(HEADER_SET_COOKIE)) {
-			ClientCookie cookie = parseClientCookie(requestBldr.build().url(), setCookie);
-			cookies.add(cookie);
+		final String location = response != null ? response.headers().get("Location") : null;
+
+		final List<ClientCookie> cookies = new ArrayList<>();
+		if (response != null) {
+			for (String setCookie : response.headers(HEADER_SET_COOKIE)) {
+				ClientCookie cookie = parseClientCookie(requestBldr.build().url(), setCookie);
+				cookies.add(cookie);
+			}
 		}
+
 		closeResponse(response);
 		if (location == null) throw new MarkLogicInternalException("transaction open failed to provide location");
 		if (!location.contains("/")) {
@@ -2562,7 +2570,7 @@ public Response apply(Request.Builder funcBuilder) {
 			}
 		};
 		Response response = sendRequestWithRetry(requestBldr, doGetFunction, null);
-		int status = response.code();
+		int status = response != null ? response.code() : 0;
 		if (status == STATUS_FORBIDDEN) {
 			throw new ForbiddenUserException("User is not allowed to read "
 				+ type, extractErrorFields(response));
@@ -2574,8 +2582,8 @@ public Response apply(Request.Builder funcBuilder) {
 
 		logRequest(reqlog, "read %s values with %s mime type", type, mimetype);
 
-		ResponseBody body = response.body();
-		T entity = body.contentLength() != 0 ? getEntity(body, as) : null;
+		ResponseBody body = response != null ? response.body() : null;
+		T entity = body != null && body.contentLength() != 0 ? getEntity(body, as) : null;
 		if (entity == null || (as != InputStream.class && as != Reader.class)) {
 			closeResponse(response);
 		}
@@ -2749,7 +2757,7 @@ public Response apply(Request.Builder funcBuilder) {
 			}
 		};
 		Response response = sendRequestWithRetry(requestBldr, doDeleteFunction, null);
-		int status = response.code();
+		int status = response != null ? response.code() : 0;
 		if (status == STATUS_FORBIDDEN) {
 			throw new ForbiddenUserException("User is not allowed to delete "
 				+ type, extractErrorFields(response));
@@ -3181,17 +3189,19 @@ public Response apply(Request.Builder funcBuilder) {
 		};
 
 		Response response = sendRequestWithRetry(requestBldr, (transaction == null), doPostFunction, resendableConsumer);
-		int status = response.code();
+		int status = response != null ? response.code() : 0;
 		checkStatus(response, status, operation, "resource", path,
 			ResponseStatus.OK_OR_CREATED_OR_NO_CONTENT);
 
-		Headers headers = response.headers();
-		if (responseHeaders != null) {
-			// add all the headers from the OkHttp Headers object to the caller-provided map
-			responseHeaders.putAll(headers.toMultimap());
-		} else if (outputBase != null) {
-			updateLength(outputBase, headers);
-			updateServerTimestamp(outputBase, headers);
+		if (response != null) {
+			Headers headers = response.headers();
+			if (responseHeaders != null) {
+				// add all the headers from the OkHttp Headers object to the caller-provided map
+				responseHeaders.putAll(headers.toMultimap());
+			} else if (outputBase != null) {
+				updateLength(outputBase, headers);
+				updateServerTimestamp(outputBase, headers);
+			}
 		}
 
 		if (as != null) {
@@ -3712,7 +3722,7 @@ public RESTServiceResultIterator postMultipartForm(
 		Consumer<Boolean> resendableConsumer = null;
 
 		Response response = sendRequestWithRetry(requestBldr, (transaction == null), doPostFunction, resendableConsumer);
-		int status = response.code();
+		int status = response != null ? response.code() : 0;
 		checkStatus(response, status, "apply", "resource", path, ResponseStatus.OK_OR_CREATED_OR_NO_CONTENT);
 		return makeResults(OkHttpServiceResultIterator::new, reqlog, "apply", "resource", response);
 	}
@@ -3782,10 +3792,11 @@ private <U extends OkHttpResultIterator> U postIteratedResourceImpl(
 		);
 
 		Response response = sendRequestWithRetry(requestBldr, (transaction == null), doPostFunction, resendableConsumer);
-		checkStatus(response, response.code(), "apply", "resource", path, ResponseStatus.OK_OR_CREATED_OR_NO_CONTENT);
+		final int code = response != null ? response.code() : 0;
+		checkStatus(response, code, "apply", "resource", path, ResponseStatus.OK_OR_CREATED_OR_NO_CONTENT);
 
 		boolean shouldStreamResults = "eval".equalsIgnoreCase(path) || "invoke".equalsIgnoreCase(path);
-		boolean hasDataToStream = response.body().contentLength() != 0;
+		boolean hasDataToStream = response != null && response.body().contentLength() != 0;
 		// If body is empty, we can use the "old" way of reading results as there's nothing to stream.
 		return shouldStreamResults && hasDataToStream ?
 			evalAndStreamResults(reqlog, response) :
@@ -4820,7 +4831,7 @@ public Response apply(Request.Builder funcBuilder) {
 			}
 		};
 		Response response = sendRequestWithRetry(requestBldr, doGetFunction, null);
-		int status = response.code();
+		int status = response != null ? response.code() : 0;
 		if (status == STATUS_FORBIDDEN) {
 			throw new ForbiddenUserException(
 				"User is not allowed to get suggestions",
@@ -4831,8 +4842,8 @@ public Response apply(Request.Builder funcBuilder) {
 				+ getReasonPhrase(response), extractErrorFields(response));
 		}
 
-		ResponseBody body = response.body();
-		T entity = body.contentLength() != 0 ? getEntity(body, as) : null;
+		ResponseBody body = response != null ? response.body() : null;
+		T entity = body != null && body.contentLength() != 0 ? getEntity(body, as) : null;
 		if (entity == null || (as != InputStream.class && as != Reader.class)) {
 			closeResponse(response);
 		}
@@ -5040,7 +5051,7 @@ public Response apply(Request.Builder funcBuilder) {
 			}
 		};
 		Response response = sendRequestWithRetry(requestBldr, doGetFunction, null);
-		int status = response.code();
+		final int status = response != null ? response.code() : 0;
 		if (status == STATUS_FORBIDDEN) {
 			throw new ForbiddenUserException("User is not allowed to match",
 				extractErrorFields(response));
@@ -5050,8 +5061,8 @@ public Response apply(Request.Builder funcBuilder) {
 				+ getReasonPhrase(response), extractErrorFields(response));
 		}
 
-		ResponseBody body = response.body();
-		InputStream entity = body.contentLength() != 0 ?
+		ResponseBody body = response != null ? response.body() : null;
+		InputStream entity = body != null && body.contentLength() != 0 ?
 			getEntity(body, InputStream.class) : null;
 		if (entity == null) closeResponse(response);
 
@@ -5618,9 +5629,11 @@ private void executeRequest(CallResponseImpl responseImpl) {
 
 			if (session != null) {
 				List<ClientCookie> cookies = new ArrayList<>();
-				for (String setCookie : response.headers(HEADER_SET_COOKIE)) {
-					ClientCookie cookie = parseClientCookie(requestBldr.build().url(), setCookie);
-					cookies.add(cookie);
+				if (response != null) {
+					for (String setCookie : response.headers(HEADER_SET_COOKIE)) {
+						ClientCookie cookie = parseClientCookie(requestBldr.build().url(), setCookie);
+						cookies.add(cookie);
+					}
 				}
 				((SessionStateImpl) session).setCookies(cookies);
 			}