Moving or removing unused traits (#1051)

kafka-connect-aws-s3/src/main/scala/io/lenses/streamreactor/connect/aws/s3/sink/config/S3SinkConfigDefBuilder.scala

@@ -27,8 +27,6 @@ case class S3SinkConfigDefBuilder(props: Map[String, String])
     with CloudSinkConfigDefBuilder
     with ErrorPolicySettings
     with NumberRetriesSettings
-    with UserSettings
-    with ConnectionSettings
     with DeleteModeSettings {
 
   def getParsedValues: Map[String, _] = values().asScala.toMap

kafka-connect-azure-datalake/src/main/scala/io/lenses/streamreactor/connect/datalake/sink/config/DatalakeSinkConfigDefBuilder.scala

@@ -27,8 +27,6 @@ case class DatalakeSinkConfigDefBuilder(props: Map[String, String])
     with CloudSinkConfigDefBuilder
     with ErrorPolicySettings
     with NumberRetriesSettings
-    with UserSettings
-    with ConnectionSettings
     with AuthModeSettings {
 
   def getParsedValues: Map[String, _] = values().asScala.toMap

kafka-connect-cloud-common/src/main/scala/io/lenses/streamreactor/connect/cloud/common/source/config/CloudSourceConfigDefBuilder.scala

@@ -16,11 +16,9 @@
 package io.lenses.streamreactor.connect.cloud.common.source.config
 
 import io.lenses.streamreactor.common.config.base.traits.BaseConfig
-import io.lenses.streamreactor.common.config.base.traits.ConnectionSettings
 import io.lenses.streamreactor.common.config.base.traits.ErrorPolicySettings
 import io.lenses.streamreactor.common.config.base.traits.KcqlSettings
 import io.lenses.streamreactor.common.config.base.traits.NumberRetriesSettings
-import io.lenses.streamreactor.common.config.base.traits.UserSettings
 import io.lenses.streamreactor.connect.cloud.common.config.CompressionCodecSettings
 import org.apache.kafka.common.config.ConfigDef
 
@@ -33,6 +31,4 @@ abstract class CloudSourceConfigDefBuilder(
     with KcqlSettings
     with ErrorPolicySettings
     with NumberRetriesSettings
-    with UserSettings
-    with ConnectionSettings
     with CompressionCodecSettings {}

kafka-connect-common/src/main/scala/io/lenses/streamreactor/common/config/base/traits/UserSettings.scala

@@ -23,8 +23,8 @@ import io.lenses.streamreactor.common.config.base.const.TraitConfigConst.USERNAM
   * stream-reactor
   */
 trait UserSettings extends BaseSettings {
-  val passwordConst = s"$connectorPrefix.$PASSWORD_SUFFIX"
-  val usernameConst = s"$connectorPrefix.$USERNAME_SUFFIX"
+  private val passwordConst = s"$connectorPrefix.$PASSWORD_SUFFIX"
+  private val usernameConst = s"$connectorPrefix.$USERNAME_SUFFIX"
 
   def getSecret   = getPassword(passwordConst)
   def getUsername = getString(usernameConst)

kafka-connect-gcp-storage/src/main/scala/io/lenses/streamreactor/connect/gcp/storage/sink/config/GCPStorageSinkConfigDefBuilder.scala

@@ -28,8 +28,6 @@ case class GCPStorageSinkConfigDefBuilder(props: Map[String, String])
     with CloudSinkConfigDefBuilder
     with ErrorPolicySettings
     with NumberRetriesSettings
-    with UserSettings
-    with ConnectionSettings
     with AuthModeSettings
     with UploadSettings {
 

kafka-connect-jms/src/main/scala/io/lenses/streamreactor/connect/jms/config/JMSConfig.scala

@@ -288,4 +288,4 @@ case class JMSConfig(props: Map[String, String])
     with ErrorPolicySettings
     with NumberRetriesSettings
     with UserSettings
-    with ConnectionSettings
+    with UrlSettings

kafka-connect-jms/src/main/scala/io/lenses/streamreactor/connect/jms/config/UrlSettings.scala

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2017-2024 Lenses.io Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lenses.streamreactor.connect.jms.config
+
+/**
+  * Created by [email protected] on 31/07/2017.
+  * stream-reactor
+  */
+
+import io.lenses.streamreactor.common.config.base.const.TraitConfigConst._
+import io.lenses.streamreactor.common.config.base.traits.BaseSettings
+import org.apache.kafka.common.config.ConfigException
+
+trait UrlSettings extends BaseSettings {
+  private val urlConst = s"$connectorPrefix.$URL_SUFFIX"
+
+  def getUrl: String = {
+    val url = getString(urlConst)
+    if (url == null || url.trim.isEmpty) {
+      throw new ConfigException(s"$urlConst has not been set")
+    }
+    url
+  }
+
+}

kafka-connect-common/src/main/scala/io/lenses/streamreactor/common/config/base/traits/ConnectionSettings.scala → kafka-connect-mqtt/src/main/scala/io/lenses/streamreactor/connect/mqtt/config/HostSettings.scala

@@ -13,31 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.lenses.streamreactor.common.config.base.traits
+package io.lenses.streamreactor.connect.mqtt.config
 
 /**
   * Created by [email protected] on 31/07/2017.
   * stream-reactor
   */
 
 import io.lenses.streamreactor.common.config.base.const.TraitConfigConst._
+import io.lenses.streamreactor.common.config.base.traits.BaseSettings
 import org.apache.kafka.common.config.ConfigException
 
-trait ConnectionSettings extends BaseSettings {
-  val urlConst   = s"$connectorPrefix.$URL_SUFFIX"
-  val hostConst  = s"$connectorPrefix.$CONNECTION_HOST_SUFFIX"
-  val hostsConst = s"$connectorPrefix.$CONNECTION_HOSTS_SUFFIX"
-  val portConst  = s"$connectorPrefix.$CONNECTION_PORT_SUFFIX"
-
-  def getPort = getInt(portConst)
-
-  def getUrl: String = {
-    val url = getString(urlConst)
-    if (url == null || url.trim.isEmpty) {
-      throw new ConfigException(s"$urlConst has not been set")
-    }
-    url
-  }
+trait HostSettings extends BaseSettings {
+  private val hostsConst = s"$connectorPrefix.$CONNECTION_HOSTS_SUFFIX"
 
   def getHosts: String = {
     val connection = getString(hostsConst)
@@ -48,12 +36,4 @@ trait ConnectionSettings extends BaseSettings {
     connection
   }
 
-  def getHost: String = {
-    val connection = getString(hostConst)
-
-    if (connection == null || connection.trim.isEmpty) {
-      throw new ConfigException(s"$hostsConst is not provided!")
-    }
-    connection
-  }
 }

kafka-connect-mqtt/src/main/scala/io/lenses/streamreactor/connect/mqtt/config/MqttConfig.scala

@@ -303,5 +303,5 @@ trait MqttConfigBase
     with NumberRetriesSettings
     with ErrorPolicySettings
     with SSLSettings
-    with ConnectionSettings
+    with HostSettings
     with UserSettings