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

Fix two issues found by ErrorProne

This commit is contained in:
James Agnew 2017-12-22 13:47:40 -05:00
parent 8c10d96416
commit a8e5413d1f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hapi-fhir-jpaserver-base/pom.xml
View File

@ -747,6 +747,7 @@
<reuseForks>true</reuseForks> <reuseForks>true</reuseForks>
<excludes> <excludes>
<exclude>**/*Dstu2*</exclude> <exclude>**/*Dstu2*</exclude>
<exclude>**/*Dstu3*</exclude>
<exclude>**/stresstest/*</exclude> <exclude>**/stresstest/*</exclude>
</excludes> </excludes>
</configuration> </configuration>

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/conformance/ProfileUtilities.java
View File

@ -1833,8 +1833,8 @@ public class ProfileUtilities extends TranslatingUtilities {
case BUNDLED : return "b"; case BUNDLED : return "b";
case CONTAINED : return "c"; case CONTAINED : return "c";
case REFERENCED: return "r"; case REFERENCED: return "r";
default: return "?";
} }
return "?";
} }
@ -2271,7 +2271,7 @@ public class ProfileUtilities extends TranslatingUtilities {
if (definition != null && definition.hasShort()) { if (definition != null && definition.hasShort()) {
if (!c.getPieces().isEmpty()) c.addPiece(gen.new Piece("br")); if (!c.getPieces().isEmpty()) c.addPiece(gen.new Piece("br"));
c.addPiece(checkForNoChange(definition.getShortElement(), gen.new Piece(null, gt(definition.getShortElement()), null))); c.addPiece(checkForNoChange(definition.getShortElement(), gen.new Piece(null, gt(definition.getShortElement()), null)));
} else if (fallback != null && fallback != null && fallback.hasShort()) { } else if (fallback != null && fallback.hasShort()) {
if (!c.getPieces().isEmpty()) c.addPiece(gen.new Piece("br")); if (!c.getPieces().isEmpty()) c.addPiece(gen.new Piece("br"));
c.addPiece(checkForNoChange(fallback.getShortElement(), gen.new Piece(null, gt(fallback.getShortElement()), null))); c.addPiece(checkForNoChange(fallback.getShortElement(), gen.new Piece(null, gt(fallback.getShortElement()), null)));
} }