Merge pull request #2418 from SanojPunchihewa/bug-fixes-api

SanojPunchihewa · web-flow · commit 35cce2add802 · 2025-10-20T14:25:44.000+05:30
Fix connector deployment issue in unit tests
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
@@ -25,6 +25,7 @@
 import org.apache.synapse.Mediator;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.SynapseConstants;
+import org.apache.synapse.mediators.AbstractMediator;
 import org.apache.synapse.mediators.ext.ClassMediator;
 import org.apache.synapse.mediators.v2.Utils;
 import org.apache.synapse.mediators.v2.ext.AbstractClassMediator;
@@ -118,6 +119,9 @@ public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         try {
             mediator = (Mediator) clazz.newInstance();
+            if (mediator instanceof AbstractMediator && FactoryUtils.isVersionedDeployment(properties)) {
+                ((AbstractMediator) mediator).setArtifactIdentifier(properties.getProperty(SynapseConstants.SYNAPSE_ARTIFACT_IDENTIFIER));
+            }
         } catch (Throwable e) {
             String msg = "Error in instantiating class : " + name.getAttributeValue();
             log.error(msg, e);
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/inbound/InboundEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/inbound/InboundEndpointFactory.java
@@ -63,8 +63,7 @@ public static InboundEndpoint createInboundEndpoint(OMElement inboundEndpointEle
 
         InboundEndpoint inboundEndpoint = new InboundEndpoint();
         if (inboundEndpointElem.getAttributeValue(ATT_NAME) != null) {
-            inboundEndpoint.setName(FactoryUtils.getFullyQualifiedName(properties,
-                    inboundEndpointElem.getAttributeValue(ATT_NAME)));
+            inboundEndpoint.setName(inboundEndpointElem.getAttributeValue(ATT_NAME));
         } else {
             String msg = "Inbound Endpoint name cannot be null";
             log.error(msg);
diff --git a/modules/core/src/main/java/org/apache/synapse/libraries/util/LibDeployerUtils.java b/modules/core/src/main/java/org/apache/synapse/libraries/util/LibDeployerUtils.java
@@ -218,7 +218,7 @@ private static SynapseLibrary createSynapseLibraryWithDeps(OMElement artifactEle
         }
         String packageName = readAttribute(artifactEle, LibDeployerConstants.PACKAGE_ATTR);
         SynapseLibrary synLib;
-        if (deploymentFileData.isVersionedDeployment()) {
+        if (deploymentFileData != null && deploymentFileData.isVersionedDeployment()) {
             synLib = new SynapseLibrary(deploymentFileData.getArtifactIdentifier(), readAttribute(artifactEle, LibDeployerConstants.NAME),
                     packageName);
         } else {
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
@@ -72,6 +72,7 @@ public abstract class AbstractMediator implements Mediator, AspectConfigurable {
     private boolean isSkipEnabled = false;
 
     private SynapseMediationFlowPoint flowPoint = null;
+    private String artifactIdentifier;
 
 
     /**
@@ -567,4 +568,14 @@ protected MediatorFaultHandler getLastSequenceFaultHandler(MessageContext synCtx
         }
         return null;
     }
+
+    public String getArtifactIdentifier() {
+
+        return artifactIdentifier;
+    }
+
+    public void setArtifactIdentifier(String artifactIdentifier) {
+
+        this.artifactIdentifier = artifactIdentifier;
+    }
 }
diff --git a/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java b/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java
@@ -136,8 +136,7 @@ private void updateTaskForVersioning(TaskDescription taskDescription, Properties
 
         taskDescription.setName(FactoryUtils.getFullyQualifiedName(properties, taskDescription.getName()));
         taskDescription.getXmlProperties().forEach(prop -> {
-            if (prop.getAttributeValue(NAME).equals("sequenceName")
-                    || prop.getAttributeValue(NAME).equals("proxyName")) {
+            if (prop.getAttributeValue(NAME).equals("sequenceName")) {
                 prop.setText(FactoryUtils.getFullyQualifiedName(properties, prop.getText()));
                 String value = prop.getAttributeValue(VALUE);
                 if (value != null) {
diff --git a/modules/core/src/test/java/org/apache/synapse/endpoints/dynamic/InboundEndpointTestCase.java b/modules/core/src/test/java/org/apache/synapse/endpoints/dynamic/InboundEndpointTestCase.java
@@ -28,6 +28,8 @@
 import org.apache.synapse.config.xml.inbound.InboundEndpointSerializer;
 import org.apache.synapse.inbound.InboundEndpoint;
 
+import java.util.Properties;
+
 /**
  * Testing InboundEndpoint related operations
  */
@@ -73,6 +75,30 @@ public class InboundEndpointTestCase extends TestCase {
             + "<sequence xmlns=\"http://ws.apache.org/ns/synapse\" name=\"receiveSeq\">\n" + "    <send/>\n"
             + "</sequence>";
 
+    private static final String rabbitMQInbound = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+            "<inboundEndpoint name=\"RabbitMQInbound\" sequence=\"RabbitMQInbound-inboundSequence\" onError=\"RabbitMQInbound-inboundErrorSequence\" suspend=\"false\" protocol=\"rabbitmq\">\n" +
+            "    <parameters xmlns=\"http://ws.apache.org/ns/synapse\">\n" +
+            "        <parameter name=\"rabbitmq.connection.factory\">QueueConnectionFactory</parameter>\n" +
+            "        <parameter name=\"rabbitmq.server.host.name\">localhost</parameter>\n" +
+            "        <parameter name=\"rabbitmq.server.port\">5672</parameter>\n" +
+            "        <parameter name=\"rabbitmq.server.user.name\">guest</parameter>\n" +
+            "        <parameter name=\"rabbitmq.server.password\">guest</parameter>\n" +
+            "        <parameter name=\"rabbitmq.queue.name\">queue_transaction</parameter>\n" +
+            "        <parameter name=\"sequential\">true</parameter>\n" +
+            "        <parameter name=\"coordination\">true</parameter>\n" +
+            "        <parameter name=\"rabbitmq.queue.durable\">false</parameter>\n" +
+            "        <parameter name=\"rabbitmq.queue.exclusive\">false</parameter>\n" +
+            "        <parameter name=\"rabbitmq.queue.auto.delete\">false</parameter>\n" +
+            "        <parameter name=\"rabbitmq.queue.auto.ack\">false</parameter>\n" +
+            "        <parameter name=\"rabbitmq.queue.autodeclare\">false</parameter>\n" +
+            "        <parameter name=\"rabbitmq.exchange.durable\">false</parameter>\n" +
+            "        <parameter name=\"rabbitmq.exchange.auto.delete\">false</parameter>\n" +
+            "        <parameter name=\"rabbitmq.exchange.autodeclare\">false</parameter>\n" +
+            "        <parameter name=\"rabbitmq.connection.ssl.enabled\">false</parameter>\n" +
+            "        <parameter name=\"rabbitmq.channel.consumer.qos\">0</parameter>\n" +
+            "    </parameters>\n" +
+            "</inboundEndpoint>";
+
     public void testCreateValidInboundEP() throws Exception {
         ep = factory.createInboundEndpoint(AXIOMUtil.stringToOM(sampleEP), config);
         Assert.assertNotNull("Inbound Endpoint is null", ep);
@@ -110,4 +136,28 @@ public void testCreateInvalidInboundEP() throws Exception {
             Assert.assertEquals(e.getMessage().contains("Inbound Endpoint name cannot be null"), true);
         }
     }
+
+    public void testInboundEPWithVersionedDeployment() throws Exception {
+
+        Properties properties = new Properties();
+        properties.put("synapse.artifact.versioned.deployment", true);
+        properties.put("synapse.artifact.identifier", "com.microintegrator.projects__beta1__1.0.2");
+
+        ep = factory.createInboundEndpoint(AXIOMUtil.stringToOM(rabbitMQInbound), config, properties);
+        Assert.assertEquals("RabbitMQInbound", ep.getName());
+        Assert.assertEquals("com.microintegrator.projects__beta1__1.0.2__RabbitMQInbound-inboundSequence", ep.getInjectingSeq());
+        Assert.assertEquals("com.microintegrator.projects__beta1__1.0.2__RabbitMQInbound-inboundErrorSequence", ep.getOnErrorSeq());
+    }
+
+    public void testInboundEPWithNonVersionedDeployment() throws Exception {
+
+        Properties properties = new Properties();
+        properties.put("synapse.artifact.versioned.deployment", false);
+        properties.put("synapse.artifact.identifier", "com.microintegrator.projects__beta1__1.0.2");
+
+        ep = factory.createInboundEndpoint(AXIOMUtil.stringToOM(rabbitMQInbound), config, properties);
+        Assert.assertEquals("RabbitMQInbound", ep.getName());
+        Assert.assertEquals("RabbitMQInbound-inboundSequence", ep.getInjectingSeq());
+        Assert.assertEquals("RabbitMQInbound-inboundErrorSequence", ep.getOnErrorSeq());
+    }
 }
diff --git a/pom.xml b/pom.xml
@@ -1564,7 +1564,7 @@
       <mina.version>2.1.6</mina.version>
       <jms-1.1-spec.version>1.1</jms-1.1-spec.version>
       <!-- Axis2 and its dependencies -->
-      <axis2.version>1.6.1-wso2v112</axis2.version>
+      <axis2.version>1.6.1-wso2v113</axis2.version>
       <axis2.transport.version>2.0.0-wso2v77</axis2.transport.version>
       <axiom.version>1.2.11-wso2v30</axiom.version>
       <xml_schema.version>1.4.7</xml_schema.version>

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ private static SynapseLibrary createSynapseLibraryWithDeps(OMElement artifactEle`
`218`	`218`	`}`
`219`	`219`	`String packageName = readAttribute(artifactEle, LibDeployerConstants.PACKAGE_ATTR);`
`220`	`220`	`SynapseLibrary synLib;`
`221`		`- if (deploymentFileData.isVersionedDeployment()) {`
	`221`	`+ if (deploymentFileData != null && deploymentFileData.isVersionedDeployment()) {`
`222`	`222`	`synLib = new SynapseLibrary(deploymentFileData.getArtifactIdentifier(), readAttribute(artifactEle, LibDeployerConstants.NAME),`
`223`	`223`	`packageName);`
`224`	`224`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ public abstract class AbstractMediator implements Mediator, AspectConfigurable {`
`72`	`72`	`private boolean isSkipEnabled = false;`
`73`	`73`
`74`	`74`	`private SynapseMediationFlowPoint flowPoint = null;`
	`75`	`+ private String artifactIdentifier;`
`75`	`76`
`76`	`77`
`77`	`78`	`/**`
`@@ -567,4 +568,14 @@ protected MediatorFaultHandler getLastSequenceFaultHandler(MessageContext synCtx`
`567`	`568`	`}`
`568`	`569`	`return null;`
`569`	`570`	`}`
	`571`	`+`
	`572`	`+ public String getArtifactIdentifier() {`
	`573`	`+`
	`574`	`+ return artifactIdentifier;`
	`575`	`+ }`
	`576`	`+`
	`577`	`+ public void setArtifactIdentifier(String artifactIdentifier) {`
	`578`	`+`
	`579`	`+ this.artifactIdentifier = artifactIdentifier;`
	`580`	`+ }`
`570`	`581`	`}`