address reviewed changes

wso2 · Dec 7, 2024 · eb46402 · eb46402
1 parent 74ad88a
commit eb46402
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 34 deletions.
diff --git a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
@@ -93,6 +93,8 @@ public class SynapseConfigUtils {
 
     private static final Log log = LogFactory.getLog(SynapseConfigUtils.class);
 
+    public static final String RESOURCES_IDENTIFIER = "resources:";
+    public static final String CONVERTED_RESOURCES_IDENTIFIER = "gov:mi-resources/";
 
     private static ConcurrentHashMap<String, SynapseConfiguration> lastRegisteredSynapseConfigurationMap =
                                                                  new ConcurrentHashMap<String, SynapseConfiguration>();
@@ -903,5 +905,13 @@ public static SynapseConfiguration getSynapseConfiguration(String tenantDomain){
     public static void addSynapseConfiguration(String tenantDomain , SynapseConfiguration synapseConfiguration){
         lastRegisteredSynapseConfigurationMap.put(tenantDomain,synapseConfiguration);
     }
+
+    public static String transformFileKey(String fileKey) {
+
+        if (fileKey.startsWith(RESOURCES_IDENTIFIER)) {
+            return CONVERTED_RESOURCES_IDENTIFIER + fileKey.substring(RESOURCES_IDENTIFIER.length());
+        }
+        return fileKey;
+    }
 }
 
diff --git a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
@@ -1018,7 +1018,7 @@ public Object getEntry(String key) {
      * @return its value
      */
     public Entry getEntryDefinition(String key) {
-        String transformedKey = Utils.transformFileKey(key);
+        String transformedKey = SynapseConfigUtils.transformFileKey(key);
         Object o = localRegistry.get(key);
         if (o == null || o instanceof Entry) {
             if (o == null) {

diff --git a/modules/core/src/main/java/org/apache/synapse/config/Utils.java b/modules/core/src/main/java/org/apache/synapse/config/Utils.java