honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make method static again

This commit is contained in:
James Agnew 2019-08-29 22:03:58 -04:00
parent 347aada62e
commit 668af76514
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,6 @@ import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionSynchronizationAdapter; import org.springframework.transaction.support.TransactionSynchronizationAdapter;
import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.transaction.support.TransactionSynchronizationManager;
import javax.annotation.PostConstruct;
import javax.persistence.*; import javax.persistence.*;
import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;
@ -170,7 +169,6 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao,
private SearchBuilderFactory mySearchBuilderFactory; private SearchBuilderFactory mySearchBuilderFactory;
private FhirContext myContext; private FhirContext myContext;
private ApplicationContext myApplicationContext; private ApplicationContext myApplicationContext;
private Class<IPrimitiveType<String>> myStringType;
@Override @Override
public void setApplicationContext(ApplicationContext theApplicationContext) throws BeansException { public void setApplicationContext(ApplicationContext theApplicationContext) throws BeansException {
@ -1452,19 +1450,16 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao,
return mySearchParamRegistry; return mySearchParamRegistry;
} }
@PostConstruct @SuppressWarnings("unchecked")
@SuppressWarnings({"ResultOfMethodCallIgnored", "unchecked"}) public static String parseContentTextIntoWords(FhirContext theContext, IBaseResource theResource) {
public void startSetStringType() {
myStringType = (Class<IPrimitiveType<String>>) myContext.getElementDefinition("string").getImplementingClass();
}
private String parseContentTextIntoWords(FhirContext theContext, IBaseResource theResource) { Class<IPrimitiveType<String>> stringType = (Class<IPrimitiveType<String>>) theContext.getElementDefinition("string").getImplementingClass();
StringBuilder retVal = new StringBuilder(); StringBuilder retVal = new StringBuilder();
List<IPrimitiveType<String>> childElements = theContext.newTerser().getAllPopulatedChildElementsOfType(theResource, myStringType); List<IPrimitiveType<String>> childElements = theContext.newTerser().getAllPopulatedChildElementsOfType(theResource, stringType);
for (@SuppressWarnings("rawtypes") for (@SuppressWarnings("rawtypes")
IPrimitiveType<String> nextType : childElements) { IPrimitiveType<String> nextType : childElements) {
if (myStringType.equals(nextType.getClass())) { if (stringType.equals(nextType.getClass())) {
String nextValue = nextType.getValueAsString(); String nextValue = nextType.getValueAsString();
if (isNotBlank(nextValue)) { if (isNotBlank(nextValue)) {
retVal.append(nextValue.replace("\n", " ").replace("\r", " ")); retVal.append(nextValue.replace("\n", " ").replace("\r", " "));