Remove existing transaction counter

wso2 · Nov 1, 2023 · 44e003c · 44e003c
1 parent 06c15ef
commit 44e003c
Show file tree

Hide file tree

Showing 51 changed files with 3 additions and 3,150 deletions.
diff --git a/...ndpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/jms/JMSInjectHandler.java b/...ndpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/jms/JMSInjectHandler.java
@@ -152,9 +152,6 @@ public boolean invoke(Object object, String name) throws SynapseException {
             }
             axis2MsgCtx.setProperty(MessageContext.TRANSPORT_HEADERS, transportHeaders);
 
-            // set transaction property
-            axis2MsgCtx.setProperty(BaseConstants.INTERNAL_TRANSACTION_COUNTED,
-                                    msg.getBooleanProperty(BaseConstants.INTERNAL_TRANSACTION_COUNTED));
             // set the JMS Message ID as the Message ID of the MessageContext
             try {
                 if (msg.getJMSMessageID() != null) {

diff --git a/...nbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/jms/JMSUtils.java b/...nbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/jms/JMSUtils.java
@@ -429,10 +429,6 @@ public static Map<String, Object> getTransportHeaders(Message message, MessageCo
             log.error("Error while reading the Transport Headers from JMS Message", e);
         }
 
-        // remove "INTERNAL_TRANSACTION_COUNTED" header from the transport level headers map.
-        // this property will be maintained in the message context. Therefore, no need to set this in the transport
-        // headers.
-        map.remove(BaseConstants.INTERNAL_TRANSACTION_COUNTED);
         return map;
     }
 

diff --git a/...or.management.apis/src/main/java/org/wso2/micro/integrator/management/apis/Constants.java b/...or.management.apis/src/main/java/org/wso2/micro/integrator/management/apis/Constants.java
@@ -52,11 +52,9 @@ public class Constants {
     public static final String PREFIX_LOGOUT = "/logout";
     public static final String PREFIX_SERVER_DATA = "/server";
     public static final String PREFIX_LOG_FILES = "/logs";
-    public static final String PREFIX_TRANSACTION = "/transactions";
     public static final String PREFIX_DATA_SOURCES = "/data-sources";
     public static final String PREFIX_ROLES = "/roles";
     public static final String PATH_PARAM_ROLE = "/" + "{role}";
-    public static final String PATH_PARAM_TRANSACTION = "/" + "{param}";
     public static final String ROOT_CONTEXT = "/";
     public static final String PREFIX_CONFIGS = "/configs";
 

diff --git a/...t.apis/src/main/java/org/wso2/micro/integrator/management/apis/ManagementInternalApi.java b/...t.apis/src/main/java/org/wso2/micro/integrator/management/apis/ManagementInternalApi.java
@@ -32,7 +32,6 @@
 import static org.wso2.micro.integrator.management.apis.Constants.PATH_PARAM_CARBON_APP_NAME;
 import static org.wso2.micro.integrator.management.apis.Constants.PATH_PARAM_EXTERNAL_VAULT_NAME;
 import static org.wso2.micro.integrator.management.apis.Constants.PATH_PARAM_ROLE;
-import static org.wso2.micro.integrator.management.apis.Constants.PATH_PARAM_TRANSACTION;
 import static org.wso2.micro.integrator.management.apis.Constants.PATH_PARAM_USER;
 import static org.wso2.micro.integrator.management.apis.Constants.PREFIX_APIS;
 import static org.wso2.micro.integrator.management.apis.Constants.PREFIX_CARBON_APPS;
@@ -55,7 +54,6 @@
 import static org.wso2.micro.integrator.management.apis.Constants.PREFIX_SERVER_DATA;
 import static org.wso2.micro.integrator.management.apis.Constants.PREFIX_TASKS;
 import static org.wso2.micro.integrator.management.apis.Constants.PREFIX_TEMPLATES;
-import static org.wso2.micro.integrator.management.apis.Constants.PREFIX_TRANSACTION;
 import static org.wso2.micro.integrator.management.apis.Constants.PREFIX_USERS;
 import static org.wso2.micro.integrator.management.apis.Constants.REST_API_CONTEXT;
 import static org.wso2.micro.integrator.management.apis.Constants.ROOT_CONTEXT;
@@ -101,8 +99,6 @@ public ManagementInternalApi() {
         resourcesList.add(new ApiResourceAdapter(PREFIX_LOGOUT, new LogoutResource()));
         resourcesList.add(new ApiResourceAdapter(PREFIX_SERVER_DATA, new MetaDataResource()));
         resourcesList.add(new LogFilesResource(PREFIX_LOG_FILES));
-        resourcesList.add(new ApiResourceAdapter(PREFIX_TRANSACTION + PATH_PARAM_TRANSACTION,
-                                                 new RequestCountResource()));
         resourcesList.add(new ExternalVaultResource(PREFIX_EXTERNAL_VAULTS
                 + PATH_PARAM_EXTERNAL_VAULT_NAME));
         resourcesList.add(new ApiResourceAdapter(PREFIX_DATA_SOURCES, new DataSourceResource()));

diff --git a/...nt.apis/src/main/java/org/wso2/micro/integrator/management/apis/RequestCountResource.java b/...nt.apis/src/main/java/org/wso2/micro/integrator/management/apis/RequestCountResource.java