Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import ca.uhn.fhir.context.RuntimeResourceBlockDefinition;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -720,6 +721,10 @@ private List<String> sortedPaths() {
// the 3 above are the only options in the enum
}
}

Collections.sort(whereEquals);
Collections.sort(whereUnequals);
Collections.sort(withoutWhere);

List<String> ret = new ArrayList<String>();
ret.addAll(whereEquals);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.LinkedHashMap;
import java.util.stream.Collectors;

import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -76,7 +77,7 @@ public static void buildPlanEligibilities(String state, String fileName) {
private static <T> Map<T, String> removeBlankMapStringValues(Map<T, String> map) {
Map<T, String> mapValuesToKeep = map.entrySet().stream()
.filter(entry -> !StringUtils.isBlank(entry.getValue())).collect(
Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
return mapValuesToKeep;
}

Expand Down