From a63d90c1f5c5659eefaa8cbccd32d9bf08a8e1de Mon Sep 17 00:00:00 2001
From: ianmarshall <ian@simpatico.ai>
Date: Mon, 25 May 2020 18:36:04 -0400
Subject: [PATCH] Additional cleanup and test fixes.

---
 .../extractor/BaseSearchParamExtractor.java          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java
index 74891a5aa54..a4331c1e05f 100644
--- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java
+++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java
@@ -399,12 +399,6 @@ public abstract class BaseSearchParamExtractor implements ISearchParamExtractor
 		return new DateExtractor(theResource);
 	}
 
-	@Override
-	public Date extractDateFromResource(IBase theValue, String thePath) {
-		DateExtractor extractor = new DateExtractor("DateType");
-		return extractor.get(theValue, thePath).getValueHigh();
-	}
-
 	private class DateExtractor implements IExtractor<ResourceIndexedSearchParamDate> {
 
 		String myResourceType;
@@ -508,6 +502,12 @@ public abstract class BaseSearchParamExtractor implements ISearchParamExtractor
 		}
 	}
 
+	@Override
+	public Date extractDateFromResource(IBase theValue, String thePath) {
+		DateExtractor extractor = new DateExtractor("DateType");
+		return extractor.get(theValue, thePath).getValueHigh();
+	}
+
 	@Override
 	public SearchParamSet<ResourceIndexedSearchParamNumber> extractSearchParamNumber(IBaseResource theResource) {
 		IExtractor<ResourceIndexedSearchParamNumber> extractor = createNumberExtractor(theResource);