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

Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core into gg-work

This commit is contained in:
Grahame Grieve 2020-06-20 05:47:04 +10:00
parent 35be964dd4 c1f5244873
commit 8ed7b89dde
6 changed files with 102 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nBase.java
View File

@ -12,12 +12,11 @@ import java.util.ResourceBundle;
*/
public abstract class I18nBase {
private Locale locale;
private ResourceBundle i18Nmessages;
private ResourceBundle i18nMessages;
public Locale getLocale() {
if (Objects.nonNull(locale)){
if (Objects.nonNull(locale)) {
return locale;
} else {
return Locale.US;
@ -29,19 +28,54 @@ public abstract class I18nBase {
setValidationMessageLanguage(getLocale());
}
/**
* Verifies if a {@link ResourceBundle} has been loaded for the current {@link Locale}. If not, it triggers a load.
*/
private void checkResourceBundleIsLoaded() {
if (i18nMessages == null) {
setValidationMessageLanguage(getLocale());
}
}
/**
* Checks the loaded {@link ResourceBundle} to see if the passed in message exists with the current loaded {@link Locale}.
* If no {@link Locale} is currently loaded, it will load the {@link Locale} (default {@link Locale#US} is none is
* specified), and search.
* @param message The {@link String} message to search for within the current {@link Locale}
* @return {@link Boolean#TRUE} if the message exists within the loaded {@link Locale}.
*/
private boolean messageExistsForLocale(String message) {
checkResourceBundleIsLoaded();
if (!i18nMessages.containsKey(message)) {
System.out.println("Attempting to localize message " + message + ", but no such equivalent message exists for" +
" the local " + getLocale());
}
return i18nMessages.containsKey(message);
}
/**
* Formats the given message, if needed, with the passed in message arguments.
* @param theMessage Base message to format.
* @param theMessageArguments Placeholder arguments, if needed.
* @return The formatted, internationalized, {@link String}
*/
public String formatMessage(String theMessage, Object... theMessageArguments) {
String message = theMessage;
if (Objects.nonNull(i18Nmessages) && i18Nmessages.containsKey(theMessage)) {
if (messageExistsForLocale(theMessage)) {
if (Objects.nonNull(theMessageArguments) && theMessageArguments.length > 0) {
message = MessageFormat.format(i18Nmessages.getString(theMessage), theMessageArguments);
message = MessageFormat.format(i18nMessages.getString(theMessage), theMessageArguments);
} else {
message = i18Nmessages.getString(theMessage);
message = i18nMessages.getString(theMessage);
}
}
return message;
}
/**
* Loads the corresponding {@link ResourceBundle} for the passed in {@link Locale}.
* @param locale {@link Locale} to load resources for.
*/
public void setValidationMessageLanguage(Locale locale) {
i18Nmessages = ResourceBundle.getBundle("Messages", locale);
i18nMessages = ResourceBundle.getBundle("Messages", locale);
}
}

1
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java
View File

@ -12,6 +12,7 @@ public class I18nConstants {
public static final String ATTEMPT_TO_REPLACE_ELEMENT_NAME_FOR_A_NONCHOICE_TYPE = "Attempt_to_replace_element_name_for_a_nonchoice_type";
public static final String ATTEMPT_TO_USE_A_SNAPSHOT_ON_PROFILE__AS__BEFORE_IT_IS_GENERATED = "Attempt_to_use_a_snapshot_on_profile__as__before_it_is_generated";
public static final String ATTEMPT_TO_USE_TERMINOLOGY_SERVER_WHEN_NO_TERMINOLOGY_SERVER_IS_AVAILABLE = "Attempt_to_use_Terminology_server_when_no_Terminology_server_is_available";
public static final String BAD_FILE_PATH_ERROR = "Bad_file_path_error";
public static final String BASE_PROFILE__HAS_NO_TYPE = "Base_profile__has_no_type";
public static final String BASE__DERIVED_PROFILES_HAVE_DIFFERENT_TYPES____VS___ = "Base__Derived_profiles_have_different_types____vs___";
public static final String BUNDLE_BUNDLE_ENTRY_CANONICAL = "Bundle_BUNDLE_Entry_Canonical";

1
org.hl7.fhir.utilities/src/main/resources/Messages.properties
View File

@ -1,4 +1,5 @@
#InstanceValidator
Bad_file_path_error = \n********************\n* The file name you passed in, "{0}", doesn't exist on the local filesystem.\n* Please verify that this is valid file location.\n********************\n\n
Bundle_BUNDLE_Entry_Canonical = The canonical URL ({0}) cannot match the fullUrl ({1}) unless on the canonical server itself
Bundle_BUNDLE_Entry_Document = The first entry in a document must be a composition
Bundle_BUNDLE_Entry_IdUrlMismatch = Resource ID does not match the ID in the entry full URL ("{0}" vs "{1}")

45
org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/i18n/I18nBaseTest.java Normal file
View File

@ -0,0 +1,45 @@
package org.hl7.fhir.utilities.i18n;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import java.text.MessageFormat;
import java.util.Locale;
import java.util.ResourceBundle;
class I18nBaseTest {
public static final String BAD_STRING_ARG = "THIS_DOES_NOT_EXIST";
public static final String ARG_1 = "test arg";
@Test
@DisplayName("Test argument substitution with initializing Locale.")
void testFormatMessageWithInitLocale() {
I18nTestClass testClass = new I18nTestClass();
ResourceBundle loadedBundle = ResourceBundle.getBundle("Messages", Locale.GERMAN);
testClass.setLocale(Locale.GERMAN);
String result = testClass.formatMessage(I18nConstants.BUNDLE_BUNDLE_MULTIPLEMATCHES, ARG_1);
MessageFormat form = new MessageFormat(loadedBundle.getString(I18nConstants.BUNDLE_BUNDLE_MULTIPLEMATCHES));
Object[] testArgs = {ARG_1};
Assertions.assertEquals(form.format(testArgs), result);
}
@Test
@DisplayName("Test argument substitution without initializing Locale.")
void testFormatMessageWithoutInitLocale() {
I18nTestClass testClass = new I18nTestClass();
ResourceBundle loadedBundle = ResourceBundle.getBundle("Messages", Locale.US);
String result = testClass.formatMessage(I18nConstants.BUNDLE_BUNDLE_MULTIPLEMATCHES, ARG_1);
MessageFormat form = new MessageFormat(loadedBundle.getString(I18nConstants.BUNDLE_BUNDLE_MULTIPLEMATCHES));
Object[] testArgs = {ARG_1};
Assertions.assertEquals(form.format(testArgs), result);
}
@Test
@DisplayName("Assert no string modification is done when no match is found.")
void testFormatMessageForNonExistentMessage() {
I18nTestClass testClass = new I18nTestClass();
Assertions.assertEquals(BAD_STRING_ARG, testClass.formatMessage(BAD_STRING_ARG, ARG_1));
}
}

5
org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/i18n/I18nTestClass.java Normal file
View File

@ -0,0 +1,5 @@
package org.hl7.fhir.utilities.i18n;
public class I18nTestClass extends I18nBase {
public I18nTestClass() {}
}

16
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java
View File

@ -31,6 +31,7 @@ import org.hl7.fhir.r5.terminologies.ConceptMapEngine;
import org.hl7.fhir.r5.utils.*;
import org.hl7.fhir.r5.utils.IResourceValidator.*;
import org.hl7.fhir.r5.utils.StructureMapUtilities.ITransformerServices;
import org.hl7.fhir.utilities.i18n.I18nConstants;
import org.hl7.fhir.validation.instance.InstanceValidator;
import org.hl7.fhir.utilities.IniFile;
import org.hl7.fhir.utilities.TextFile;
@ -160,8 +161,6 @@ POSSIBILITY OF SUCH DAMAGE.
*/
public class ValidationEngine implements IValidatorResourceFetcher {
public class ScanOutputItem {
private String ref;
private ImplementationGuide ig;
@ -1066,16 +1065,19 @@ public class ValidationEngine implements IValidatorResourceFetcher {
for (int i=0; i < files.length; i++) {
refs.add(files[i].getPath());
}
} else {
File file = new File(name);
if (!file.exists())
if (!file.exists()) {
if (System.console() != null) {
System.console().printf(context.formatMessage(I18nConstants.BAD_FILE_PATH_ERROR, name));
} else {
System.out.println(context.formatMessage(I18nConstants.BAD_FILE_PATH_ERROR, name));
}
throw new IOException("File " + name + " does not exist");
}
if (file.isFile()) {
refs.add(name);
} else {
isBundle = true;
for (int i=0; i < file.listFiles().length; i++) {