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

fix npe

This commit is contained in:
Ken Stevens 2020-01-23 16:06:15 -05:00
parent 48a71d6649
commit 8114419110
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -911,10 +911,6 @@ public class SearchBuilder implements ISearchBuilder {
return myCallingDao; return myCallingDao;
} }
public PredicateBuilder getPredicateBuilder() {
return myPredicateBuilder;
}
public class IncludesIterator extends BaseIterator<ResourcePersistentId> implements Iterator<ResourcePersistentId> { public class IncludesIterator extends BaseIterator<ResourcePersistentId> implements Iterator<ResourcePersistentId> {
private final RequestDetails myRequest; private final RequestDetails myRequest;

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/PredicateBuilder.java
View File

@ -31,7 +31,7 @@ public class PredicateBuilder {
myPredicateBuilderResourceId = thePredicateBuilderFactory.newPredicateBuilderResourceId(theSearchBuilder); myPredicateBuilderResourceId = thePredicateBuilderFactory.newPredicateBuilderResourceId(theSearchBuilder);
myPredicateBuilderString = thePredicateBuilderFactory.newPredicateBuilderString(theSearchBuilder); myPredicateBuilderString = thePredicateBuilderFactory.newPredicateBuilderString(theSearchBuilder);
myPredicateBuilderTag = thePredicateBuilderFactory.newPredicateBuilderTag(theSearchBuilder); myPredicateBuilderTag = thePredicateBuilderFactory.newPredicateBuilderTag(theSearchBuilder);
myPredicateBuilderToken = thePredicateBuilderFactory.newPredicateBuilderToken(theSearchBuilder); myPredicateBuilderToken = thePredicateBuilderFactory.newPredicateBuilderToken(theSearchBuilder, this);
myPredicateBuilderUri = thePredicateBuilderFactory.newPredicateBuilderUri(theSearchBuilder); myPredicateBuilderUri = thePredicateBuilderFactory.newPredicateBuilderUri(theSearchBuilder);
} }

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/PredicateBuilderFactory.java
View File

@ -23,7 +23,7 @@ public abstract class PredicateBuilderFactory {
@Lookup @Lookup
public abstract PredicateBuilderTag newPredicateBuilderTag(SearchBuilder theSearchBuilder); public abstract PredicateBuilderTag newPredicateBuilderTag(SearchBuilder theSearchBuilder);
@Lookup @Lookup
public abstract PredicateBuilderToken newPredicateBuilderToken(SearchBuilder theSearchBuilder); public abstract PredicateBuilderToken newPredicateBuilderToken(SearchBuilder theSearchBuilder, PredicateBuilder thePredicateBuilder);
@Lookup @Lookup
public abstract PredicateBuilderUri newPredicateBuilderUri(SearchBuilder theSearchBuilder); public abstract PredicateBuilderUri newPredicateBuilderUri(SearchBuilder theSearchBuilder);
} }

4
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/PredicateBuilderToken.java
View File

@ -38,9 +38,9 @@ class PredicateBuilderToken extends BasePredicateBuilder {
private ISearchParamRegistry mySearchParamRegistry; private ISearchParamRegistry mySearchParamRegistry;
private final PredicateBuilder myPredicateBuilder; private final PredicateBuilder myPredicateBuilder;
PredicateBuilderToken(SearchBuilder theSearchBuilder) { PredicateBuilderToken(SearchBuilder theSearchBuilder, PredicateBuilder thePredicateBuilder) {
super(theSearchBuilder); super(theSearchBuilder);
myPredicateBuilder = theSearchBuilder.getPredicateBuilder(); myPredicateBuilder = thePredicateBuilder;
} }
Predicate addPredicateToken(String theResourceName, Predicate addPredicateToken(String theResourceName,