allign to newer object-core (#78)

dorotaphanSiili · web-flow · commit bf245b1ed26c · 2023-02-03T11:14:11.000+01:00
* allign to newer object-core
diff --git a/goldenmaster/apigear/olink/CMakeLists.txt b/goldenmaster/apigear/olink/CMakeLists.txt
@@ -13,7 +13,7 @@ if(NOT objectlink-core-cpp_FOUND)
   message(STATUS "objectlink-core-cpp NOT FOUND, fetching the git repository")
   FetchContent_Declare(olink-core
       GIT_REPOSITORY https://github.com/apigear-io/objectlink-core-cpp.git
-      GIT_TAG v0.2.1
+      GIT_TAG v0.2.4
       GIT_SHALLOW TRUE
       EXCLUDE_FROM_ALL FALSE
   )
diff --git a/goldenmaster/apigear/olink/private/olinkremote.cpp b/goldenmaster/apigear/olink/private/olinkremote.cpp
@@ -16,8 +16,7 @@ namespace PocoImpl {
 OLinkRemote::OLinkRemote(std::unique_ptr<Poco::Net::WebSocket> socket, IConnectionStorage& connectionStorage, ApiGear::ObjectLink::RemoteRegistry& registry)
     : m_socket(*this),
      m_connectionStorage(connectionStorage),
-     m_node(ApiGear::ObjectLink::RemoteNode::createRemoteNode(registry)),
-     m_registry(registry)
+     m_node(ApiGear::ObjectLink::RemoteNode::createRemoteNode(registry))
 {
     m_node->onLog(m_log.logFunc());
     m_node->onWrite([this](std::string msg) {
@@ -28,7 +27,6 @@ OLinkRemote::OLinkRemote(std::unique_ptr<Poco::Net::WebSocket> socket, IConnecti
 
 OLinkRemote::~OLinkRemote()
 {
-    removeNodeFromRegistryIfNotUnlikend();
     if(!m_socket.isClosed())
     {
         m_socket.close();
@@ -46,7 +44,6 @@ void OLinkRemote::handleTextMessage(const std::string& msg)
 
 void OLinkRemote::onConnectionClosedFromNetwork()
 {
-    removeNodeFromRegistryIfNotUnlikend();
     m_connectionStorage.notifyConnectionClosed();
 }
 
@@ -55,13 +52,4 @@ bool OLinkRemote::isClosed() const
     return m_socket.isClosed();
 }
 
-void OLinkRemote::removeNodeFromRegistryIfNotUnlikend()
-{
-    auto objectsUsingNode = m_registry.getObjectIds(m_node);
-    for (auto objectId : objectsUsingNode)
-    {
-        m_registry.removeNodeFromSource(m_node, objectId);
-    }
-}
-
 }}  //namespace ApiGear::PocoImpl
diff --git a/goldenmaster/apigear/olink/private/olinkremote.h b/goldenmaster/apigear/olink/private/olinkremote.h
@@ -59,13 +59,6 @@ class OLinkRemote : public ISocketUser
     */
     void onConnectionClosedFromNetwork() override;
 private:
-
-    /**
-    * Call this function when closing connection.
-    * Removes the node from registry, for objects which didn't got the unlink message for this connection.
-    */
-    void removeNodeFromRegistryIfNotUnlikend();
-
     /**A socket used for this connection.*/
     SocketWrapper m_socket;
     /**Storage that needs to be informed if client ended the connection.*/
@@ -76,8 +69,7 @@ class OLinkRemote : public ISocketUser
     *   may serve several services associated with this node by the unique objectId given in link message.
     */
     std::shared_ptr<ApiGear::ObjectLink::RemoteNode> m_node;
-    /**A global registry to which network endpoints are added for olink objects. */
-    ApiGear::ObjectLink::RemoteRegistry& m_registry;
+
     /** Logger*/
     ApiGear::ObjectLink::ConsoleLogger m_log;
 };
diff --git a/templates/apigear/olink/CMakeLists.txt b/templates/apigear/olink/CMakeLists.txt
@@ -13,7 +13,7 @@ if(NOT objectlink-core-cpp_FOUND)
   message(STATUS "objectlink-core-cpp NOT FOUND, fetching the git repository")
   FetchContent_Declare(olink-core
       GIT_REPOSITORY https://github.com/apigear-io/objectlink-core-cpp.git
-      GIT_TAG v0.2.1
+      GIT_TAG v0.2.4
       GIT_SHALLOW TRUE
       EXCLUDE_FROM_ALL FALSE
   )
diff --git a/templates/apigear/olink/private/olinkremote.cpp b/templates/apigear/olink/private/olinkremote.cpp
@@ -16,8 +16,7 @@ namespace PocoImpl {
 OLinkRemote::OLinkRemote(std::unique_ptr<Poco::Net::WebSocket> socket, IConnectionStorage& connectionStorage, ApiGear::ObjectLink::RemoteRegistry& registry)
     : m_socket(*this),
      m_connectionStorage(connectionStorage),
-     m_node(ApiGear::ObjectLink::RemoteNode::createRemoteNode(registry)),
-     m_registry(registry)
+     m_node(ApiGear::ObjectLink::RemoteNode::createRemoteNode(registry))
 {
     m_node->onLog(m_log.logFunc());
     m_node->onWrite([this](std::string msg) {
@@ -28,7 +27,6 @@ OLinkRemote::OLinkRemote(std::unique_ptr<Poco::Net::WebSocket> socket, IConnecti
 
 OLinkRemote::~OLinkRemote()
 {
-    removeNodeFromRegistryIfNotUnlikend();
     if(!m_socket.isClosed())
     {
         m_socket.close();
@@ -46,7 +44,6 @@ void OLinkRemote::handleTextMessage(const std::string& msg)
 
 void OLinkRemote::onConnectionClosedFromNetwork()
 {
-    removeNodeFromRegistryIfNotUnlikend();
     m_connectionStorage.notifyConnectionClosed();
 }
 
@@ -55,13 +52,4 @@ bool OLinkRemote::isClosed() const
     return m_socket.isClosed();
 }
 
-void OLinkRemote::removeNodeFromRegistryIfNotUnlikend()
-{
-    auto objectsUsingNode = m_registry.getObjectIds(m_node);
-    for (auto objectId : objectsUsingNode)
-    {
-        m_registry.removeNodeFromSource(m_node, objectId);
-    }
-}
-
 }}  //namespace ApiGear::PocoImpl
diff --git a/templates/apigear/olink/private/olinkremote.h b/templates/apigear/olink/private/olinkremote.h
@@ -59,13 +59,6 @@ class OLinkRemote : public ISocketUser
     */
     void onConnectionClosedFromNetwork() override;
 private:
-
-    /**
-    * Call this function when closing connection.
-    * Removes the node from registry, for objects which didn't got the unlink message for this connection.
-    */
-    void removeNodeFromRegistryIfNotUnlikend();
-
     /**A socket used for this connection.*/
     SocketWrapper m_socket;
     /**Storage that needs to be informed if client ended the connection.*/
@@ -76,8 +69,7 @@ class OLinkRemote : public ISocketUser
     *   may serve several services associated with this node by the unique objectId given in link message.
     */
     std::shared_ptr<ApiGear::ObjectLink::RemoteNode> m_node;
-    /**A global registry to which network endpoints are added for olink objects. */
-    ApiGear::ObjectLink::RemoteRegistry& m_registry;
+
     /** Logger*/
     ApiGear::ObjectLink::ConsoleLogger m_log;
 };

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ if(NOT objectlink-core-cpp_FOUND)`
`13`	`13`	`message(STATUS "objectlink-core-cpp NOT FOUND, fetching the git repository")`
`14`	`14`	`FetchContent_Declare(olink-core`
`15`	`15`	`GIT_REPOSITORY https://github.com/apigear-io/objectlink-core-cpp.git`
`16`		`- GIT_TAG v0.2.1`
	`16`	`+ GIT_TAG v0.2.4`
`17`	`17`	`GIT_SHALLOW TRUE`
`18`	`18`	`EXCLUDE_FROM_ALL FALSE`
`19`	`19`	`)`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@ namespace PocoImpl {`
`16`	`16`	`OLinkRemote::OLinkRemote(std::unique_ptr<Poco::Net::WebSocket> socket, IConnectionStorage& connectionStorage, ApiGear::ObjectLink::RemoteRegistry& registry)`
`17`	`17`	`: m_socket(*this),`
`18`	`18`	`m_connectionStorage(connectionStorage),`
`19`		`- m_node(ApiGear::ObjectLink::RemoteNode::createRemoteNode(registry)),`
`20`		`- m_registry(registry)`
	`19`	`+ m_node(ApiGear::ObjectLink::RemoteNode::createRemoteNode(registry))`
`21`	`20`	`{`
`22`	`21`	`m_node->onLog(m_log.logFunc());`
`23`	`22`	`m_node->onWrite([this](std::string msg) {`
`@@ -28,7 +27,6 @@ OLinkRemote::OLinkRemote(std::unique_ptr<Poco::Net::WebSocket> socket, IConnecti`
`28`	`27`
`29`	`28`	`OLinkRemote::~OLinkRemote()`
`30`	`29`	`{`
`31`		`- removeNodeFromRegistryIfNotUnlikend();`
`32`	`30`	`if(!m_socket.isClosed())`
`33`	`31`	`{`
`34`	`32`	`m_socket.close();`
`@@ -46,7 +44,6 @@ void OLinkRemote::handleTextMessage(const std::string& msg)`
`46`	`44`
`47`	`45`	`void OLinkRemote::onConnectionClosedFromNetwork()`
`48`	`46`	`{`
`49`		`- removeNodeFromRegistryIfNotUnlikend();`
`50`	`47`	`m_connectionStorage.notifyConnectionClosed();`
`51`	`48`	`}`
`52`	`49`
`@@ -55,13 +52,4 @@ bool OLinkRemote::isClosed() const`
`55`	`52`	`return m_socket.isClosed();`
`56`	`53`	`}`
`57`	`54`
`58`		`-void OLinkRemote::removeNodeFromRegistryIfNotUnlikend()`
`59`		`-{`
`60`		`- auto objectsUsingNode = m_registry.getObjectIds(m_node);`
`61`		`- for (auto objectId : objectsUsingNode)`
`62`		`- {`
`63`		`- m_registry.removeNodeFromSource(m_node, objectId);`
`64`		`- }`
`65`		`-}`
`66`		`-`
`67`	`55`	`}} //namespace ApiGear::PocoImpl`