Test fix

hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/ToggleSearchParametersCommand.java

@@ -0,0 +1,37 @@
+package ca.uhn.fhir.cli;
+
+import ca.uhn.fhir.jpa.term.IHapiTerminologyLoaderSvc;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+
+import java.util.concurrent.ExecutionException;
+
+public class ToggleSearchParametersCommand extends BaseCommand {
+
+	@Override
+	public String getCommandDescription() {
+		return null;
+	}
+
+	@Override
+	public String getCommandName() {
+		return null;
+	}
+
+	@Override
+	public Options getOptions() {
+		Options options = new Options();
+		addFhirVersionOption(options);
+		addBaseUrlOption(options);
+		addRequiredOption(options, "u", "url", true, "The code system URL associated with this upload (e.g. " + IHapiTerminologyLoaderSvc.SCT_URI + ")");
+		addBasicAuthOption(options);
+		return options;
+	}
+
+	@Override
+	public void run(CommandLine theCommandLine) throws ParseException, ExecutionException {
+
+	}
+
+}

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java

@@ -16,6 +16,7 @@ import ca.uhn.fhir.jpa.entity.SearchTypeEnum;
 import ca.uhn.fhir.jpa.model.entity.*;
 import ca.uhn.fhir.jpa.model.search.SearchStatusEnum;
 import ca.uhn.fhir.jpa.model.search.StorageProcessingMessage;
+import ca.uhn.fhir.jpa.model.util.JpaConstants;
 import ca.uhn.fhir.jpa.search.ISearchCoordinatorSvc;
 import ca.uhn.fhir.jpa.search.PersistedJpaBundleProvider;
 import ca.uhn.fhir.jpa.searchparam.ResourceMetaParams;
@@ -25,7 +26,6 @@ import ca.uhn.fhir.jpa.searchparam.registry.ISearchParamRegistry;
 import ca.uhn.fhir.jpa.sp.ISearchParamPresenceSvc;
 import ca.uhn.fhir.jpa.term.IHapiTerminologySvc;
 import ca.uhn.fhir.jpa.util.AddRemoveCount;
-import ca.uhn.fhir.jpa.model.util.JpaConstants;
 import ca.uhn.fhir.jpa.util.JpaInterceptorBroadcaster;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
@@ -35,7 +35,6 @@ import ca.uhn.fhir.model.base.composite.BaseCodingDt;
 import ca.uhn.fhir.model.base.composite.BaseResourceReferenceDt;
 import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.model.valueset.BundleEntryTransactionMethodEnum;
 import ca.uhn.fhir.parser.DataFormatException;
 import ca.uhn.fhir.parser.IParser;
@@ -76,6 +75,7 @@ import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.support.TransactionSynchronizationAdapter;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
+import javax.annotation.PostConstruct;
 import javax.persistence.*;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -147,8 +147,13 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao,
 	@Autowired
 	protected ISearchParamRegistry mySearchParamRegistry;
 	@Autowired
+	protected DeleteConflictService myDeleteConflictService;
+	@Autowired
+	protected IInterceptorBroadcaster myInterceptorBroadcaster;
+	@Autowired
+	ExpungeService myExpungeService;
+	@Autowired
 	private DaoConfig myConfig;
-
 	@Autowired
 	private PlatformTransactionManager myPlatformTransactionManager;
 	@Autowired
@@ -163,20 +168,9 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao,
 	private DaoSearchParamSynchronizer myDaoSearchParamSynchronizer;
 	@Autowired
 	private SearchBuilderFactory mySearchBuilderFactory;
-	@Autowired
-	ExpungeService myExpungeService;
-	@Autowired
-	protected DeleteConflictService myDeleteConflictService;
-
 	private FhirContext myContext;
 	private ApplicationContext myApplicationContext;
-	@Autowired
-	protected IInterceptorBroadcaster myInterceptorBroadcaster;
-
-	@Autowired
-	public void setContext(FhirContext theContext) {
-		myContext = theContext;
-	}
+	private Class<IPrimitiveType<String>> myStringType;
 
 	@Override
 	public void setApplicationContext(ApplicationContext theApplicationContext) throws BeansException {
@@ -344,6 +338,11 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao,
 		return myContext;
 	}
 
+	@Autowired
+	public void setContext(FhirContext theContext) {
+		myContext = theContext;
+	}
+
 	public FhirContext getContext(FhirVersionEnum theVersion) {
 		Validate.notNull(theVersion, "theVersion must not be null");
 		synchronized (ourRetrievalContexts) {
@@ -875,7 +874,7 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao,
 			ResourceTable resource = (ResourceTable) theEntity;
 			version = theEntity.getVersion();
 			ResourceHistoryTable history = myResourceHistoryTableDao.findForIdAndVersionAndFetchProvenance(theEntity.getId(), version);
-			((ResourceTable)theEntity).setCurrentVersionEntity(history);
+			((ResourceTable) theEntity).setCurrentVersionEntity(history);
 
 			while (history == null) {
 				if (version > 1L) {
@@ -1453,6 +1452,27 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao,
 		return mySearchParamRegistry;
 	}
 
+	@PostConstruct
+	@SuppressWarnings({"ResultOfMethodCallIgnored", "unchecked"})
+	public void startSetStringType() {
+		myStringType = (Class<IPrimitiveType<String>>) myContext.getElementDefinition("string").getImplementingClass();
+	}
+
+	private String parseContentTextIntoWords(FhirContext theContext, IBaseResource theResource) {
+
+		StringBuilder retVal = new StringBuilder();
+		List<IPrimitiveType<String>> childElements = theContext.newTerser().getAllPopulatedChildElementsOfType(theResource, myStringType);
+		for (@SuppressWarnings("rawtypes")
+			IPrimitiveType<String> nextType : childElements) {
+			String nextValue = nextType.getValueAsString();
+			if (isNotBlank(nextValue)) {
+				retVal.append(nextValue.replace("\n", " ").replace("\r", " "));
+				retVal.append("\n");
+			}
+		}
+		return retVal.toString();
+	}
+
 	public static void clearRequestAsProcessingSubRequest(ServletRequestDetails theRequestDetails) {
 		if (theRequestDetails != null) {
 			theRequestDetails.getUserData().remove(PROCESSING_SUB_REQUEST);
@@ -1465,24 +1485,7 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao,
 		}
 	}
 
-	public static String parseContentTextIntoWords(FhirContext theContext, IBaseResource theResource) {
-		StringBuilder retVal = new StringBuilder();
-		@SuppressWarnings("rawtypes")
-		List<IPrimitiveType> childElements = theContext.newTerser().getAllPopulatedChildElementsOfType(theResource, IPrimitiveType.class);
-		for (@SuppressWarnings("rawtypes")
-			IPrimitiveType nextType : childElements) {
-			if (nextType instanceof StringDt || nextType.getClass().getSimpleName().equals("StringType")) {
-				String nextValue = nextType.getValueAsString();
-				if (isNotBlank(nextValue)) {
-					retVal.append(nextValue.replace("\n", " ").replace("\r", " "));
-					retVal.append("\n");
-				}
-			}
-		}
-		return retVal.toString();
-	}
-
-	public static void populateFullTextFields(final FhirContext theContext, final IBaseResource theResource, ResourceTable theEntity) {
+	public void populateFullTextFields(final FhirContext theContext, final IBaseResource theResource, ResourceTable theEntity) {
 		if (theEntity.getDeleted() != null) {
 			theEntity.setNarrativeTextParsedIntoWords(null);
 			theEntity.setContentTextParsedIntoWords(null);