add generic ClientCompanion

Author: fupelaqu

build.sbt

@@ -19,7 +19,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "softclient4es"
 
-ThisBuild / version := "0.10.0"
+ThisBuild / version := "0.10.1"
 
 ThisBuild / scalaVersion := scala213
 

core/src/main/scala/app/softnetwork/common/package.scala

@@ -0,0 +1,22 @@
+package app.softnetwork
+
+import org.slf4j.Logger
+
+import java.io.Closeable
+
+package object common {
+
+  trait ClientCompanion extends Closeable { _: { def logger: Logger } =>
+
+    /** Check if client is initialized and connected
+      */
+    def isInitialized: Boolean
+
+    /** Test connection
+      * @return
+      *   true if connection is successful
+      */
+    def testConnection(): Boolean
+  }
+
+}

core/src/main/scala/app/softnetwork/elastic/client/ElasticClientApi.scala

@@ -16,6 +16,7 @@
 
 package app.softnetwork.elastic.client
 
+import app.softnetwork.common.ClientCompanion
 import com.typesafe.config.{Config, ConfigFactory}
 import org.json4s.jackson
 import org.json4s.jackson.Serialization
@@ -44,7 +45,7 @@ trait ElasticClientApi
     with FlushApi
     with VersionApi
     with SerializationApi
-    with Closeable {
+    with ClientCompanion {
 
   protected def logger: Logger
 

core/src/main/scala/app/softnetwork/elastic/client/ElasticClientCompanion.scala

@@ -16,6 +16,7 @@
 
 package app.softnetwork.elastic.client
 
+import app.softnetwork.common.ClientCompanion
 import org.apache.http.HttpHost
 import org.slf4j.Logger
 
@@ -25,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger
 import scala.language.reflectiveCalls
 import scala.util.{Failure, Success, Try}
 
-trait ElasticClientCompanion[T <: Closeable] extends Closeable { _: { def logger: Logger } =>
+trait ElasticClientCompanion[T <: Closeable] extends ClientCompanion { _: { def logger: Logger } =>
 
   def elasticConfig: ElasticConfig
 
@@ -140,13 +141,7 @@ trait ElasticClientCompanion[T <: Closeable] extends Closeable { _: { def logger
 
   /** Check if client is initialized and connected
     */
-  def isInitialized: Boolean = client.isDefined
-
-  /** Test connection to Elasticsearch cluster
-    * @return
-    *   true if connection is successful
-    */
-  def testConnection(): Boolean
+  override def isInitialized: Boolean = client.isDefined
 
   /** Close the client and release resources Idempotent - safe to call multiple times
     */

core/src/main/scala/app/softnetwork/elastic/client/ElasticClientDelegator.scala

@@ -41,10 +41,21 @@ trait ElasticClientDelegator extends ElasticClientApi with BulkTypes {
   // Delegate config to the underlying client
   override lazy val config: Config = delegate.config
 
-  // ==================== Closeable ====================
+  // ==================== ClientCompanion ====================
 
   override def close(): Unit = delegate.close()
 
+  /** Check if client is initialized and connected
+    */
+  override def isInitialized: Boolean = delegate.isInitialized
+
+  /** Test connection
+    *
+    * @return
+    *   true if connection is successful
+    */
+  override def testConnection(): Boolean = delegate.testConnection()
+
   // ==================== VersionApi ====================
 
   /** Get Elasticsearch version.