From 7cbc0aec6713d9deaa4709eb5722ebc80c22eb15 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Wed, 12 Feb 2025 16:54:06 -0500
Subject: [PATCH 1/3] Remove HTTPClient dependency in hapi-fhir-base

---
 hapi-fhir-base/pom.xml                        |  5 +-
 .../main/java/ca/uhn/fhir/util/UrlUtil.java   | 36 --------------
 .../fhir/jpa/searchparam/MatchUrlService.java |  3 +-
 hapi-fhir-server/pom.xml                      |  5 ++
 .../fhir/rest/server/util/MatchUrlUtil.java   | 48 +++++++++++++++++++
 .../rest/server/util/ServletRequestUtil.java  |  4 +-
 .../rest/server/util/MatchUrlUtilTest.java    | 30 ++++++++++++
 .../java/ca/uhn/fhir/util/UrlUtilTest.java    | 22 ---------
 8 files changed, 88 insertions(+), 65 deletions(-)
 create mode 100644 hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/MatchUrlUtil.java
 create mode 100644 hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/server/util/MatchUrlUtilTest.java

diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml
index 33cb33894626..442e4802fed6 100644
--- a/hapi-fhir-base/pom.xml
+++ b/hapi-fhir-base/pom.xml
@@ -70,10 +70,7 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-		</dependency>
+
 		<!-- JENA Dependencies - Used for Turtle encoding -->
 		<dependency>
 			<groupId>org.apache.jena</groupId>
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlUtil.java
index af3fae81c8a5..771a79d1fd7d 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlUtil.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlUtil.java
@@ -31,9 +31,6 @@
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.utils.URLEncodedUtils;
-import org.apache.http.message.BasicNameValuePair;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 import java.io.UnsupportedEncodingException;
@@ -572,39 +569,6 @@ public static String unescape(String theString) {
 		return theString;
 	}
 
