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

improved npe safety formatMessage method

This commit is contained in:
patrick-werner 2020-03-10 16:03:50 +01:00
parent 14a0f7d687
commit 7ada30807d
5 changed files with 393 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/BaseWorkerContext.java
View File

@ -425,13 +425,13 @@ public abstract class BaseWorkerContext implements IWorkerContext {
@Override @Override
public String formatMessage(String theMessage, Object... theMessageArguments) { public String formatMessage(String theMessage, Object... theMessageArguments) {
String message; String message = theMessage;
if (theMessageArguments != null && theMessageArguments.length > 0) { if (Objects.nonNull(i18Nmessages) && i18Nmessages.containsKey(theMessage)) {
if (Objects.nonNull(theMessageArguments) && theMessageArguments.length > 0) {
message = MessageFormat.format(i18Nmessages.getString(theMessage), theMessageArguments); message = MessageFormat.format(i18Nmessages.getString(theMessage), theMessageArguments);
} else if (i18Nmessages.containsKey(theMessage)) {
message = i18Nmessages.getString(theMessage);
} else { } else {
message = theMessage; message = i18Nmessages.getString(theMessage);
}
} }
return message; return message;
} }

10
org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/utils/BaseWorkerContext.java
View File

@ -464,13 +464,13 @@ public abstract class BaseWorkerContext implements IWorkerContext {
@Override @Override
public String formatMessage(String theMessage, Object... theMessageArguments) { public String formatMessage(String theMessage, Object... theMessageArguments) {
String message; String message = theMessage;
if (theMessageArguments != null && theMessageArguments.length > 0) { if (Objects.nonNull(i18Nmessages) && i18Nmessages.containsKey(theMessage)) {
if (Objects.nonNull(theMessageArguments) && theMessageArguments.length > 0) {
message = MessageFormat.format(i18Nmessages.getString(theMessage), theMessageArguments); message = MessageFormat.format(i18Nmessages.getString(theMessage), theMessageArguments);
} else if (i18Nmessages.containsKey(theMessage)) {
message = i18Nmessages.getString(theMessage);
} else { } else {
message = theMessage; message = i18Nmessages.getString(theMessage);
}
} }
return message; return message;
} }

553
org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/context/BaseWorkerContext.java
View File

File diff suppressed because it is too large Load Diff

10
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/BaseWorkerContext.java
View File

@ -1197,13 +1197,13 @@ public abstract class BaseWorkerContext implements IWorkerContext {
@Override @Override
public String formatMessage(String theMessage, Object... theMessageArguments) { public String formatMessage(String theMessage, Object... theMessageArguments) {
String message; String message = theMessage;
if (theMessageArguments != null && theMessageArguments.length > 0) { if (Objects.nonNull(i18Nmessages) && i18Nmessages.containsKey(theMessage)) {
if (Objects.nonNull(theMessageArguments) && theMessageArguments.length > 0) {
message = MessageFormat.format(i18Nmessages.getString(theMessage), theMessageArguments); message = MessageFormat.format(i18Nmessages.getString(theMessage), theMessageArguments);
} else if (i18Nmessages.containsKey(theMessage)) {
message = i18Nmessages.getString(theMessage);
} else { } else {
message = theMessage; message = i18Nmessages.getString(theMessage);
}
} }
return message; return message;
} }

10
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
View File

@ -1297,13 +1297,13 @@ public abstract class BaseWorkerContext implements IWorkerContext {
@Override @Override
public String formatMessage(String theMessage, Object... theMessageArguments) { public String formatMessage(String theMessage, Object... theMessageArguments) {
String message; String message = theMessage;
if (theMessageArguments != null && theMessageArguments.length > 0) { if (Objects.nonNull(i18Nmessages) && i18Nmessages.containsKey(theMessage)) {
if (Objects.nonNull(theMessageArguments) && theMessageArguments.length > 0) {
message = MessageFormat.format(i18Nmessages.getString(theMessage), theMessageArguments); message = MessageFormat.format(i18Nmessages.getString(theMessage), theMessageArguments);
} else if (i18Nmessages.containsKey(theMessage)) {
message = i18Nmessages.getString(theMessage);
} else { } else {
message = theMessage; message = i18Nmessages.getString(theMessage);
}
} }
return message; return message;
} }