more review changes

hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/nickname/NicknameMap.java

@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 
-class NicknameMap {
+public class NicknameMap {
  private final Map<String, List<String>> myFormalToNick = new HashMap<>();
  private final Map<String, List<String>> myNicknameToFormal = new HashMap<>();
 
@@ -45,31 +45,35 @@ void load(Reader theReader) throws IOException {
  }
  }
 
- void clear() {
+ public void clear() {
  myFormalToNick.clear();
  myNicknameToFormal.clear();
  }
 
- void add(String theKey, List<String> theValues) {
+ public void add(String theKey, List<String> theValues) {
  myFormalToNick.put(theKey, theValues);
  for (String value : theValues) {
  myNicknameToFormal.putIfAbsent(value, new ArrayList<>());
  myNicknameToFormal.get(value).add(theKey);
  }
  }
 
- int size() {
+ public int size() {
  return myFormalToNick.size();
  }
 
+ public boolean isEmpty() {
+ return size() > 0;
+ }
+
  @Nonnull
- List<String> getNicknamesFromFormalName(String theName) {
+ public List<String> getNicknamesFromFormalName(String theName) {
  List<String> result = myFormalToNick.get(theName);
  return result == null ? new ArrayList<>() : result;
  }
 
  @Nonnull
- List<String> getFormalNamesFromNickname(String theNickname) {
+ public List<String> getFormalNamesFromNickname(String theNickname) {
  List<String> result = myNicknameToFormal.get(theNickname);
  return result == null ? new ArrayList<>() : result;
  }

hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/nickname/NicknameServiceFactory.java

@@ -11,9 +11,6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
 
 /**
  * A factory used to create NicknameSvc objects.
@@ -28,9 +25,7 @@ public class NicknameServiceFactory {
 
  private NicknameSvc myNicknameSvc;
 
- private final NicknameMap myNicknameMap = new NicknameMap();
-
- private Map<String, Collection<String>> myNameToNickname;
+ private NicknameMap myNicknameMap;
 
  /**
  * Returns this factory's NicknameSvc
@@ -47,14 +42,13 @@ public synchronized NicknameSvc getNicknameSvc() {
  *
  * This map (if populated) will be used instead of the defaults.
  */
- public void setNicknameMap(Map<String, Collection<String>> theNameToNicknameListMap) {
- myNameToNickname = theNameToNicknameListMap;
+ public void setNicknameMap(NicknameMap theNameToNicknameListMap) {
+ myNicknameMap = theNameToNicknameListMap;
 
  // we ideally never see this
  // but in case someone wants to redefine the map after construction, we'll allow it
  if (myNicknameSvc != null) {
  ourLog.warn("Resetting Nickname map. Future calls to nickname service will use this new map");
- myNicknameMap.clear();
  populateNicknameMap();
  myNicknameSvc.setNicknameMap(myNicknameMap);
  }
@@ -68,7 +62,8 @@ private void createNicknameSvc() {
  }
 
  private void populateNicknameMap() {
- if (myNameToNickname == null || myNameToNickname.isEmpty()) {
+ if (myNicknameMap == null) {
+ myNicknameMap = new NicknameMap();
  // default
  try {
  Resource nicknameCsvResource = new ClassPathResource("/nickname/names.csv");
@@ -80,10 +75,6 @@ private void populateNicknameMap() {
  } catch (IOException e) {
  throw new ConfigurationException(Msg.code(2234) + "Unable to load nicknames", e);
  }
- } else {
- for (Map.Entry<String, Collection<String>> entry : myNameToNickname.entrySet()) {
- myNicknameMap.add(entry.getKey(), new ArrayList<>(entry.getValue()));
- }
  }
  }
 }

hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSettings.java

@@ -19,11 +19,9 @@
  */
 package ca.uhn.fhir.mdm.api;
 
+import ca.uhn.fhir.jpa.nickname.NicknameMap;
 import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 public interface IMdmSettings {
@@ -68,7 +66,7 @@ default String getSupportedMdmTypes() {
  /**
  * Returns a map of names -> list of related names
  */
- default Map<String, Collection<String>> getNicknameMap() {
- return new HashMap<>();
+ default NicknameMap getNicknameMap() {
+ return new NicknameMap();
  };
 }

hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmSettings.java

@@ -19,6 +19,7 @@
  */
 package ca.uhn.fhir.mdm.rules.config;
 
+import ca.uhn.fhir.jpa.nickname.NicknameMap;
 import ca.uhn.fhir.mdm.api.IMdmRuleValidator;
 import ca.uhn.fhir.mdm.api.IMdmSettings;
 import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
@@ -27,11 +28,6 @@
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 @Component
 public class MdmSettings implements IMdmSettings {
@@ -50,7 +46,7 @@ public class MdmSettings implements IMdmSettings {
  /**
  * Map of name -> set of related nicknames
  */
- private Map<String, Collection<String>> myNickNameMap = new HashMap<>();
+ private final NicknameMap myNickNameMap = new NicknameMap();
 
  /**
  * If disabled, the underlying MDM system will operate under the following assumptions:
@@ -170,7 +166,7 @@ public void setSearchAllPartitionForMatch(boolean theSearchAllPartitionForMatch)
  }
 
  @Override
- public Map<String, Collection<String>> getNicknameMap() {
+ public NicknameMap getNicknameMap() {
  return myNickNameMap;
  }
 }