-	public static List<NameValuePair> translateMatchUrl(String theMatchUrl) {
-		List<NameValuePair> parameters;
-		String matchUrl = theMatchUrl;
-		int questionMarkIndex = matchUrl.indexOf('?');
-		if (questionMarkIndex != -1) {
-			matchUrl = matchUrl.substring(questionMarkIndex + 1);
-		}
-
-		final String[] searchList = new String[] {"|", "=>=", "=<=", "=>", "=<"};
-		final String[] replacementList = new String[] {"%7C", "=%3E%3D", "=%3C%3D", "=%3E", "=%3C"};
-		matchUrl = StringUtils.replaceEach(matchUrl, searchList, replacementList);
-		if (matchUrl.contains(" ")) {
-			throw new InvalidRequestException(Msg.code(1744) + "Failed to parse match URL[" + theMatchUrl
-					+ "] - URL is invalid (must not contain spaces)");
-		}
-
-		parameters = URLEncodedUtils.parse((matchUrl), Constants.CHARSET_UTF8, '&');
-
-		// One issue that has happened before is people putting a "+" sign into an email address in a match URL
-		// and having that turn into a " ". Since spaces are never appropriate for email addresses, let's just
-		// assume they really meant "+".
-		for (int i = 0; i < parameters.size(); i++) {
-			NameValuePair next = parameters.get(i);
-			if (next.getName().equals("email") && next.getValue().contains(" ")) {
-				BasicNameValuePair newPair =
-						new BasicNameValuePair(next.getName(), next.getValue().replace(' ', '+'));
-				parameters.set(i, newPair);
-			}
-		}
-
-		return parameters;
-	}
-
 	/**
 	 * Creates list of sub URIs candidates for search with :above modifier
 	 * Example input: http://[host]/[pathPart1]/[pathPart2]
diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java
index 870b6c9681cd..c34a9a973471 100644
--- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java
+++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java
@@ -37,6 +37,7 @@
 import ca.uhn.fhir.rest.param.ParameterUtil;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import ca.uhn.fhir.rest.server.util.ISearchParamRegistry;
+import ca.uhn.fhir.rest.server.util.ServletRequestUtil;
 import ca.uhn.fhir.util.ReflectionUtil;
 import ca.uhn.fhir.util.UrlUtil;
 import com.google.common.collect.ArrayListMultimap;
@@ -59,7 +60,7 @@ public class MatchUrlService {
 	public SearchParameterMap translateMatchUrl(
 			String theMatchUrl, RuntimeResourceDefinition theResourceDefinition, Flag... theFlags) {
 		SearchParameterMap paramMap = new SearchParameterMap();
-		List<NameValuePair> parameters = UrlUtil.translateMatchUrl(theMatchUrl);
+		List<NameValuePair> parameters = ServletRequestUtil.translateMatchUrl(theMatchUrl);
 
 		ArrayListMultimap<String, QualifiedParamList> nameToParamLists = ArrayListMultimap.create();
 		for (NameValuePair next : parameters) {
diff --git a/hapi-fhir-server/pom.xml b/hapi-fhir-server/pom.xml
index b69918288ad3..94c8440ff992 100644
--- a/hapi-fhir-server/pom.xml
+++ b/hapi-fhir-server/pom.xml
@@ -49,6 +49,11 @@
 			<artifactId>owasp-java-html-sanitizer</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+
 		<!-- 
 		Spring is added as an optional dependency just so that it
 		can be used for CORS
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/MatchUrlUtil.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/MatchUrlUtil.java
new file mode 100644
index 000000000000..12b56942828a
--- /dev/null
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/MatchUrlUtil.java
@@ -0,0 +1,48 @@
+package ca.uhn.fhir.rest.server.util;
+
+import ca.uhn.fhir.i18n.Msg;
+import ca.uhn.fhir.rest.api.Constants;
+import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.utils.URLEncodedUtils;
+import org.apache.http.message.BasicNameValuePair;
+
+import java.util.List;
+
+public class MatchUrlUtil {
+
+	public static List<NameValuePair> translateMatchUrl(String theMatchUrl) {
+		List<NameValuePair> parameters;
+		String matchUrl = theMatchUrl;
+		int questionMarkIndex = matchUrl.indexOf('?');
+		if (questionMarkIndex != -1) {
+			matchUrl = matchUrl.substring(questionMarkIndex + 1);
+		}
+
+		final String[] searchList = new String[] {"|", "=>=", "=<=", "=>", "=<"};
+		final String[] replacementList = new String[] {"%7C", "=%3E%3D", "=%3C%3D", "=%3E", "=%3C"};
+		matchUrl = StringUtils.replaceEach(matchUrl, searchList, replacementList);
+		if (matchUrl.contains(" ")) {
+			throw new InvalidRequestException(Msg.code(1744) + "Failed to parse match URL[" + theMatchUrl
+				+ "] - URL is invalid (must not contain spaces)");
+		}
+
+		parameters = URLEncodedUtils.parse((matchUrl), Constants.CHARSET_UTF8, '&');
+
+		// One issue that has happened before is people putting a "+" sign into an email address in a match URL
+		// and having that turn into a " ". Since spaces are never appropriate for email addresses, let's just
+		// assume they really meant "+".
+		for (int i = 0; i < parameters.size(); i++) {
+			NameValuePair next = parameters.get(i);
+			if (next.getName().equals("email") && next.getValue().contains(" ")) {
+				BasicNameValuePair newPair =
+					new BasicNameValuePair(next.getName(), next.getValue().replace(' ', '+'));
+				parameters.set(i, newPair);
+			}
+		}
+
+		return parameters;
+	}
+
+}
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ServletRequestUtil.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ServletRequestUtil.java
index 6e03812dba3c..9c65024220c7 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ServletRequestUtil.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ServletRequestUtil.java
@@ -22,7 +22,6 @@
 import ca.uhn.fhir.rest.api.RequestTypeEnum;
 import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
 import ca.uhn.fhir.rest.server.servlet.ServletSubRequestDetails;
-import ca.uhn.fhir.util.UrlUtil;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.http.NameValuePair;
 
@@ -43,7 +42,7 @@ public static ServletSubRequestDetails getServletSubRequestDetails(
 		requestDetails.setParameters(new HashMap<>());
 		if (qIndex != -1) {
 			String params = url.substring(qIndex);
-			List<NameValuePair> parameters = UrlUtil.translateMatchUrl(params);
+			List<NameValuePair> parameters = MatchUrlUtil.translateMatchUrl(params);
 			for (NameValuePair next : parameters) {
 				theParamValues.put(next.getName(), next.getValue());
 			}
@@ -68,4 +67,5 @@ public static ServletSubRequestDetails getServletSubRequestDetails(
 		theRequestDetails.getServer().populateRequestDetailsFromRequestPath(requestDetails, url);
 		return requestDetails;
 	}
+
 }
diff --git a/hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/server/util/MatchUrlUtilTest.java b/hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/server/util/MatchUrlUtilTest.java
new file mode 100644
index 000000000000..bb29cd2e49d8
--- /dev/null
+++ b/hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/server/util/MatchUrlUtilTest.java
@@ -0,0 +1,30 @@
+package ca.uhn.fhir.rest.server.util;
+
+import org.apache.http.message.BasicNameValuePair;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class MatchUrlUtilTest {
+
+	@Test
+	public void testTranslateMatchUrl_UrlWithSpaces() {
+		// %20 is an encoded space character
+		assertThat(MatchUrlUtil.translateMatchUrl("Observation?names=homer%20simpson")).containsExactlyInAnyOrder(new BasicNameValuePair("names", "homer simpson"));
+
+		// + is also an encoded space character
+		assertThat(MatchUrlUtil.translateMatchUrl("Observation?names=homer+simpson")).containsExactlyInAnyOrder(new BasicNameValuePair("names", "homer simpson"));
+	}
+
+	@Test
+	public void testTranslateMatchUrl_UrlWithPlusSign() {
+		// %2B is an encoded plus sign
+		assertThat(MatchUrlUtil.translateMatchUrl("Observation?names=homer%2Bsimpson")).containsExactlyInAnyOrder(new BasicNameValuePair("names", "homer+simpson"));
+	}
+
+	@Test
+	public void testTranslateMatchUrl_UrlWithPipe() {
+		// Real space
+		assertThat(MatchUrlUtil.translateMatchUrl("Observation?names=homer|simpson")).containsExactlyInAnyOrder(new BasicNameValuePair("names", "homer|simpson"));
+	}
+}
diff --git a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/util/UrlUtilTest.java b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/util/UrlUtilTest.java
index 740657cb3b8e..1dcb72ee2343 100644
--- a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/util/UrlUtilTest.java
+++ b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/util/UrlUtilTest.java
@@ -4,7 +4,6 @@
 import ca.uhn.fhir.i18n.Msg;
 import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
-import org.apache.http.message.BasicNameValuePair;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
@@ -115,27 +114,6 @@ public void testSanitize() {
 		assertEquals("  ", UrlUtil.sanitizeUrlPart(" \0 "));
 	}
 
-	@Test
-	public void testTranslateMatchUrl_UrlWithSpaces() {
-		// %20 is an encoded space character
-		assertThat(UrlUtil.translateMatchUrl("Observation?names=homer%20simpson")).containsExactlyInAnyOrder(new BasicNameValuePair("names", "homer simpson"));
-
-		// + is also an encoded space character
-		assertThat(UrlUtil.translateMatchUrl("Observation?names=homer+simpson")).containsExactlyInAnyOrder(new BasicNameValuePair("names", "homer simpson"));
-	}
-
-	@Test
-	public void testTranslateMatchUrl_UrlWithPlusSign() {
-		// %2B is an encoded plus sign
-		assertThat(UrlUtil.translateMatchUrl("Observation?names=homer%2Bsimpson")).containsExactlyInAnyOrder(new BasicNameValuePair("names", "homer+simpson"));
-	}
-
-	@Test
-	public void testTranslateMatchUrl_UrlWithPipe() {
-		// Real space
-		assertThat(UrlUtil.translateMatchUrl("Observation?names=homer|simpson")).containsExactlyInAnyOrder(new BasicNameValuePair("names", "homer|simpson"));
-	}
-
 	@ParameterizedTest
 	@CsvSource({
 		"null,    null",

From d7202101926a2b1c2824857c77406654b914f962 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Wed, 12 Feb 2025 17:00:34 -0500
Subject: [PATCH 2/3] Spotless

---
 .../ca/uhn/fhir/parser/LenientErrorHandler.java  |  6 +++---
 .../uhn/fhir/rest/server/util/MatchUrlUtil.java  | 16 +++++++++++++---
 .../rest/server/util/ServletRequestUtil.java     |  1 -
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/LenientErrorHandler.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/LenientErrorHandler.java
index 20e368a38e89..abc21e57958b 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/LenientErrorHandler.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/LenientErrorHandler.java
@@ -87,9 +87,9 @@ public void incorrectJsonType(
 			ScalarType theFoundScalarType) {
 		if (myLogErrors) {
 			if (ourLog.isWarnEnabled()) {
-				String message = describeLocation(theLocation) +
-						createIncorrectJsonTypeMessage(
-							theElementName, theExpected, theExpectedScalarType, theFound, theFoundScalarType);
+				String message = describeLocation(theLocation)
+						+ createIncorrectJsonTypeMessage(
+								theElementName, theExpected, theExpectedScalarType, theFound, theFoundScalarType);
 				ourLog.warn(message);
 			}
 		}
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/MatchUrlUtil.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/MatchUrlUtil.java
index 12b56942828a..a1f2eeef1574 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/MatchUrlUtil.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/MatchUrlUtil.java
@@ -12,6 +12,17 @@
 
 public class MatchUrlUtil {
 
+	/**
+	 * Non-instantiable
+	 */
+	private MatchUrlUtil() {
+		// nothing
+	}
+
+	/**
+	 * Parses a FHIR-style Match URL (Patient?identifier=http://foo|bar) into
+	 * a parsed set of parameters.
+	 */
 	public static List<NameValuePair> translateMatchUrl(String theMatchUrl) {
 		List<NameValuePair> parameters;
 		String matchUrl = theMatchUrl;
@@ -25,7 +36,7 @@ public static List<NameValuePair> translateMatchUrl(String theMatchUrl) {
 		matchUrl = StringUtils.replaceEach(matchUrl, searchList, replacementList);
 		if (matchUrl.contains(" ")) {
 			throw new InvalidRequestException(Msg.code(1744) + "Failed to parse match URL[" + theMatchUrl
-				+ "] - URL is invalid (must not contain spaces)");
+					+ "] - URL is invalid (must not contain spaces)");
 		}
 
 		parameters = URLEncodedUtils.parse((matchUrl), Constants.CHARSET_UTF8, '&');
@@ -37,12 +48,11 @@ public static List<NameValuePair> translateMatchUrl(String theMatchUrl) {
 			NameValuePair next = parameters.get(i);
 			if (next.getName().equals("email") && next.getValue().contains(" ")) {
 				BasicNameValuePair newPair =
-					new BasicNameValuePair(next.getName(), next.getValue().replace(' ', '+'));
+						new BasicNameValuePair(next.getName(), next.getValue().replace(' ', '+'));
 				parameters.set(i, newPair);
 			}
 		}
 
 		return parameters;
 	}
