Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle new resource file key values. #2242

Merged
merged 6 commits into from
Dec 13, 2024
Merged

Handle new resource file key values. #2242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
76f646f
handle resource file key in xslt,jsontransform,payload,script,validat…
chathuranga-jayanath-99 Nov 30, 2024
fe5cce3
Revert "handle resource file key in xslt,jsontransform,payload,script…
chathuranga-jayanath-99 Dec 5, 2024
8ba0433
transform key if it indicates resource:
chathuranga-jayanath-99 Dec 5, 2024
3e10b77
add test for transforming key
chathuranga-jayanath-99 Dec 5, 2024
74ad88a
add license headers
chathuranga-jayanath-99 Dec 5, 2024
eb46402
address reviewed changes
chathuranga-jayanath-99 Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
Expand Down Expand Up @@ -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;
}
}

3 changes: 2 additions & 1 deletion modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,14 +1018,15 @@ public Object getEntry(String key) {
* @return its value
*/
public Entry getEntryDefinition(String key) {
String transformedKey = SynapseConfigUtils.transformFileKey(key);
Object o = localRegistry.get(key);
if (o == null || o instanceof Entry) {
if (o == null) {
// this is not a local definition
synchronized (this) {
o = localRegistry.get(key);
if (o == null) {
Entry entry = new Entry(key);
Entry entry = new Entry(transformedKey);
entry.setType(Entry.REMOTE_ENTRY);
addEntry(key, entry);
return entry;
Expand Down
10 changes: 10 additions & 0 deletions modules/core/src/test/java/org/apache/synapse/config/SynapseConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

import junit.framework.TestCase;
import org.apache.synapse.endpoints.HTTPEndpoint;
import org.apache.synapse.registry.url.SimpleURLRegistry;
import org.apache.synapse.registry.url.SimpleURLRegistryTest;

public class SynapseConfigurationTest extends TestCase {

Expand Down Expand Up @@ -120,4 +122,12 @@ public void run() {
throw new RuntimeException(e);
}
}

public void testGetEntryDefinition() throws Exception {

String key = "resources:xslt/sample.xslt";
SynapseConfiguration config = new SynapseConfiguration();
Entry entry = config.getEntryDefinition(key);
assertEquals("Key of entry should be transformed.", "gov:mi-resources/xslt/sample.xslt", entry.getKey());
}
}
Loading