incorporate recent development changes

Author: Petr Matousek

src/api/qpid-proton/reactor/handler/TxReceiverHandler.cpp

@@ -156,7 +156,7 @@ void TxReceiverHandler::on_transaction_declared(session s) {
         batch_size = count;
     }
     logger(trace) << "[on_transaction_declared] txn called " << (&s);
-    logger(debug) << "[on_transaction_declared] txn is_empty " << (s.txn_is_empty());
+    logger(debug) << "[on_transaction_declared] txn is_empty " << (s.transaction_is_empty());
 }
 
 void TxReceiverHandler::on_transaction_aborted(session s) {
@@ -371,7 +371,7 @@ void TxReceiverHandler::on_message(delivery &d, message &m)
     // TODO legit?
     session s = d.session();
 
-    s.txn_accept(d);
+    s.transaction_accept(d);
     current_batch += 1;
 
     logger(debug) << "[on_message] current batch: " << current_batch;
@@ -440,9 +440,9 @@ void TxReceiverHandler::on_message(delivery &d, message &m)
     if(current_batch == batch_size) {
         logger(debug) << "[send] Transaction attempt: " << tx_action;
         if (tx_action == "commit") {
-            s.txn_commit();
+            s.transaction_commit();
         } else if (tx_action == "rollback") {
-            s.txn_abort();
+            s.transaction_abort();
         }
 
         if (tx_action == "none") {
@@ -462,9 +462,9 @@ void TxReceiverHandler::on_message(delivery &d, message &m)
     } else if (count != 0 && processed + current_batch == count) {
         logger(debug) << "[send] Transaction attempt (endloop): " << tx_endloop_action;
         if (tx_endloop_action == "commit") {
-            s.txn_commit();
+            s.transaction_commit();
         } else if (tx_endloop_action == "rollback") {
-            s.txn_abort();
+            s.transaction_abort();
         } else {
           recv.connection().close();
         }

src/api/qpid-proton/reactor/handler/TxReceiverHandler.h

@@ -14,11 +14,10 @@
 #ifndef TXRECEIVERHANDLER_H
 #define TXRECEIVERHANDLER_H
 
-#include <proton/transaction.hpp>
+#include <proton/transaction_handler.hpp>
 
 #include "ReceiverHandler.h"
 
-using proton::transaction;
 using proton::session;
 using proton::transaction_handler;
 

src/api/qpid-proton/reactor/handler/TxSenderHandler.cpp

@@ -152,12 +152,12 @@ void TxSenderHandler::send(session s)
     }
 
 
-    logger(trace) << "[send] Transaction is empty: " << s.txn_is_empty();
+    logger(trace) << "[send] Transaction is empty: " << s.transaction_is_empty();
     logger(debug) << "[send] Messages processed: " << processed;
     logger(trace) << "[send] Current batch: " << current_batch;
-    while (s.txn_is_declared() && sndr.credit() && (processed + current_batch) < count)
+    while (s.transaction_is_declared() && sndr.credit() && (processed + current_batch) < count)
     {
-        s.txn_send(sndr, message_to_send);
+        sndr.send(message_to_send);
         current_batch += 1;
 
         if (log_msgs == "dict") {
@@ -187,9 +187,9 @@ void TxSenderHandler::send(session s)
         if(current_batch == batch_size) {
             logger(debug) << "[send] Transaction attempt: " << tx_action;
             if (tx_action == "commit") {
-                s.txn_commit();
+                s.transaction_commit();
             } else if (tx_action == "rollback") {
-                s.txn_abort();
+                s.transaction_abort();
             }
 
             if (tx_action == "none") {
@@ -204,9 +204,9 @@ void TxSenderHandler::send(session s)
         } else if (processed + current_batch == count) {
             logger(debug) << "[send] Transaction attempt (endloop): " << tx_endloop_action;
             if (tx_endloop_action == "commit") {
-                s.txn_commit();
+                s.transaction_commit();
             } else if (tx_endloop_action == "rollback") {
-                s.txn_abort();
+                s.transaction_abort();
             }
             sndr.connection().close();
         }
@@ -241,8 +241,8 @@ void TxSenderHandler::on_connection_close(connection &c)
 
 void TxSenderHandler::on_transaction_declared(session s) {
     logger(trace) << "[on_transaction_declared] txn called " << (&s);
-    logger(trace) << "[on_transaction_declared] txn is_empty " << (s.txn_is_empty())
-                  << "\t" << s.txn_is_empty();
+    logger(trace) << "[on_transaction_declared] txn is_empty " << (s.transaction_is_empty())
+                  << "\t" << s.transaction_is_empty();
     send(s);
 }
 

src/api/qpid-proton/reactor/handler/TxSenderHandler.h

@@ -14,11 +14,10 @@
 #ifndef TXSENDERHANDLER_H
 #define TXSENDERHANDLER_H
 
-#include <proton/transaction.hpp>
+#include <proton/transaction_handler.hpp>
 
 #include "SenderHandler.h"
 
-using proton::transaction;
 using proton::session;
 using proton::transaction_handler;