Add support for properties file encoding detection

Bump up release version

efsity/build.gradle.kts

@@ -18,7 +18,7 @@ repositories {
 
 group = "org.smartregister"
 
-version = "2.3.7-SNAPSHOT"
+version = "2.3.8-SNAPSHOT"
 
 description = "fhircore-tooling (efsity)"
 
@@ -82,6 +82,7 @@ dependencies {
   implementation(deps.jsonschemafriend)
   implementation(deps.picocli)
   implementation(deps.xstream)
+  implementation(deps.icu4j)
 
   testImplementation(kotlin("test"))
   testImplementation("junit:junit:4.13.2")

efsity/libs.versions.toml

@@ -16,6 +16,7 @@ opencds-cql-version="2.4.0"
 project-build-sourceEncoding="UTF-8"
 spotless-version ="6.20.0"
 xstream="1.4.20"
+icu4j-version = "75.1"
 
 [libraries]
 caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffeine-version" }
@@ -44,6 +45,7 @@ jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson-version" }
 picocli = { module = "info.picocli:picocli", version.ref = "info-picocli-version" }
 xstream = { module = "com.thoughtworks.xstream:xstream", version.ref = "xstream" }
+icu4j = { module="com.ibm.icu:icu4j", version.ref = "icu4j-version" }
 
 [bundles]
 cqf-cql = ["cql-to-elm","elm","elm-jackson","model","model-jackson"]

efsity/src/main/java/org/smartregister/command/PublishFhirResourcesCommand.java

@@ -104,7 +104,12 @@ public void run() {
     long start = System.currentTimeMillis();
     if (propertiesFile != null && !propertiesFile.isBlank()) {
 
-      Properties properties = FctUtils.readPropertiesFile(propertiesFile);
+      Properties properties = null;
+      try {
+        properties = FctUtils.readPropertiesFile(propertiesFile);
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
       setProperties(properties);
     }
     try {
@@ -121,18 +126,21 @@ public void run() {
   }
 
   void setProperties(Properties properties) {
+    if (properties == null)
+      throw new IllegalStateException("Properties file is missing or could not be parsed");
+
     if (projectFolder == null || projectFolder.isBlank()) {
       if (properties.getProperty("projectFolder") != null) {
         projectFolder = properties.getProperty("projectFolder");
       } else {
-        throw new NullPointerException("The projectFolder is missing");
+        throw new IllegalStateException("The projectFolder is missing");
       }
     }
     if (fhirBaseUrl == null || fhirBaseUrl.isBlank()) {
       if (properties.getProperty("fhirBaseUrl") != null) {
         fhirBaseUrl = properties.getProperty("fhirBaseUrl");
       } else {
-        throw new NullPointerException("The fhirBaseUrl is missing");
+        throw new IllegalStateException("The fhirBaseUrl is missing");
       }
     }
     if (accessToken == null || accessToken.isBlank()) {

efsity/src/main/java/org/smartregister/util/FctUtils.java

@@ -4,12 +4,14 @@
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
 import ca.uhn.fhir.parser.IParser;
+import com.ibm.icu.text.CharsetDetector;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
-import java.io.FileInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -108,14 +110,19 @@ public static void writeJsonFile(String outputPath, String fhirResourceAsString)
     }
   }
 
-  public static Properties readPropertiesFile(String propertiesFilePath) {
+  public static Properties readPropertiesFile(String propertiesFilePath) throws IOException {
+
+    CharsetDetector detector = new CharsetDetector();
+    byte[] fileBytes = Files.readAllBytes(Path.of(propertiesFilePath));
+    detector.setText(fileBytes);
+
     Properties properties = new Properties();
-    try (FileInputStream fileInputStream = new FileInputStream(propertiesFilePath);
-        InputStreamReader reader = new InputStreamReader(fileInputStream, StandardCharsets.UTF_8)) {
+    try (InputStreamReader reader =
+        new InputStreamReader(
+            new ByteArrayInputStream(fileBytes), Charset.forName(detector.detect().getName()))) {
       properties.load(reader);
-    } catch (IOException ex) {
-      ex.printStackTrace();
     }
+
     return properties;
   }
 
@@ -136,7 +143,7 @@ public static Map<String, Map<String, String>> indexConfigurationFiles(
           @Override
           public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
             if (!Files.isDirectory(file)
-                && (fileExtensions.length == 1 && fileExtensions[0] == "*"
+                && (fileExtensions.length == 1 && "*".equals(fileExtensions[0])
                     || Arrays.asList(fileExtensions)
                         .contains(FilenameUtils.getExtension(file.getFileName().toString())))) {
 

efsity/src/test/java/org/smartregister/command/TranslateCommandTest.java

@@ -109,7 +109,8 @@ public void testRunMerge() throws IOException {
     Path tempRawQuestionnaire = Files.createTempFile("temp_raw_questionnaire", ".json");
     Files.copy(rawQuestionnairePath, tempRawQuestionnaire, StandardCopyOption.REPLACE_EXISTING);
 
-    Path mergedQuestionnairePath = Paths.get("src/test/resources/merged_questionnaire.json");
+    Path expectedMergedQuestionnairePath =
+        Paths.get("src/test/resources/merged_questionnaire.json");
 
     Path frPropertiesPath = Paths.get("src/test/resources/strings_fr.properties");
 
@@ -121,15 +122,15 @@ public void testRunMerge() throws IOException {
     assertDoesNotThrow(() -> translateCommand.run());
 
     ObjectMapper objectMapper = new ObjectMapper();
-    JsonNode rawQuestionnaire =
+    JsonNode processedRawQuestionnaire =
         objectMapper.readTree(
             Files.newBufferedReader(tempRawQuestionnaire, StandardCharsets.UTF_8));
     JsonNode mergedQuestionnaire =
         objectMapper.readTree(
-            Files.newBufferedReader(mergedQuestionnairePath, StandardCharsets.UTF_8));
+            Files.newBufferedReader(expectedMergedQuestionnairePath, StandardCharsets.UTF_8));
 
     // Compare the contents of the two nodes
-    assertEquals(rawQuestionnaire, mergedQuestionnaire, "File merged as expected");
+    assertEquals(mergedQuestionnaire, processedRawQuestionnaire, "File merged as expected");
     tempRawQuestionnaire.toFile().delete();
   }
 }