Skip to content

Commit b240e97

Browse files
authored
Merge pull request #479 from ChinthakaJ98/fix-legacy-update
Fix legacy mediators updating issue
2 parents bebce52 + 34b3b5b commit b240e97

File tree

7 files changed

+67
-7
lines changed

7 files changed

+67
-7
lines changed

org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/customservice/synapse/mediatorService/mediators/LogMediator.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ public static Either<Map<String, Object>, Map<Range, Map<String, Object>>> proce
3232
Log log,
3333
List<String> dirtyFields) {
3434

35+
if (data.containsKey("isLatest") && !Boolean.parseBoolean((String) data.get("isLatest"))) {
36+
data.put("isLatest", false);
37+
} else {
38+
data.put("isLatest", true);
39+
}
40+
3541
if (data.containsKey("level") && data.get("level") instanceof String) {
3642
data.put("level", ((String) data.get("level")).toLowerCase());
3743
}

org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/customservice/synapse/mediatorService/mediators/PayloadFactoryMediator.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@ public static Either<Map<String, Object>, Map<Range, Map<String, Object>>> proce
116116
PayloadFactory payloadFactory,
117117
List<String> dirtyFields) {
118118

119+
if (data.containsKey("isLatest") && !Boolean.parseBoolean((String) data.get("isLatest"))) {
120+
data.put("isLatest", false);
121+
} else {
122+
data.put("isLatest", true);
123+
}
124+
119125
Boolean useTemplateResource = (Boolean) data.get("useTemplateResource");
120126
if (useTemplateResource == null || !useTemplateResource) {
121127
data.put("isInlined", true);
Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
1-
<log {{#category}}category="{{category}}"{{/category}} {{#level}}level="{{level}}"{{/level}} {{#separator}}separator="{{separator}}"{{/separator}} logMessageID="{{logMessageID}}" logFullPayload="{{logFullPayload}}" {{#description}}description="{{description}}"{{/description}}>
1+
{{#isLatest}}<log {{#category}}category="{{category}}"{{/category}} {{#level}}level="{{level}}"{{/level}} {{#separator}}separator="{{separator}}"{{/separator}} logMessageID="{{logMessageID}}" logFullPayload="{{logFullPayload}}" {{#description}}description="{{description}}"{{/description}}>
22
<message>{{message}}</message>
33
{{#properties}}
44
<property name="{{propertyName}}" {{#value}}value="{{value}}"{{/value}} {{#expression}}expression="{{expression}}" {{#namespaces}} xmlns:{{prefix}}="{{uri}}"{{/namespaces}} {{/expression}} />
55
{{/properties}}
6+
</log>{{/isLatest}}
7+
{{^isLatest}}{{#selfClosed}}
8+
<log {{#category}}category="{{category}}"{{/category}} {{#level}}level="{{level}}"{{/level}} {{#separator}}separator="{{separator}}"{{/separator}} {{#description}}description="{{description}}"{{/description}}/>
9+
{{/selfClosed}}
10+
{{^selfClosed}}
11+
<log {{#category}}category="{{category}}"{{/category}} {{#level}}level="{{level}}"{{/level}} {{#separator}}separator="{{separator}}"{{/separator}} {{#description}}description="{{description}}"{{/description}}>
12+
{{#properties}}
13+
<property name="{{propertyName}}" {{#value}}value="{{value}}"{{/value}} {{#expression}}expression="{{expression}}" {{#namespaces}} xmlns:{{prefix}}="{{uri}}"{{/namespaces}} {{/expression}} />
14+
{{/properties}}
615
</log>
16+
{{/selfClosed}}
17+
{{/isLatest}}

org.eclipse.lemminx/src/main/resources/org/eclipse/lemminx/mediators/440/templates/payloadFactory.mustache

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<payloadFactory {{#description}}description="{{description}}"{{/description}} media-type="{{mediaType}}" template-type="{{templateType}}">
1+
{{#isLatest}}<payloadFactory {{#description}}description="{{description}}"{{/description}} media-type="{{mediaType}}" template-type="{{templateType}}">
22
{{#isInlined}}
33
{{#isFreemarker}}<format><![CDATA[{{{payload}}}]]></format>{{/isFreemarker}}
44
{{^isFreemarker}}<format>{{{payload}}}</format>{{/isFreemarker}}
@@ -13,4 +13,19 @@
1313
{{/args}}
1414
</args>
1515
{{/containArgs}}
16+
</payloadFactory>{{/isLatest}}
17+
{{^isLatest}}<payloadFactory {{#description}}description="{{description}}"{{/description}} media-type="{{mediaType}}" template-type="{{templateType}}">
18+
{{#isInlined}}
19+
{{#isFreemarker}}<format><![CDATA[{{{payload}}}]]></format>{{/isFreemarker}}
20+
{{^isFreemarker}}<format>{{{payload}}}</format>{{/isFreemarker}}
21+
{{/isInlined}}
22+
{{^isInlined}}
23+
<format key="{{payloadKey}}"/>
24+
{{/isInlined}}
25+
<args>
26+
{{#args}}
27+
<arg {{#literal}}literal="{{literal}}"{{/literal}} {{#value}}value="{{value}}"{{/value}} {{#expression}}expression="{{value}}" evaluator="{{evaluator}}" {{#namespaces}} xmlns:{{prefix}}="{{uri}}"{{/namespaces}} {{/expression}} />
28+
{{/args}}
29+
</args>
1630
</payloadFactory>
31+
{{/isLatest}}

org.eclipse.lemminx/src/main/resources/org/eclipse/lemminx/mediators/440/ui-schemas/foreach_430.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "mediator",
44
"title": "ForEach Mediator",
55
"help": "Splits message based on XPath/JSONPath, processes sequentially, then merges back.",
6-
"banner": "This is an old version of the Foreach mediator. Please migrate to the new version.",
6+
"banner": "This is an old version of the Foreach mediator.",
77
"elements": [
88
{
99
"type": "attribute",
@@ -76,4 +76,4 @@
7676
}
7777
}
7878
]
79-
}
79+
}

org.eclipse.lemminx/src/main/resources/org/eclipse/lemminx/mediators/440/ui-schemas/log_430.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "mediator",
44
"title": "Log Mediator",
55
"help": "Generates logs for messages. Log details are customisable.",
6-
"banner": "This is an old version of the Log mediator. Please migrate to the new version.",
6+
"banner": "This is an old version of the Log mediator.",
77
"elements": [
88
{
99
"type": "attribute",
@@ -95,6 +95,17 @@
9595
"required": "false",
9696
"helpTip": "Description"
9797
}
98+
},
99+
{
100+
"type": "attribute",
101+
"value": {
102+
"name": "isLatest",
103+
"displayName": "IsLatest",
104+
"inputType": "string",
105+
"defaultValue": "false",
106+
"hidden": "true",
107+
"required": "true"
108+
}
98109
}
99110
]
100111
}

org.eclipse.lemminx/src/main/resources/org/eclipse/lemminx/mediators/440/ui-schemas/payloadFactory_430.json

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "mediator",
44
"title": "Payload Mediator",
55
"help": "Replaces message payload with a new SOAP/JSON payload.",
6-
"banner": "This is an old version of the Payload Factory mediator. Please migrate to the new version.",
6+
"banner": "This is an old version of the Payload Factory mediator.",
77
"canTryout": true,
88
"elements": [
99
{
@@ -177,6 +177,17 @@
177177
"required": false,
178178
"helpTip": ""
179179
}
180+
},
181+
{
182+
"type": "attribute",
183+
"value": {
184+
"name": "isLatest",
185+
"displayName": "IsLatest",
186+
"inputType": "string",
187+
"defaultValue": "false",
188+
"hidden": "true",
189+
"required": "true"
190+
}
180191
}
181192
]
182-
}
193+
}

0 commit comments

Comments
 (0)