Improved samples based on SubscriberInstance

Author: ritchiecarroll

src/samples/InstanceSubscribe/SubscriberHandler.cpp

@@ -203,12 +203,3 @@ void SubscriberHandler::HistoricalReadComplete()
     StatusMessage("Historical data read complete.");
 }
 
-void SubscriberHandler::ConnectionEstablished()
-{
-    StatusMessage("Connection established.");
-}
-
-void SubscriberHandler::ConnectionTerminated()
-{
-    StatusMessage("Connection terminated.");
-}

src/samples/InstanceSubscribe/SubscriberHandler.h

@@ -47,8 +47,6 @@ class SubscriberHandler : public sttp::transport::SubscriberInstance
     void ParsedMetadata() override;
     void ConfigurationChanged() override;
     void HistoricalReadComplete() override;
-    void ConnectionEstablished() override;
-    void ConnectionTerminated() override;
 
 public:
     SubscriberHandler(std::string name);

src/samples/InteropTest/SubscriberHandler.cpp

@@ -112,7 +112,7 @@ void SubscriberHandler::SubscriptionUpdated(const SignalIndexCachePtr& signalInd
 
 void SubscriberHandler::ConnectionEstablished()
 {
-    StatusMessage("Connection established.");
+    SubscriberInstance::ConnectionEstablished();
 
     stringstream fileNameBuf;
     fileNameBuf << m_name << "-cpp.csv";
@@ -128,6 +128,8 @@ void SubscriberHandler::ConnectionEstablished()
 
 void SubscriberHandler::ConnectionTerminated()
 {
+    SubscriberInstance::ConnectionTerminated();
+
     StatusMessage("Connection terminated.");
     fclose(m_export);
 }

src/samples/LatencyTest/SubscriberHandler.cpp

@@ -108,13 +108,3 @@ void SubscriberHandler::SubscriptionUpdated(const SignalIndexCachePtr& signalInd
 {
     StatusMessage("Publisher provided " + ToString(signalIndexCache->Count()) + " measurements in response to subscription.");
 }
-
-void SubscriberHandler::ConnectionEstablished()
-{
-    StatusMessage("Connection established.");
-}
-
-void SubscriberHandler::ConnectionTerminated()
-{
-    StatusMessage("Connection terminated.");
-}

src/samples/LatencyTest/SubscriberHandler.h

@@ -42,8 +42,6 @@ class SubscriberHandler : public sttp::transport::SubscriberInstance
     void StatusMessage(const std::string& message) override;
     void ErrorMessage(const std::string& message) override;
     void SubscriptionUpdated(const sttp::transport::SignalIndexCachePtr& signalIndexCache) override;
-    void ConnectionEstablished() override;
-    void ConnectionTerminated() override;
 
 public:
     explicit SubscriberHandler(std::string name);

src/samples/ReversePublish/PublisherHandler.cpp

@@ -177,7 +177,7 @@ void PublisherHandler::StartDataPublication()
 
     // Setup data publication timer - for this publishing sample we send
     // data type reasonable random values every 33 milliseconds
-    m_publishTimer = NewSharedPtr<Timer>(33, [this](Timer*, void*)
+    m_publishTimer = NewSharedPtr<Timer>(33, [this](const TimerPtr&, void*)
     {
         // If metadata can change, the following integer should not be static:
         static uint32_t count = ConvertUInt32(m_measurementMetadata.size());

src/samples/ReversePublish/ReversePublish.cpp

@@ -75,7 +75,7 @@ int main(int argc, char* argv[])
     // Stop publisher - this stops publication
     Publisher->Stop();
 
-    // Delete publisher instances - this closes sockets
+    // Delete publisher instance - this closes sockets
     delete Publisher;
 
     cout << "Publisher stopped." << endl;