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

Address review comments.

This commit is contained in:
Diederik Muylwyk 2019-09-03 16:37:28 -04:00
parent 6ebc9572ac
commit 3e522a7414
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSet.java
View File

@ -44,8 +44,6 @@ import static org.apache.commons.lang3.StringUtils.length;
public class TermValueSet implements Serializable { public class TermValueSet implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final int MAX_TOTAL_LENGTH = 19;
public static final int MAX_EXPANSION_STATUS_LENGTH = 50; public static final int MAX_EXPANSION_STATUS_LENGTH = 50;
public static final int MAX_NAME_LENGTH = 200; public static final int MAX_NAME_LENGTH = 200;
public static final int MAX_URL_LENGTH = 200; public static final int MAX_URL_LENGTH = 200;
@ -72,11 +70,11 @@ public class TermValueSet implements Serializable {
@OneToMany(mappedBy = "myValueSet") @OneToMany(mappedBy = "myValueSet")
private List<TermValueSetConcept> myConcepts; private List<TermValueSetConcept> myConcepts;
@Column(name = "TOTAL_CONCEPTS", nullable = false, length = MAX_TOTAL_LENGTH) @Column(name = "TOTAL_CONCEPTS", nullable = false)
@ColumnDefault("0") @ColumnDefault("0")
private Long myTotalConcepts; private Long myTotalConcepts;
@Column(name = "TOTAL_CONCEPT_DESIGNATIONS", nullable = false, length = MAX_TOTAL_LENGTH) @Column(name = "TOTAL_CONCEPT_DESIGNATIONS", nullable = false)
@ColumnDefault("0") @ColumnDefault("0")
private Long myTotalConceptDesignations; private Long myTotalConceptDesignations;

3
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvcImpl.java
View File

@ -541,8 +541,7 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
private void expandConcepts(ValueSet.ValueSetExpansionComponent theExpansionComponent, TermValueSet theTermValueSet, int theOffset, int theCount) { private void expandConcepts(ValueSet.ValueSetExpansionComponent theExpansionComponent, TermValueSet theTermValueSet, int theOffset, int theCount) {
int conceptsExpanded = 0; int conceptsExpanded = 0;
int toIndex = theOffset + theCount; int toIndex = theOffset + theCount;
Supplier<Slice<TermValueSetConcept>> loader = () -> myValueSetConceptDao.findByTermValueSetIdAndPreFetchDesignations(SearchCoordinatorSvcImpl.toPage(theOffset, toIndex), theTermValueSet.getId()); Slice<TermValueSetConcept> slice = myValueSetConceptDao.findByTermValueSetIdAndPreFetchDesignations(SearchCoordinatorSvcImpl.toPage(theOffset, toIndex), theTermValueSet.getId());
Slice<TermValueSetConcept> slice = loader.get();
if (!slice.hasContent()) { if (!slice.hasContent()) {
logConceptsExpanded(theTermValueSet, conceptsExpanded); logConceptsExpanded(theTermValueSet, conceptsExpanded);
return; return;