From 9e5c130f5784ba7a6da77d39e222dba0a7e4d44e Mon Sep 17 00:00:00 2001 From: Jeremy Custenborder Date: Sun, 14 Feb 2021 17:37:56 -0600 Subject: [PATCH] Refactored to shade jackson and guava. Fixes #173. (#175) --- bin/debug.sh | 19 ++++++++++++++++--- config/JsonExample.properties | 2 ++ config/connect-avro-docker.properties | 2 +- docker-compose.yml | 11 +++++++++++ pom.xml | 3 ++- .../spooldir/AbstractSchemaGenerator.java | 8 ++++---- .../AbstractSourceConnectorConfig.java | 4 ++-- .../connect/spooldir/AbstractSourceTask.java | 6 +++--- .../AbstractSpoolDirSourceConnector.java | 6 +++--- ...AbstractSpoolDirSourceConnectorConfig.java | 8 ++++---- .../spooldir/AbstractSpoolDirSourceTask.java | 2 +- .../AbstractTaskPartitionerPredicate.java | 2 +- .../connect/spooldir/FileComparator.java | 2 +- .../kafka/connect/spooldir/InputFile.java | 4 ++-- .../connect/spooldir/InputFileDequeue.java | 2 +- .../connect/spooldir/JsonSchemaGenerator.java | 6 +++--- .../kafka/connect/spooldir/Metadata.java | 4 ++-- .../SpoolDirBinaryFileSourceTask.java | 2 +- .../SpoolDirCsvSourceConnectorConfig.java | 4 ++-- .../spooldir/SpoolDirCsvSourceTask.java | 2 +- .../spooldir/SpoolDirJsonSourceTask.java | 6 +++--- .../SpoolDirSchemaLessJsonSourceTask.java | 6 +++--- .../spooldir/elf/SchemaConversionBuilder.java | 2 +- .../spooldir/AbstractCleanUpPolicyTest.java | 4 ++-- .../spooldir/AbstractSchemaGeneratorTest.java | 2 +- .../AbstractSpoolDirSourceConnectorTest.java | 2 +- .../AbstractSpoolDirSourceTaskTest.java | 8 ++++---- .../connect/spooldir/FileComparatorTest.java | 4 ++-- .../ProcessingFileExistsPredicateTest.java | 2 +- .../spooldir/SpoolDirAvroSourceTaskTest.java | 2 +- .../SpoolDirBinaryFileSourceTaskTest.java | 2 +- .../SpoolDirCsvSourceConnectorTest.java | 2 +- .../spooldir/SpoolDirCsvSourceTaskTest.java | 2 +- .../SpoolDirJsonSourceConnectorTest.java | 2 +- .../spooldir/SpoolDirJsonSourceTaskTest.java | 2 +- .../SpoolDirSchemaLessJsonSourceTaskTest.java | 2 +- .../kafka/connect/spooldir/TestCase.java | 2 +- .../kafka/connect/spooldir/TestDataUtils.java | 2 +- .../elf/SchemaConversionBuilderTest.java | 2 +- .../elf/SpoolDirELFSourceTaskTest.java | 2 +- 40 files changed, 92 insertions(+), 65 deletions(-) diff --git a/bin/debug.sh b/bin/debug.sh index 18d79e9..fa6f913 100755 --- a/bin/debug.sh +++ b/bin/debug.sh @@ -38,6 +38,19 @@ if [ ! -d "${FINISHED_PATH}" ]; then mkdir -p "${FINISHED_PATH}" fi -cp src/test/resources/com/github/jcustenborder/kafka/connect/spooldir/csv/FieldsMatch.data "${INPUT_PATH}/FieldsMatch.csv" -connect-standalone config/connect-avro-docker.properties config/CSVSchemaGenerator.properties -# connect-standalone config/connect-avro-docker.properties config/AvroExample.properties \ No newline at end of file +cp /Users/jeremy/Downloads/csv-spooldir-source.csv "${INPUT_PATH}/csv-spooldir-source.csv" +# cp src/test/resources/com/github/jcustenborder/kafka/connect/spooldir/csv/FieldsMatch.data "${INPUT_PATH}/FieldsMatch.csv" +# cp src/test/resources/com/github/jcustenborder/kafka/connect/spooldir/json/FieldsMatch.data "${INPUT_PATH}/FieldsMatch.json" +# connect-standalone config/connect-avro-docker.properties config/CSVSchemaGenerator.properties +# connect-standalone config/connect-avro-docker.properties config/JsonExample.properties +# connect-standalone config/connect-avro-docker.properties config/AvroExample.properties + +export DOCKER_IMAGE="confluentinc/cp-kafka-connect:5.5.2-1-ubi8" + +docker run --rm --network=kafka-connect-spooldir_default \ + -p "5005:5005" \ + -v "/tmp/spooldir:/tmp/spooldir" \ + -v "$(pwd)/config:/config" \ + -v "$(pwd)/target/kafka-connect-target/usr/share/kafka-connect:/plugins" \ + "${DOCKER_IMAGE}" /bin/connect-standalone /config/connect-avro-docker.properties /config/CSVSchemaGenerator.properties + diff --git a/config/JsonExample.properties b/config/JsonExample.properties index b6e8e38..2dc2a12 100644 --- a/config/JsonExample.properties +++ b/config/JsonExample.properties @@ -19,6 +19,8 @@ tasks.max=1 connector.class=com.github.jcustenborder.kafka.connect.spooldir.SpoolDirJsonSourceConnector input.file.pattern=^.*\.json$ finished.path=/tmp/spooldir/finished +input.path=/tmp/spooldir/input +error.path=/tmp/spooldir/error halt.on.error=false topic=testing key.schema={"name":"com.example.users.UserKey","type":"STRUCT","isOptional":false,"fieldSchemas":{"id":{"type":"INT64","isOptional":false}}} diff --git a/config/connect-avro-docker.properties b/config/connect-avro-docker.properties index f72651a..11388e8 100644 --- a/config/connect-avro-docker.properties +++ b/config/connect-avro-docker.properties @@ -24,7 +24,7 @@ internal.value.converter=org.apache.kafka.connect.json.JsonConverter internal.key.converter.schemas.enable=false internal.value.converter.schemas.enable=false offset.storage.file.filename=/tmp/connect.offsets -plugin.path=target/kafka-connect-target/usr/share/kafka-connect +plugin.path=target/kafka-connect-target/usr/share/kafka-connect,/plugins config.storage.replication.factor=1 config.storage.topic=connect_config diff --git a/docker-compose.yml b/docker-compose.yml index 769fbf4..80dd664 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,3 +42,14 @@ services: environment: SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: "zookeeper:2181" SCHEMA_REGISTRY_HOST_NAME: schema-registry + connect: + image: confluentinc/cp-kafka-connect:5.5.1-1-ubi8 + depends_on: + - kafka + - zookeeper + - schema-registry + ports: + - "5005:5005" + environment: + CONNECT_BOOTSTRAP_SERVERS: kafka:9092 + CONNECT_GROUP_ID: spooldir diff --git a/pom.xml b/pom.xml index 0b57c51..653e60c 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.github.jcustenborder.kafka.connect kafka-connect-parent - 2.6.1 + 2.6.1-1 kafka-connect-spooldir 2.0-SNAPSHOT @@ -91,6 +91,7 @@ + io.confluent kafka-connect-maven-plugin diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSchemaGenerator.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSchemaGenerator.java index 04b253c..cbba312 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSchemaGenerator.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSchemaGenerator.java @@ -15,11 +15,11 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.fasterxml.jackson.core.JsonProcessingException; +import shaded.com.fasterxml.jackson.core.JsonProcessingException; import com.github.jcustenborder.kafka.connect.utils.jackson.ObjectMapperFactory; -import com.google.common.base.Strings; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; +import shaded.com.google.common.base.Strings; +import shaded.com.google.common.collect.ImmutableList; +import shaded.com.google.common.collect.ImmutableMap; import net.sourceforge.argparse4j.ArgumentParsers; import net.sourceforge.argparse4j.inf.ArgumentParser; import net.sourceforge.argparse4j.inf.ArgumentParserException; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSourceConnectorConfig.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSourceConnectorConfig.java index 61dd8fe..7446893 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSourceConnectorConfig.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSourceConnectorConfig.java @@ -22,8 +22,8 @@ import com.github.jcustenborder.kafka.connect.utils.config.recommenders.Recommenders; import com.github.jcustenborder.kafka.connect.utils.config.validators.Validators; import com.github.jcustenborder.kafka.connect.utils.config.validators.filesystem.ValidDirectoryWritable; -import com.google.common.collect.ImmutableList; -import com.google.common.io.PatternFilenameFilter; +import shaded.com.google.common.collect.ImmutableList; +import shaded.com.google.common.io.PatternFilenameFilter; import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.config.ConfigDef; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSourceTask.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSourceTask.java index e6a0a3d..5b041cf 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSourceTask.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSourceTask.java @@ -16,9 +16,9 @@ package com.github.jcustenborder.kafka.connect.spooldir; import com.github.jcustenborder.kafka.connect.utils.VersionUtil; -import com.google.common.base.Preconditions; -import com.google.common.base.Stopwatch; -import com.google.common.collect.ImmutableMap; +import shaded.com.google.common.base.Preconditions; +import shaded.com.google.common.base.Stopwatch; +import shaded.com.google.common.collect.ImmutableMap; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.errors.ConnectException; import org.apache.kafka.connect.source.SourceRecord; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceConnector.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceConnector.java index 63b06bd..286be17 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceConnector.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceConnector.java @@ -17,9 +17,9 @@ import com.github.jcustenborder.kafka.connect.utils.VersionUtil; import com.github.jcustenborder.kafka.connect.utils.jackson.ObjectMapperFactory; -import com.google.common.base.Preconditions; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import shaded.com.google.common.base.Preconditions; +import shaded.com.google.common.collect.HashMultimap; +import shaded.com.google.common.collect.Multimap; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.errors.ConnectException; import org.apache.kafka.connect.errors.DataException; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceConnectorConfig.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceConnectorConfig.java index 7ffa2bb..9bd7422 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceConnectorConfig.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceConnectorConfig.java @@ -15,13 +15,13 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.fasterxml.jackson.core.JsonProcessingException; +import shaded.com.fasterxml.jackson.core.JsonProcessingException; import com.github.jcustenborder.kafka.connect.utils.config.ConfigKeyBuilder; import com.github.jcustenborder.kafka.connect.utils.config.recommenders.Recommenders; import com.github.jcustenborder.kafka.connect.utils.jackson.ObjectMapperFactory; -import com.google.common.base.Preconditions; -import com.google.common.base.Strings; -import com.google.common.collect.ImmutableList; +import shaded.com.google.common.base.Preconditions; +import shaded.com.google.common.base.Strings; +import shaded.com.google.common.collect.ImmutableList; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigDef.Type; import org.apache.kafka.connect.data.Field; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceTask.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceTask.java index c4f68d4..da6b305 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceTask.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceTask.java @@ -20,7 +20,7 @@ import com.github.jcustenborder.kafka.connect.utils.data.type.TimeTypeParser; import com.github.jcustenborder.kafka.connect.utils.data.type.TimestampTypeParser; import com.github.jcustenborder.kafka.connect.utils.data.type.TypeParser; -import com.google.common.collect.ImmutableMap; +import shaded.com.google.common.collect.ImmutableMap; import org.apache.kafka.connect.data.Date; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractTaskPartitionerPredicate.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractTaskPartitionerPredicate.java index e3751e6..6c852b4 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractTaskPartitionerPredicate.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractTaskPartitionerPredicate.java @@ -15,7 +15,7 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.hash.Hashing; +import shaded.com.google.common.hash.Hashing; import org.apache.kafka.common.config.ConfigException; import java.io.File; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/FileComparator.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/FileComparator.java index 2d6295c..5ec31c2 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/FileComparator.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/FileComparator.java @@ -15,7 +15,7 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.collect.ComparisonChain; +import shaded.com.google.common.collect.ComparisonChain; import java.io.File; import java.util.Comparator; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/InputFile.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/InputFile.java index 43317a2..ca7b8a5 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/InputFile.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/InputFile.java @@ -15,8 +15,8 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.collect.ImmutableMap; -import com.google.common.io.Files; +import shaded.com.google.common.collect.ImmutableMap; +import shaded.com.google.common.io.Files; import org.apache.commons.compress.compressors.CompressorException; import org.apache.commons.compress.compressors.CompressorStreamFactory; import org.slf4j.Logger; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/InputFileDequeue.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/InputFileDequeue.java index c078452..495e72c 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/InputFileDequeue.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/InputFileDequeue.java @@ -15,7 +15,7 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.collect.ForwardingDeque; +import shaded.com.google.common.collect.ForwardingDeque; import org.apache.kafka.common.utils.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/JsonSchemaGenerator.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/JsonSchemaGenerator.java index 20d7dfe..139e93e 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/JsonSchemaGenerator.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/JsonSchemaGenerator.java @@ -15,9 +15,9 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.JsonNode; +import shaded.com.fasterxml.jackson.core.JsonFactory; +import shaded.com.fasterxml.jackson.core.JsonParser; +import shaded.com.fasterxml.jackson.databind.JsonNode; import com.github.jcustenborder.kafka.connect.utils.jackson.ObjectMapperFactory; import org.apache.kafka.connect.data.Schema; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/Metadata.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/Metadata.java index 8c7df6a..32dfd1f 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/Metadata.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/Metadata.java @@ -15,8 +15,8 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.collect.ImmutableMap; -import com.google.common.io.Files; +import shaded.com.google.common.collect.ImmutableMap; +import shaded.com.google.common.io.Files; import org.apache.kafka.connect.header.ConnectHeaders; import org.apache.kafka.connect.header.Headers; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirBinaryFileSourceTask.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirBinaryFileSourceTask.java index 119a673..e235a96 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirBinaryFileSourceTask.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirBinaryFileSourceTask.java @@ -15,7 +15,7 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.io.ByteStreams; +import shaded.com.google.common.io.ByteStreams; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.source.SourceRecord; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceConnectorConfig.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceConnectorConfig.java index 1b6ffdd..dc92a05 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceConnectorConfig.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceConnectorConfig.java @@ -18,8 +18,8 @@ import com.github.jcustenborder.kafka.connect.utils.config.ConfigKeyBuilder; import com.github.jcustenborder.kafka.connect.utils.config.ConfigUtils; import com.github.jcustenborder.kafka.connect.utils.config.ValidEnum; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; +import shaded.com.google.common.base.Joiner; +import shaded.com.google.common.base.Preconditions; import com.opencsv.CSVParser; import com.opencsv.CSVParserBuilder; import com.opencsv.CSVReader; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceTask.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceTask.java index 90e5071..0106c32 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceTask.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceTask.java @@ -15,7 +15,7 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.base.Joiner; +import shaded.com.google.common.base.Joiner; import com.opencsv.CSVReader; import com.opencsv.CSVReaderBuilder; import com.opencsv.ICSVParser; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirJsonSourceTask.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirJsonSourceTask.java index 77b40ca..bdc7f62 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirJsonSourceTask.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirJsonSourceTask.java @@ -15,9 +15,9 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.JsonNode; +import shaded.com.fasterxml.jackson.core.JsonFactory; +import shaded.com.fasterxml.jackson.core.JsonParser; +import shaded.com.fasterxml.jackson.databind.JsonNode; import com.github.jcustenborder.kafka.connect.utils.jackson.ObjectMapperFactory; import org.apache.kafka.connect.data.Field; import org.apache.kafka.connect.data.SchemaAndValue; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirSchemaLessJsonSourceTask.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirSchemaLessJsonSourceTask.java index d9cf349..4f40c5f 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirSchemaLessJsonSourceTask.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirSchemaLessJsonSourceTask.java @@ -15,9 +15,9 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.MappingIterator; +import shaded.com.fasterxml.jackson.core.JsonParser; +import shaded.com.fasterxml.jackson.databind.JsonNode; +import shaded.com.fasterxml.jackson.databind.MappingIterator; import com.github.jcustenborder.kafka.connect.utils.jackson.ObjectMapperFactory; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; diff --git a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/elf/SchemaConversionBuilder.java b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/elf/SchemaConversionBuilder.java index 3a5b8d7..2d41be0 100644 --- a/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/elf/SchemaConversionBuilder.java +++ b/src/main/java/com/github/jcustenborder/kafka/connect/spooldir/elf/SchemaConversionBuilder.java @@ -18,7 +18,7 @@ import com.github.jcustenborder.kafka.connect.spooldir.elf.converters.LogFieldConverter; import com.github.jcustenborder.kafka.connect.spooldir.elf.converters.LogFieldConverterFactory; import com.github.jcustenborder.parsers.elf.ElfParser; -import com.google.common.base.Preconditions; +import shaded.com.google.common.base.Preconditions; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaBuilder; import org.slf4j.Logger; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractCleanUpPolicyTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractCleanUpPolicyTest.java index 5367b64..6574e2b 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractCleanUpPolicyTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractCleanUpPolicyTest.java @@ -1,7 +1,7 @@ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.collect.ImmutableMap; -import com.google.common.io.Files; +import shaded.com.google.common.collect.ImmutableMap; +import shaded.com.google.common.io.Files; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSchemaGeneratorTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSchemaGeneratorTest.java index ec27613..0b27b9a 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSchemaGeneratorTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSchemaGeneratorTest.java @@ -15,7 +15,7 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.io.Files; +import shaded.com.google.common.io.Files; import org.junit.jupiter.api.BeforeEach; import java.io.File; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceConnectorTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceConnectorTest.java index 866c581..b524874 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceConnectorTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceConnectorTest.java @@ -15,7 +15,7 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.io.Files; +import shaded.com.google.common.io.Files; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceTaskTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceTaskTest.java index 764ea4f..c17c3da 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceTaskTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/AbstractSpoolDirSourceTaskTest.java @@ -15,11 +15,11 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.fasterxml.jackson.databind.SerializationFeature; +import shaded.com.fasterxml.jackson.databind.SerializationFeature; import com.github.jcustenborder.kafka.connect.utils.jackson.ObjectMapperFactory; -import com.google.common.collect.Maps; -import com.google.common.io.ByteStreams; -import com.google.common.io.Files; +import shaded.com.google.common.collect.Maps; +import shaded.com.google.common.io.ByteStreams; +import shaded.com.google.common.io.Files; import org.apache.kafka.connect.source.SourceRecord; import org.apache.kafka.connect.source.SourceTaskContext; import org.apache.kafka.connect.storage.OffsetStorageReader; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/FileComparatorTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/FileComparatorTest.java index f499594..207673b 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/FileComparatorTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/FileComparatorTest.java @@ -1,7 +1,7 @@ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.collect.ImmutableList; -import com.google.common.io.Files; +import shaded.com.google.common.collect.ImmutableList; +import shaded.com.google.common.io.Files; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/ProcessingFileExistsPredicateTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/ProcessingFileExistsPredicateTest.java index 1984f33..8e3eae1 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/ProcessingFileExistsPredicateTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/ProcessingFileExistsPredicateTest.java @@ -1,6 +1,6 @@ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.io.Files; +import shaded.com.google.common.io.Files; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirAvroSourceTaskTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirAvroSourceTaskTest.java index 26b6537..06ace13 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirAvroSourceTaskTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirAvroSourceTaskTest.java @@ -1,6 +1,6 @@ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.io.Files; +import shaded.com.google.common.io.Files; import io.confluent.connect.avro.AvroData; import org.apache.avro.Schema; import org.apache.avro.file.CodecFactory; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirBinaryFileSourceTaskTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirBinaryFileSourceTaskTest.java index 359c91b..415c312 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirBinaryFileSourceTaskTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirBinaryFileSourceTaskTest.java @@ -1,6 +1,6 @@ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.io.Files; +import shaded.com.google.common.io.Files; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.TestFactory; import org.slf4j.Logger; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceConnectorTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceConnectorTest.java index e8f63af..9591f83 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceConnectorTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceConnectorTest.java @@ -15,7 +15,7 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.io.ByteStreams; +import shaded.com.google.common.io.ByteStreams; import org.apache.kafka.connect.errors.DataException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceTaskTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceTaskTest.java index ba7e5ff..c2cc9d4 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceTaskTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirCsvSourceTaskTest.java @@ -16,7 +16,7 @@ package com.github.jcustenborder.kafka.connect.spooldir; import com.github.jcustenborder.kafka.connect.utils.jackson.ObjectMapperFactory; -import com.google.common.io.Files; +import shaded.com.google.common.io.Files; import com.opencsv.CSVWriterBuilder; import com.opencsv.ICSVWriter; import org.apache.kafka.connect.data.Field; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirJsonSourceConnectorTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirJsonSourceConnectorTest.java index b17258d..1028140 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirJsonSourceConnectorTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirJsonSourceConnectorTest.java @@ -15,7 +15,7 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.io.ByteStreams; +import shaded.com.google.common.io.ByteStreams; import org.apache.kafka.connect.errors.DataException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirJsonSourceTaskTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirJsonSourceTaskTest.java index 5cecc44..4b6b7c2 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirJsonSourceTaskTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirJsonSourceTaskTest.java @@ -15,7 +15,7 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.io.Files; +import shaded.com.google.common.io.Files; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.TestFactory; import org.slf4j.Logger; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirSchemaLessJsonSourceTaskTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirSchemaLessJsonSourceTaskTest.java index 19c6278..2ca6c53 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirSchemaLessJsonSourceTaskTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/SpoolDirSchemaLessJsonSourceTaskTest.java @@ -1,6 +1,6 @@ package com.github.jcustenborder.kafka.connect.spooldir; -import com.google.common.io.Files; +import shaded.com.google.common.io.Files; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.TestFactory; import org.slf4j.Logger; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/TestCase.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/TestCase.java index dce2a24..0b7d050 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/TestCase.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/TestCase.java @@ -15,7 +15,7 @@ */ package com.github.jcustenborder.kafka.connect.spooldir; -import com.fasterxml.jackson.annotation.JsonIgnore; +import shaded.com.fasterxml.jackson.annotation.JsonIgnore; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.source.SourceRecord; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/TestDataUtils.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/TestDataUtils.java index ca6790b..1c497fc 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/TestDataUtils.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/TestDataUtils.java @@ -16,7 +16,7 @@ package com.github.jcustenborder.kafka.connect.spooldir; import com.github.jcustenborder.kafka.connect.utils.jackson.ObjectMapperFactory; -import com.google.common.base.Preconditions; +import shaded.com.google.common.base.Preconditions; import org.junit.jupiter.api.Test; import org.reflections.Reflections; import org.reflections.scanners.ResourcesScanner; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/elf/SchemaConversionBuilderTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/elf/SchemaConversionBuilderTest.java index 4077d6f..e80178a 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/elf/SchemaConversionBuilderTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/elf/SchemaConversionBuilderTest.java @@ -17,7 +17,7 @@ import com.github.jcustenborder.parsers.elf.ElfParser; import com.github.jcustenborder.parsers.elf.LogEntry; -import com.google.common.collect.ImmutableMap; +import shaded.com.google.common.collect.ImmutableMap; import org.apache.commons.lang3.tuple.Pair; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.data.Struct; diff --git a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/elf/SpoolDirELFSourceTaskTest.java b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/elf/SpoolDirELFSourceTaskTest.java index bdbed96..5534525 100644 --- a/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/elf/SpoolDirELFSourceTaskTest.java +++ b/src/test/java/com/github/jcustenborder/kafka/connect/spooldir/elf/SpoolDirELFSourceTaskTest.java @@ -17,7 +17,7 @@ import com.github.jcustenborder.kafka.connect.spooldir.AbstractSpoolDirSourceTaskTest; import com.github.jcustenborder.kafka.connect.spooldir.TestCase; -import com.google.common.io.Files; +import shaded.com.google.common.io.Files; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.TestFactory; import org.slf4j.Logger;