Issue #2162 - change "mapper" to "function"

Signed-off-by: John T.E. Timm <johntimm@us.ibm.com>
LinuxForHealth · Apr 8, 2021 · 610c0a4 · 610c0a4
1 parent 2d1f2e2
commit 610c0a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/fhir-term-graph/src/main/java/com/ibm/fhir/term/graph/provider/GraphTermServiceProvider.java b/fhir-term-graph/src/main/java/com/ibm/fhir/term/graph/provider/GraphTermServiceProvider.java
@@ -128,7 +128,7 @@ public Set<Concept> getConcepts(CodeSystem codeSystem) {
     }
 
     @Override
-    public <R> Set<R> getConcepts(CodeSystem codeSystem, Function<Concept, ? extends R> mapper) {
+    public <R> Set<R> getConcepts(CodeSystem codeSystem, Function<Concept, ? extends R> function) {
         checkArgument(codeSystem);
 
         Set<R> concepts = new LinkedHashSet<>(getCount(codeSystem));
@@ -138,7 +138,7 @@ public <R> Set<R> getConcepts(CodeSystem codeSystem, Function<Concept, ? extends
             .timeLimit(timeLimit);
         TimeLimitStep<?> timeLimitStep = getTimeLimitStep(g);
 
-        g.elementMap().toStream().forEach(elementMap -> concepts.add(mapper.apply(createConcept(elementMap))));
+        g.elementMap().toStream().forEach(elementMap -> concepts.add(function.apply(createConcept(elementMap))));
 
         checkTimeLimit(timeLimitStep);
 
@@ -151,7 +151,7 @@ public Set<Concept> getConcepts(CodeSystem codeSystem, List<Filter> filters) {
     }
 
     @Override
-    public <R> Set<R> getConcepts(CodeSystem codeSystem, List<Filter> filters, Function<Concept, ? extends R> mapper) {
+    public <R> Set<R> getConcepts(CodeSystem codeSystem, List<Filter> filters, Function<Concept, ? extends R> function) {
         checkArguments(codeSystem, filters);
 
         Set<R> concepts = new LinkedHashSet<>();
@@ -203,7 +203,7 @@ public <R> Set<R> getConcepts(CodeSystem codeSystem, List<Filter> filters, Funct
         g = g.timeLimit(timeLimit);
         TimeLimitStep<?> timeLimitStep = getTimeLimitStep(g);
 
-        g.elementMap().toStream().forEach(elementMap -> concepts.add(mapper.apply(createConcept(elementMap))));
+        g.elementMap().toStream().forEach(elementMap -> concepts.add(function.apply(createConcept(elementMap))));
 
         checkTimeLimit(timeLimitStep);
 

diff --git a/fhir-term/src/main/java/com/ibm/fhir/term/service/provider/RegistryTermServiceProvider.java b/fhir-term/src/main/java/com/ibm/fhir/term/service/provider/RegistryTermServiceProvider.java
@@ -46,8 +46,8 @@ public Set<Concept> getConcepts(CodeSystem codeSystem) {
     }
 
     @Override
-    public <R> Set<R> getConcepts(CodeSystem codeSystem, Function<Concept, ? extends R> mapper) {
-        return CodeSystemSupport.getConcepts(codeSystem, mapper);
+    public <R> Set<R> getConcepts(CodeSystem codeSystem, Function<Concept, ? extends R> function) {
+        return CodeSystemSupport.getConcepts(codeSystem, function);
     }
 
     @Override
@@ -56,9 +56,9 @@ public Set<Concept> getConcepts(CodeSystem codeSystem, List<Filter> filters) {
     }
 
     @Override
-    public <R> Set<R> getConcepts(CodeSystem codeSystem, List<Filter> filters, Function<Concept, ? extends R> mapper) {
+    public <R> Set<R> getConcepts(CodeSystem codeSystem, List<Filter> filters, Function<Concept, ? extends R> function) {
         try {
-            return CodeSystemSupport.getConcepts(codeSystem, filters, mapper);
+            return CodeSystemSupport.getConcepts(codeSystem, filters, function);
         } catch (FHIRTermException e) {
             throw new FHIRTermServiceException(e.getMessage(), e, e.getIssues());
         }