-
Notifications
You must be signed in to change notification settings - Fork 441
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'wso2:master' into master
- Loading branch information
Showing
52 changed files
with
717 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
modules/core/src/main/java/org/apache/synapse/config/xml/VariableMediatorFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* | ||
| * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.org) All Rights Reserved. | ||
| * | ||
| * WSO2 LLC. licenses this file to you under the Apache License, | ||
| * Version 2.0 (the "License"); you may not use this file except | ||
| * in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.synapse.config.xml; | ||
|
|
||
| import org.apache.axiom.om.OMAttribute; | ||
| import org.apache.axiom.om.OMElement; | ||
| import org.apache.synapse.Mediator; | ||
| import org.apache.synapse.SynapseException; | ||
| import org.apache.synapse.mediators.v2.VariableMediator; | ||
| import org.jaxen.JaxenException; | ||
|
|
||
| import java.util.Properties; | ||
| import javax.xml.namespace.QName; | ||
|
|
||
| /** | ||
| * Creates a variable mediator through the supplied XML configuration | ||
| * <p/> | ||
| * <pre> | ||
| * <variable name="string" [action=set/remove] (value="literal" | expression="expression") type="string|integer|JSON"/> | ||
| * </pre> | ||
| */ | ||
| public class VariableMediatorFactory extends AbstractMediatorFactory { | ||
|
|
||
| private static final QName ATT_ACTION = new QName("action"); | ||
| private static final QName ATT_TYPE = new QName("type"); | ||
|
|
||
| public Mediator createSpecificMediator(OMElement elem, Properties properties) { | ||
|
|
||
| VariableMediator variableMediator = new VariableMediator(); | ||
| OMAttribute name = elem.getAttribute(ATT_NAME); | ||
| OMAttribute value = elem.getAttribute(ATT_VALUE); | ||
| OMAttribute expression = elem.getAttribute(ATT_EXPRN); | ||
| OMAttribute action = elem.getAttribute(ATT_ACTION); | ||
| OMAttribute type = elem.getAttribute(ATT_TYPE); | ||
|
|
||
| if (name == null || name.getAttributeValue().isEmpty()) { | ||
| String msg = "The 'name' attribute is required for the configuration of a variable mediator"; | ||
| log.error(msg); | ||
| throw new SynapseException(msg); | ||
| } else if ((value == null && expression == null) && | ||
| !(action != null && "remove".equals(action.getAttributeValue()))) { | ||
| String msg = "'value' or 'expression' attributes is required for a variable mediator when action is SET"; | ||
| log.error(msg); | ||
| throw new SynapseException(msg); | ||
| } | ||
| variableMediator.setName(name.getAttributeValue()); | ||
|
|
||
| String dataType = null; | ||
| if (type != null) { | ||
| dataType = type.getAttributeValue(); | ||
| } | ||
|
|
||
| if (value != null) { | ||
| variableMediator.setValue(value.getAttributeValue(), dataType); | ||
| } else if (expression != null) { | ||
| try { | ||
| variableMediator.setExpression(SynapsePathFactory.getSynapsePath(elem, ATT_EXPRN), | ||
| dataType); | ||
| } catch (JaxenException e) { | ||
| String msg = "Invalid expression for attribute 'expression' : " + | ||
| expression.getAttributeValue(); | ||
| log.error(msg); | ||
| throw new SynapseException(msg); | ||
| } | ||
| } | ||
|
|
||
| if (action != null && "remove".equals(action.getAttributeValue())) { | ||
| variableMediator.setAction(VariableMediator.ACTION_REMOVE); | ||
| } | ||
| processAuditStatus(variableMediator, elem); | ||
| addAllCommentChildrenToList(elem, variableMediator.getCommentsList()); | ||
| return variableMediator; | ||
| } | ||
|
|
||
| public QName getTagQName() { | ||
|
|
||
| return VARIABLE_Q; | ||
| } | ||
| } |
77 changes: 77 additions & 0 deletions
77
modules/core/src/main/java/org/apache/synapse/config/xml/VariableMediatorSerializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.org) All Rights Reserved. | ||
| * | ||
| * WSO2 LLC. licenses this file to you under the Apache License, | ||
| * Version 2.0 (the "License"); you may not use this file except | ||
| * in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.synapse.config.xml; | ||
|
|
||
| import org.apache.axiom.om.OMElement; | ||
| import org.apache.synapse.Mediator; | ||
| import org.apache.synapse.mediators.v2.VariableMediator; | ||
|
|
||
| /** | ||
| * <pre> | ||
| * <variable name="string" [action=set/remove] (value="literal" | expression="expression") type="string|integer|JSON"/> | ||
| * </pre> | ||
| */ | ||
| public class VariableMediatorSerializer extends AbstractMediatorSerializer { | ||
|
|
||
| public OMElement serializeSpecificMediator(Mediator m) { | ||
|
|
||
| if (!(m instanceof VariableMediator)) { | ||
| handleException("Unsupported mediator passed in for serialization : " + m.getType()); | ||
| } | ||
|
|
||
| VariableMediator mediator = (VariableMediator) m; | ||
| OMElement variable = fac.createOMElement("variable", synNS); | ||
| saveTracingState(variable, mediator); | ||
|
|
||
| if (mediator.getName() != null) { | ||
| variable.addAttribute(fac.createOMAttribute( | ||
| "name", nullNS, mediator.getName())); | ||
| } else { | ||
| handleException("Invalid variable mediator. Name is required"); | ||
| } | ||
|
|
||
| if (mediator.getValue() != null) { | ||
| variable.addAttribute(fac.createOMAttribute( | ||
| "value", nullNS, mediator.getValue().toString())); | ||
| } else if (mediator.getExpression() != null) { | ||
| SynapsePathSerializer.serializePath((SynapsePath) mediator.getExpression(), | ||
| variable, "expression"); | ||
| } else if (mediator.getAction() == VariableMediator.ACTION_SET) { | ||
| handleException("Invalid variable mediator. Value or expression is required if " + | ||
| "action is SET"); | ||
| } | ||
|
|
||
| if (mediator.getAction() == VariableMediator.ACTION_REMOVE) { | ||
| variable.addAttribute(fac.createOMAttribute( | ||
| "action", nullNS, "remove")); | ||
| } else if (mediator.getType() != null) { | ||
| variable.addAttribute(fac.createOMAttribute( | ||
| "type", nullNS, mediator.getType())); | ||
| } | ||
|
|
||
| serializeComments(variable, mediator.getCommentsList()); | ||
|
|
||
| return variable; | ||
| } | ||
|
|
||
| public String getMediatorClassName() { | ||
|
|
||
| return VariableMediator.class.getName(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.