Skip to content

Commit

Permalink
Feat/package standardisation (#1004)
Browse files Browse the repository at this point in the history
* Consistent package names throughout the project (io.lenses)
* Deprecate hbase and pulsar connectors (#1005)
  • Loading branch information
davidsloan authored Nov 28, 2023
1 parent 957c085 commit c41144a
Show file tree
Hide file tree
Showing 595 changed files with 3,137 additions and 7,713 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ A collection of components to build a real time ingestion pipeline.
The following connectors have been deprecated and are no longer included in future releases:

* Kudu
* HBase
* Hive
* Pulsar

### Connectors

Expand All @@ -46,15 +48,12 @@ The following connectors have been deprecated and are no longer included in futu
| Elastic 6 | Sink | Copy data from Kafka to Elastic Search 6.x w. tcp or http | [Docs](https://docs.lenses.io/connectors/sink/elastic6.html) |
| FTP/HTTP | Source | Copy data from FTP/HTTP to Kafka. | [Docs](https://docs.lenses.io/5.2/connectors/sources/ftpsourceconnector/) |
| Hazelcast | Sink | Copy data from Kafka to Hazelcast. | [Docs](https://docs.lenses.io/connectors/sink/hazelcast.html) |
| HBase | Sink | Copy data from Kafka to HBase. | [Docs](https://docs.lenses.io/connectors/sink/hbase.html) |
| InfluxDb | Sink | Copy data from Kafka to InfluxDb. | [Docs](https://docs.lenses.io/4.0/integrations/connectors/stream-reactor/sinks/influxsinkconnector/) |
| JMS | Source | Copy data from JMS topics/queues to Kafka. | [Docs](https://docs.lenses.io/connectors/source/jms.html) |
| JMS | Sink | Copy data from Kafka to JMS. | [Docs](https://docs.lenses.io/connectors/sink/jms.html) |
| MongoDB | Sink | Copy data from Kafka to MongoDB. | [Docs](https://docs.lenses.io/connectors/sink/mongo.html) |
| MQTT | Source | Copy data from MQTT to Kafka. | [Docs](https://docs.lenses.io/connectors/source/mqtt.html) |
| MQTT | Sink | Copy data from Kafka to MQTT. | [Docs](https://docs.lenses.io/connectors/sink/mqtt.html) |
| Pulsar | Source | Copy data from Pulsar to Kafka. | [Docs](https://docs.lenses.io/connectors/source/pulsar.html) |
| Pulsar | Sink | Copy data from Kafka to Pulsar. | [Docs](https://docs.lenses.io/connectors/sink/pulsar.html) |
| Redis | Sink | Copy data from Kafka to Redis. | [Docs](https://docs.lenses.io/connectors/sink/redis.html) |

## Release Notes
Expand Down
40 changes: 0 additions & 40 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,10 @@ lazy val subProjects: Seq[Project] = Seq(
ftp,
`gcp-storage`,
hazelcast,
hbase,
influxdb,
jms,
mongodb,
mqtt,
pulsar,
redis,
)

Expand Down Expand Up @@ -338,25 +336,6 @@ lazy val mqtt = (project in file("kafka-connect-mqtt"))
.disableParallel()
.enablePlugins(PackPlugin)

lazy val pulsar = (project in file("kafka-connect-pulsar"))
.dependsOn(common)
.settings(
settings ++
Seq(
name := "kafka-connect-pulsar",
description := "Kafka Connect compatible connectors to move data between Kafka and popular data stores",
libraryDependencies ++= baseDeps ++ kafkaConnectPulsarDeps,
publish / skip := true,
packExcludeJars := Seq(
"scala-.*\\.jar",
"zookeeper-.*\\.jar",
),
),
)
.configureAssembly(true)
.configureTests(baseTestDeps)
.enablePlugins(PackPlugin)

lazy val ftp = (project in file("kafka-connect-ftp"))
.dependsOn(common)
.settings(
Expand All @@ -377,25 +356,6 @@ lazy val ftp = (project in file("kafka-connect-ftp"))
.configureIntegrationTests(kafkaConnectFtpTestDeps)
.enablePlugins(PackPlugin)

lazy val hbase = (project in file("kafka-connect-hbase"))
.dependsOn(common)
.settings(
settings ++
Seq(
name := "kafka-connect-hbase",
description := "Kafka Connect compatible connectors to move data between Kafka and popular data stores",
libraryDependencies ++= baseDeps ++ kafkaConnectHbaseDeps,
publish / skip := true,
packExcludeJars := Seq(
"scala-.*\\.jar",
"zookeeper-.*\\.jar",
),
),
)
.configureAssembly(true)
.configureTests(baseTestDeps)
.enablePlugins(PackPlugin)

lazy val mongodb = (project in file("kafka-connect-mongodb"))
.dependsOn(common)
.dependsOn(`test-common` % "test->compile;it->compile;fun->compile")
Expand Down
2 changes: 1 addition & 1 deletion conf/azure-docdb-sink.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
name=azure-docdb-sink
connector.class=com.datamountaineer.streamreactor.connect.azure.documentdb.sink.DocumentDbSinkConnector
connector.class=io.lenses.streamreactor.connect.azure.documentdb.sink.DocumentDbSinkConnector
tasks.max=1
topics=orders-avro
connect.documentdb.db=dm
Expand Down
2 changes: 1 addition & 1 deletion conf/cassandra-sink.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
name=cassandra-sink-orders
connector.class=com.datamountaineer.streamreactor.connect.cassandra.sink.CassandraSinkConnector
connector.class=io.lenses.streamreactor.connect.cassandra.sink.CassandraSinkConnector
tasks.max=1
topics=orders-topic
connect.cassandra.port=9042
Expand Down
2 changes: 1 addition & 1 deletion conf/cassandra-source-incr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
name=cassandra-source-incremental
connector.class=com.datamountaineer.streamreactor.connect.cassandra.source.CassandraSourceConnector
connector.class=io.lenses.streamreactor.connect.cassandra.source.CassandraSourceConnector
tasks.max=1
connect.cassandra.contact.points=localhost
connect.cassandra.username=cassandra
Expand Down
2 changes: 1 addition & 1 deletion conf/cassandra-source.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
name=cassandra-source-orders
connector.class=com.datamountaineer.streamreactor.connect.cassandra.source.CassandraSourceConnector
connector.class=io.lenses.streamreactor.connect.cassandra.source.CassandraSourceConnector
tasks.max=1
connect.cassandra.key.space=demo
connect.cassandra.import.mode=incremental
Expand Down
2 changes: 1 addition & 1 deletion conf/elastic-sink.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
name=elastic-sink
connector.class=com.datamountaineer.streamreactor.connect.elastic5.ElasticSinkConnector
connector.class=io.lenses.streamreactor.connect.elastic5.ElasticSinkConnector
tasks.max=1
topics=orders-topic
connect.elastic.url=localhost:9300
Expand Down
2 changes: 1 addition & 1 deletion conf/elastic5-sink.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
name=elastic-sink
connector.class=com.datamountaineer.streamreactor.connect.elastic5.ElasticSinkConnector
connector.class=io.lenses.streamreactor.connect.elastic5.ElasticSinkConnector
tasks.max=1
topics=orders-topic
connect.elastic.url=localhost:9300
Expand Down
2 changes: 1 addition & 1 deletion conf/elastic6-sink.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
name=elastic-sink
connector.class=com.datamountaineer.streamreactor.connect.elastic6.ElasticSinkConnector
connector.class=io.lenses.streamreactor.connect.elastic6.ElasticSinkConnector
tasks.max=1
topics=orders-topic
connect.elastic.url=localhost:9300
Expand Down
2 changes: 1 addition & 1 deletion conf/ftp-source.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
name=ftp-source
connector.class=com.datamountaineer.streamreactor.connect.ftp.FtpSourceConnector
connector.class=io.lenses.streamreactor.connect.ftp.FtpSourceConnector
tasks.max=1

#server settings
Expand Down
2 changes: 1 addition & 1 deletion conf/hazelcast-sink.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
name=hazelcast-sink
connector.class=com.datamountaineer.streamreactor.connect.hazelcast.sink.HazelCastSinkConnector
connector.class=io.lenses.streamreactor.connect.hazelcast.sink.HazelCastSinkConnector
tasks.max=1
topics=hazelcast-topic
connect.hazelcast.cluster.members=locallhost
Expand Down
22 changes: 0 additions & 22 deletions conf/hbase-sink.properties

This file was deleted.

2 changes: 1 addition & 1 deletion conf/influxdb-sink.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
name=influxdb-sink
connector.class=com.datamountaineer.streamreactor.connect.influx.InfluxSinkConnector
connector.class=io.lenses.streamreactor.connect.influx.InfluxSinkConnector
tasks.max=1
topics=influx-topic
connect.influx.url=http://localhost:8086
Expand Down
2 changes: 1 addition & 1 deletion conf/jms-sink.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
name=jms-sink
connector.class=com.datamountaineer.streamreactor.connect.jms.sink.JMSSinkConnector
connector.class=io.lenses.streamreactor.connect.jms.sink.JMSSinkConnector
tasks.max=1
topics=topic
connect.jms.url=tcp://localhost:61616
Expand Down
2 changes: 1 addition & 1 deletion conf/mongodb-sink.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
name=mongo-sink-orders
connector.class=com.datamountaineer.streamreactor.connect.mongodb.sink.MongoSinkConnector
connector.class=io.lenses.streamreactor.connect.mongodb.sink.MongoSinkConnector
tasks.max=1
topics=orders-topic
connect.mongo.db=connect
Expand Down
2 changes: 1 addition & 1 deletion conf/mqtt-sink.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
name=mqtt-sink
connector.class=com.datamountaineer.streamreactor.connect.mqtt.sink.MqttSinkConnector
connector.class=io.lenses.streamreactor.connect.mqtt.sink.MqttSinkConnector
tasks.max=1
connect.mqtt.clean=true
connect.mqtt.timeout=1000
Expand Down
4 changes: 2 additions & 2 deletions conf/mqtt-source.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
# limitations under the License.
#
name=mqtt-source
connector.class=com.datamountaineer.streamreactor.connect.mqtt.source.MqttSourceConnector
connector.class=io.lenses.streamreactor.connect.mqtt.source.MqttSourceConnector
tasks.max=1
connect.mqtt.connection.clean=true
connect.mqtt.connection.timeout=1000
connect.mqtt.client.id=dm_source_id
connect.mqtt.converter.throw.on.error=true
connect.mqtt.hosts=tcp://127.0.0.1:11883
connect.mqtt.service.quality=1
connect.mqtt.kcql=INSERT INTO kjson SELECT * FROM /mjson WITHCONVERTER=`com.datamountaineer.streamreactor.connect.converters.source.JsonSimpleConverter`
connect.mqtt.kcql=INSERT INTO kjson SELECT * FROM /mjson WITHCONVERTER=`io.lenses.streamreactor.connect.converters.source.JsonSimpleConverter`
connect.converter.avro.schemas=/mavro=$PATH_TO/temperaturemeasure.avro
connect.progress.enabled=true
2 changes: 1 addition & 1 deletion conf/redis-sink.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
name=redis-sink
connector.class=com.datamountaineer.streamreactor.connect.redis.sink.RedisSinkConnector
connector.class=io.lenses.streamreactor.connect.redis.sink.RedisSinkConnector
tasks.max=1
topics=redis-topic
connect.redis.host=localhost
Expand Down
1 change: 0 additions & 1 deletion kafka-connect-aws-s3/src/fun/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
</encoder>
</appender>
<logger name="io.lenses" level="INFO"/>
<logger name="com.datamountaineer" level="INFO"/>
<logger name="org.apache.kafka.connect.json.JsonConverterConfig" level="WARN"/>
<root level="INFO">
<appender-ref ref="stdout"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.lenses.streamreactor.connect.cloud.common.sink

import com.datamountaineer.streamreactor.common.config.base.const.TraitConfigConst.ERROR_POLICY_PROP_SUFFIX
import com.datamountaineer.streamreactor.common.config.base.const.TraitConfigConst.MAX_RETRIES_PROP_SUFFIX
import com.datamountaineer.streamreactor.common.config.base.const.TraitConfigConst.RETRY_INTERVAL_PROP_SUFFIX
import io.lenses.streamreactor.common.config.base.const.TraitConfigConst.ERROR_POLICY_PROP_SUFFIX
import io.lenses.streamreactor.common.config.base.const.TraitConfigConst.MAX_RETRIES_PROP_SUFFIX
import io.lenses.streamreactor.common.config.base.const.TraitConfigConst.RETRY_INTERVAL_PROP_SUFFIX
import com.opencsv.CSVReader
import com.typesafe.scalalogging.LazyLogging
import io.lenses.streamreactor.connect.cloud.common.formats.AvroFormatReader
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
package io.lenses.streamreactor.connect.aws.s3.config

import com.datamountaineer.streamreactor.common.config.base.traits.BaseSettings
import com.datamountaineer.streamreactor.common.config.base.traits.WithConnectorPrefix
import io.lenses.streamreactor.common.config.base.traits.BaseSettings
import io.lenses.streamreactor.common.config.base.traits.WithConnectorPrefix
import enumeratum.Enum
import enumeratum.EnumEntry

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/
package io.lenses.streamreactor.connect.aws.s3.config

import com.datamountaineer.streamreactor.common.errors.ErrorPolicy
import com.datamountaineer.streamreactor.common.errors.ErrorPolicyEnum
import com.datamountaineer.streamreactor.common.errors.ThrowErrorPolicy
import io.lenses.streamreactor.common.errors.ErrorPolicy
import io.lenses.streamreactor.common.errors.ErrorPolicyEnum
import io.lenses.streamreactor.common.errors.ThrowErrorPolicy
import enumeratum.Enum
import enumeratum.EnumEntry
import io.lenses.streamreactor.connect.aws.s3.config.S3ConfigSettings._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package io.lenses.streamreactor.connect.aws.s3.config

import com.datamountaineer.streamreactor.common.config.base.const.TraitConfigConst._
import io.lenses.streamreactor.common.config.base.const.TraitConfigConst._

object S3ConfigSettings {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package io.lenses.streamreactor.connect.aws.s3.sink

import com.datamountaineer.streamreactor.common.utils.JarManifest
import io.lenses.streamreactor.common.utils.JarManifest
import com.typesafe.scalalogging.LazyLogging
import io.lenses.streamreactor.connect.aws.s3.config.S3ConfigSettings
import io.lenses.streamreactor.connect.aws.s3.sink.config.S3SinkConfigDef
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
package io.lenses.streamreactor.connect.aws.s3.sink

import com.datamountaineer.streamreactor.common.errors.RetryErrorPolicy
import com.datamountaineer.streamreactor.common.utils.JarManifest
import io.lenses.streamreactor.common.errors.RetryErrorPolicy
import io.lenses.streamreactor.common.utils.JarManifest
import io.lenses.streamreactor.connect.aws.s3.auth.AwsS3ClientCreator
import io.lenses.streamreactor.connect.aws.s3.config.S3Config
import io.lenses.streamreactor.connect.aws.s3.config.S3ConfigSettings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package io.lenses.streamreactor.connect.aws.s3.sink.config

import com.datamountaineer.streamreactor.common.config.base.traits._
import io.lenses.streamreactor.common.config.base.traits._
import io.lenses.streamreactor.connect.aws.s3.config.DeleteModeSettings
import io.lenses.streamreactor.connect.aws.s3.config.S3ConfigSettings
import io.lenses.streamreactor.connect.cloud.common.config.CompressionCodecSettings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package io.lenses.streamreactor.connect.aws.s3.source

import com.datamountaineer.streamreactor.common.utils.JarManifest
import io.lenses.streamreactor.common.utils.JarManifest
import com.typesafe.scalalogging.LazyLogging
import io.lenses.streamreactor.connect.aws.s3.config.S3ConfigSettings.CONNECTOR_PREFIX
import io.lenses.streamreactor.connect.aws.s3.source.config.S3SourceConfigDef
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import cats.effect.IO
import cats.effect.Ref
import cats.effect.unsafe.implicits.global
import cats.implicits.catsSyntaxOptionId
import com.datamountaineer.streamreactor.common.utils.AsciiArtPrinter.printAsciiHeader
import com.datamountaineer.streamreactor.common.utils.JarManifest
import io.lenses.streamreactor.common.utils.AsciiArtPrinter.printAsciiHeader
import io.lenses.streamreactor.common.utils.JarManifest
import com.typesafe.scalalogging.LazyLogging
import io.lenses.streamreactor.connect.aws.s3.model.location.S3LocationValidator
import io.lenses.streamreactor.connect.aws.s3.source.state.S3SourceState
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package io.lenses.streamreactor.connect.aws.s3.source.config

import cats.implicits.toTraverseOps
import com.datamountaineer.kcql.Kcql
import io.lenses.kcql.Kcql
import io.lenses.streamreactor.connect.aws.s3.config.S3Config
import io.lenses.streamreactor.connect.aws.s3.config.S3ConfigSettings.SOURCE_ORDERING_TYPE
import io.lenses.streamreactor.connect.aws.s3.config.S3ConfigSettings.SOURCE_PARTITION_EXTRACTOR_REGEX
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package io.lenses.streamreactor.connect.aws.s3.source.config

import com.datamountaineer.streamreactor.common.config.base.traits._
import io.lenses.streamreactor.common.config.base.traits._
import io.lenses.streamreactor.connect.aws.s3.config.DeleteModeSettings
import io.lenses.streamreactor.connect.aws.s3.config.S3ConfigSettings
import io.lenses.streamreactor.connect.cloud.common.config.CompressionCodecSettings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
package io.lenses.streamreactor.connect.aws.s3.source.config

import com.datamountaineer.streamreactor.common.config.base.traits.BaseSettings
import com.datamountaineer.streamreactor.common.config.base.traits.WithConnectorPrefix
import io.lenses.streamreactor.common.config.base.traits.BaseSettings
import io.lenses.streamreactor.common.config.base.traits.WithConnectorPrefix
import io.lenses.streamreactor.connect.aws.s3.config.S3ConfigSettings._
import io.lenses.streamreactor.connect.cloud.common.config.ConfigParse.getLong
import io.lenses.streamreactor.connect.cloud.common.source.config.PartitionSearcherOptions
Expand Down
Loading

0 comments on commit c41144a

Please sign in to comment.