client_state is made public. get_logger() method is removed, log level is increased. (#1140)

Author: OzanCansel

hazelcast/include/hazelcast/client/connection/ClientConnectionManagerImpl.h

@@ -117,8 +117,6 @@ class HAZELCAST_API ClientConnectionManagerImpl
     void add_connection_listener(
       const std::shared_ptr<ConnectionListener>& connection_listener);
 
-    logger& get_logger();
-
     std::shared_ptr<Connection> get_random_connection();
 
     /**
@@ -160,23 +158,6 @@ class HAZELCAST_API ClientConnectionManagerImpl
 
     void notify_backup(int64_t call_id);
 
-private:
-    static constexpr size_t EXECUTOR_CORE_POOL_SIZE = 10;
-    static constexpr int32_t CLIENT = 1;
-    static const endpoint_qualifier PUBLIC_ENDPOINT_QUALIFIER;
-    static constexpr int SQL_CONNECTION_RANDOM_ATTEMPTS = 10;
-
-    struct auth_response
-    {
-        byte status;
-        boost::uuids::uuid member_uuid;
-        byte serialization_version;
-        int32_t partition_count;
-        boost::uuids::uuid cluster_id;
-        boost::optional<address> server_address;
-        std::string server_version;
-    };
-
     enum class client_state
     {
         /**
@@ -213,6 +194,23 @@ class HAZELCAST_API ClientConnectionManagerImpl
     friend std::ostream HAZELCAST_API& operator<<(std::ostream& os,
                                                   client_state);
 
+private:
+    static constexpr size_t EXECUTOR_CORE_POOL_SIZE = 10;
+    static constexpr int32_t CLIENT = 1;
+    static const endpoint_qualifier PUBLIC_ENDPOINT_QUALIFIER;
+    static constexpr int SQL_CONNECTION_RANDOM_ATTEMPTS = 10;
+
+    struct auth_response
+    {
+        byte status;
+        boost::uuids::uuid member_uuid;
+        byte serialization_version;
+        int32_t partition_count;
+        boost::uuids::uuid cluster_id;
+        boost::optional<address> server_address;
+        std::string server_version;
+    };
+
     auth_response authenticate_on_cluster(
       std::shared_ptr<Connection>& connection);
 

hazelcast/src/hazelcast/client/network.cpp

@@ -674,12 +674,6 @@ ClientConnectionManagerImpl::~ClientConnectionManagerImpl()
     shutdown();
 }
 
-logger&
-ClientConnectionManagerImpl::get_logger()
-{
-    return client_.get_logger();
-}
-
 void
 ClientConnectionManagerImpl::check_client_active()
 {

hazelcast/test/src/HazelcastTests8.cpp

@@ -2571,6 +2571,27 @@ TEST_F(
     EXPECT_THROW(connection_manager.get_or_connect(dummy_member),
                  exception::hazelcast_);
 }
+
+struct ClientStateOutput : ::testing::Test
+{};
+
+TEST_F(ClientStateOutput, test_output)
+{
+    using client_state = connection::ClientConnectionManagerImpl::client_state;
+
+    auto to_string = [](client_state st){
+        std::stringstream ss;
+
+        ss << st;
+
+        return ss.str();
+    };
+
+    EXPECT_EQ(to_string(client_state::CONNECTED_TO_CLUSTER), "CONNECTED_TO_CLUSTER");
+    EXPECT_EQ(to_string(client_state::DISCONNECTED_FROM_CLUSTER), "DISCONNECTED_FROM_CLUSTER");
+    EXPECT_EQ(to_string(client_state::INITIAL), "INITIAL");
+    EXPECT_EQ(to_string(client_state::INITIALIZED_ON_CLUSTER), "INITIALIZED_ON_CLUSTER");
+}
 } // namespace test
 } // namespace client
 } // namespace hazelcast

hazelcast/test/src/compact/compact_test_base.h

@@ -108,6 +108,7 @@ class compact_test_base : public testing::Test
         client_config cfg;
 
         cfg.set_cluster_name("compact-dev");
+        cfg.get_logger_config().level(logger::level::finest);
 
         return cfg;
     }