From 9f77c57e5a8977690e016cfbf405cc2d20c5d5c9 Mon Sep 17 00:00:00 2001
From: jamesagnew <jamesagnew@gmail.com>
Date: Tue, 20 Jul 2021 17:30:26 -0400
Subject: [PATCH] Widen access for utility methods

---
 .../ca/uhn/fhir/rest/server/RestfulServer.java | 18 ++++++++++++------
 .../method/ConformanceMethodBinding.java       |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
index 9df9b113306..71381470fa8 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
@@ -124,7 +124,6 @@ public class RestfulServer extends HttpServlet implements IRestfulServer<Servlet
 	 * with this key. The value will be a Java {@link Date} with the time that request processing began.
 	 */
 	public static final String REQUEST_START_TIME = RestfulServer.class.getName() + "REQUEST_START_TIME";
-
 	/**
 	 * Default setting for {@link #setETagSupport(ETagSupportEnum) ETag Support}: {@link ETagSupportEnum#ENABLED}
 	 */
@@ -196,6 +195,13 @@ public class RestfulServer extends HttpServlet implements IRestfulServer<Servlet
 		setInterceptorService(theInterceptorService);
 	}
 
+	/**
+	 * @since 5.5.0
+	 */
+	protected ConformanceMethodBinding getServerConformanceMethod() {
+		return myServerConformanceMethod;
+	}
+
 	private void addContentLocationHeaders(RequestDetails theRequest, HttpServletResponse servletResponse, MethodOutcome response, String resourceName) {
 		if (response != null && response.getId() != null) {
 			addLocationHeader(theRequest, servletResponse, response, Constants.HEADER_LOCATION, resourceName);
@@ -348,14 +354,14 @@ public class RestfulServer extends HttpServlet implements IRestfulServer<Servlet
 		myResourceNameToBinding
 			.values()
 			.stream()
-			.flatMap(t->t.getMethodBindings().stream())
-			.forEach(t->t.close());
+			.flatMap(t -> t.getMethodBindings().stream())
+			.forEach(t -> t.close());
 		myGlobalBinding
 			.getMethodBindings()
-			.forEach(t->t.close());
+			.forEach(t -> t.close());
 		myServerBinding
 			.getMethodBindings()
-			.forEach(t->t.close());
+			.forEach(t -> t.close());
 
 	}
 
@@ -2033,7 +2039,7 @@ public class RestfulServer extends HttpServlet implements IRestfulServer<Servlet
 		String message = theFhirContext.getLocalizer().getMessage(RestfulServer.class, "unknownMethod", theRequestType.name(), requestPath, requestDetails.getParameters().keySet());
 
 		IBaseOperationOutcome oo = OperationOutcomeUtil.newInstance(theFhirContext);
-		OperationOutcomeUtil.addIssue(theFhirContext, oo, "error", message, null,  "not-supported");
+		OperationOutcomeUtil.addIssue(theFhirContext, oo, "error", message, null, "not-supported");
 
 		throw new InvalidRequestException(message, oo);
 	}
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ConformanceMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ConformanceMethodBinding.java
index 1930d176f5b..27bb38ca89e 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ConformanceMethodBinding.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/ConformanceMethodBinding.java
@@ -110,7 +110,7 @@ public class ConformanceMethodBinding extends BaseResourceReturningMethodBinding
 	 * @see Metadata#cacheMillis()
 	 * @since 4.1.0
 	 */
-	private void setCacheMillis(long theCacheMillis) {
+	public void setCacheMillis(long theCacheMillis) {
 		myCacheMillis = theCacheMillis;
 	}