Skip to content

Reverts: https://github.com/wso2/wso2-synapse/pull/2407 #2413

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 1 commit into from
Oct 10, 2025
Merged

Reverts: https://github.com/wso2/wso2-synapse/pull/2407 #2413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 4 deletions modules/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,6 @@
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-commons</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.config.mapper</groupId>
<artifactId>config-mapper</artifactId>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-tasks</artifactId>
Expand Down
63 changes: 0 additions & 63 deletions modules/core/src/main/java/org/apache/synapse/AckDecisionSetter.java
View file
Open in desktop

This file was deleted.

154 changes: 0 additions & 154 deletions modules/core/src/main/java/org/apache/synapse/CallbackAckConfigUtil.java
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,6 @@ public static final class Axis2Param {
//- Axis2 Message Context Properties used by Synapse -
/** an axis2 message context property set to hold the relates to for POX responses */
public static final String RELATES_TO_FOR_POX = "synapse.RelatesToForPox";
public static final String CLIENT_API_NON_BLOCKING = "ClientApiNonBlocking";
public static final String ENABLE_CLIENT_API_NON_BLOCKING_MODE = "enable_client_api_nonblocking_mode";

/** an axis2 message context property set to indicate this is a response message for Synapse */
public static final String ISRESPONSE_PROPERTY = "synapse.isresponse";

Expand Down Expand Up @@ -391,13 +388,6 @@ public static final class Axis2Param {
// - Blocking Message Sender Constants
public static final String BLOCKING_SENDER_ERROR = "blocking.sender.error";
public static final String SET_ROLLBACK_ONLY = "SET_ROLLBACK_ONLY";
public static final String SET_REQUEUE_ON_ROLLBACK = "SET_REQUEUE_ON_ROLLBACK";
public static final String ACK_ON_SUCCESS = "ACKNOWLEDGE";
public static final String MESSAGING_CALLBACK_CONFIGS = "messaging_callback";
public static final String CALLBACK_CONTROLLED_ACK = "callback_controlled_ack_enabled";
public static final String PRESERVE_PAYLOAD_ON_TIMEOUT = "preserve_payload_on_timeout";
public static final String ACKNOWLEDGEMENT_DECISION = "ACK_DECISION";

public static final String HTTP_SC = "HTTP_SC";
public static final String HTTP_SENDER_STATUSCODE = "transport.http.statusCode";
public static final String BLOCKING_SENDER_PRESERVE_REQ_HEADERS =
Expand Down
2 changes: 0 additions & 2 deletions modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ public void executeImpl(boolean block) throws AxisFault {
axisCallback).getSynapseOutMsgCtx()).getAxis2MessageContext().setProperty(
NhttpConstants.IGNORE_SC_ACCEPTED, Constants.VALUE_TRUE);
callbackReceiver.addCallback(outMsgCtx.getMessageID(), axisCallback);
callbackReceiver.setClientApiNonBlockingEnabled(outMsgCtx);

EndpointReference replyToFromTransport = outMsgCtx.getConfigurationContext()
.getListenerManager().getEPRforService(sc.getAxisService().getName(),
Expand All @@ -186,7 +185,6 @@ public void executeImpl(boolean block) throws AxisFault {
SynapseCallbackReceiver callbackReceiver =
(SynapseCallbackReceiver) axisOp.getMessageReceiver();
callbackReceiver.addCallback(outMsgCtx.getMessageID(), axisCallback);
callbackReceiver.setClientApiNonBlockingEnabled(outMsgCtx);
send(outMsgCtx);
}
}
Expand Down
26 changes: 0 additions & 26 deletions modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.nio.NHttpServerConnection;
import org.apache.synapse.CallbackAckConfigUtil;
import org.apache.synapse.ContinuationState;
import org.apache.synapse.FaultHandler;
import org.apache.synapse.ServerContextInformation;
Expand Down Expand Up @@ -84,8 +83,6 @@
public class SynapseCallbackReceiver extends CallbackReceiver {

private static final Log log = LogFactory.getLog(SynapseCallbackReceiver.class);
private final boolean isCallbackControlledAckEnabled;
private final boolean isClientApiNonBlockingModeEnabled;

/**
* Create the *single* instance of this class that would be used by all anonymous services
Expand All @@ -98,8 +95,6 @@ public SynapseCallbackReceiver(SynapseConfiguration synCfg,

// create the Timer object and a TimeoutHandler task
TimeoutHandler timeoutHandler = new TimeoutHandler(callbackStore, contextInformation);
isCallbackControlledAckEnabled = CallbackAckConfigUtil.isCallbackControlledAckEnabled();
isClientApiNonBlockingModeEnabled = CallbackAckConfigUtil.isClientApiNonBlockingModeEnabled();
Timer timeOutTimer = synCfg.getSynapseTimer();
long timeoutHandlerInterval = SynapseConfigUtils.getTimeoutHandlerInterval();

Expand All @@ -122,22 +117,6 @@ public void addCallback(String MsgID, AxisCallback callback) {
}
}

/**
* Set the CLIENT_API_NON_BLOCKING property to the outgoing message context if
* Callback Controlled Ack and Client API Non Blocking Mode are enabled and
* the transport is RabbitMQ.
*
* @param outMsgContext the outgoing message context
*/
public void setClientApiNonBlockingEnabled(MessageContext outMsgContext) {
if (outMsgContext != null) {
if (isCallbackControlledAckEnabled && isClientApiNonBlockingModeEnabled
&& CallbackAckConfigUtil.isRabbitMQTransport(outMsgContext)) {
outMsgContext.setProperty(SynapseConstants.CLIENT_API_NON_BLOCKING, Boolean.TRUE);
}
}
}

/**
* Everytime a response message is received this method gets invoked. It will then select
* the outgoing *Synapse* message context for the reply we received, and determine what action
Expand Down Expand Up @@ -283,11 +262,6 @@ private void handleMessage(String messageID ,MessageContext response,
configurator.applyTenantInfo(synapseOutMsgCtx);
}

// set the ACK/NACK decision to the response message context
MessageContext synOutMessageCtx = ((Axis2MessageContext) synapseOutMsgCtx).getAxis2MessageContext();
response.setProperty(SynapseConstants.ACKNOWLEDGEMENT_DECISION, synOutMessageCtx
.getProperty(SynapseConstants.ACKNOWLEDGEMENT_DECISION));

Boolean isConcurrencyThrottleEnabled = (Boolean) synapseOutMsgCtx
.getProperty(SynapseConstants.SYNAPSE_CONCURRENCY_THROTTLE);

Expand Down
Loading
Loading