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

Merge pull request #1103 from hapifhir/gg-202302-resource-names 

Gg 202302 resource names
This commit is contained in:
Grahame Grieve 2023-02-06 07:09:34 +11:00 committed by GitHub
parent b3cebe7bc6 1d4f1e9d90
commit 2792b941a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java
View File

@ -37,9 +37,11 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
@ -560,13 +562,12 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon
@Override @Override
public List<String> getResourceNames() { public List<String> getResourceNames() {
List<String> result = new ArrayList<String>(); Set<String> result = new HashSet<String>();
for (StructureDefinition sd : listStructures()) { for (StructureDefinition sd : listStructures()) {
if (sd.getKind() == StructureDefinitionKind.RESOURCE && sd.getDerivation() == TypeDerivationRule.SPECIALIZATION) if (sd.getKind() == StructureDefinitionKind.RESOURCE && sd.getDerivation() == TypeDerivationRule.SPECIALIZATION)
result.add(sd.getName()); result.add(sd.getName());
} }
Collections.sort(result); return Utilities.sorted(result);
return result;
} }

2
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
View File

@ -1297,7 +1297,7 @@ public class Utilities {
return id.matches("[A-Za-z0-9\\-\\.]{1,64}"); return id.matches("[A-Za-z0-9\\-\\.]{1,64}");
} }
public static List<String> sorted(Set<String> set) { public static List<String> sorted(Collection<String> set) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
list.addAll(set); list.addAll(set);
Collections.sort(list); Collections.sort(list);