You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2016/01/20 16:05:53 UTC
[3/5] qpid-proton git commit: PROTON-1083: [C++ binding] Renamed
messaging_handler as simply handler - Now the API visible objects are
proton::event & proton::handler
PROTON-1083: [C++ binding] Renamed messaging_handler as simply handler
- Now the API visible objects are proton::event & proton::handler
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/3faacc52
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/3faacc52
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/3faacc52
Branch: refs/heads/master
Commit: 3faacc5258d957fbf1e4c3f0efebffb7a001ef03
Parents: d5c68c4
Author: Andrew Stitcher <as...@apache.org>
Authored: Tue Jan 19 15:41:40 2016 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Wed Jan 20 00:55:55 2016 -0500
----------------------------------------------------------------------
examples/cpp/broker.cpp | 2 +-
examples/cpp/broker.hpp | 4 +-
examples/cpp/client.cpp | 4 +-
examples/cpp/connection_options.cpp | 6 +-
examples/cpp/direct_recv.cpp | 4 +-
examples/cpp/direct_send.cpp | 4 +-
examples/cpp/helloworld.cpp | 4 +-
examples/cpp/helloworld_direct.cpp | 4 +-
examples/cpp/queue_browser.cpp | 4 +-
examples/cpp/recurring_timer.cpp | 8 +-
examples/cpp/selected_recv.cpp | 4 +-
examples/cpp/server.cpp | 4 +-
examples/cpp/server_direct.cpp | 4 +-
examples/cpp/simple_recv.cpp | 4 +-
examples/cpp/simple_send.cpp | 4 +-
examples/cpp/ssl.cpp | 6 +-
examples/cpp/ssl_client_cert.cpp | 6 +-
proton-c/bindings/cpp/CMakeLists.txt | 2 +-
.../cpp/include/proton/connection_engine.hpp | 4 +-
.../cpp/include/proton/connection_options.hpp | 2 +-
.../bindings/cpp/include/proton/container.hpp | 6 +-
.../bindings/cpp/include/proton/handler.hpp | 98 ++++++++++++++++++++
.../cpp/include/proton/link_options.hpp | 2 +-
.../cpp/include/proton/messaging_handler.hpp | 98 --------------------
.../cpp/include/proton/request_response.hpp | 2 +-
.../cpp/src/blocking_connection_impl.cpp | 4 +-
.../cpp/src/blocking_connection_impl.hpp | 4 +-
proton-c/bindings/cpp/src/blocking_fetcher.cpp | 2 +-
proton-c/bindings/cpp/src/blocking_fetcher.hpp | 4 +-
proton-c/bindings/cpp/src/connection_engine.cpp | 4 +-
.../bindings/cpp/src/connection_options.cpp | 4 +-
proton-c/bindings/cpp/src/container.cpp | 4 +-
proton-c/bindings/cpp/src/container_impl.hpp | 2 +-
proton-c/bindings/cpp/src/handler.cpp | 62 +++++++++++++
proton-c/bindings/cpp/src/link_options.cpp | 4 +-
proton-c/bindings/cpp/src/messaging_adapter.cpp | 2 +-
proton-c/bindings/cpp/src/messaging_adapter.hpp | 6 +-
proton-c/bindings/cpp/src/messaging_event.cpp | 2 +-
proton-c/bindings/cpp/src/messaging_handler.cpp | 62 -------------
tests/tools/apps/cpp/reactor_send.cpp | 6 +-
40 files changed, 231 insertions(+), 231 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/broker.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/broker.cpp b/examples/cpp/broker.cpp
index a98d43d..097a612 100644
--- a/examples/cpp/broker.cpp
+++ b/examples/cpp/broker.cpp
@@ -36,7 +36,7 @@ class broker {
public:
broker(const proton::url& url) : handler_(url, queues_) {}
- proton::messaging_handler& handler() { return handler_; }
+ proton::handler& handler() { return handler_; }
private:
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/broker.hpp
----------------------------------------------------------------------
diff --git a/examples/cpp/broker.hpp b/examples/cpp/broker.hpp
index c89eb5d..6b4096e 100644
--- a/examples/cpp/broker.hpp
+++ b/examples/cpp/broker.hpp
@@ -29,7 +29,7 @@
#include "proton/event.hpp"
#include "proton/message.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/sender.hpp"
#include "proton/url.hpp"
@@ -134,7 +134,7 @@ class queues {
/** Common handler logic for brokers. */
-class broker_handler : public proton::messaging_handler {
+class broker_handler : public proton::handler {
public:
broker_handler(queues& qs) : queues_(qs) {}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/client.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/client.cpp b/examples/cpp/client.cpp
index 704315b..60eb13b 100644
--- a/examples/cpp/client.cpp
+++ b/examples/cpp/client.cpp
@@ -22,13 +22,13 @@
#include "options.hpp"
#include "proton/container.hpp"
#include "proton/event.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/connection.hpp"
#include <iostream>
#include <vector>
-class client : public proton::messaging_handler {
+class client : public proton::handler {
private:
proton::url url;
std::vector<std::string> requests;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/connection_options.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/connection_options.cpp b/examples/cpp/connection_options.cpp
index e40dac5..10bd320 100644
--- a/examples/cpp/connection_options.cpp
+++ b/examples/cpp/connection_options.cpp
@@ -20,7 +20,7 @@
*/
#include "proton/container.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/event.hpp"
#include "proton/url.hpp"
#include "proton/transport.hpp"
@@ -29,7 +29,7 @@
using proton::connection_options;
-class handler_2 : public proton::messaging_handler {
+class handler_2 : public proton::handler {
void on_connection_open(proton::event &e) {
std::cout << "connection events going to handler_2" << std::endl;
std::cout << "connection max_frame_size: " << e.connection().transport().max_frame_size() <<
@@ -38,7 +38,7 @@ class handler_2 : public proton::messaging_handler {
}
};
-class main_handler : public proton::messaging_handler {
+class main_handler : public proton::handler {
private:
proton::url url;
handler_2 conn_handler;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/direct_recv.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/direct_recv.cpp b/examples/cpp/direct_recv.cpp
index b027ef4..56fa1e2 100644
--- a/examples/cpp/direct_recv.cpp
+++ b/examples/cpp/direct_recv.cpp
@@ -24,7 +24,7 @@
#include "proton/container.hpp"
#include "proton/acceptor.hpp"
#include "proton/event.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/link.hpp"
#include "proton/url.hpp"
#include "proton/value.hpp"
@@ -32,7 +32,7 @@
#include <iostream>
#include <map>
-class direct_recv : public proton::messaging_handler {
+class direct_recv : public proton::handler {
private:
proton::url url;
uint64_t expected;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/direct_send.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/direct_send.cpp b/examples/cpp/direct_send.cpp
index def523f..35b41d5 100644
--- a/examples/cpp/direct_send.cpp
+++ b/examples/cpp/direct_send.cpp
@@ -25,13 +25,13 @@
#include "proton/connection.hpp"
#include "proton/container.hpp"
#include "proton/event.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/value.hpp"
#include <iostream>
#include <map>
-class simple_send : public proton::messaging_handler {
+class simple_send : public proton::handler {
private:
proton::url url;
int sent;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/helloworld.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/helloworld.cpp b/examples/cpp/helloworld.cpp
index 15ffe54..b8f8b61 100644
--- a/examples/cpp/helloworld.cpp
+++ b/examples/cpp/helloworld.cpp
@@ -21,12 +21,12 @@
#include "proton/container.hpp"
#include "proton/event.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/url.hpp"
#include <iostream>
-class hello_world : public proton::messaging_handler {
+class hello_world : public proton::handler {
private:
proton::url url;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/helloworld_direct.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/helloworld_direct.cpp b/examples/cpp/helloworld_direct.cpp
index 3b53e17..8b4af5b 100644
--- a/examples/cpp/helloworld_direct.cpp
+++ b/examples/cpp/helloworld_direct.cpp
@@ -22,11 +22,11 @@
#include "proton/acceptor.hpp"
#include "proton/container.hpp"
#include "proton/event.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include <iostream>
-class hello_world_direct : public proton::messaging_handler {
+class hello_world_direct : public proton::handler {
private:
proton::url url;
proton::acceptor acceptor;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/queue_browser.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/queue_browser.cpp b/examples/cpp/queue_browser.cpp
index 56b8015..015e6ad 100644
--- a/examples/cpp/queue_browser.cpp
+++ b/examples/cpp/queue_browser.cpp
@@ -21,13 +21,13 @@
#include "proton/container.hpp"
#include "proton/event.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/url.hpp"
#include "proton/link_options.hpp"
#include <iostream>
-class browser : public proton::messaging_handler {
+class browser : public proton::handler {
private:
proton::url url;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/recurring_timer.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/recurring_timer.cpp b/examples/cpp/recurring_timer.cpp
index 1987357..a4fb4bd 100644
--- a/examples/cpp/recurring_timer.cpp
+++ b/examples/cpp/recurring_timer.cpp
@@ -23,26 +23,26 @@
#include "proton/container.hpp"
#include "proton/event.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/task.hpp"
#include <iostream>
#include <map>
-class ticker : public proton::messaging_handler {
+class ticker : public proton::handler {
void on_timer(proton::event &e) {
std::cout << "Tick..." << std::endl;
}
};
-class tocker : public proton::messaging_handler {
+class tocker : public proton::handler {
void on_timer(proton::event &e) {
std::cout << "Tock..." << std::endl;
}
};
-class recurring : public proton::messaging_handler {
+class recurring : public proton::handler {
private:
int remaining_msecs, tick_ms;
ticker tick_handler;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/selected_recv.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/selected_recv.cpp b/examples/cpp/selected_recv.cpp
index 16bab7c..ad010c0 100644
--- a/examples/cpp/selected_recv.cpp
+++ b/examples/cpp/selected_recv.cpp
@@ -21,13 +21,13 @@
#include "proton/container.hpp"
#include "proton/event.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/url.hpp"
#include "proton/link_options.hpp"
#include <iostream>
-class selected_recv : public proton::messaging_handler {
+class selected_recv : public proton::handler {
private:
proton::url url;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/server.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/server.cpp b/examples/cpp/server.cpp
index db186ba..7711f0e 100644
--- a/examples/cpp/server.cpp
+++ b/examples/cpp/server.cpp
@@ -24,7 +24,7 @@
#include "proton/connection.hpp"
#include "proton/container.hpp"
#include "proton/event.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/url.hpp"
#include <iostream>
@@ -32,7 +32,7 @@
#include <string>
#include <cctype>
-class server : public proton::messaging_handler {
+class server : public proton::handler {
private:
typedef std::map<std::string, proton::sender> sender_map;
proton::url url;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/server_direct.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/server_direct.cpp b/examples/cpp/server_direct.cpp
index c29757c..62384b4 100644
--- a/examples/cpp/server_direct.cpp
+++ b/examples/cpp/server_direct.cpp
@@ -24,7 +24,7 @@
#include "proton/acceptor.hpp"
#include "proton/container.hpp"
#include "proton/event.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/url.hpp"
#include <iostream>
@@ -33,7 +33,7 @@
#include <sstream>
#include <cctype>
-class server : public proton::messaging_handler {
+class server : public proton::handler {
private:
typedef std::map<std::string, proton::sender> sender_map;
proton::url url;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/simple_recv.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/simple_recv.cpp b/examples/cpp/simple_recv.cpp
index a28b793..c3df477 100644
--- a/examples/cpp/simple_recv.cpp
+++ b/examples/cpp/simple_recv.cpp
@@ -23,7 +23,7 @@
#include "proton/container.hpp"
#include "proton/event.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/link.hpp"
#include "proton/value.hpp"
#include "proton/message_id.hpp"
@@ -33,7 +33,7 @@
-class simple_recv : public proton::messaging_handler {
+class simple_recv : public proton::handler {
private:
proton::url url;
proton::receiver receiver;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/simple_send.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/simple_send.cpp b/examples/cpp/simple_send.cpp
index 0f627ed..5a2d401 100644
--- a/examples/cpp/simple_send.cpp
+++ b/examples/cpp/simple_send.cpp
@@ -23,14 +23,14 @@
#include "proton/container.hpp"
#include "proton/event.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/connection.hpp"
#include "proton/value.hpp"
#include <iostream>
#include <map>
-class simple_send : public proton::messaging_handler {
+class simple_send : public proton::handler {
private:
proton::url url;
proton::sender sender;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/ssl.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/ssl.cpp b/examples/cpp/ssl.cpp
index fb775b2..2d68c37 100644
--- a/examples/cpp/ssl.cpp
+++ b/examples/cpp/ssl.cpp
@@ -22,7 +22,7 @@
#include "proton/acceptor.hpp"
#include "proton/container.hpp"
#include "proton/event.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/connection_options.hpp"
#include "proton/transport.hpp"
#include "proton/ssl.hpp"
@@ -42,7 +42,7 @@ std::string cert_directory;
std::string find_CN(const std::string &);
-struct server_handler : public proton::messaging_handler {
+struct server_handler : public proton::handler {
proton::acceptor acceptor;
void on_connection_open(proton::event &e) {
@@ -57,7 +57,7 @@ struct server_handler : public proton::messaging_handler {
};
-class hello_world_direct : public proton::messaging_handler {
+class hello_world_direct : public proton::handler {
private:
proton::url url;
server_handler s_handler;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/examples/cpp/ssl_client_cert.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/ssl_client_cert.cpp b/examples/cpp/ssl_client_cert.cpp
index 10218ee..a12873c 100644
--- a/examples/cpp/ssl_client_cert.cpp
+++ b/examples/cpp/ssl_client_cert.cpp
@@ -22,7 +22,7 @@
#include "proton/acceptor.hpp"
#include "proton/container.hpp"
#include "proton/event.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/connection_options.hpp"
#include "proton/transport.hpp"
#include "proton/ssl.hpp"
@@ -44,7 +44,7 @@ std::string cert_directory;
std::string find_CN(const std::string &);
-struct server_handler : public proton::messaging_handler {
+struct server_handler : public proton::handler {
proton::acceptor inbound_listener;
void on_connection_open(proton::event &e) {
@@ -67,7 +67,7 @@ struct server_handler : public proton::messaging_handler {
};
-class hello_world_direct : public proton::messaging_handler {
+class hello_world_direct : public proton::handler {
private:
proton::url url;
server_handler s_handler;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/CMakeLists.txt b/proton-c/bindings/cpp/CMakeLists.txt
index 4c55af4..8ae1c94 100644
--- a/proton-c/bindings/cpp/CMakeLists.txt
+++ b/proton-c/bindings/cpp/CMakeLists.txt
@@ -53,7 +53,7 @@ set(qpid-proton-cpp-source
src/message.cpp
src/messaging_adapter.cpp
src/messaging_event.cpp
- src/messaging_handler.cpp
+ src/handler.cpp
src/object.cpp
src/proton_bits.cpp
src/proton_event.cpp
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/include/proton/connection_engine.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/connection_engine.hpp b/proton-c/bindings/cpp/include/proton/connection_engine.hpp
index 28ecce4..3a39be1 100644
--- a/proton-c/bindings/cpp/include/proton/connection_engine.hpp
+++ b/proton-c/bindings/cpp/include/proton/connection_engine.hpp
@@ -28,7 +28,7 @@
namespace proton {
-class messaging_handler;
+class handler;
class connection;
/// Pointers to a byte range to use as a buffer.
@@ -84,7 +84,7 @@ class connection_engine {
/**
* Create an engine that will advertise id as the AMQP container-id for its connection.
*/
- PN_CPP_EXTERN connection_engine(messaging_handler&, const std::string& id=std::string());
+ PN_CPP_EXTERN connection_engine(handler&, const std::string& id=std::string());
PN_CPP_EXTERN ~connection_engine();
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/include/proton/connection_options.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/connection_options.hpp b/proton-c/bindings/cpp/include/proton/connection_options.hpp
index 633fd82..bebeef7 100644
--- a/proton-c/bindings/cpp/include/proton/connection_options.hpp
+++ b/proton-c/bindings/cpp/include/proton/connection_options.hpp
@@ -63,7 +63,7 @@ class connection_options {
// TODO: Document options
- PN_CPP_EXTERN connection_options& handler(class messaging_handler *);
+ PN_CPP_EXTERN connection_options& handler(class handler *);
PN_CPP_EXTERN connection_options& max_frame_size(uint32_t max);
PN_CPP_EXTERN connection_options& max_channels(uint16_t max);
PN_CPP_EXTERN connection_options& idle_timeout(uint32_t t);
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/include/proton/container.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/container.hpp b/proton-c/bindings/cpp/include/proton/container.hpp
index d4dac36..4251038 100644
--- a/proton-c/bindings/cpp/include/proton/container.hpp
+++ b/proton-c/bindings/cpp/include/proton/container.hpp
@@ -35,7 +35,7 @@ namespace proton {
class connection;
class acceptor;
-class messaging_handler;
+class handler;
class sender;
class receiver;
class link;
@@ -55,7 +55,7 @@ class container {
PN_CPP_EXTERN container(const std::string& id=std::string());
/// Container ID should be unique within your system. By default a random ID is generated.
- PN_CPP_EXTERN container(messaging_handler& mhandler, const std::string& id=std::string());
+ PN_CPP_EXTERN container(handler& mhandler, const std::string& id=std::string());
PN_CPP_EXTERN ~container();
@@ -87,7 +87,7 @@ class container {
PN_CPP_EXTERN class reactor reactor() const;
// Schedule a timer task event in delay milliseconds.
- PN_CPP_EXTERN task schedule(int delay, messaging_handler *h = 0);
+ PN_CPP_EXTERN task schedule(int delay, handler *h = 0);
/** Copy the connection options to a template which will be
applied to subsequent outgoing connections. These are applied first
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/include/proton/handler.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/handler.hpp b/proton-c/bindings/cpp/include/proton/handler.hpp
new file mode 100644
index 0000000..971ffab
--- /dev/null
+++ b/proton-c/bindings/cpp/include/proton/handler.hpp
@@ -0,0 +1,98 @@
+#ifndef PROTON_CPP_MESSAGING_HANDLER_H
+#define PROTON_CPP_MESSAGING_HANDLER_H
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#include "proton/export.hpp"
+#include "proton/event.h"
+#include "proton/pn_unique_ptr.hpp"
+
+#include <stdexcept>
+
+namespace proton {
+
+class event;
+class messaging_adapter;
+
+/** messaging_handler base class. Provides a simpler set of events than
+ * proton::proton_handler and automates some common tasks. Subclass and
+ * over-ride event handling member functions.
+ * @see proton::messaging_event for meaning of events.
+ */
+class handler
+{
+ public:
+ /** Create a messaging_handler
+ *@param prefetch set flow control to automatically pre-fetch this many messages
+ *@param auto_accept automatically accept received messages after on_message()
+ *@param auto_settle automatically settle on receipt of delivery for sent messages.
+ *@param peer_close_is_error treat orderly remote connection close as error.
+ */
+ PN_CPP_EXTERN handler(int prefetch=10, bool auto_accept=true, bool auto_settle=true,
+ bool peer_close_is_error=false);
+
+ PN_CPP_EXTERN virtual ~handler();
+
+ ///@name Over-ride these member functions to handle events
+ ///@{
+ PN_CPP_EXTERN virtual void on_start(event &e);
+ PN_CPP_EXTERN virtual void on_message(event &e);
+ PN_CPP_EXTERN virtual void on_sendable(event &e);
+ PN_CPP_EXTERN virtual void on_disconnect(event &e);
+
+ PN_CPP_EXTERN virtual void on_connection_open(event &e);
+ PN_CPP_EXTERN virtual void on_connection_close(event &e);
+ PN_CPP_EXTERN virtual void on_connection_error(event &e);
+
+ PN_CPP_EXTERN virtual void on_session_open(event &e);
+ PN_CPP_EXTERN virtual void on_session_close(event &e);
+ PN_CPP_EXTERN virtual void on_session_error(event &e);
+
+ PN_CPP_EXTERN virtual void on_link_open(event &e);
+ PN_CPP_EXTERN virtual void on_link_close(event &e);
+ PN_CPP_EXTERN virtual void on_link_error(event &e);
+
+ PN_CPP_EXTERN virtual void on_delivery_accept(event &e);
+ PN_CPP_EXTERN virtual void on_delivery_reject(event &e);
+ PN_CPP_EXTERN virtual void on_delivery_release(event &e);
+ PN_CPP_EXTERN virtual void on_delivery_settle(event &e);
+
+ PN_CPP_EXTERN virtual void on_transaction_declare(event &e);
+ PN_CPP_EXTERN virtual void on_transaction_commit(event &e);
+ PN_CPP_EXTERN virtual void on_transaction_abort(event &e);
+
+ PN_CPP_EXTERN virtual void on_timer(event &e);
+
+ PN_CPP_EXTERN virtual void on_unhandled(event &e);
+ PN_CPP_EXTERN virtual void on_unhandled_error(event &e);
+ ///@}
+
+ private:
+ pn_unique_ptr<messaging_adapter> messaging_adapter_;
+ friend class container;
+ friend class connection_engine;
+ friend class connection_options;
+ friend class link_options;
+};
+
+}
+
+#endif /*!PROTON_CPP_MESSAGING_HANDLER_H*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/include/proton/link_options.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/link_options.hpp b/proton-c/bindings/cpp/include/proton/link_options.hpp
index 02613c1..d7f3406 100644
--- a/proton-c/bindings/cpp/include/proton/link_options.hpp
+++ b/proton-c/bindings/cpp/include/proton/link_options.hpp
@@ -88,7 +88,7 @@ class link_options {
PN_CPP_EXTERN void override(const link_options& other);
/** Set a handler for events scoped to the link. If NULL, link-scoped events on the link are discarded. */
- PN_CPP_EXTERN link_options& handler(class messaging_handler *);
+ PN_CPP_EXTERN link_options& handler(class handler *);
/** Receiver-only option to specify whether messages are browsed or
consumed. Setting browsing to true is Equivalent to setting
distribution_mode(COPY). Setting browsing to false is equivalent to
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/include/proton/messaging_handler.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/messaging_handler.hpp b/proton-c/bindings/cpp/include/proton/messaging_handler.hpp
deleted file mode 100644
index 5a20b81..0000000
--- a/proton-c/bindings/cpp/include/proton/messaging_handler.hpp
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef PROTON_CPP_MESSAGING_HANDLER_H
-#define PROTON_CPP_MESSAGING_HANDLER_H
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-#include "proton/export.hpp"
-#include "proton/event.h"
-#include "proton/pn_unique_ptr.hpp"
-
-#include <stdexcept>
-
-namespace proton {
-
-class event;
-class messaging_adapter;
-
-/** messaging_handler base class. Provides a simpler set of events than
- * proton::proton_handler and automates some common tasks. Subclass and
- * over-ride event handling member functions.
- * @see proton::messaging_event for meaning of events.
- */
-class messaging_handler
-{
- public:
- /** Create a messaging_handler
- *@param prefetch set flow control to automatically pre-fetch this many messages
- *@param auto_accept automatically accept received messages after on_message()
- *@param auto_settle automatically settle on receipt of delivery for sent messages.
- *@param peer_close_is_error treat orderly remote connection close as error.
- */
- PN_CPP_EXTERN messaging_handler(int prefetch=10, bool auto_accept=true, bool auto_settle=true,
- bool peer_close_is_error=false);
-
- PN_CPP_EXTERN virtual ~messaging_handler();
-
- ///@name Over-ride these member functions to handle events
- ///@{
- PN_CPP_EXTERN virtual void on_start(event &e);
- PN_CPP_EXTERN virtual void on_message(event &e);
- PN_CPP_EXTERN virtual void on_sendable(event &e);
- PN_CPP_EXTERN virtual void on_disconnect(event &e);
-
- PN_CPP_EXTERN virtual void on_connection_open(event &e);
- PN_CPP_EXTERN virtual void on_connection_close(event &e);
- PN_CPP_EXTERN virtual void on_connection_error(event &e);
-
- PN_CPP_EXTERN virtual void on_session_open(event &e);
- PN_CPP_EXTERN virtual void on_session_close(event &e);
- PN_CPP_EXTERN virtual void on_session_error(event &e);
-
- PN_CPP_EXTERN virtual void on_link_open(event &e);
- PN_CPP_EXTERN virtual void on_link_close(event &e);
- PN_CPP_EXTERN virtual void on_link_error(event &e);
-
- PN_CPP_EXTERN virtual void on_delivery_accept(event &e);
- PN_CPP_EXTERN virtual void on_delivery_reject(event &e);
- PN_CPP_EXTERN virtual void on_delivery_release(event &e);
- PN_CPP_EXTERN virtual void on_delivery_settle(event &e);
-
- PN_CPP_EXTERN virtual void on_transaction_declare(event &e);
- PN_CPP_EXTERN virtual void on_transaction_commit(event &e);
- PN_CPP_EXTERN virtual void on_transaction_abort(event &e);
-
- PN_CPP_EXTERN virtual void on_timer(event &e);
-
- PN_CPP_EXTERN virtual void on_unhandled(event &e);
- PN_CPP_EXTERN virtual void on_unhandled_error(event &e);
- ///@}
-
- private:
- pn_unique_ptr<messaging_adapter> messaging_adapter_;
- friend class container;
- friend class connection_engine;
- friend class connection_options;
- friend class link_options;
-};
-
-}
-
-#endif /*!PROTON_CPP_MESSAGING_HANDLER_H*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/include/proton/request_response.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/request_response.hpp b/proton-c/bindings/cpp/include/proton/request_response.hpp
index 58b8156..23af836 100644
--- a/proton-c/bindings/cpp/include/proton/request_response.hpp
+++ b/proton-c/bindings/cpp/include/proton/request_response.hpp
@@ -24,7 +24,7 @@
#include "proton/blocking_receiver.hpp"
#include "proton/blocking_sender.hpp"
#include "proton/export.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/pn_unique_ptr.hpp"
#include <string>
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/src/blocking_connection_impl.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/blocking_connection_impl.cpp b/proton-c/bindings/cpp/src/blocking_connection_impl.cpp
index db457b0..f05efb6 100644
--- a/proton-c/bindings/cpp/src/blocking_connection_impl.cpp
+++ b/proton-c/bindings/cpp/src/blocking_connection_impl.cpp
@@ -19,7 +19,7 @@
*
*/
#include "proton/container.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/duration.hpp"
#include "proton/connection.h"
#include "proton/error.hpp"
@@ -50,7 +50,7 @@ blocking_connection_impl::blocking_connection_impl(const url& url, duration time
{
container_->reactor().start();
container_->reactor().timeout(timeout);
- messaging_handler* h = this; // Set this as handler.
+ handler* h = this; // Set this as handler.
connection_ = container_->connect(url, connection_options().handler(h));
wait(connection_opening(connection_));
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/src/blocking_connection_impl.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/blocking_connection_impl.hpp b/proton-c/bindings/cpp/src/blocking_connection_impl.hpp
index cd93de8..0c7f02d 100644
--- a/proton-c/bindings/cpp/src/blocking_connection_impl.hpp
+++ b/proton-c/bindings/cpp/src/blocking_connection_impl.hpp
@@ -23,7 +23,7 @@
*/
#include "proton/export.hpp"
#include "proton/container.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/connection.hpp"
#include "proton/types.h"
#include <string>
@@ -35,7 +35,7 @@ namespace proton {
class handler;
class container;
-class blocking_connection_impl : public messaging_handler
+class blocking_connection_impl : public handler
{
public:
blocking_connection_impl(const url &url, duration d);
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/src/blocking_fetcher.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/blocking_fetcher.cpp b/proton-c/bindings/cpp/src/blocking_fetcher.cpp
index 0d0b706..fb95aaf 100644
--- a/proton-c/bindings/cpp/src/blocking_fetcher.cpp
+++ b/proton-c/bindings/cpp/src/blocking_fetcher.cpp
@@ -26,7 +26,7 @@
namespace proton {
-blocking_fetcher::blocking_fetcher(int prefetch) : messaging_handler(prefetch, false /*auto_accept*/) {}
+blocking_fetcher::blocking_fetcher(int prefetch) : handler(prefetch, false /*auto_accept*/) {}
void blocking_fetcher::on_message(event &e) {
messages_.push_back(e.message());
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/src/blocking_fetcher.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/blocking_fetcher.hpp b/proton-c/bindings/cpp/src/blocking_fetcher.hpp
index 337df3e..b3e2169 100644
--- a/proton-c/bindings/cpp/src/blocking_fetcher.hpp
+++ b/proton-c/bindings/cpp/src/blocking_fetcher.hpp
@@ -22,14 +22,14 @@
*
*/
#include "proton/delivery.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/message.hpp"
#include <string>
#include <deque>
namespace proton {
-class blocking_fetcher : public messaging_handler {
+class blocking_fetcher : public handler {
public:
blocking_fetcher(int prefetch);
void on_message(event &e);
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/src/connection_engine.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/connection_engine.cpp b/proton-c/bindings/cpp/src/connection_engine.cpp
index 639bd3c..2c54725 100644
--- a/proton-c/bindings/cpp/src/connection_engine.cpp
+++ b/proton-c/bindings/cpp/src/connection_engine.cpp
@@ -19,7 +19,7 @@
#include "proton/connection_engine.hpp"
#include "proton/error.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "messaging_adapter.hpp"
#include "messaging_event.hpp"
@@ -58,7 +58,7 @@ struct connection_engine::impl {
pn_collector_t * collector;
};
-connection_engine::connection_engine(messaging_handler &h, const std::string& id_) :
+connection_engine::connection_engine(handler &h, const std::string& id_) :
impl_(new impl(*h.messaging_adapter_.get(), pn_transport())) {
if (!impl_->transport || !impl_->connection || !impl_->collector)
throw error("connection_engine setup failed");
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/src/connection_options.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/connection_options.cpp b/proton-c/bindings/cpp/src/connection_options.cpp
index 4e5fb44..013daaa 100644
--- a/proton-c/bindings/cpp/src/connection_options.cpp
+++ b/proton-c/bindings/cpp/src/connection_options.cpp
@@ -19,7 +19,7 @@
*
*/
#include "proton/connection_options.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/reconnect_timer.hpp"
#include "proton/transport.hpp"
#include "proton/ssl.hpp"
@@ -158,7 +158,7 @@ connection_options& connection_options::operator=(const connection_options& x) {
void connection_options::override(const connection_options& x) { impl_->override(*x.impl_); }
-connection_options& connection_options::handler(class messaging_handler *h) { impl_->handler = h->messaging_adapter_.get(); return *this; }
+connection_options& connection_options::handler(class handler *h) { impl_->handler = h->messaging_adapter_.get(); return *this; }
connection_options& connection_options::max_frame_size(uint32_t n) { impl_->max_frame_size = n; return *this; }
connection_options& connection_options::max_channels(uint16_t n) { impl_->max_frame_size = n; return *this; }
connection_options& connection_options::idle_timeout(uint32_t t) { impl_->idle_timeout = t; return *this; }
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/src/container.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/container.cpp b/proton-c/bindings/cpp/src/container.cpp
index 60bfcbd..fc34f39 100644
--- a/proton-c/bindings/cpp/src/container.cpp
+++ b/proton-c/bindings/cpp/src/container.cpp
@@ -47,7 +47,7 @@ container::container(const std::string& id) {
impl_.reset(new container_impl(*this, 0, id));
}
-container::container(messaging_handler &mhandler, const std::string& id) {
+container::container(handler &mhandler, const std::string& id) {
impl_.reset(new container_impl(*this, mhandler.messaging_adapter_.get(), id));
}
@@ -75,7 +75,7 @@ acceptor container::listen(const proton::url &url, const connection_options &opt
return impl_->listen(url, opts);
}
-task container::schedule(int delay, messaging_handler *h) { return impl_->schedule(delay, h ? h->messaging_adapter_.get() : 0); }
+task container::schedule(int delay, handler *h) { return impl_->schedule(delay, h ? h->messaging_adapter_.get() : 0); }
void container::client_connection_options(const connection_options &o) { impl_->client_connection_options(o); }
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/src/container_impl.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/container_impl.hpp b/proton-c/bindings/cpp/src/container_impl.hpp
index 035fb18..d46250e 100644
--- a/proton-c/bindings/cpp/src/container_impl.hpp
+++ b/proton-c/bindings/cpp/src/container_impl.hpp
@@ -22,7 +22,7 @@
*
*/
#include "proton/export.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/connection.hpp"
#include "proton/link.hpp"
#include "proton/duration.hpp"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/src/handler.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/handler.cpp b/proton-c/bindings/cpp/src/handler.cpp
new file mode 100644
index 0000000..4597156
--- /dev/null
+++ b/proton-c/bindings/cpp/src/handler.cpp
@@ -0,0 +1,62 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#include "proton/handler.hpp"
+
+#include "proton_event.hpp"
+#include "messaging_adapter.hpp"
+
+#include "proton/handlers.h"
+
+#include <algorithm>
+
+namespace proton {
+
+handler::handler(int prefetch0, bool auto_accept0, bool auto_settle0, bool peer_close_is_error0) :
+ messaging_adapter_(new messaging_adapter(*this, prefetch0, auto_accept0, auto_settle0, peer_close_is_error0))
+{}
+
+handler::~handler(){}
+
+void handler::on_delivery_accept(event &e) { on_unhandled(e); }
+void handler::on_connection_close(event &e) { on_unhandled(e); }
+void handler::on_connection_error(event &e) { on_unhandled(e); }
+void handler::on_connection_open(event &e) { on_unhandled(e); }
+void handler::on_disconnect(event &e) { on_unhandled(e); }
+void handler::on_link_close(event &e) { on_unhandled(e); }
+void handler::on_link_error(event &e) { on_unhandled(e); }
+void handler::on_link_open(event &e) { on_unhandled(e); }
+void handler::on_message(event &e) { on_unhandled(e); }
+void handler::on_delivery_reject(event &e) { on_unhandled(e); }
+void handler::on_delivery_release(event &e) { on_unhandled(e); }
+void handler::on_sendable(event &e) { on_unhandled(e); }
+void handler::on_session_close(event &e) { on_unhandled(e); }
+void handler::on_session_error(event &e) { on_unhandled(e); }
+void handler::on_session_open(event &e) { on_unhandled(e); }
+void handler::on_delivery_settle(event &e) { on_unhandled(e); }
+void handler::on_start(event &e) { on_unhandled(e); }
+void handler::on_timer(event &e) { on_unhandled(e); }
+void handler::on_transaction_abort(event &e) { on_unhandled(e); }
+void handler::on_transaction_commit(event &e) { on_unhandled(e); }
+void handler::on_transaction_declare(event &e) { on_unhandled(e); }
+
+void handler::on_unhandled(event &) {}
+void handler::on_unhandled_error(event &) {}
+}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/src/link_options.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/link_options.cpp b/proton-c/bindings/cpp/src/link_options.cpp
index 03c30ea..ef8de3f 100644
--- a/proton-c/bindings/cpp/src/link_options.cpp
+++ b/proton-c/bindings/cpp/src/link_options.cpp
@@ -20,7 +20,7 @@
*/
#include "proton/link.hpp"
#include "proton/link_options.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "msg.hpp"
#include "messaging_adapter.hpp"
@@ -159,7 +159,7 @@ link_options& link_options::operator=(const link_options& x) {
void link_options::override(const link_options& x) { impl_->override(*x.impl_); }
-link_options& link_options::handler(class messaging_handler *h) { impl_->handler = h->messaging_adapter_.get(); return *this; }
+link_options& link_options::handler(class handler *h) { impl_->handler = h->messaging_adapter_.get(); return *this; }
link_options& link_options::browsing(bool b) { distribution_mode(b ? terminus::COPY : terminus::MOVE); return *this; }
link_options& link_options::distribution_mode(terminus::distribution_mode_t m) { impl_->distribution_mode = m; return *this; }
link_options& link_options::durable_subscription(bool b) {impl_->durable_subscription = b; return *this; }
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/src/messaging_adapter.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/messaging_adapter.cpp b/proton-c/bindings/cpp/src/messaging_adapter.cpp
index e9ce0ea..cc6f097 100644
--- a/proton-c/bindings/cpp/src/messaging_adapter.cpp
+++ b/proton-c/bindings/cpp/src/messaging_adapter.cpp
@@ -68,7 +68,7 @@ void messaging_adapter::create_helpers() {
}
}
-messaging_adapter::messaging_adapter(messaging_handler &delegate,
+messaging_adapter::messaging_adapter(handler &delegate,
int prefetch, bool auto_accept, bool auto_settle, bool peer_close_iserror) :
delegate_(delegate),
prefetch_(prefetch),
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/src/messaging_adapter.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/messaging_adapter.hpp b/proton-c/bindings/cpp/src/messaging_adapter.hpp
index 866644d..32e0423 100644
--- a/proton-c/bindings/cpp/src/messaging_adapter.hpp
+++ b/proton-c/bindings/cpp/src/messaging_adapter.hpp
@@ -22,7 +22,7 @@
*
*/
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton_handler.hpp"
@@ -38,7 +38,7 @@ namespace proton {
class messaging_adapter : public proton_handler
{
public:
- PN_CPP_EXTERN messaging_adapter(messaging_handler &delegate,
+ PN_CPP_EXTERN messaging_adapter(handler &delegate,
int prefetch, bool auto_accept, bool auto_settle,
bool peer_close_is_error);
PN_CPP_EXTERN virtual ~messaging_adapter();
@@ -56,7 +56,7 @@ class messaging_adapter : public proton_handler
PN_CPP_EXTERN void on_timer_task(proton_event &e);
private:
- messaging_handler &delegate_; // The handler for generated messaging_event's
+ handler &delegate_; // The handler for generated messaging_event's
int prefetch_;
bool auto_accept_;
bool auto_settle_;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/src/messaging_event.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/messaging_event.cpp b/proton-c/bindings/cpp/src/messaging_event.cpp
index 0c6c51d..1434ac7 100644
--- a/proton-c/bindings/cpp/src/messaging_event.cpp
+++ b/proton-c/bindings/cpp/src/messaging_event.cpp
@@ -21,7 +21,7 @@
#include "messaging_event.hpp"
#include "proton/message.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/sender.hpp"
#include "proton/receiver.hpp"
#include "proton/error.hpp"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/proton-c/bindings/cpp/src/messaging_handler.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/messaging_handler.cpp b/proton-c/bindings/cpp/src/messaging_handler.cpp
deleted file mode 100644
index 6071ea2..0000000
--- a/proton-c/bindings/cpp/src/messaging_handler.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-#include "proton/messaging_handler.hpp"
-
-#include "proton_event.hpp"
-#include "messaging_adapter.hpp"
-
-#include "proton/handlers.h"
-
-#include <algorithm>
-
-namespace proton {
-
-messaging_handler::messaging_handler(int prefetch0, bool auto_accept0, bool auto_settle0, bool peer_close_is_error0) :
- messaging_adapter_(new messaging_adapter(*this, prefetch0, auto_accept0, auto_settle0, peer_close_is_error0))
-{}
-
-messaging_handler::~messaging_handler(){}
-
-void messaging_handler::on_delivery_accept(event &e) { on_unhandled(e); }
-void messaging_handler::on_connection_close(event &e) { on_unhandled(e); }
-void messaging_handler::on_connection_error(event &e) { on_unhandled(e); }
-void messaging_handler::on_connection_open(event &e) { on_unhandled(e); }
-void messaging_handler::on_disconnect(event &e) { on_unhandled(e); }
-void messaging_handler::on_link_close(event &e) { on_unhandled(e); }
-void messaging_handler::on_link_error(event &e) { on_unhandled(e); }
-void messaging_handler::on_link_open(event &e) { on_unhandled(e); }
-void messaging_handler::on_message(event &e) { on_unhandled(e); }
-void messaging_handler::on_delivery_reject(event &e) { on_unhandled(e); }
-void messaging_handler::on_delivery_release(event &e) { on_unhandled(e); }
-void messaging_handler::on_sendable(event &e) { on_unhandled(e); }
-void messaging_handler::on_session_close(event &e) { on_unhandled(e); }
-void messaging_handler::on_session_error(event &e) { on_unhandled(e); }
-void messaging_handler::on_session_open(event &e) { on_unhandled(e); }
-void messaging_handler::on_delivery_settle(event &e) { on_unhandled(e); }
-void messaging_handler::on_start(event &e) { on_unhandled(e); }
-void messaging_handler::on_timer(event &e) { on_unhandled(e); }
-void messaging_handler::on_transaction_abort(event &e) { on_unhandled(e); }
-void messaging_handler::on_transaction_commit(event &e) { on_unhandled(e); }
-void messaging_handler::on_transaction_declare(event &e) { on_unhandled(e); }
-
-void messaging_handler::on_unhandled(event &) {}
-void messaging_handler::on_unhandled_error(event &) {}
-}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3faacc52/tests/tools/apps/cpp/reactor_send.cpp
----------------------------------------------------------------------
diff --git a/tests/tools/apps/cpp/reactor_send.cpp b/tests/tools/apps/cpp/reactor_send.cpp
index 29c78a0..aa69658 100644
--- a/tests/tools/apps/cpp/reactor_send.cpp
+++ b/tests/tools/apps/cpp/reactor_send.cpp
@@ -22,7 +22,7 @@
#include "options.hpp"
#include "proton/container.hpp"
-#include "proton/messaging_handler.hpp"
+#include "proton/handler.hpp"
#include "proton/connection.hpp"
#include "proton/decoder.hpp"
#include "proton/event.hpp"
@@ -37,7 +37,7 @@
-class reactor_send : public proton::messaging_handler {
+class reactor_send : public proton::handler {
private:
proton::url url_;
proton::message message_;
@@ -54,7 +54,7 @@ class reactor_send : public proton::messaging_handler {
public:
reactor_send(const std::string &url, int c, int size, bool replying)
- : messaging_handler(1024), // prefetch=1024
+ : handler(1024), // prefetch=1024
url_(url), sent_(0), confirmed_(0), total_(c),
received_(0), received_bytes_(0), replying_(replying) {
if (replying_)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org