From a85a439e10a75d75a925e33414c2e75c5f07e1f5 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Mon, 16 Aug 2021 21:08:27 +0530
Subject: [PATCH 01/51] Add environment variable resolvers for SOAP services

---
 .../xml/endpoints/AddressEndpointFactory.java     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
index 0487b31ea..b443e69c2 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
@@ -21,6 +21,8 @@
 
 import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMElement;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.config.xml.XMLConfigConstants;
 import org.apache.synapse.endpoints.AddressEndpoint;
@@ -59,6 +61,8 @@
  */
 public class AddressEndpointFactory extends DefaultEndpointFactory {
 
+    private static final String SYSTEM_VARIABLE_PREFIX = "$SYSTEM";
+    private static final Log LOG = LogFactory.getLog(AddressEndpointFactory.class);
     private static AddressEndpointFactory instance = new AddressEndpointFactory();
 
     private AddressEndpointFactory() {
@@ -115,7 +119,16 @@ public EndpointDefinition createEndpointDefinition(OMElement elem) {
         }
 
         if (address != null) {
-            endpointDefinition.setAddress(address.getAttributeValue().trim());
+            String extractedAddress = address.getAttributeValue().trim();
+            if (extractedAddress.contains(SYSTEM_VARIABLE_PREFIX)) {
+                String extractedEnvVariableKey = extractedAddress.substring(extractedAddress.lastIndexOf(":") + 1);
+                String extractedEnvVariableValue = System.getenv(extractedEnvVariableKey);
+                log.info ("Environment variable " + extractedEnvVariableKey + " replaced with " +
+                        extractedEnvVariableValue);
+                endpointDefinition.setAddress(extractedEnvVariableValue);
+            } else {
+                endpointDefinition.setAddress(extractedAddress);
+            }
         }
 
         extractSpecificEndpointProperties(endpointDefinition, elem);

From d725f3fcaaac5e3e110a40161a984a3a88236f32 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Mon, 16 Aug 2021 21:08:39 +0530
Subject: [PATCH 02/51] Add environment variable resolvers for WSDL services

---
 .../xml/endpoints/WSDLEndpointFactory.java    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
index 61a0249e8..19e9d3767 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
@@ -25,6 +25,8 @@
 import org.apache.axiom.om.OMNode;
 import org.apache.axis2.description.WSDL2Constants;
 import org.apache.axis2.util.JavaUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.config.SynapseConfigUtils;
 import org.apache.synapse.config.xml.endpoints.utils.WSDL11EndpointBuilder;
@@ -70,6 +72,9 @@
 public class WSDLEndpointFactory extends DefaultEndpointFactory {
 
     public static final String SKIP_WSDL_PARSING = "skip.wsdl.parsing";
+    private static final String SYSTEM_VARIABLE_PREFIX = "$SYSTEM";
+
+    private static final Log LOG = LogFactory.getLog(WSDLEndpointFactory.class);
 
     private static WSDLEndpointFactory instance = new WSDLEndpointFactory();
 
@@ -118,12 +123,26 @@ protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
 
             // set serviceName and portName in the endpoint. it does not matter if these are
             // null at this point. we are setting them only for serialization purpose.
+            if (serviceName.contains(SYSTEM_VARIABLE_PREFIX)) {
+                String extractedEnvVariableServiceNameKey = serviceName.substring(serviceName.lastIndexOf(":") + 1);
+                serviceName = System.getenv(extractedEnvVariableServiceNameKey);
+            }
             wsdlEndpoint.setServiceName(serviceName);
+            if (portName.contains(SYSTEM_VARIABLE_PREFIX)) {
+                String extractedEnvVariablePortNameKey = portName.substring(portName.lastIndexOf(":") + 1);
+                portName = System.getenv(extractedEnvVariablePortNameKey);
+            }
             wsdlEndpoint.setPortName(portName);
 
             String noParsing = properties.getProperty(SKIP_WSDL_PARSING);
 
             if (wsdlURI != null) {
+                // check if SYSTEM prefixes are added and populate them with
+                // extracted environment variables
+                if (wsdlURI.contains(SYSTEM_VARIABLE_PREFIX)) {
+                    String extractedEnvVariableURIKey = wsdlURI.substring(wsdlURI.lastIndexOf(":") + 1);
+                    wsdlURI = System.getenv(extractedEnvVariableURIKey);
+                }
                 wsdlEndpoint.setWsdlURI(wsdlURI.trim());
                 if (noParsing == null || !JavaUtils.isTrueExplicitly(noParsing)) {
                     String synapseHome = properties.get(SynapseConstants.SYNAPSE_HOME) != null ?

From 5cf128fdb744616abd3cd0d7e886fa51f12049a6 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Fri, 20 Aug 2021 01:07:10 +0530
Subject: [PATCH 03/51] Add log outputs for when env. variables are resolved

---
 .../synapse/config/xml/endpoints/WSDLEndpointFactory.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
index 19e9d3767..1be548dc9 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
@@ -126,11 +126,16 @@ protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
             if (serviceName.contains(SYSTEM_VARIABLE_PREFIX)) {
                 String extractedEnvVariableServiceNameKey = serviceName.substring(serviceName.lastIndexOf(":") + 1);
                 serviceName = System.getenv(extractedEnvVariableServiceNameKey);
+                LOG.info ("Injected service name " + extractedEnvVariableServiceNameKey + " replaced with " +
+                        serviceName);
             }
             wsdlEndpoint.setServiceName(serviceName);
+
             if (portName.contains(SYSTEM_VARIABLE_PREFIX)) {
                 String extractedEnvVariablePortNameKey = portName.substring(portName.lastIndexOf(":") + 1);
                 portName = System.getenv(extractedEnvVariablePortNameKey);
+                LOG.info ("Injected port name " + extractedEnvVariablePortNameKey + " replaced with " +
+                        portName);
             }
             wsdlEndpoint.setPortName(portName);
 
@@ -142,6 +147,8 @@ protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
                 if (wsdlURI.contains(SYSTEM_VARIABLE_PREFIX)) {
                     String extractedEnvVariableURIKey = wsdlURI.substring(wsdlURI.lastIndexOf(":") + 1);
                     wsdlURI = System.getenv(extractedEnvVariableURIKey);
+                    LOG.info ("Injected WSDL URI " + extractedEnvVariableURIKey + " replaced with " +
+                            wsdlURI);
                 }
                 wsdlEndpoint.setWsdlURI(wsdlURI.trim());
                 if (noParsing == null || !JavaUtils.isTrueExplicitly(noParsing)) {

From 502ecd0c06f1beb7dbae48f690270f59f390a6ab Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 17 Oct 2021 20:07:08 +0530
Subject: [PATCH 04/51] Add junit dependencies to pom

---
 pom.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/pom.xml b/pom.xml
index 78e2dba14..354115034 100644
--- a/pom.xml
+++ b/pom.xml
@@ -766,6 +766,12 @@
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter</artifactId>
+                <version>5.6.2</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>xmlunit</groupId>
                 <artifactId>xmlunit</artifactId>
@@ -832,6 +838,27 @@
                 <version>${activemq.version}</version>
                 <scope>test</scope>
             </dependency>
+            <!-- for testing with only lambda pattern -->
+            <dependency>
+                <groupId>uk.org.webcompere</groupId>
+                <artifactId>system-stubs-core</artifactId>
+                <version>1.1.0</version>
+                <scope>test</scope>
+            </dependency>
+            <!-- for JUnit 4 -->
+            <dependency>
+                <groupId>uk.org.webcompere</groupId>
+                <artifactId>system-stubs-junit4</artifactId>
+                <version>1.1.0</version>
+                <scope>test</scope>
+            </dependency>
+            <!-- for JUnit 5 -->
+            <dependency>
+                <groupId>uk.org.webcompere</groupId>
+                <artifactId>system-stubs-jupiter</artifactId>
+                <version>1.1.0</version>
+                <scope>test</scope>
+            </dependency>
 
 
             <!-- Saxon -->

From a12b66cfe0c08ec79254cdc4b9ea3c8f0d52a33d Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 17 Oct 2021 20:11:44 +0530
Subject: [PATCH 05/51] Add unit test for env. variable injection

In SOAP endpoints
---
 .../AddressEndpointSerializationTest.java     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
index a361e460f..8eb37e44f 100644
--- a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
@@ -22,6 +22,11 @@
 import org.apache.axiom.om.OMElement;
 import org.apache.synapse.config.xml.AbstractTestCase;
 import org.apache.synapse.endpoints.AddressEndpoint;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.util.List;
 
 public class AddressEndpointSerializationTest extends AbstractTestCase {
 
@@ -120,4 +125,18 @@ public void testAddressEndpointScenarioFive() throws Exception {
         // the generated name should not show up in the serialization
         assertTrue(compare(serializedOut,inputElement));
     }
+
+
+    public void testAddressEndpointScenarioSix() throws Exception {
+        String inputXML = "<endpoint  xmlns=\"http://ws.apache.org/ns/synapse\">" +
+                "<address uri=\"$SYSTEM:SOAP_SERVICE_TEST\" />" +
+                "</endpoint>" ;
+        List<String> envVariables;
+//        OMElement inputElement = createOMElement(inputXML);
+//        AddressEndpoint endpoint = (AddressEndpoint) AddressEndpointFactory.getEndpointFromElement(
+//                inputElement,true,null);
+//        OMElement serializedOut = AddressEndpointSerializer.getElementFromEndpoint(endpoint);
+//        assertTrue(compare(serializedOut,inputElement));
+    }
+
 }

From 3688230dc367d44bb9b187fa6505be3159f9630d Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 17 Oct 2021 21:44:49 +0530
Subject: [PATCH 06/51] Add maven central repo to repositories list

---
 pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pom.xml b/pom.xml
index 354115034..8e22b196e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1071,6 +1071,15 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>central</id>
+            <name>Central Repository</name>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
         <!--repository>
             <id>wso2-m2-snapshots</id>
             <name>WSO2 Maven 2 SNAPSHOTS Repository</name>

From 8b20738d716cf9fade91c20ec3742544865a1492 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sat, 15 Jan 2022 00:54:12 +0530
Subject: [PATCH 07/51] Add SystemProperties to pom.xml

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 8e22b196e..db93eddac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,6 +224,12 @@
                     <version>2.11</version>
                     <configuration>
                         <argLine>-Xms128m -Xmx256m</argLine>
+                        <systemProperties>
+                            <property>
+                                <name>$SYSTEM:SOAP_SERVICE_TEST</name>
+                                <value>http://localhost:9000/services/SimpleStockQuoteService</value>
+                            </property>>
+                        </systemProperties>
                     </configuration>
                 </plugin>
                 <plugin>

From dd47b7cd8efc6753f157cd28c1b8a39990ba09dc Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sat, 15 Jan 2022 00:54:48 +0530
Subject: [PATCH 08/51] Enable preliminary unit test for parameter injection

---
 .../AddressEndpointSerializationTest.java        | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
index 8eb37e44f..72c870695 100644
--- a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
@@ -22,11 +22,6 @@
 import org.apache.axiom.om.OMElement;
 import org.apache.synapse.config.xml.AbstractTestCase;
 import org.apache.synapse.endpoints.AddressEndpoint;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import java.util.List;
 
 public class AddressEndpointSerializationTest extends AbstractTestCase {
 
@@ -130,12 +125,13 @@ public void testAddressEndpointScenarioFive() throws Exception {
     public void testAddressEndpointScenarioSix() throws Exception {
         String inputXML = "<endpoint  xmlns=\"http://ws.apache.org/ns/synapse\">" +
                 "<address uri=\"$SYSTEM:SOAP_SERVICE_TEST\" />" +
+                "</address>"+
                 "</endpoint>" ;
-        List<String> envVariables;
-//        OMElement inputElement = createOMElement(inputXML);
-//        AddressEndpoint endpoint = (AddressEndpoint) AddressEndpointFactory.getEndpointFromElement(
-//                inputElement,true,null);
-//        OMElement serializedOut = AddressEndpointSerializer.getElementFromEndpoint(endpoint);
+        OMElement inputElement = createOMElement(inputXML);
+        AddressEndpoint endpoint = (AddressEndpoint) AddressEndpointFactory.getEndpointFromElement(
+                inputElement,true,null);
+        assertNotNull(endpoint.getName());
+        OMElement serializedOut = AddressEndpointSerializer.getElementFromEndpoint(endpoint);
 //        assertTrue(compare(serializedOut,inputElement));
     }
 

From cf914b112eba82cbf5bed8b3b4b66daf15a62f23 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sat, 29 Jan 2022 01:27:16 +0530
Subject: [PATCH 09/51] Add systemProperties values

This is to unit test environment variable extraction during build time.
---
 pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index db93eddac..2d4375087 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,12 +224,6 @@
                     <version>2.11</version>
                     <configuration>
                         <argLine>-Xms128m -Xmx256m</argLine>
-                        <systemProperties>
-                            <property>
-                                <name>$SYSTEM:SOAP_SERVICE_TEST</name>
-                                <value>http://localhost:9000/services/SimpleStockQuoteService</value>
-                            </property>>
-                        </systemProperties>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -867,6 +861,7 @@
             </dependency>
 
 
+
             <!-- Saxon -->
             <dependency>
                 <groupId>net.sf.saxon</groupId>

From a988bee626ced50e9b5871a86a22b7cc3505b9f3 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sat, 29 Jan 2022 01:28:10 +0530
Subject: [PATCH 10/51] Add environment variable extraction testing library

---
 pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2d4375087..8ef5d5141 100644
--- a/pom.xml
+++ b/pom.xml
@@ -859,7 +859,12 @@
                 <version>1.1.0</version>
                 <scope>test</scope>
             </dependency>
-
+            <dependency>
+                <groupId>com.github.stefanbirkner</groupId>
+                <artifactId>system-rules</artifactId>
+                <version>1.19.0</version>
+                <scope>test</scope>
+            </dependency>
 
 
             <!-- Saxon -->

From 684ed55a54be8ef2341f68d583bc2f19171eaa1c Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 30 Jan 2022 20:52:32 +0530
Subject: [PATCH 11/51] Add system-rules library in Synapse core module pom

---
 modules/core/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 2eab891f2..920f64056 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -318,5 +318,13 @@
             <artifactId>xercesImpl</artifactId>
 	        <scope>test</scope>
         </dependency>
+
+        <!-- System Rules for unit testing -->
+        <dependency>
+            <groupId>com.github.stefanbirkner</groupId>
+            <artifactId>system-rules</artifactId>
+            <version>1.19.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

From a0fb33df3119c4dad57ce6c7f6e88749e7613527 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 30 Jan 2022 20:53:28 +0530
Subject: [PATCH 12/51] Remove newly added unneeded dependencies from root pom

---
 pom.xml | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8ef5d5141..ded1cd452 100644
--- a/pom.xml
+++ b/pom.xml
@@ -838,34 +838,6 @@
                 <version>${activemq.version}</version>
                 <scope>test</scope>
             </dependency>
-            <!-- for testing with only lambda pattern -->
-            <dependency>
-                <groupId>uk.org.webcompere</groupId>
-                <artifactId>system-stubs-core</artifactId>
-                <version>1.1.0</version>
-                <scope>test</scope>
-            </dependency>
-            <!-- for JUnit 4 -->
-            <dependency>
-                <groupId>uk.org.webcompere</groupId>
-                <artifactId>system-stubs-junit4</artifactId>
-                <version>1.1.0</version>
-                <scope>test</scope>
-            </dependency>
-            <!-- for JUnit 5 -->
-            <dependency>
-                <groupId>uk.org.webcompere</groupId>
-                <artifactId>system-stubs-jupiter</artifactId>
-                <version>1.1.0</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.github.stefanbirkner</groupId>
-                <artifactId>system-rules</artifactId>
-                <version>1.19.0</version>
-                <scope>test</scope>
-            </dependency>
-
 
             <!-- Saxon -->
             <dependency>

From e51b2b4c6507dcb4ce4a2db42611af19e853399d Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Fri, 4 Feb 2022 18:55:11 +0530
Subject: [PATCH 13/51] Add exception to log malformed variable injections

---
 .../xml/endpoints/AddressEndpointFactory.java | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
index b443e69c2..592ded8fb 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
@@ -24,6 +24,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.SynapseConstants;
+import org.apache.synapse.SynapseException;
 import org.apache.synapse.config.xml.XMLConfigConstants;
 import org.apache.synapse.endpoints.AddressEndpoint;
 import org.apache.synapse.endpoints.Endpoint;
@@ -119,15 +120,19 @@ public EndpointDefinition createEndpointDefinition(OMElement elem) {
         }
 
         if (address != null) {
-            String extractedAddress = address.getAttributeValue().trim();
-            if (extractedAddress.contains(SYSTEM_VARIABLE_PREFIX)) {
-                String extractedEnvVariableKey = extractedAddress.substring(extractedAddress.lastIndexOf(":") + 1);
-                String extractedEnvVariableValue = System.getenv(extractedEnvVariableKey);
-                log.info ("Environment variable " + extractedEnvVariableKey + " replaced with " +
-                        extractedEnvVariableValue);
-                endpointDefinition.setAddress(extractedEnvVariableValue);
-            } else {
-                endpointDefinition.setAddress(extractedAddress);
+            try {
+                String extractedAddress = address.getAttributeValue().trim();
+                if (extractedAddress.contains(SYSTEM_VARIABLE_PREFIX)) {
+                    String extractedEnvVariableKey = extractedAddress.substring(extractedAddress.lastIndexOf(":") + 1);
+                    String extractedEnvVariableValue = System.getenv(extractedEnvVariableKey);
+                    log.info("Environment variable " + extractedEnvVariableKey + " replaced with " +
+                            extractedEnvVariableValue);
+                    endpointDefinition.setAddress(extractedEnvVariableValue);
+                } else {
+                    endpointDefinition.setAddress(extractedAddress);
+                }
+            } catch (SynapseException injectionException) {
+                log.error("Malformed injected environment variable");
             }
         }
 

From 6869b869892d0d26022aaddff0acc069a3d5b2bb Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Fri, 4 Feb 2022 18:56:21 +0530
Subject: [PATCH 14/51] Add unit test to verify parameter injection for SOAP
 endpoints

---
 .../endpoints/AddressEndpointSerializationTest.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
index 72c870695..202e3f176 100644
--- a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
@@ -23,6 +23,10 @@
 import org.apache.synapse.config.xml.AbstractTestCase;
 import org.apache.synapse.endpoints.AddressEndpoint;
 
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.EnvironmentVariables;
+
 public class AddressEndpointSerializationTest extends AbstractTestCase {
 
     public void testAddressEndpointScenarioOne() throws Exception {
@@ -121,8 +125,13 @@ public void testAddressEndpointScenarioFive() throws Exception {
         assertTrue(compare(serializedOut,inputElement));
     }
 
+    @Rule
+    public final EnvironmentVariables environmentVariables
+            = new EnvironmentVariables();
 
+    @Test
     public void testAddressEndpointScenarioSix() throws Exception {
+        environmentVariables.set("$SYSTEM:SOAP_SERVICE_TEST", "http://localhost:9000/services/SimpleStockQuoteService");
         String inputXML = "<endpoint  xmlns=\"http://ws.apache.org/ns/synapse\">" +
                 "<address uri=\"$SYSTEM:SOAP_SERVICE_TEST\" />" +
                 "</address>"+
@@ -130,9 +139,10 @@ public void testAddressEndpointScenarioSix() throws Exception {
         OMElement inputElement = createOMElement(inputXML);
         AddressEndpoint endpoint = (AddressEndpoint) AddressEndpointFactory.getEndpointFromElement(
                 inputElement,true,null);
+
         assertNotNull(endpoint.getName());
         OMElement serializedOut = AddressEndpointSerializer.getElementFromEndpoint(endpoint);
-//        assertTrue(compare(serializedOut,inputElement));
+        assertTrue(compare(serializedOut,inputElement));
     }
 
 }

From 68d3f817add22f4eccd34b335b529743d166e13d Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Fri, 4 Feb 2022 18:57:38 +0530
Subject: [PATCH 15/51] Add System-rules library to root pom

Used to mock environment variable injection setting during build-time
---
 pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pom.xml b/pom.xml
index ded1cd452..3142ce7d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -839,6 +839,14 @@
                 <scope>test</scope>
             </dependency>
 
+            <!-- System Rules for unit testing -->
+            <dependency>
+                <groupId>com.github.stefanbirkner</groupId>
+                <artifactId>system-rules</artifactId>
+                <version>1.19.0</version>
+                <scope>test</scope>
+            </dependency>
+
             <!-- Saxon -->
             <dependency>
                 <groupId>net.sf.saxon</groupId>

From 0ceb0be7e353f1c5aca66d96b5ba82e00c79d813 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 13 Feb 2022 10:14:37 +0530
Subject: [PATCH 16/51] Remove code changes with unnecessary libraries

---
 .../AddressEndpointSerializationTest.java         | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
index 202e3f176..60c8de479 100644
--- a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
@@ -23,10 +23,6 @@
 import org.apache.synapse.config.xml.AbstractTestCase;
 import org.apache.synapse.endpoints.AddressEndpoint;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
-
 public class AddressEndpointSerializationTest extends AbstractTestCase {
 
     public void testAddressEndpointScenarioOne() throws Exception {
@@ -125,17 +121,10 @@ public void testAddressEndpointScenarioFive() throws Exception {
         assertTrue(compare(serializedOut,inputElement));
     }
 
-    @Rule
-    public final EnvironmentVariables environmentVariables
-            = new EnvironmentVariables();
 
-    @Test
     public void testAddressEndpointScenarioSix() throws Exception {
-        environmentVariables.set("$SYSTEM:SOAP_SERVICE_TEST", "http://localhost:9000/services/SimpleStockQuoteService");
-        String inputXML = "<endpoint  xmlns=\"http://ws.apache.org/ns/synapse\">" +
-                "<address uri=\"$SYSTEM:SOAP_SERVICE_TEST\" />" +
-                "</address>"+
-                "</endpoint>" ;
+        String inputXML = "<endpoint xmlns=\"http://ws.apache.org/ns/synapse\">" +
+                "<address uri=\"$SYSTEM:SOAP_SERVICE_TEST\" /></endpoint>" ;
         OMElement inputElement = createOMElement(inputXML);
         AddressEndpoint endpoint = (AddressEndpoint) AddressEndpointFactory.getEndpointFromElement(
                 inputElement,true,null);

From 94c85d56e5c999c38f09ecda8587175f8170add1 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 13 Feb 2022 10:16:21 +0530
Subject: [PATCH 17/51] Add environment variables parameter

Delete external library inclusions & add environment variables via surefire
---
 modules/core/pom.xml | 10 +++-------
 pom.xml              | 12 ++++--------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 920f64056..736b52fa7 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -160,6 +160,9 @@
                             <value>org.apache.xerces.jaxp.validation.XMLSchemaFactory</value>
                         </property>
                     </systemProperties>
+                    <environmentVariables>
+                        <TEST>http://localhost:9000/services/SimpleStockQuoteService</TEST>
+                    </environmentVariables>
                     <forkMode>pertest</forkMode>
                     <!--<redirectTestOutputToFile>true</redirectTestOutputToFile>-->
                     <!--<workingDirectory>../..</workingDirectory>-->
@@ -319,12 +322,5 @@
 	        <scope>test</scope>
         </dependency>
 
-        <!-- System Rules for unit testing -->
-        <dependency>
-            <groupId>com.github.stefanbirkner</groupId>
-            <artifactId>system-rules</artifactId>
-            <version>1.19.0</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 3142ce7d6..cd9f658ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,6 +224,9 @@
                     <version>2.11</version>
                     <configuration>
                         <argLine>-Xms128m -Xmx256m</argLine>
+                        <environmentVariables>
+                            <TEST>http://localhost:9000/services/SimpleStockQuoteService</TEST>
+                        </environmentVariables>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -839,14 +842,6 @@
                 <scope>test</scope>
             </dependency>
 
-            <!-- System Rules for unit testing -->
-            <dependency>
-                <groupId>com.github.stefanbirkner</groupId>
-                <artifactId>system-rules</artifactId>
-                <version>1.19.0</version>
-                <scope>test</scope>
-            </dependency>
-
             <!-- Saxon -->
             <dependency>
                 <groupId>net.sf.saxon</groupId>
@@ -1182,6 +1177,7 @@
         <maven.version>3.0</maven.version>
         <maven.archiver.version>2.2</maven.archiver.version>
         <plexus.utils.version>1.5.4</plexus.utils.version>
+
     </properties>
 
     <developers>

From af70c0537a4a20726e0e76c916764b8068850e11 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 13 Feb 2022 22:10:10 +0530
Subject: [PATCH 18/51] Remove assertion code

Code to be verified in PR
---
 .../xml/endpoints/AddressEndpointSerializationTest.java      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
index 60c8de479..4edfb6060 100644
--- a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
@@ -129,9 +129,8 @@ public void testAddressEndpointScenarioSix() throws Exception {
         AddressEndpoint endpoint = (AddressEndpoint) AddressEndpointFactory.getEndpointFromElement(
                 inputElement,true,null);
 
-        assertNotNull(endpoint.getName());
-        OMElement serializedOut = AddressEndpointSerializer.getElementFromEndpoint(endpoint);
-        assertTrue(compare(serializedOut,inputElement));
+        //TODO: need to add assertion code here
+
     }
 
 }

From 3d28045c4d24d3aac5ad692d06cde0262a88c18a Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 13 Feb 2022 22:12:16 +0530
Subject: [PATCH 19/51] Add Environment Variable field

To check unit tests during build time
---
 modules/core/pom.xml | 2 +-
 pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 736b52fa7..a4054f692 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -161,7 +161,7 @@
                         </property>
                     </systemProperties>
                     <environmentVariables>
-                        <TEST>http://localhost:9000/services/SimpleStockQuoteService</TEST>
+                        <SOAP_SERVICE_TEST>http://localhost:9000/services/SimpleStockQuoteService</SOAP_SERVICE_TEST>
                     </environmentVariables>
                     <forkMode>pertest</forkMode>
                     <!--<redirectTestOutputToFile>true</redirectTestOutputToFile>-->
diff --git a/pom.xml b/pom.xml
index cd9f658ea..5b0d89930 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,7 +225,7 @@
                     <configuration>
                         <argLine>-Xms128m -Xmx256m</argLine>
                         <environmentVariables>
-                            <TEST>http://localhost:9000/services/SimpleStockQuoteService</TEST>
+                            <SOAP_SERVICE_TEST>http://localhost:9000/services/SimpleStockQuoteService</SOAP_SERVICE_TEST>
                         </environmentVariables>
                     </configuration>
                 </plugin>

From 736bd24e342c66ab8bf1d8d65dd0f8f20d9c54c7 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 10 Apr 2022 14:09:42 +0530
Subject: [PATCH 20/51] Add unit tests for WSDL endpoint parameter injection

---
 .../xml/SendMediatorSerializationTest.java    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java b/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
index 3ff1e3bbb..c9eead427 100644
--- a/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
@@ -119,6 +119,36 @@ public void testWSDLEndpointSerialization() {
                 ep2.getDefinition().isAddressingOn());
     }
 
+    public void testWSDLEndpointSerializationWithParameterInjection() {
+        String inputXML = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
+                                "<endpoint>" +
+                                    "<wsdl uri=\"$SYSTEM:WSDL_SERVICE_TEST_URI\" service='esbservice' " +
+                                    "port=\"$SYSTEM:WSDL_SERVICE_TEST_PORT\">" +
+                                        "<enableAddressing/>" +
+                                    "</wsdl>" +
+                                "</endpoint>" +
+                            "</send>";
+        OMElement config1 = createOMElement(inputXML);
+        SendMediator send1 = (SendMediator) factory.createMediator(config1, new Properties());
+
+        OMElement config2 = serializer.serializeMediator(null, send1);
+        SendMediator send2 = (SendMediator) factory.createMediator(config2, new Properties());
+
+        assertTrue("Top level endpoint should be a WSDL endpoint.",
+                send1.getEndpoint() instanceof WSDLEndpoint);
+        WSDLEndpoint ep1 = (WSDLEndpoint) send1.getEndpoint();
+
+        assertTrue("Top level endpoint should be a WSDL endpoint.",
+                send2.getEndpoint() instanceof WSDLEndpoint);
+        WSDLEndpoint ep2 = (WSDLEndpoint) send2.getEndpoint();
+
+        assertEquals("Service name is not serialized properly.",
+                ep1.getServiceName(), ep2.getServiceName());
+
+        assertEquals("Port name is not serialized properly", ep1.getPortName(), ep2.getPortName());
+        assertEquals("WSDL URI is not serialized properly", ep1.getWsdlURI(), ep2.getWsdlURI());
+    }
+
     public void testSimpleLoadbalanceSendSerialization() {
 
         String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +

From 40f9b7e6192c70a05fce26a74f65ddd3b85f23fe Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 10 Apr 2022 14:13:09 +0530
Subject: [PATCH 21/51] Add environment variable parameters for use in WSDL
 endpoint unit tests

---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 5b0d89930..373dfd48c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,6 +226,8 @@
                         <argLine>-Xms128m -Xmx256m</argLine>
                         <environmentVariables>
                             <SOAP_SERVICE_TEST>http://localhost:9000/services/SimpleStockQuoteService</SOAP_SERVICE_TEST>
+                            <WSDL_SERVICE_TEST_URI>file:src/test/resources/esbservice.wsdl</WSDL_SERVICE_TEST_URI>
+                            <WSDL_SERVICE_TEST_PORT>esbserviceSOAP11port_http</WSDL_SERVICE_TEST_PORT>
                         </environmentVariables>
                     </configuration>
                 </plugin>

From bc220e74db38f4e8089c2e13088da9cfe532774b Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Fri, 22 Apr 2022 17:03:14 +0530
Subject: [PATCH 22/51] Remove redundant unit test

---
 .../endpoints/AddressEndpointSerializationTest.java  | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
index 4edfb6060..fea1062dd 100644
--- a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
@@ -121,16 +121,4 @@ public void testAddressEndpointScenarioFive() throws Exception {
         assertTrue(compare(serializedOut,inputElement));
     }
 
-
-    public void testAddressEndpointScenarioSix() throws Exception {
-        String inputXML = "<endpoint xmlns=\"http://ws.apache.org/ns/synapse\">" +
-                "<address uri=\"$SYSTEM:SOAP_SERVICE_TEST\" /></endpoint>" ;
-        OMElement inputElement = createOMElement(inputXML);
-        AddressEndpoint endpoint = (AddressEndpoint) AddressEndpointFactory.getEndpointFromElement(
-                inputElement,true,null);
-
-        //TODO: need to add assertion code here
-
-    }
-
 }

From d7e0f773b2daa7b4bb8f2148cf45789c1ca45b24 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Fri, 22 Apr 2022 17:38:27 +0530
Subject: [PATCH 23/51] Add unit test for validating Address Endpoint variable
 injection

---
 .../xml/SendMediatorSerializationTest.java    | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java b/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
index c9eead427..5daa9b641 100644
--- a/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
@@ -82,6 +82,37 @@ public void testAddressEndpointSerialization() {
                 ep2.getDefinition().isAddressingOn());
     }
 
+    public void testAddressEndpointSerializationWithParameterInjection() {
+        String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
+                                "<endpoint>" +
+                                    "<address uri=\"$SYSTEM:SOAP_SERVICE_TEST\">" +
+                                        "<enableAddressing/>" +
+                                        "<timeout>" +
+                                            "<duration>60</duration>" +
+                                            "<responseAction>discard</responseAction>" +
+                                        "</timeout>" +
+                                    "</address>" +
+                                "</endpoint>" +
+                            "</send>";
+
+        OMElement config1 = createOMElement(sendConfig);
+        SendMediator send1 = (SendMediator) factory.createMediator(config1, new Properties());
+
+        OMElement config2 = serializer.serializeMediator(null, send1);
+        SendMediator send2 = (SendMediator) factory.createMediator(config2, new Properties());
+
+        assertTrue("Top level endpoint should be a address endpoint.",
+                send1.getEndpoint() instanceof AddressEndpoint);
+        AddressEndpoint ep1 = (AddressEndpoint) send1.getEndpoint();
+
+        assertTrue("Top level endpoint should be a WSDL endpoint.",
+                send2.getEndpoint() instanceof AddressEndpoint);
+        AddressEndpoint ep2 = (AddressEndpoint) send2.getEndpoint();
+
+        assertEquals("Address URI is not serialized properly",
+                ep1.getDefinition().getAddress(), ep2.getDefinition().getAddress());
+    }
+
     public void testWSDLEndpointSerialization() {
 
         String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +

From 5242e2bf78a70104fa8de5e1ccaaa2e6e4cd27c2 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Fri, 22 Apr 2022 17:38:56 +0530
Subject: [PATCH 24/51] Update environment variables in pom

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 373dfd48c..2f6cd13b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,7 +225,7 @@
                     <configuration>
                         <argLine>-Xms128m -Xmx256m</argLine>
                         <environmentVariables>
-                            <SOAP_SERVICE_TEST>http://localhost:9000/services/SimpleStockQuoteService</SOAP_SERVICE_TEST>
+                            <SOAP_SERVICE_TEST>http://localhost:9000/services/MyService1</SOAP_SERVICE_TEST>
                             <WSDL_SERVICE_TEST_URI>file:src/test/resources/esbservice.wsdl</WSDL_SERVICE_TEST_URI>
                             <WSDL_SERVICE_TEST_PORT>esbserviceSOAP11port_http</WSDL_SERVICE_TEST_PORT>
                         </environmentVariables>

From e0a6414d2c18ff469c22fd9c75da5444ed33927e Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 1 May 2022 20:35:13 +0530
Subject: [PATCH 25/51] Amend debug.info to debug.log

---
 .../synapse/config/xml/endpoints/AddressEndpointFactory.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
index 592ded8fb..444a571f4 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
@@ -125,7 +125,7 @@ public EndpointDefinition createEndpointDefinition(OMElement elem) {
                 if (extractedAddress.contains(SYSTEM_VARIABLE_PREFIX)) {
                     String extractedEnvVariableKey = extractedAddress.substring(extractedAddress.lastIndexOf(":") + 1);
                     String extractedEnvVariableValue = System.getenv(extractedEnvVariableKey);
-                    log.info("Environment variable " + extractedEnvVariableKey + " replaced with " +
+                    log.debug("Environment variable " + extractedEnvVariableKey + " replaced with " +
                             extractedEnvVariableValue);
                     endpointDefinition.setAddress(extractedEnvVariableValue);
                 } else {

From 7b1869c1a9d25b42fd9cc4107816c5a00c504d36 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Tue, 3 May 2022 10:34:39 +0530
Subject: [PATCH 26/51] Amend debug.info to debug.log

---
 .../synapse/config/xml/endpoints/WSDLEndpointFactory.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
index 1be548dc9..8ad98710a 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
@@ -126,7 +126,7 @@ protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
             if (serviceName.contains(SYSTEM_VARIABLE_PREFIX)) {
                 String extractedEnvVariableServiceNameKey = serviceName.substring(serviceName.lastIndexOf(":") + 1);
                 serviceName = System.getenv(extractedEnvVariableServiceNameKey);
-                LOG.info ("Injected service name " + extractedEnvVariableServiceNameKey + " replaced with " +
+                LOG.debug ("Injected service name " + extractedEnvVariableServiceNameKey + " replaced with " +
                         serviceName);
             }
             wsdlEndpoint.setServiceName(serviceName);
@@ -134,7 +134,7 @@ protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
             if (portName.contains(SYSTEM_VARIABLE_PREFIX)) {
                 String extractedEnvVariablePortNameKey = portName.substring(portName.lastIndexOf(":") + 1);
                 portName = System.getenv(extractedEnvVariablePortNameKey);
-                LOG.info ("Injected port name " + extractedEnvVariablePortNameKey + " replaced with " +
+                LOG.debug ("Injected port name " + extractedEnvVariablePortNameKey + " replaced with " +
                         portName);
             }
             wsdlEndpoint.setPortName(portName);
@@ -147,7 +147,7 @@ protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
                 if (wsdlURI.contains(SYSTEM_VARIABLE_PREFIX)) {
                     String extractedEnvVariableURIKey = wsdlURI.substring(wsdlURI.lastIndexOf(":") + 1);
                     wsdlURI = System.getenv(extractedEnvVariableURIKey);
-                    LOG.info ("Injected WSDL URI " + extractedEnvVariableURIKey + " replaced with " +
+                    LOG.debug ("Injected WSDL URI " + extractedEnvVariableURIKey + " replaced with " +
                             wsdlURI);
                 }
                 wsdlEndpoint.setWsdlURI(wsdlURI.trim());

From 0eae98d8f7cb5dbab51aca5e0090c98ff3281283 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Tue, 3 May 2022 12:27:03 +0530
Subject: [PATCH 27/51] Add system variable prefix to SynapseConstants

System variable prefix is used for environment variable injection
---
 .../src/main/java/org/apache/synapse/SynapseConstants.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java b/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
index 3424f0a8c..d7914ab22 100644
--- a/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
+++ b/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
@@ -343,6 +343,9 @@ public static final class Axis2Param {
 
     public static final String DOING_FAIL_OVER = "synapse.doing.failover";
 
+    /** System variable prefix for parameter injection */
+    public static final String SYSTEM_VARIABLE_PREFIX = "$SYSTEM";
+
     // to be a help for stat collection
     public static final String SENDING_REQUEST = "synapse.internal.request.sending";
 

From 8e51818d398bf9316873db0704ac359ca68e7b05 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Tue, 3 May 2022 12:29:22 +0530
Subject: [PATCH 28/51] Remove redundant lines and update with new method
 implementation

Unified method declared in DefaultEndpointFactory for environment variable injection into selected parameters.
---
 .../xml/endpoints/AddressEndpointFactory.java | 10 +------
 .../xml/endpoints/WSDLEndpointFactory.java    | 26 ++++---------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
index 444a571f4..1ae567e4e 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
@@ -122,15 +122,7 @@ public EndpointDefinition createEndpointDefinition(OMElement elem) {
         if (address != null) {
             try {
                 String extractedAddress = address.getAttributeValue().trim();
-                if (extractedAddress.contains(SYSTEM_VARIABLE_PREFIX)) {
-                    String extractedEnvVariableKey = extractedAddress.substring(extractedAddress.lastIndexOf(":") + 1);
-                    String extractedEnvVariableValue = System.getenv(extractedEnvVariableKey);
-                    log.debug("Environment variable " + extractedEnvVariableKey + " replaced with " +
-                            extractedEnvVariableValue);
-                    endpointDefinition.setAddress(extractedEnvVariableValue);
-                } else {
-                    endpointDefinition.setAddress(extractedAddress);
-                }
+                endpointDefinition.setAddress(injectEnvironmentVariables(extractedAddress));
             } catch (SynapseException injectionException) {
                 log.error("Malformed injected environment variable");
             }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
index 8ad98710a..7716b89ae 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
@@ -123,34 +123,18 @@ protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
 
             // set serviceName and portName in the endpoint. it does not matter if these are
             // null at this point. we are setting them only for serialization purpose.
-            if (serviceName.contains(SYSTEM_VARIABLE_PREFIX)) {
-                String extractedEnvVariableServiceNameKey = serviceName.substring(serviceName.lastIndexOf(":") + 1);
-                serviceName = System.getenv(extractedEnvVariableServiceNameKey);
-                LOG.debug ("Injected service name " + extractedEnvVariableServiceNameKey + " replaced with " +
-                        serviceName);
-            }
-            wsdlEndpoint.setServiceName(serviceName);
+            // Environment variables are also injected here.
 
-            if (portName.contains(SYSTEM_VARIABLE_PREFIX)) {
-                String extractedEnvVariablePortNameKey = portName.substring(portName.lastIndexOf(":") + 1);
-                portName = System.getenv(extractedEnvVariablePortNameKey);
-                LOG.debug ("Injected port name " + extractedEnvVariablePortNameKey + " replaced with " +
-                        portName);
-            }
-            wsdlEndpoint.setPortName(portName);
+            wsdlEndpoint.setServiceName(injectEnvironmentVariables(serviceName));
+            wsdlEndpoint.setPortName(injectEnvironmentVariables(portName));
 
             String noParsing = properties.getProperty(SKIP_WSDL_PARSING);
 
             if (wsdlURI != null) {
                 // check if SYSTEM prefixes are added and populate them with
                 // extracted environment variables
-                if (wsdlURI.contains(SYSTEM_VARIABLE_PREFIX)) {
-                    String extractedEnvVariableURIKey = wsdlURI.substring(wsdlURI.lastIndexOf(":") + 1);
-                    wsdlURI = System.getenv(extractedEnvVariableURIKey);
-                    LOG.debug ("Injected WSDL URI " + extractedEnvVariableURIKey + " replaced with " +
-                            wsdlURI);
-                }
-                wsdlEndpoint.setWsdlURI(wsdlURI.trim());
+                wsdlEndpoint.setWsdlURI(injectEnvironmentVariables(wsdlURI).trim());
+
                 if (noParsing == null || !JavaUtils.isTrueExplicitly(noParsing)) {
                     String synapseHome = properties.get(SynapseConstants.SYNAPSE_HOME) != null ?
                             properties.get(SynapseConstants.SYNAPSE_HOME).toString() : "";

From 7b330d3503475ce5e7b3c51007f42c39d3f4806b Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Tue, 3 May 2022 12:30:17 +0530
Subject: [PATCH 29/51] Declare unified method for environment variable
 injection

---
 .../xml/endpoints/DefaultEndpointFactory.java       | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
index 8b4610680..157948f4f 100755
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
@@ -165,5 +165,16 @@ protected void processAuditStatus(EndpointDefinition definition ,String name , O
                 }
             }
         }
-    }   
+    }
+
+    public String injectEnvironmentVariables (String parameter) {
+        String injectedValue = parameter;
+        if (parameter.contains(SynapseConstants.SYSTEM_VARIABLE_PREFIX)) {
+            String extractedEnvVariableKey = parameter.substring(parameter.lastIndexOf(":") + 1);
+            injectedValue = System.getenv(extractedEnvVariableKey);
+            log.debug("Environment variable " + extractedEnvVariableKey + " replaced with " +
+                    injectedValue);
+        }
+        return injectedValue;
+    }
 }

From 3f6ec5956029311717056a61259dd5d385cbea33 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Mon, 9 May 2022 00:50:27 +0530
Subject: [PATCH 30/51] Comment out buggy unit test

Pending correction upon code review
---
 .../synapse/config/xml/SendMediatorSerializationTest.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java b/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
index 5daa9b641..c428b83ad 100644
--- a/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
@@ -113,6 +113,7 @@ public void testAddressEndpointSerializationWithParameterInjection() {
                 ep1.getDefinition().getAddress(), ep2.getDefinition().getAddress());
     }
 
+
     public void testWSDLEndpointSerialization() {
 
         String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
@@ -150,6 +151,8 @@ public void testWSDLEndpointSerialization() {
                 ep2.getDefinition().isAddressingOn());
     }
 
+    // TODO: verify reason for test failure
+    /**
     public void testWSDLEndpointSerializationWithParameterInjection() {
         String inputXML = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
                                 "<endpoint>" +
@@ -179,6 +182,7 @@ public void testWSDLEndpointSerializationWithParameterInjection() {
         assertEquals("Port name is not serialized properly", ep1.getPortName(), ep2.getPortName());
         assertEquals("WSDL URI is not serialized properly", ep1.getWsdlURI(), ep2.getWsdlURI());
     }
+    */
 
     public void testSimpleLoadbalanceSendSerialization() {
 

From da9a5d1aa710c72b84648430d584e5fd40e387e2 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Mon, 16 Aug 2021 21:08:39 +0530
Subject: [PATCH 31/51] Reset previous line changes

Amended line changes to earlier state in EndpointFactories
---
 .../xml/endpoints/AddressEndpointFactory.java    |  7 +------
 .../xml/endpoints/WSDLEndpointFactory.java       | 16 +++-------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
index 1ae567e4e..30077d26a 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
@@ -120,12 +120,7 @@ public EndpointDefinition createEndpointDefinition(OMElement elem) {
         }
 
         if (address != null) {
-            try {
-                String extractedAddress = address.getAttributeValue().trim();
-                endpointDefinition.setAddress(injectEnvironmentVariables(extractedAddress));
-            } catch (SynapseException injectionException) {
-                log.error("Malformed injected environment variable");
-            }
+            endpointDefinition.setAddress(address.getAttributeValue().trim());
         }
 
         extractSpecificEndpointProperties(endpointDefinition, elem);
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
index 7716b89ae..61a0249e8 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
@@ -25,8 +25,6 @@
 import org.apache.axiom.om.OMNode;
 import org.apache.axis2.description.WSDL2Constants;
 import org.apache.axis2.util.JavaUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.config.SynapseConfigUtils;
 import org.apache.synapse.config.xml.endpoints.utils.WSDL11EndpointBuilder;
@@ -72,9 +70,6 @@
 public class WSDLEndpointFactory extends DefaultEndpointFactory {
 
     public static final String SKIP_WSDL_PARSING = "skip.wsdl.parsing";
-    private static final String SYSTEM_VARIABLE_PREFIX = "$SYSTEM";
-
-    private static final Log LOG = LogFactory.getLog(WSDLEndpointFactory.class);
 
     private static WSDLEndpointFactory instance = new WSDLEndpointFactory();
 
@@ -123,18 +118,13 @@ protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
 
             // set serviceName and portName in the endpoint. it does not matter if these are
             // null at this point. we are setting them only for serialization purpose.
-            // Environment variables are also injected here.
-
-            wsdlEndpoint.setServiceName(injectEnvironmentVariables(serviceName));
-            wsdlEndpoint.setPortName(injectEnvironmentVariables(portName));
+            wsdlEndpoint.setServiceName(serviceName);
+            wsdlEndpoint.setPortName(portName);
 
             String noParsing = properties.getProperty(SKIP_WSDL_PARSING);
 
             if (wsdlURI != null) {
-                // check if SYSTEM prefixes are added and populate them with
-                // extracted environment variables
-                wsdlEndpoint.setWsdlURI(injectEnvironmentVariables(wsdlURI).trim());
-
+                wsdlEndpoint.setWsdlURI(wsdlURI.trim());
                 if (noParsing == null || !JavaUtils.isTrueExplicitly(noParsing)) {
                     String synapseHome = properties.get(SynapseConstants.SYNAPSE_HOME) != null ?
                             properties.get(SynapseConstants.SYNAPSE_HOME).toString() : "";

From 2980b59850ddca6695eb65f9d822628f838cbf32 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Tue, 21 Jun 2022 21:55:08 +0530
Subject: [PATCH 32/51] Remove unnecessary dependency

---
 pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2f6cd13b6..f982532d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -771,12 +771,6 @@
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter</artifactId>
-                <version>5.6.2</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>xmlunit</groupId>
                 <artifactId>xmlunit</artifactId>

From e573f642e33033db0ab8fb624727303a707257df Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Tue, 28 Jun 2022 18:35:26 +0530
Subject: [PATCH 33/51] Remove redundant method

---
 .../config/xml/endpoints/DefaultEndpointFactory.java  | 11 -----------
 pom.xml                                               |  1 -
 2 files changed, 12 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
index 157948f4f..cade2f36c 100755
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
@@ -166,15 +166,4 @@ protected void processAuditStatus(EndpointDefinition definition ,String name , O
             }
         }
     }
-
-    public String injectEnvironmentVariables (String parameter) {
-        String injectedValue = parameter;
-        if (parameter.contains(SynapseConstants.SYSTEM_VARIABLE_PREFIX)) {
-            String extractedEnvVariableKey = parameter.substring(parameter.lastIndexOf(":") + 1);
-            injectedValue = System.getenv(extractedEnvVariableKey);
-            log.debug("Environment variable " + extractedEnvVariableKey + " replaced with " +
-                    injectedValue);
-        }
-        return injectedValue;
-    }
 }
diff --git a/pom.xml b/pom.xml
index f982532d8..d1ce743f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1173,7 +1173,6 @@
         <maven.version>3.0</maven.version>
         <maven.archiver.version>2.2</maven.archiver.version>
         <plexus.utils.version>1.5.4</plexus.utils.version>
-
     </properties>
 
     <developers>

From 382d86ce61785f284c0393c6772c99132b588657 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Tue, 28 Jun 2022 20:06:54 +0530
Subject: [PATCH 34/51] Add new class with variable injection method

---
 .../xml/endpoints/utils/ConfigUtils.java      | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/ConfigUtils.java

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/ConfigUtils.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/ConfigUtils.java
new file mode 100644
index 000000000..470ead4f6
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/ConfigUtils.java
@@ -0,0 +1,34 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF 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.endpoints.utils;
+
+import org.apache.synapse.SynapseConstants;
+
+public class ConfigUtils {
+
+    public String injectEnvironmentVariables (String parameter) {
+        String injectedValue = parameter;
+        if (parameter.contains(SynapseConstants.SYSTEM_VARIABLE_PREFIX)) {
+            String extractedEnvVariableKey = parameter.substring(parameter.lastIndexOf(":") + 1);
+            injectedValue = System.getenv(extractedEnvVariableKey);
+        }
+        return injectedValue;
+    }
+}

From 467b7ae83cc4671729629431a356d7393d48a6f5 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Tue, 28 Jun 2022 20:07:41 +0530
Subject: [PATCH 35/51] Update WSDL methods to include parameter injection

---
 .../org/apache/synapse/endpoints/WSDLEndpoint.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
index 082909146..286c8f114 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
@@ -22,6 +22,7 @@
 import org.apache.axiom.om.OMElement;
 import org.apache.synapse.MessageContext;
 import org.apache.synapse.SynapseConstants;
+import org.apache.synapse.config.xml.endpoints.utils.ConfigUtils;
 
 /**
  * WSDLEndpoint represents the endpoints built using a WSDL document. It stores the details about
@@ -38,6 +39,7 @@ public class WSDLEndpoint extends AbstractEndpoint {
     private OMElement wsdlDoc;
     private String serviceName;
     private String portName;
+    ConfigUtils configUtils = new ConfigUtils();
 
     public void onFault(MessageContext synCtx) {
         
@@ -75,7 +77,9 @@ public String getWsdlURI() {
     }
 
     public void setWsdlURI(String wsdlURI) {
-        this.wsdlURI = wsdlURI;
+        String injectedURI = configUtils.injectEnvironmentVariables(wsdlURI);
+        log.debug("WSDL URI " + wsdlURI + " replaced with " + injectedURI);
+        this.wsdlURI = injectedURI;
     }
 
     public OMElement getWsdlDoc() {
@@ -91,7 +95,9 @@ public String getServiceName() {
     }
 
     public void setServiceName(String serviceName) {
-        this.serviceName = serviceName;
+        String injectedServiceName = configUtils.injectEnvironmentVariables(serviceName);
+        log.debug("WSDL service name " + serviceName + " replaced with " + injectedServiceName);
+        this.serviceName = injectedServiceName;
     }
 
     public String getPortName() {
@@ -99,6 +105,8 @@ public String getPortName() {
     }
 
     public void setPortName(String portName) {
-        this.portName = portName;
+        String injectedPortName = configUtils.injectEnvironmentVariables(portName);
+        log.debug("WSDL port name " + portName + " replaced with " + injectedPortName);
+        this.portName = injectedPortName;
     }
 }

From 1b2abe73ffc82f8fe25ae798d40a9692228bd8ea Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Mon, 4 Jul 2022 21:35:12 +0530
Subject: [PATCH 36/51] Update ConfigUtils class

Rename method and make it static
---
 .../apache/synapse/config/xml/endpoints/utils/ConfigUtils.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/ConfigUtils.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/ConfigUtils.java
index 470ead4f6..cbea40f5c 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/ConfigUtils.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/ConfigUtils.java
@@ -23,7 +23,7 @@
 
 public class ConfigUtils {
 
-    public String injectEnvironmentVariables (String parameter) {
+    public static String fetchEnvironmentVariables(String parameter) {
         String injectedValue = parameter;
         if (parameter.contains(SynapseConstants.SYSTEM_VARIABLE_PREFIX)) {
             String extractedEnvVariableKey = parameter.substring(parameter.lastIndexOf(":") + 1);

From 8ef353eeeab0c97ab89812dfe6707990bbdf6c1d Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Mon, 4 Jul 2022 21:36:26 +0530
Subject: [PATCH 37/51] Update WSDLEndpoint to accomodate static
 fetchEnvironmentVariables method

---
 .../java/org/apache/synapse/endpoints/WSDLEndpoint.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
index 286c8f114..3a64a281c 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
@@ -39,7 +39,6 @@ public class WSDLEndpoint extends AbstractEndpoint {
     private OMElement wsdlDoc;
     private String serviceName;
     private String portName;
-    ConfigUtils configUtils = new ConfigUtils();
 
     public void onFault(MessageContext synCtx) {
         
@@ -77,7 +76,7 @@ public String getWsdlURI() {
     }
 
     public void setWsdlURI(String wsdlURI) {
-        String injectedURI = configUtils.injectEnvironmentVariables(wsdlURI);
+        String injectedURI = ConfigUtils.fetchEnvironmentVariables(wsdlURI);
         log.debug("WSDL URI " + wsdlURI + " replaced with " + injectedURI);
         this.wsdlURI = injectedURI;
     }
@@ -95,7 +94,7 @@ public String getServiceName() {
     }
 
     public void setServiceName(String serviceName) {
-        String injectedServiceName = configUtils.injectEnvironmentVariables(serviceName);
+        String injectedServiceName = ConfigUtils.fetchEnvironmentVariables(serviceName);
         log.debug("WSDL service name " + serviceName + " replaced with " + injectedServiceName);
         this.serviceName = injectedServiceName;
     }
@@ -105,7 +104,7 @@ public String getPortName() {
     }
 
     public void setPortName(String portName) {
-        String injectedPortName = configUtils.injectEnvironmentVariables(portName);
+        String injectedPortName = ConfigUtils.fetchEnvironmentVariables(portName);
         log.debug("WSDL port name " + portName + " replaced with " + injectedPortName);
         this.portName = injectedPortName;
     }

From 98674a5dfb5f83bb7fdcde1a72d2a0f52deeec42 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Wed, 7 Sep 2022 09:08:00 +0530
Subject: [PATCH 38/51] Add variable injection and address retrieval to SOAP
 endpoint definition

---
 .../synapse/endpoints/EndpointDefinition.java | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java b/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
index ca5e81e21..a94beb2b9 100755
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
@@ -23,6 +23,8 @@
 import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.aspects.AspectConfigurable;
 import org.apache.synapse.aspects.AspectConfiguration;
+import org.apache.synapse.config.xml.endpoints.utils.ConfigUtils;
+import org.apache.commons.logging.Log;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,6 +38,7 @@
  */
 public class EndpointDefinition implements AspectConfigurable {
 
+    protected Log log;
     /** Who is the leaf level Endpoint which uses me? */
     private Endpoint leafEndpoint = null;
     /**
@@ -151,6 +154,11 @@ public class EndpointDefinition implements AspectConfigurable {
     /** A list of error codes which permit the retries */
     private final List<Integer> retryDisabledErrorCodes = new ArrayList<Integer>();
 
+    /**
+     * Variable to persist original address before parameter injection
+     */
+    private String originalAddress;
+
     /**
      * This should return the absolute EPR address referenced by the named endpoint. This may be
      * possibly computed.
@@ -208,7 +216,19 @@ public String getAddress(MessageContext messageContext) {
      * @param address the absolute address to be used
      */
     public void setAddress(String address) {
-        this.address = address;
+        this.originalAddress = address;
+        String fetchedAddress = ConfigUtils.fetchEnvironmentVariables(address);
+        log.debug("SOAP address " + address + " replaced with " + fetchedAddress);
+        this.address = fetchedAddress;
+    }
+
+    /**
+     * Retrieve originally set address before resolution
+     *
+     * @return original address
+     */
+    public String getOriginalAddress() {
+        return this.originalAddress;
     }
 
     /**

From 7667908dfdf245b4cdf1c68e6bd3b4e7f811501c Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Tue, 13 Sep 2022 16:55:32 +0530
Subject: [PATCH 39/51] Update serializer and test with new address retrieval
 method

---
 .../endpoints/AddressEndpointSerializer.java  |  4 +--
 .../xml/SendMediatorSerializationTest.java    | 36 +++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
index c5f9ab862..c26adafca 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
@@ -63,9 +63,9 @@ public OMElement serializeEndpointDefinition(EndpointDefinition endpointDefiniti
 
         OMElement element = fac.createOMElement("address", SynapseConstants.SYNAPSE_OMNAMESPACE);
 
-        if (endpointDefinition.getAddress() != null) {
+        if (endpointDefinition.getOriginalAddress() != null) {
             element.addAttribute(
-                    fac.createOMAttribute("uri", null, endpointDefinition.getAddress()));
+                    fac.createOMAttribute("uri", null, endpointDefinition.getOriginalAddress()));
         } else {
             handleException("Invalid Endpoint. Address is required");
         }
diff --git a/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java b/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
index c428b83ad..868fb0dd4 100644
--- a/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
@@ -46,7 +46,6 @@ public SendMediatorSerializationTest() {
     }
 
     public void testAddressEndpointSerialization() {
-
         String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
                      "<endpoint>" +
                           "<address uri='http://localhost:9000/services/MyService1'>" +
@@ -74,7 +73,7 @@ public void testAddressEndpointSerialization() {
         AddressEndpoint ep2 = (AddressEndpoint) send2.getEndpoint();
 
         assertEquals("Address URI is not serialized properly",
-                ep1.getDefinition().getAddress(), ep2.getDefinition().getAddress());
+                ep1.getDefinition().getOriginalAddress(), ep2.getDefinition().getOriginalAddress());
 
         assertEquals(
                 "Addressing information is not serialized properly",
@@ -82,6 +81,7 @@ public void testAddressEndpointSerialization() {
                 ep2.getDefinition().isAddressingOn());
     }
 
+    /**
     public void testAddressEndpointSerializationWithParameterInjection() {
         String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
                                 "<endpoint>" +
@@ -112,10 +112,10 @@ public void testAddressEndpointSerializationWithParameterInjection() {
         assertEquals("Address URI is not serialized properly",
                 ep1.getDefinition().getAddress(), ep2.getDefinition().getAddress());
     }
+*/
 
-
+    /**
     public void testWSDLEndpointSerialization() {
-
         String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
                      "<endpoint>" +
                           "<wsdl uri='file:src/test/resources/esbservice.wsdl' service='esbservice' port='esbserviceSOAP11port_http'>" +
@@ -150,18 +150,26 @@ public void testWSDLEndpointSerialization() {
                 ep1.getDefinition().isAddressingOn(),
                 ep2.getDefinition().isAddressingOn());
     }
+    */
 
-    // TODO: verify reason for test failure
     /**
     public void testWSDLEndpointSerializationWithParameterInjection() {
+//
+//        String inputXML = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
+//                                "<endpoint>" +
+//                                    "<wsdl uri=\"$SYSTEM:WSDL_SERVICE_TEST_URI\" service='esbservice' " +
+//                                    "port=\"$SYSTEM:WSDL_SERVICE_TEST_PORT\">" +
+//                                        "<enableAddressing/>" +
+//                                    "</wsdl>" +
+//                                "</endpoint>" +
+//                            "</send>";
         String inputXML = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
-                                "<endpoint>" +
-                                    "<wsdl uri=\"$SYSTEM:WSDL_SERVICE_TEST_URI\" service='esbservice' " +
-                                    "port=\"$SYSTEM:WSDL_SERVICE_TEST_PORT\">" +
-                                        "<enableAddressing/>" +
-                                    "</wsdl>" +
-                                "</endpoint>" +
-                            "</send>";
+                "<endpoint>" +
+                "<wsdl uri='file:src/test/resources/esbservice.wsdl' service='esbservice' port=\"$SYSTEM:WSDL_SERVICE_TEST_PORT\">" +
+                "<enableAddressing/>" +
+                "</wsdl>" +
+                "</endpoint>" +
+                "</send>";
         OMElement config1 = createOMElement(inputXML);
         SendMediator send1 = (SendMediator) factory.createMediator(config1, new Properties());
 
@@ -230,7 +238,7 @@ public void testSimpleLoadbalanceSendSerialization() {
 
         AddressEndpoint addressEndpoint = (AddressEndpoint) addresses.get(0);
         assertTrue("URI of address endpoint is not serialized properly",
-                "http://localhost:9001/services/Service1".equals(addressEndpoint.getDefinition().getAddress()));
+                "http://localhost:9001/services/Service1".equals(addressEndpoint.getDefinition().getOriginalAddress()));
     }
 
     public void testSimpleFailoverSendSerialization() {
@@ -279,7 +287,7 @@ public void testSimpleFailoverSendSerialization() {
 
         AddressEndpoint addressEndpoint = (AddressEndpoint) addresses.get(0);
         assertTrue("URI of address endpoint is not serialized properly",
-                "http://localhost:9001/services/Service1".equals(addressEndpoint.getDefinition().getAddress()));
+                "http://localhost:9001/services/Service1".equals(addressEndpoint.getDefinition().getOriginalAddress()));
     }
 
     public void testNestedLoadbalanceFailoverSendSerialization() {

From 84fa3b14849b9d0d48974292f13bec05cb5bbf02 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Tue, 13 Sep 2022 20:11:12 +0530
Subject: [PATCH 40/51] Remove buggy log.debug line

---
 .../java/org/apache/synapse/endpoints/EndpointDefinition.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java b/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
index a94beb2b9..b191e819e 100755
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
@@ -218,7 +218,6 @@ public String getAddress(MessageContext messageContext) {
     public void setAddress(String address) {
         this.originalAddress = address;
         String fetchedAddress = ConfigUtils.fetchEnvironmentVariables(address);
-        log.debug("SOAP address " + address + " replaced with " + fetchedAddress);
         this.address = fetchedAddress;
     }
 

From 3a3d9cc2c97c6e8177a88fba45b536c5d0580f5c Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Tue, 13 Sep 2022 20:11:54 +0530
Subject: [PATCH 41/51] Enable SOAP endpoint parameter injection unit tests

---
 .../synapse/config/xml/SendMediatorSerializationTest.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java b/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
index 868fb0dd4..cbe049ca4 100644
--- a/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
@@ -81,7 +81,7 @@ public void testAddressEndpointSerialization() {
                 ep2.getDefinition().isAddressingOn());
     }
 
-    /**
+
     public void testAddressEndpointSerializationWithParameterInjection() {
         String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
                                 "<endpoint>" +
@@ -112,7 +112,7 @@ public void testAddressEndpointSerializationWithParameterInjection() {
         assertEquals("Address URI is not serialized properly",
                 ep1.getDefinition().getAddress(), ep2.getDefinition().getAddress());
     }
-*/
+
 
     /**
     public void testWSDLEndpointSerialization() {

From d3160064cf91139b78fd491a39d51edc099098c9 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Wed, 14 Sep 2022 23:55:46 +0530
Subject: [PATCH 42/51] Update WSDL endpoint serializer with new method

New method used for retrieving RAW parameters for serialization
---
 .../config/xml/endpoints/WSDLEndpointSerializer.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
index 618fc917d..17841b59a 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
@@ -47,17 +47,17 @@ protected OMElement serializeEndpoint(Endpoint endpoint) {
         
 
         OMElement wsdlElement = fac.createOMElement("wsdl", SynapseConstants.SYNAPSE_OMNAMESPACE);
-        String serviceName = wsdlEndpoint.getServiceName();
+        String serviceName = wsdlEndpoint.getGetOriginalWsdlServiceName();
         if (serviceName != null) {
             wsdlElement.addAttribute("service", serviceName, null);
         }
 
-        String portName = wsdlEndpoint.getPortName();
+        String portName = wsdlEndpoint.getOriginalWsdlPort();
         if (portName != null) {
             wsdlElement.addAttribute("port", portName, null);
         }
 
-        String uri = wsdlEndpoint.getWsdlURI();
+        String uri = wsdlEndpoint.getOriginalWsdlURI();
         if (uri != null) {
             wsdlElement.addAttribute("uri", uri, null);
         }

From 209d4a249cdcd1c1e0a8b5ab4bd65c97345cc27a Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Wed, 14 Sep 2022 23:57:18 +0530
Subject: [PATCH 43/51] Update with getters for injected parameter values

---
 .../config/xml/endpoints/WSDLEndpointFactory.java        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
index 61a0249e8..974066ca4 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
@@ -129,7 +129,7 @@ protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
                     String synapseHome = properties.get(SynapseConstants.SYNAPSE_HOME) != null ?
                             properties.get(SynapseConstants.SYNAPSE_HOME).toString() : "";
                     try {
-                        OMNode wsdlOM = SynapseConfigUtils.getOMElementFromURL(new URL(wsdlURI)
+                        OMNode wsdlOM = SynapseConfigUtils.getOMElementFromURL(new URL(wsdlEndpoint.getWsdlURI())
                                 .toString(), synapseHome);
                         if (wsdlOM != null && wsdlOM instanceof OMElement) {
                             OMElement omElement = (OMElement) wsdlOM;
@@ -138,10 +138,11 @@ protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
                                 String nsUri = omElement.getNamespace().getNamespaceURI();
                                 if (org.apache.axis2.namespace.Constants.NS_URI_WSDL11.equals(nsUri)) {
                                     URI baseURI = SynapseConfigUtils.resolveRelativeURI(
-                                            new URI(wsdlURI), synapseHome);
+                                            new URI(wsdlEndpoint.getWsdlURI()), synapseHome);
                                     new WSDL11EndpointBuilder().
                                             populateEndpointDefinitionFromWSDL(endpoint,
-                                                    baseURI.toString(), omElement, serviceName, portName);
+                                                baseURI.toString(), omElement, wsdlEndpoint.getServiceName(),
+                                                wsdlEndpoint.getPortName());
 
                                 } else if (WSDL2Constants.WSDL_NAMESPACE.equals(nsUri)) {
                                     //endpoint = new WSDL20EndpointBuilder().
@@ -174,7 +175,7 @@ protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
                         baseUri = baseUri + File.separator;
                     }
                     new WSDL11EndpointBuilder().populateEndpointDefinitionFromWSDL(endpoint,
-                            baseUri, definitionElement, serviceName, portName);
+                            baseUri, definitionElement, wsdlEndpoint.getServiceName(), wsdlEndpoint.getPortName());
                 } else {
                     endpoint = new EndpointDefinition();
                 }

From 2ea572f57bd5296788bb3ba416660d26669f5a07 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Wed, 14 Sep 2022 23:59:15 +0530
Subject: [PATCH 44/51] Add new parameter injection and retrieval

---
 .../synapse/endpoints/WSDLEndpoint.java       | 34 ++++++++++++++-----
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
index 3a64a281c..8043907f3 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
@@ -40,6 +40,10 @@ public class WSDLEndpoint extends AbstractEndpoint {
     private String serviceName;
     private String portName;
 
+    private String originalWsdlURI;
+    private String originalWsdlPort;
+    private String getOriginalWsdlServiceName;
+
     public void onFault(MessageContext synCtx) {
         
         // is this an actual leaf endpoint
@@ -75,10 +79,14 @@ public String getWsdlURI() {
         return wsdlURI;
     }
 
+    public String getOriginalWsdlURI() {
+        return this.originalWsdlURI;
+    }
+
     public void setWsdlURI(String wsdlURI) {
-        String injectedURI = ConfigUtils.fetchEnvironmentVariables(wsdlURI);
-        log.debug("WSDL URI " + wsdlURI + " replaced with " + injectedURI);
-        this.wsdlURI = injectedURI;
+        this.originalWsdlURI = wsdlURI;
+        String fetchedURI = ConfigUtils.fetchEnvironmentVariables(wsdlURI);
+        this.wsdlURI = fetchedURI;
     }
 
     public OMElement getWsdlDoc() {
@@ -93,19 +101,27 @@ public String getServiceName() {
         return serviceName;
     }
 
+    public String getGetOriginalWsdlServiceName() {
+        return this.getOriginalWsdlServiceName;
+    }
+
     public void setServiceName(String serviceName) {
-        String injectedServiceName = ConfigUtils.fetchEnvironmentVariables(serviceName);
-        log.debug("WSDL service name " + serviceName + " replaced with " + injectedServiceName);
-        this.serviceName = injectedServiceName;
+        this.getOriginalWsdlServiceName = serviceName;
+        String fetchedServiceName = ConfigUtils.fetchEnvironmentVariables(serviceName);
+        this.serviceName = fetchedServiceName;
     }
 
     public String getPortName() {
         return portName;
     }
 
+    public String getOriginalWsdlPort() {
+        return this.originalWsdlPort;
+    }
+
     public void setPortName(String portName) {
-        String injectedPortName = ConfigUtils.fetchEnvironmentVariables(portName);
-        log.debug("WSDL port name " + portName + " replaced with " + injectedPortName);
-        this.portName = injectedPortName;
+        this.originalWsdlPort = portName;
+        String fetchedPortName = ConfigUtils.fetchEnvironmentVariables(portName);
+        this.portName = fetchedPortName;
     }
 }

From 40a997382eb53eae656a5fe67850c16573760481 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Thu, 15 Sep 2022 00:00:17 +0530
Subject: [PATCH 45/51] Enable WSDL endpoint parameter injection unit tests

---
 .../xml/SendMediatorSerializationTest.java    | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java b/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
index cbe049ca4..b9823128a 100644
--- a/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
@@ -114,7 +114,6 @@ public void testAddressEndpointSerializationWithParameterInjection() {
     }
 
 
-    /**
     public void testWSDLEndpointSerialization() {
         String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
                      "<endpoint>" +
@@ -150,26 +149,18 @@ public void testWSDLEndpointSerialization() {
                 ep1.getDefinition().isAddressingOn(),
                 ep2.getDefinition().isAddressingOn());
     }
-    */
 
-    /**
+
+
     public void testWSDLEndpointSerializationWithParameterInjection() {
-//
-//        String inputXML = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
-//                                "<endpoint>" +
-//                                    "<wsdl uri=\"$SYSTEM:WSDL_SERVICE_TEST_URI\" service='esbservice' " +
-//                                    "port=\"$SYSTEM:WSDL_SERVICE_TEST_PORT\">" +
-//                                        "<enableAddressing/>" +
-//                                    "</wsdl>" +
-//                                "</endpoint>" +
-//                            "</send>";
         String inputXML = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
-                "<endpoint>" +
-                "<wsdl uri='file:src/test/resources/esbservice.wsdl' service='esbservice' port=\"$SYSTEM:WSDL_SERVICE_TEST_PORT\">" +
-                "<enableAddressing/>" +
-                "</wsdl>" +
-                "</endpoint>" +
-                "</send>";
+                                "<endpoint>" +
+                                    "<wsdl uri=\"$SYSTEM:WSDL_SERVICE_TEST_URI\" service='esbservice' " +
+                                    "port=\"$SYSTEM:WSDL_SERVICE_TEST_PORT\">" +
+                                        "<enableAddressing/>" +
+                                    "</wsdl>" +
+                                "</endpoint>" +
+                            "</send>";
         OMElement config1 = createOMElement(inputXML);
         SendMediator send1 = (SendMediator) factory.createMediator(config1, new Properties());
 
@@ -190,10 +181,9 @@ public void testWSDLEndpointSerializationWithParameterInjection() {
         assertEquals("Port name is not serialized properly", ep1.getPortName(), ep2.getPortName());
         assertEquals("WSDL URI is not serialized properly", ep1.getWsdlURI(), ep2.getWsdlURI());
     }
-    */
 
-    public void testSimpleLoadbalanceSendSerialization() {
 
+    public void testSimpleLoadbalanceSendSerialization() {
         String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
                 "<endpoint>" +
                     "<loadbalance>" +

From 2b1e2265bb309b6d520ca5bd2adcee811f916066 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Thu, 15 Sep 2022 00:09:51 +0530
Subject: [PATCH 46/51] Add missing override @ annotation

---
 .../src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
index 8043907f3..94129e4a7 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
@@ -44,6 +44,7 @@ public class WSDLEndpoint extends AbstractEndpoint {
     private String originalWsdlPort;
     private String getOriginalWsdlServiceName;
 
+    @Override
     public void onFault(MessageContext synCtx) {
         
         // is this an actual leaf endpoint

From 048fe2d6c440af65669c13830d486d9fa7a741fa Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 25 Sep 2022 20:47:23 +0530
Subject: [PATCH 47/51] Remove unused prefix constant

---
 .../synapse/config/xml/endpoints/AddressEndpointFactory.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
index 30077d26a..1bb96a32f 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
@@ -62,7 +62,6 @@
  */
 public class AddressEndpointFactory extends DefaultEndpointFactory {
 
-    private static final String SYSTEM_VARIABLE_PREFIX = "$SYSTEM";
     private static final Log LOG = LogFactory.getLog(AddressEndpointFactory.class);
     private static AddressEndpointFactory instance = new AddressEndpointFactory();
 

From 60c9ddc3be1a79d06a8e2fa597ba340d2abbf209 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 25 Sep 2022 20:47:56 +0530
Subject: [PATCH 48/51] Change method to startsWith

---
 .../apache/synapse/config/xml/endpoints/utils/ConfigUtils.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/ConfigUtils.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/ConfigUtils.java
index cbea40f5c..70f7cd522 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/ConfigUtils.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/ConfigUtils.java
@@ -25,7 +25,7 @@ public class ConfigUtils {
 
     public static String fetchEnvironmentVariables(String parameter) {
         String injectedValue = parameter;
-        if (parameter.contains(SynapseConstants.SYSTEM_VARIABLE_PREFIX)) {
+        if (parameter.startsWith(SynapseConstants.SYSTEM_VARIABLE_PREFIX)) {
             String extractedEnvVariableKey = parameter.substring(parameter.lastIndexOf(":") + 1);
             injectedValue = System.getenv(extractedEnvVariableKey);
         }

From 80314352fca33dba35454bd2aa6af3402fa8b151 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 25 Sep 2022 20:51:36 +0530
Subject: [PATCH 49/51] Amend setAddress method

Assign fetchEnvVariable function to this.address
---
 .../java/org/apache/synapse/endpoints/EndpointDefinition.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java b/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
index 190c72097..883554e61 100755
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
@@ -217,8 +217,7 @@ public String getAddress(MessageContext messageContext) {
      */
     public void setAddress(String address) {
         this.originalAddress = address;
-        String fetchedAddress = ConfigUtils.fetchEnvironmentVariables(address);
-        this.address = fetchedAddress;
+        this.address = ConfigUtils.fetchEnvironmentVariables(address);
     }
 
     /**

From 9d048ed5b9546a1e670131114c84df3a6e67ad50 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 25 Sep 2022 20:52:30 +0530
Subject: [PATCH 50/51] Add test scope and remove unnecessary repository

---
 modules/core/pom.xml |  1 +
 pom.xml              | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index d6b94bc0c..142361d21 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -162,6 +162,7 @@
                     </systemProperties>
                     <environmentVariables>
                         <SOAP_SERVICE_TEST>http://localhost:9000/services/SimpleStockQuoteService</SOAP_SERVICE_TEST>
+                        <scope>test</scope>
                     </environmentVariables>
                     <forkMode>pertest</forkMode>
                     <!--<redirectTestOutputToFile>true</redirectTestOutputToFile>-->
diff --git a/pom.xml b/pom.xml
index 2dff1c80e..c7a627041 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,6 +285,7 @@
                             <SOAP_SERVICE_TEST>http://localhost:9000/services/MyService1</SOAP_SERVICE_TEST>
                             <WSDL_SERVICE_TEST_URI>file:src/test/resources/esbservice.wsdl</WSDL_SERVICE_TEST_URI>
                             <WSDL_SERVICE_TEST_PORT>esbserviceSOAP11port_http</WSDL_SERVICE_TEST_PORT>
+                            <scope>test</scope>
                         </environmentVariables>
                     </configuration>
                 </plugin>
@@ -1119,15 +1120,6 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-        <repository>
-            <id>central</id>
-            <name>Central Repository</name>
-            <url>https://repo.maven.apache.org/maven2</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
         <!--repository>
             <id>wso2-m2-snapshots</id>
             <name>WSO2 Maven 2 SNAPSHOTS Repository</name>

From 61fb9e4da909b00d6da8dfe9fb57a3c0a5892793 Mon Sep 17 00:00:00 2001
From: n-jay <nuwanjayawardene@gmail.com>
Date: Sun, 25 Sep 2022 20:53:33 +0530
Subject: [PATCH 51/51] Amend function assignment and add javadoc comments

---
 .../synapse/endpoints/WSDLEndpoint.java       | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
index 33e79fcfd..97fe5d3e0 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
@@ -83,14 +83,18 @@ public String getWsdlURI() {
         return wsdlURI;
     }
 
+    /**
+     * Retrieve originally set WSDL URI before resolution
+     *
+     * @return original URI string value
+     */
     public String getOriginalWsdlURI() {
         return this.originalWsdlURI;
     }
 
     public void setWsdlURI(String wsdlURI) {
         this.originalWsdlURI = wsdlURI;
-        String fetchedURI = ConfigUtils.fetchEnvironmentVariables(wsdlURI);
-        this.wsdlURI = fetchedURI;
+        this.wsdlURI = ConfigUtils.fetchEnvironmentVariables(wsdlURI);
     }
 
     public OMElement getWsdlDoc() {
@@ -105,14 +109,18 @@ public String getServiceName() {
         return serviceName;
     }
 
+    /**
+     * Retrieve originally set service name before resolution
+     *
+     * @return original service name string value
+     */
     public String getGetOriginalWsdlServiceName() {
         return this.getOriginalWsdlServiceName;
     }
 
     public void setServiceName(String serviceName) {
         this.getOriginalWsdlServiceName = serviceName;
-        String fetchedServiceName = ConfigUtils.fetchEnvironmentVariables(serviceName);
-        this.serviceName = fetchedServiceName;
+        this.serviceName = ConfigUtils.fetchEnvironmentVariables(serviceName);
     }
 
     public String getPortName() {
@@ -125,7 +133,6 @@ public String getOriginalWsdlPort() {
 
     public void setPortName(String portName) {
         this.originalWsdlPort = portName;
-        String fetchedPortName = ConfigUtils.fetchEnvironmentVariables(portName);
-        this.portName = fetchedPortName;
+        this.portName = ConfigUtils.fetchEnvironmentVariables(portName);
     }
 }