Skip to content

Fix connector deployment issue in unit tests #2418

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 20, 2025
Merged

Fix connector deployment issue in unit tests #2418

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9bee97e
Fix connector deployment issue in unit tests
SanojPunchihewa Oct 17, 2025
838253c
Set artifact Identifier property to Class mediators
SanojPunchihewa Oct 20, 2025
12d94f4
Remove fully qualified name from inbound endpoints
SanojPunchihewa Oct 20, 2025
f474706
Bump axis2 version and add inbound factory test for versioned deployment
SanojPunchihewa Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions modules/core/src/main/java/org/apache/synapse/config/xml/inbound/InboundEndpointFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion modules/core/src/main/java/org/apache/synapse/libraries/util/LibDeployerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 11 additions & 0 deletions modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ public abstract class AbstractMediator implements Mediator, AspectConfigurable {
private boolean isSkipEnabled = false;

private SynapseMediationFlowPoint flowPoint = null;
private String artifactIdentifier;


/**
Expand Down Expand Up @@ -567,4 +568,14 @@ protected MediatorFaultHandler getLastSequenceFaultHandler(MessageContext synCtx
}
return null;
}

public String getArtifactIdentifier() {

return artifactIdentifier;
}

public void setArtifactIdentifier(String artifactIdentifier) {

this.artifactIdentifier = artifactIdentifier;
}
}
3 changes: 1 addition & 2 deletions modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading