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

Fixed build failures

This commit is contained in:
Nick Goupinets 2020-11-27 18:00:24 -05:00
parent c64ca81373
commit da3df49089
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/CanonicalEID.java
View File

@ -148,4 +148,9 @@ public class CanonicalEID {
&& Objects.equals(otherEid.getValue(), this.getValue()) && Objects.equals(otherEid.getValue(), this.getValue())
&& Objects.equals(otherEid.getUse(), this.getUse()); && Objects.equals(otherEid.getUse(), this.getUse());
} }
@Override
public int hashCode() {
return Objects.hash(mySystem, myValue, myUse);
}
} }

2
hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/GoldenResourceHelper.java
View File

@ -261,7 +261,7 @@ public class GoldenResourceHelper {
String mdmSystem = myMdmSettings.getMdmRules().getEnterpriseEIDSystem(); String mdmSystem = myMdmSettings.getMdmRules().getEnterpriseEIDSystem();
String baseSystem = system.get().getValueAsString(); String baseSystem = system.get().getValueAsString();
if (Objects.equals(baseSystem, mdmSystem)) { if (Objects.equals(baseSystem, mdmSystem)) {
ourLog.debug(String.format("Found EID confirming to MDM rules {}. It should not be copied, skipping", baseSystem)); ourLog.debug("Found EID confirming to MDM rules {}. It should not be copied, skipping", baseSystem);
continue; continue;
} }
} }