Workaround Fetch Binary breaks with latest JPA HAPI FHIR Server

exec/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.smartregister</groupId>
     <artifactId>opensrp-gateway-plugin</artifactId>
-    <version>2.0.7</version>
+    <version>2.0.8-alpha</version>
   </parent>
 
   <artifactId>exec</artifactId>
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.smartregister</groupId>
       <artifactId>plugins</artifactId>
-      <version>2.0.7</version>
+      <version>2.0.8-alpha</version>
     </dependency>
 
     <dependency>

plugins/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.smartregister</groupId>
     <artifactId>opensrp-gateway-plugin</artifactId>
-    <version>2.0.7</version>
+    <version>2.0.8-alpha</version>
   </parent>
 
   <artifactId>plugins</artifactId>

plugins/src/main/java/org/smartregister/fhir/gateway/plugins/PermissionAccessChecker.java

@@ -12,7 +12,6 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
-import org.hl7.fhir.r4.model.Binary;
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.CareTeam;
 import org.hl7.fhir.r4.model.Composition;
@@ -22,6 +21,7 @@
 import org.slf4j.LoggerFactory;
 import org.smartregister.fhir.gateway.plugins.interfaces.ResourceFinder;
 import org.smartregister.model.practitioner.PractitionerDetails;
+import org.springframework.web.client.RestTemplate;
 
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.google.common.annotations.VisibleForTesting;
@@ -49,6 +49,7 @@ public class PermissionAccessChecker implements AccessChecker {
     private final String applicationId;
     private final FhirContext fhirContext;
     private final DecodedJWT jwt;
+    private final RestTemplate restTemplate = new RestTemplateUtil().getRestTemplate();
 
     private PermissionAccessChecker(
             FhirContext fhirContext,
@@ -249,10 +250,18 @@ Pair<String, PractitionerDetails> fetchSyncStrategyDetails(
         PractitionerDetails practitionerDetails = compositionPractitionerDetailsPair.getRight();
 
         String binaryResourceReference = Utils.getBinaryResourceReference(composition);
-        Binary binary =
-                Utils.readApplicationConfigBinaryResource(binaryResourceReference, fhirContext);
+        String response = fetchBinary(binaryResourceReference);
 
-        return Pair.of(Utils.findSyncStrategy(binary), practitionerDetails);
+        //  Binary binary = Utils.readApplicationConfigBinaryResource(binaryResourceReference,
+        // fhirContext);
+
+        return Pair.of(Utils.findSyncStrategy(response), practitionerDetails);
+    }
+
+    private String fetchBinary(String binaryResourceIdentifier) {
+        final String requestURL =
+                System.getenv(Constants.PROXY_TO_ENV) + '/' + binaryResourceIdentifier;
+        return restTemplate.getForObject(requestURL, String.class);
     }
 
     private Map<String, List<String>> getSyncStrategyIds(

plugins/src/main/java/org/smartregister/fhir/gateway/plugins/RestTemplateUtil.java

@@ -0,0 +1,20 @@
+package org.smartregister.fhir.gateway.plugins;
+
+import org.springframework.web.client.RestTemplate;
+
+public class RestTemplateUtil {
+    private volatile RestTemplate restTemplate;
+
+    public RestTemplate getRestTemplate() {
+        RestTemplate localReferenceRestTemplate = restTemplate;
+        if (localReferenceRestTemplate == null) {
+            synchronized (this) {
+                localReferenceRestTemplate = restTemplate;
+                if (localReferenceRestTemplate == null) {
+                    restTemplate = localReferenceRestTemplate = new RestTemplate();
+                }
+            }
+        }
+        return localReferenceRestTemplate;
+    }
+}

plugins/src/main/java/org/smartregister/fhir/gateway/plugins/Utils.java

@@ -1,5 +1,6 @@
 package org.smartregister.fhir.gateway.plugins;
 
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collections;
@@ -168,20 +169,25 @@ public static Binary readApplicationConfigBinaryResource(
     }
 
     public static String findSyncStrategy(Binary binary) {
-
         byte[] bytes =
                 binary != null && binary.getDataElement() != null
                         ? Base64.getDecoder().decode(binary.getDataElement().getValueAsString())
                         : null;
+        return findSyncStrategy(bytes);
+    }
+
+    public static String findSyncStrategy(String binaryData) {
+        byte[] bytes = binaryData.getBytes(StandardCharsets.UTF_8);
+        return findSyncStrategy(bytes);
+    }
+
+    public static String findSyncStrategy(byte[] binaryDataBytes) {
         String syncStrategy = org.smartregister.utils.Constants.EMPTY_STRING;
-        if (bytes != null) {
-            String json = new String(bytes);
-            JsonObject jsonObject = new Gson().fromJson(json, JsonObject.class);
-            JsonArray jsonArray =
-                    jsonObject.getAsJsonArray(Constants.AppConfigJsonKey.SYNC_STRATEGY);
-            if (jsonArray != null && !jsonArray.isEmpty())
-                syncStrategy = jsonArray.get(0).getAsString();
-        }
+        String json = new String(binaryDataBytes);
+        JsonObject jsonObject = new Gson().fromJson(json, JsonObject.class);
+        JsonArray jsonArray = jsonObject.getAsJsonArray(Constants.AppConfigJsonKey.SYNC_STRATEGY);
+        if (jsonArray != null && !jsonArray.isEmpty())
+            syncStrategy = jsonArray.get(0).getAsString();
 
         return syncStrategy;
     }

pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.smartregister</groupId>
   <artifactId>opensrp-gateway-plugin</artifactId>
-  <version>2.0.7</version>
+  <version>2.0.8-alpha</version>
   <packaging>pom</packaging>
 
   <modules>