[C++ Wrapper] Remove close() method from Publication/ExclusivePublication, i.e. the underlying C publications will be closed when the corresponding C++ object is destroyed.

Author: vyazelenko

aeron-client/src/main/cpp_wrapper/ExclusivePublication.h

@@ -82,16 +82,6 @@ class ExclusivePublication
         }
     }
 
-    inline void close()
-    {
-        if (aeron_exclusive_publication_close(m_publication, nullptr, nullptr) < 0)
-        {
-            AERON_MAP_ERRNO_TO_SOURCED_EXCEPTION_AND_THROW;
-        }
-
-        m_publication = nullptr;
-    }
-
     inline void revokeOnClose()
     {
         aeron_exclusive_publication_revoke_on_close(m_publication);

aeron-client/src/main/cpp_wrapper/Publication.h

@@ -114,16 +114,6 @@ class Publication
         }
     }
 
-    inline void close()
-    {
-        if (aeron_publication_close(m_publication, nullptr, nullptr) < 0)
-        {
-            AERON_MAP_ERRNO_TO_SOURCED_EXCEPTION_AND_THROW;
-        }
-
-        m_publication = nullptr;
-    }
-
     /**
      * Media address for delivery to the channel.
      *
@@ -278,11 +268,6 @@ class Publication
         std::int64_t position = aeron_publication_position(m_publication);
         if (AERON_PUBLICATION_ERROR == position)
         {
-            if (nullptr == m_publication)
-            {
-                return AERON_PUBLICATION_CLOSED;
-            }
-
             AERON_MAP_ERRNO_TO_SOURCED_EXCEPTION_AND_THROW;
         }
 
@@ -301,11 +286,6 @@ class Publication
         std::int64_t limit = aeron_publication_position_limit(m_publication);
         if (AERON_PUBLICATION_ERROR == limit)
         {
-            if (nullptr == m_publication)
-            {
-                return AERON_PUBLICATION_CLOSED;
-            }
-
             AERON_MAP_ERRNO_TO_SOURCED_EXCEPTION_AND_THROW;
         }
 
@@ -415,11 +395,6 @@ class Publication
             (void *)&reservedValueSupplier);
         if (AERON_PUBLICATION_ERROR == position)
         {
-            if (nullptr == m_publication)
-            {
-                return AERON_PUBLICATION_CLOSED;
-            }
-
             AERON_MAP_ERRNO_TO_SOURCED_EXCEPTION_AND_THROW;
         }
 
@@ -488,11 +463,6 @@ class Publication
 
         if (AERON_PUBLICATION_ERROR == position)
         {
-            if (nullptr == m_publication)
-            {
-                return AERON_PUBLICATION_CLOSED;
-            }
-
             AERON_MAP_ERRNO_TO_SOURCED_EXCEPTION_AND_THROW;
         }
 
@@ -555,11 +525,6 @@ class Publication
 
         if (AERON_PUBLICATION_ERROR == position)
         {
-            if (nullptr == m_publication)
-            {
-                return AERON_PUBLICATION_CLOSED;
-            }
-
             AERON_MAP_ERRNO_TO_SOURCED_EXCEPTION_AND_THROW;
         }
 
@@ -605,11 +570,6 @@ class Publication
             m_publication, static_cast<std::size_t>(length), &temp_claim);
         if (AERON_PUBLICATION_ERROR == position)
         {
-            if (nullptr == m_publication)
-            {
-                return AERON_PUBLICATION_CLOSED;
-            }
-
             AERON_MAP_ERRNO_TO_SOURCED_EXCEPTION_AND_THROW;
         }
 

aeron-client/src/test/cpp_wrapper/PublicationRevokeTest.cpp

@@ -118,9 +118,7 @@ TEST_P(PublicationRevokeTest, revokeTestSimple)
     POLL_FOR(0 < pub->offer(buffer, 0, length), invoker);
 
     pub->revokeOnClose();
-    pub->close();
-
-    ASSERT_EQ(AERON_PUBLICATION_CLOSED, pub->offer(buffer, 0, length));
+    pub.reset();
 
     POLL_FOR(1 == imageUnavailable, invoker);
 
@@ -202,7 +200,7 @@ TEST_P(PublicationRevokeTest, revokeTestExclusive)
 
     POLL_FOR(2 == imageUnavailable, invoker);
 
-    pub2->close();
+    pub2.reset();
 
     ASSERT_EQ(1, aeron->countersReader().getCounterValue(AERON_SYSTEM_COUNTER_PUBLICATIONS_REVOKED));
     ASSERT_EQ(expectedPublicationImagesRevoked, aeron->countersReader().getCounterValue(AERON_SYSTEM_COUNTER_PUBLICATION_IMAGES_REVOKED));