-
 }
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ServletRequestUtil.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ServletRequestUtil.java
index 9c65024220c7..a738d20d6644 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ServletRequestUtil.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ServletRequestUtil.java
@@ -67,5 +67,4 @@ public static ServletSubRequestDetails getServletSubRequestDetails(
 		theRequestDetails.getServer().populateRequestDetailsFromRequestPath(requestDetails, url);
 		return requestDetails;
 	}
-
 }

From e21aae7083a82d1825d90904eccc45750ebc5d70 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Wed, 12 Feb 2025 17:01:52 -0500
Subject: [PATCH 3/3] Compile fix

---
 .../java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java
index c34a9a973471..1af271e14418 100644
--- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java
+++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java
@@ -37,7 +37,7 @@
 import ca.uhn.fhir.rest.param.ParameterUtil;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import ca.uhn.fhir.rest.server.util.ISearchParamRegistry;
-import ca.uhn.fhir.rest.server.util.ServletRequestUtil;
+import ca.uhn.fhir.rest.server.util.MatchUrlUtil;
 import ca.uhn.fhir.util.ReflectionUtil;
 import ca.uhn.fhir.util.UrlUtil;
 import com.google.common.collect.ArrayListMultimap;
@@ -60,7 +60,7 @@ public class MatchUrlService {
 	public SearchParameterMap translateMatchUrl(
 			String theMatchUrl, RuntimeResourceDefinition theResourceDefinition, Flag... theFlags) {
 		SearchParameterMap paramMap = new SearchParameterMap();
-		List<NameValuePair> parameters = ServletRequestUtil.translateMatchUrl(theMatchUrl);
+		List<NameValuePair> parameters = MatchUrlUtil.translateMatchUrl(theMatchUrl);
 
 		ArrayListMultimap<String, QualifiedParamList> nameToParamLists = ArrayListMultimap.create();
 		for (NameValuePair next : parameters) {