From 6f3a45543a45d108bdfd64fb630eb6b7777066ee Mon Sep 17 00:00:00 2001 From: jruaux Date: Tue, 15 Jun 2021 15:49:43 -0700 Subject: [PATCH] changed project structure --- build.gradle | 152 +++++++++++------- buildSrc/build.gradle | 17 -- .../groovy/riot.connector-conventions.gradle | 25 --- .../main/groovy/riot.java-conventions.gradle | 60 ------- .../groovy/riot.publish-conventions.gradle | 71 -------- connectors/riot-db/gradle.properties | 1 + {riot-db => connectors/riot-db}/riot-db | 0 .../riot-db/riot-db.gradle | 28 ++-- .../riot-db}/src/docs/asciidoc/index.adoc | 0 .../riot-db}/src/docs/asciidoc/order.json | 0 .../redislabs/riot/db/DataSourceOptions.java | 0 .../riot/db/DatabaseExportCommand.java | 0 .../riot/db/DatabaseExportOptions.java | 0 .../riot/db/DatabaseImportCommand.java | 0 .../riot/db/DatabaseImportOptions.java | 0 .../java/com/redislabs/riot/db/RiotDb.java | 0 .../riot/db/AbstractDatabaseTest.java | 0 .../com/redislabs/riot/db/ScriptRunner.java | 0 .../com/redislabs/riot/db/TestOracle.java | 0 .../com/redislabs/riot/db/TestPostgreSQL.java | 0 .../src/test/resources/export-postgresql | 0 .../src/test/resources/import-postgresql | 0 .../src/test/resources/import-postgresql-set | 0 .../riot-db}/src/test/resources/northwind.sql | 0 .../riot-db}/src/test/resources/oracle.sql | 0 connectors/riot-file/gradle.properties | 1 + {riot-file => connectors/riot-file}/riot-file | 0 .../riot-file/riot-file.gradle | 24 ++- .../riot-file}/src/docs/asciidoc/index.adoc | 0 .../src/docs/asciidoc/redis-dump.json | 0 .../riot/file/DataStructureItemProcessor.java | 0 .../riot/file/DumpFileImportCommand.java | 0 .../riot/file/DumpFileImportOptions.java | 0 .../com/redislabs/riot/file/DumpFileType.java | 0 .../riot/file/FileExportCommand.java | 0 .../riot/file/FileExportOptions.java | 0 .../riot/file/FileImportCommand.java | 0 .../riot/file/FileImportOptions.java | 0 .../com/redislabs/riot/file/FileOptions.java | 0 .../com/redislabs/riot/file/FileUtils.java | 0 .../riot/file/GZIPInputStreamResource.java | 0 .../riot/file/GZIPOutputStreamResource.java | 0 .../com/redislabs/riot/file/GcsOptions.java | 0 .../riot/file/HeaderCallbackHandler.java | 0 .../riot/file/MapFieldSetMapper.java | 0 .../com/redislabs/riot/file/RiotFile.java | 0 .../com/redislabs/riot/file/S3Options.java | 0 .../file/SimpleAWSCredentialsProvider.java | 0 .../riot/file/UncustomizedUrlResource.java | 0 .../com/redislabs/riot/file/TestFile.java | 0 .../com/redislabs/riot/file/TestSugadd.java | 2 +- .../riot-file}/src/test/resources/export-json | 0 .../src/test/resources/export-json-gz | 0 .../riot-file}/src/test/resources/export-xml | 0 .../src/test/resources/files/accounts.fw | 0 .../src/test/resources/files/airports.csv | 0 .../src/test/resources/files/bad.psv | 0 .../src/test/resources/files/beers.csv | 0 .../src/test/resources/files/beers.json | 0 .../src/test/resources/files/beers1.csv | 0 .../src/test/resources/files/beers2.csv | 0 .../test/resources/files/es_test-index.json | 0 .../src/test/resources/files/lacity.csv | 0 .../src/test/resources/files/redis.json | 0 .../src/test/resources/files/sample.dat | 0 .../src/test/resources/files/sample.psv | 0 .../src/test/resources/files/sample.tsv | 0 .../src/test/resources/files/timestamp.json | 0 .../src/test/resources/files/trades.xml | 0 .../riot-file}/src/test/resources/import-bad | 0 .../riot-file}/src/test/resources/import-csv | 0 .../riot-file}/src/test/resources/import-dump | 0 .../src/test/resources/import-exclude | 0 .../src/test/resources/import-filter | 0 .../riot-file}/src/test/resources/import-fw | 0 .../riot-file}/src/test/resources/import-gcs | 0 .../src/test/resources/import-geo-processor | 0 .../src/test/resources/import-geoadd | 0 .../riot-file}/src/test/resources/import-glob | 0 .../src/test/resources/import-include | 0 .../riot-file}/src/test/resources/import-json | 0 .../src/test/resources/import-json-elastic | 0 .../src/test/resources/import-json-gz | 0 .../src/test/resources/import-multi-commands | 0 .../src/test/resources/import-process | 0 .../src/test/resources/import-process-elvis | 0 .../riot-file}/src/test/resources/import-psv | 0 .../src/test/resources/import-regex | 0 .../riot-file}/src/test/resources/import-s3 | 0 .../src/test/resources/import-sugadd | 0 .../riot-file}/src/test/resources/import-tsv | 0 .../riot-file}/src/test/resources/import-type | 0 .../riot-file}/src/test/resources/import-xml | 0 connectors/riot-gen/gradle.properties | 1 + {riot-gen => connectors/riot-gen}/riot-gen | 0 connectors/riot-gen/riot-gen.gradle | 19 +++ .../riot-gen}/src/docs/asciidoc/index.adoc | 0 .../redislabs/riot/gen/FakerHelpCommand.java | 0 .../redislabs/riot/gen/FakerItemReader.java | 0 .../redislabs/riot/gen/GenerateOptions.java | 0 .../com/redislabs/riot/gen/Generator.java | 0 .../riot/gen/GeneratorImportCommand.java | 10 +- .../com/redislabs/riot/gen/MapGenerator.java | 0 .../riot/gen/MapWithMetadataGenerator.java | 0 .../riot/gen/ReflectivePropertyAccessor.java | 0 .../java/com/redislabs/riot/gen/RiotGen.java | 0 .../riot/gen/ThrottledItemReader.java | 0 .../riot/gen/BatchTestApplication.java | 0 .../riot/gen/SpringBatchFakerTests.java | 5 +- .../java/com/redislabs/riot/gen/TestGen.java | 2 +- .../riot-gen}/src/test/resources/import-hset | 0 .../riot-gen}/src/test/resources/import-infer | 0 .../riot-gen}/src/test/resources/import-sadd | 0 .../riot-gen}/src/test/resources/import-xadd | 0 .../riot-gen}/src/test/resources/import-zadd | 0 connectors/riot-redis/gradle.properties | 1 + .../riot-redis}/riot-redis | 0 connectors/riot-redis/riot-redis.gradle | 24 +++ .../riot-redis}/src/docs/asciidoc/index.adoc | 0 .../src/docs/asciidoc/replication.excalidraw | 0 .../src/docs/asciidoc/replication.png | Bin .../riot/redis/AbstractRedisCommand.java | 0 .../riot/redis/AbstractReplicateCommand.java | 0 .../riot/redis/AbstractTargetCommand.java | 0 .../redislabs/riot/redis/CompareCommand.java | 0 .../redislabs/riot/redis/CompareOptions.java | 0 .../com/redislabs/riot/redis/InfoCommand.java | 0 .../redislabs/riot/redis/LatencyCommand.java | 2 +- .../com/redislabs/riot/redis/PingCommand.java | 0 .../redis/ReplicateDataStructureCommand.java | 0 .../riot/redis/ReplicateKeyDumpCommand.java | 0 .../redislabs/riot/redis/ReplicationMode.java | 0 .../riot/redis/ReplicationOptions.java | 0 .../com/redislabs/riot/redis/RiotRedis.java | 0 .../com/redis/riot/redis/TestReplicate.java | 0 .../riot-redis}/src/test/resources/replicate | 0 .../src/test/resources/replicate-cluster-live | 0 .../src/test/resources/replicate-live | 0 .../src/test/resources/replicate-live-value | 0 connectors/riot-stream/gradle.properties | 1 + .../riot-stream}/riot-stream | 0 connectors/riot-stream/riot-stream.gradle | 27 ++++ .../riot-stream}/src/docs/asciidoc/index.adoc | 0 .../riot/stream/AvroToMapConverter.java | 0 .../riot/stream/JsonToMapConverter.java | 0 .../redislabs/riot/stream/KafkaOptions.java | 0 .../com/redislabs/riot/stream/RiotStream.java | 0 .../riot/stream/StreamExportCommand.java | 0 .../riot/stream/StreamImportCommand.java | 0 .../riot/stream/kafka/KafkaItemReader.java | 0 .../stream/kafka/KafkaItemReaderBuilder.java | 0 .../riot/stream/kafka/KafkaItemWriter.java | 0 .../processor/AbstractProducerProcessor.java | 0 .../processor/AvroProducerProcessor.java | 0 .../processor/JsonProducerProcessor.java | 0 .../com/redislabs/riot/stream/TestKafka.java | 0 .../riot-stream}/src/test/resources/export | 0 .../riot-stream}/src/test/resources/import | 0 core/riot-core/gradle.properties | 1 + .../riot-core/riot-core.gradle | 20 +-- .../redislabs/riot/AbstractExportCommand.java | 0 .../riot/AbstractFlushingTransferCommand.java | 0 .../redislabs/riot/AbstractImportCommand.java | 0 .../redislabs/riot/AbstractTaskCommand.java | 0 .../riot/AbstractTransferCommand.java | 0 .../java/com/redislabs/riot/DataType.java | 0 .../riot/FlushingTransferOptions.java | 0 .../riot/GenerateCompletionCommand.java | 0 .../java/com/redislabs/riot/HelpCommand.java | 0 .../riot/ManifestVersionProvider.java | 0 .../com/redislabs/riot/OneLineLogFormat.java | 0 .../com/redislabs/riot/ProcessorOptions.java | 0 .../com/redislabs/riot/ProgressMonitor.java | 0 .../java/com/redislabs/riot/RedisCommand.java | 0 .../java/com/redislabs/riot/RedisOptions.java | 0 .../redislabs/riot/RedisReaderOptions.java | 0 .../main/java/com/redislabs/riot/RiotApp.java | 0 .../java/com/redislabs/riot/RiotCommand.java | 0 .../com/redislabs/riot/RiotCommandLine.java | 0 .../com/redislabs/riot/RiotStepBuilder.java | 0 .../riot/StackTraceOneLineLogFormat.java | 0 .../com/redislabs/riot/TransferOptions.java | 0 .../CollectionToStringMapConverter.java | 0 .../riot/convert/CompositeConverter.java | 0 .../convert/DefaultingFieldExtractor.java | 0 .../riot/convert/FieldExtractor.java | 0 .../riot/convert/MapFilteringConverter.java | 0 .../redislabs/riot/convert/MapFlattener.java | 0 .../convert/MapToStringArrayConverter.java | 0 .../riot/convert/ObjectMapperConverter.java | 0 .../riot/convert/ObjectToNumberConverter.java | 0 .../riot/convert/ObjectToStringConverter.java | 0 .../convert/RegexNamedGroupsExtractor.java | 0 .../riot/convert/RemovingFieldExtractor.java | 0 .../riot/convert/SimpleFieldExtractor.java | 0 .../convert/StreamToStringMapConverter.java | 0 .../convert/StringToStringMapConverter.java | 0 .../convert/ZsetToStringMapConverter.java | 0 .../CompositeItemStreamItemProcessor.java | 0 .../processor/DataStructureItemProcessor.java | 0 .../riot/processor/FilteringProcessor.java | 0 .../redislabs/riot/processor/MapAccessor.java | 0 .../riot/processor/MapProcessor.java | 0 .../riot/processor/SpelProcessor.java | 0 .../riot/redis/AbstractCollectionCommand.java | 0 .../riot/redis/AbstractKeyCommand.java | 0 .../riot/redis/AbstractRedisCommand.java | 0 .../com/redislabs/riot/redis/EvalCommand.java | 0 .../redislabs/riot/redis/ExpireCommand.java | 0 .../riot/redis/FilteringOptions.java | 0 .../redislabs/riot/redis/GeoaddCommand.java | 0 .../com/redislabs/riot/redis/HsetCommand.java | 0 .../redislabs/riot/redis/LpushCommand.java | 0 .../com/redislabs/riot/redis/NoopCommand.java | 0 .../redislabs/riot/redis/RpushCommand.java | 0 .../com/redislabs/riot/redis/SaddCommand.java | 0 .../com/redislabs/riot/redis/SetCommand.java | 0 .../java/com/redislabs/riot/redis/Sugadd.java | 6 +- .../redislabs/riot/redis/SugaddCommand.java | 0 .../com/redislabs/riot/redis/XaddCommand.java | 0 .../com/redislabs/riot/redis/ZaddCommand.java | 0 .../com/redislabs/riot/TestConverters.java | 0 core/riot-test/gradle.properties | 1 + core/riot-test/riot-test.gradle | 19 +++ .../riot/AbstractRiotIntegrationTest.java | 0 .../com/redislabs/riot/AbstractRiotTest.java | 1 - .../com/redislabs/riot/DataGenerator.java | 0 docs/guide/guide.gradle | 0 .../{ => guide/src/docs}/getting_started.adoc | 0 .../src/docs}/images/architecture.excalidraw | 0 .../src/docs}/images/architecture.png | Bin docs/{ => guide/src/docs}/images/favicon.png | Bin docs/{ => guide/src/docs}/images/favicon.svg | 0 .../src/docs}/images/mapping.excalidraw | 0 docs/{ => guide/src/docs}/images/mapping.png | Bin docs/{ => guide/src/docs}/images/riot.svg | 0 docs/{ => guide/src/docs}/index.adoc | 0 docs/{ => guide/src/docs}/preamble.adoc | 0 docs/{ => guide/src/docs}/processing.adoc | 0 docs/{ => guide/src/docs}/redis-commands.adoc | 0 gradle.properties | 15 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- riot-gen/build.gradle | 21 --- riot-redis/build.gradle | 23 --- riot-stream/build.gradle | 29 ---- settings.gradle | 60 ++++++- test/build.gradle | 28 ---- 249 files changed, 299 insertions(+), 402 deletions(-) delete mode 100644 buildSrc/build.gradle delete mode 100644 buildSrc/src/main/groovy/riot.connector-conventions.gradle delete mode 100644 buildSrc/src/main/groovy/riot.java-conventions.gradle delete mode 100644 buildSrc/src/main/groovy/riot.publish-conventions.gradle create mode 100644 connectors/riot-db/gradle.properties rename {riot-db => connectors/riot-db}/riot-db (100%) rename riot-db/build.gradle => connectors/riot-db/riot-db.gradle (58%) rename {riot-db => connectors/riot-db}/src/docs/asciidoc/index.adoc (100%) rename {riot-db => connectors/riot-db}/src/docs/asciidoc/order.json (100%) rename {riot-db => connectors/riot-db}/src/main/java/com/redislabs/riot/db/DataSourceOptions.java (100%) rename {riot-db => connectors/riot-db}/src/main/java/com/redislabs/riot/db/DatabaseExportCommand.java (100%) rename {riot-db => connectors/riot-db}/src/main/java/com/redislabs/riot/db/DatabaseExportOptions.java (100%) rename {riot-db => connectors/riot-db}/src/main/java/com/redislabs/riot/db/DatabaseImportCommand.java (100%) rename {riot-db => connectors/riot-db}/src/main/java/com/redislabs/riot/db/DatabaseImportOptions.java (100%) rename {riot-db => connectors/riot-db}/src/main/java/com/redislabs/riot/db/RiotDb.java (100%) rename {riot-db => connectors/riot-db}/src/test/java/com/redislabs/riot/db/AbstractDatabaseTest.java (100%) rename {riot-db => connectors/riot-db}/src/test/java/com/redislabs/riot/db/ScriptRunner.java (100%) rename {riot-db => connectors/riot-db}/src/test/java/com/redislabs/riot/db/TestOracle.java (100%) rename {riot-db => connectors/riot-db}/src/test/java/com/redislabs/riot/db/TestPostgreSQL.java (100%) rename {riot-db => connectors/riot-db}/src/test/resources/export-postgresql (100%) rename {riot-db => connectors/riot-db}/src/test/resources/import-postgresql (100%) rename {riot-db => connectors/riot-db}/src/test/resources/import-postgresql-set (100%) rename {riot-db => connectors/riot-db}/src/test/resources/northwind.sql (100%) rename {riot-db => connectors/riot-db}/src/test/resources/oracle.sql (100%) create mode 100644 connectors/riot-file/gradle.properties rename {riot-file => connectors/riot-file}/riot-file (100%) rename riot-file/build.gradle => connectors/riot-file/riot-file.gradle (72%) rename {riot-file => connectors/riot-file}/src/docs/asciidoc/index.adoc (100%) rename {riot-file => connectors/riot-file}/src/docs/asciidoc/redis-dump.json (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/DataStructureItemProcessor.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/DumpFileImportCommand.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/DumpFileImportOptions.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/DumpFileType.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/FileExportCommand.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/FileExportOptions.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/FileImportCommand.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/FileImportOptions.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/FileOptions.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/FileUtils.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/GZIPInputStreamResource.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/GZIPOutputStreamResource.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/GcsOptions.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/HeaderCallbackHandler.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/MapFieldSetMapper.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/RiotFile.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/S3Options.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/SimpleAWSCredentialsProvider.java (100%) rename {riot-file => connectors/riot-file}/src/main/java/com/redislabs/riot/file/UncustomizedUrlResource.java (100%) rename {riot-file => connectors/riot-file}/src/test/java/com/redislabs/riot/file/TestFile.java (100%) rename {riot-file => connectors/riot-file}/src/test/java/com/redislabs/riot/file/TestSugadd.java (95%) rename {riot-file => connectors/riot-file}/src/test/resources/export-json (100%) rename {riot-file => connectors/riot-file}/src/test/resources/export-json-gz (100%) rename {riot-file => connectors/riot-file}/src/test/resources/export-xml (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/accounts.fw (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/airports.csv (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/bad.psv (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/beers.csv (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/beers.json (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/beers1.csv (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/beers2.csv (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/es_test-index.json (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/lacity.csv (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/redis.json (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/sample.dat (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/sample.psv (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/sample.tsv (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/timestamp.json (100%) rename {riot-file => connectors/riot-file}/src/test/resources/files/trades.xml (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-bad (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-csv (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-dump (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-exclude (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-filter (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-fw (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-gcs (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-geo-processor (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-geoadd (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-glob (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-include (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-json (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-json-elastic (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-json-gz (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-multi-commands (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-process (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-process-elvis (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-psv (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-regex (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-s3 (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-sugadd (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-tsv (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-type (100%) rename {riot-file => connectors/riot-file}/src/test/resources/import-xml (100%) create mode 100644 connectors/riot-gen/gradle.properties rename {riot-gen => connectors/riot-gen}/riot-gen (100%) create mode 100644 connectors/riot-gen/riot-gen.gradle rename {riot-gen => connectors/riot-gen}/src/docs/asciidoc/index.adoc (100%) rename {riot-gen => connectors/riot-gen}/src/main/java/com/redislabs/riot/gen/FakerHelpCommand.java (100%) rename {riot-gen => connectors/riot-gen}/src/main/java/com/redislabs/riot/gen/FakerItemReader.java (100%) rename {riot-gen => connectors/riot-gen}/src/main/java/com/redislabs/riot/gen/GenerateOptions.java (100%) rename {riot-gen => connectors/riot-gen}/src/main/java/com/redislabs/riot/gen/Generator.java (100%) rename {riot-gen => connectors/riot-gen}/src/main/java/com/redislabs/riot/gen/GeneratorImportCommand.java (92%) rename {riot-gen => connectors/riot-gen}/src/main/java/com/redislabs/riot/gen/MapGenerator.java (100%) rename {riot-gen => connectors/riot-gen}/src/main/java/com/redislabs/riot/gen/MapWithMetadataGenerator.java (100%) rename {riot-gen => connectors/riot-gen}/src/main/java/com/redislabs/riot/gen/ReflectivePropertyAccessor.java (100%) rename {riot-gen => connectors/riot-gen}/src/main/java/com/redislabs/riot/gen/RiotGen.java (100%) rename {riot-gen => connectors/riot-gen}/src/main/java/com/redislabs/riot/gen/ThrottledItemReader.java (100%) rename {riot-gen => connectors/riot-gen}/src/test/java/com/redislabs/riot/gen/BatchTestApplication.java (100%) rename {riot-gen => connectors/riot-gen}/src/test/java/com/redislabs/riot/gen/SpringBatchFakerTests.java (92%) rename {riot-gen => connectors/riot-gen}/src/test/java/com/redislabs/riot/gen/TestGen.java (98%) rename {riot-gen => connectors/riot-gen}/src/test/resources/import-hset (100%) rename {riot-gen => connectors/riot-gen}/src/test/resources/import-infer (100%) rename {riot-gen => connectors/riot-gen}/src/test/resources/import-sadd (100%) rename {riot-gen => connectors/riot-gen}/src/test/resources/import-xadd (100%) rename {riot-gen => connectors/riot-gen}/src/test/resources/import-zadd (100%) create mode 100644 connectors/riot-redis/gradle.properties rename {riot-redis => connectors/riot-redis}/riot-redis (100%) create mode 100644 connectors/riot-redis/riot-redis.gradle rename {riot-redis => connectors/riot-redis}/src/docs/asciidoc/index.adoc (100%) rename {riot-redis => connectors/riot-redis}/src/docs/asciidoc/replication.excalidraw (100%) rename {riot-redis => connectors/riot-redis}/src/docs/asciidoc/replication.png (100%) rename {riot-redis => connectors/riot-redis}/src/main/java/com/redislabs/riot/redis/AbstractRedisCommand.java (100%) rename {riot-redis => connectors/riot-redis}/src/main/java/com/redislabs/riot/redis/AbstractReplicateCommand.java (100%) rename {riot-redis => connectors/riot-redis}/src/main/java/com/redislabs/riot/redis/AbstractTargetCommand.java (100%) rename {riot-redis => connectors/riot-redis}/src/main/java/com/redislabs/riot/redis/CompareCommand.java (100%) rename {riot-redis => connectors/riot-redis}/src/main/java/com/redislabs/riot/redis/CompareOptions.java (100%) rename {riot-redis => connectors/riot-redis}/src/main/java/com/redislabs/riot/redis/InfoCommand.java (100%) rename {riot-redis => connectors/riot-redis}/src/main/java/com/redislabs/riot/redis/LatencyCommand.java (98%) rename {riot-redis => connectors/riot-redis}/src/main/java/com/redislabs/riot/redis/PingCommand.java (100%) rename {riot-redis => connectors/riot-redis}/src/main/java/com/redislabs/riot/redis/ReplicateDataStructureCommand.java (100%) rename {riot-redis => connectors/riot-redis}/src/main/java/com/redislabs/riot/redis/ReplicateKeyDumpCommand.java (100%) rename {riot-redis => connectors/riot-redis}/src/main/java/com/redislabs/riot/redis/ReplicationMode.java (100%) rename {riot-redis => connectors/riot-redis}/src/main/java/com/redislabs/riot/redis/ReplicationOptions.java (100%) rename {riot-redis => connectors/riot-redis}/src/main/java/com/redislabs/riot/redis/RiotRedis.java (100%) rename {riot-redis => connectors/riot-redis}/src/test/java/com/redis/riot/redis/TestReplicate.java (100%) rename {riot-redis => connectors/riot-redis}/src/test/resources/replicate (100%) rename {riot-redis => connectors/riot-redis}/src/test/resources/replicate-cluster-live (100%) rename {riot-redis => connectors/riot-redis}/src/test/resources/replicate-live (100%) rename {riot-redis => connectors/riot-redis}/src/test/resources/replicate-live-value (100%) create mode 100644 connectors/riot-stream/gradle.properties rename {riot-stream => connectors/riot-stream}/riot-stream (100%) create mode 100644 connectors/riot-stream/riot-stream.gradle rename {riot-stream => connectors/riot-stream}/src/docs/asciidoc/index.adoc (100%) rename {riot-stream => connectors/riot-stream}/src/main/java/com/redislabs/riot/stream/AvroToMapConverter.java (100%) rename {riot-stream => connectors/riot-stream}/src/main/java/com/redislabs/riot/stream/JsonToMapConverter.java (100%) rename {riot-stream => connectors/riot-stream}/src/main/java/com/redislabs/riot/stream/KafkaOptions.java (100%) rename {riot-stream => connectors/riot-stream}/src/main/java/com/redislabs/riot/stream/RiotStream.java (100%) rename {riot-stream => connectors/riot-stream}/src/main/java/com/redislabs/riot/stream/StreamExportCommand.java (100%) rename {riot-stream => connectors/riot-stream}/src/main/java/com/redislabs/riot/stream/StreamImportCommand.java (100%) rename {riot-stream => connectors/riot-stream}/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemReader.java (100%) rename {riot-stream => connectors/riot-stream}/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemReaderBuilder.java (100%) rename {riot-stream => connectors/riot-stream}/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemWriter.java (100%) rename {riot-stream => connectors/riot-stream}/src/main/java/com/redislabs/riot/stream/processor/AbstractProducerProcessor.java (100%) rename {riot-stream => connectors/riot-stream}/src/main/java/com/redislabs/riot/stream/processor/AvroProducerProcessor.java (100%) rename {riot-stream => connectors/riot-stream}/src/main/java/com/redislabs/riot/stream/processor/JsonProducerProcessor.java (100%) rename {riot-stream => connectors/riot-stream}/src/test/java/com/redislabs/riot/stream/TestKafka.java (100%) rename {riot-stream => connectors/riot-stream}/src/test/resources/export (100%) rename {riot-stream => connectors/riot-stream}/src/test/resources/import (100%) create mode 100644 core/riot-core/gradle.properties rename riot-core/build.gradle => core/riot-core/riot-core.gradle (52%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/AbstractExportCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/AbstractFlushingTransferCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/AbstractImportCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/AbstractTaskCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/AbstractTransferCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/DataType.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/FlushingTransferOptions.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/GenerateCompletionCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/HelpCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/ManifestVersionProvider.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/OneLineLogFormat.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/ProcessorOptions.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/ProgressMonitor.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/RedisCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/RedisOptions.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/RedisReaderOptions.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/RiotApp.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/RiotCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/RiotCommandLine.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/RiotStepBuilder.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/StackTraceOneLineLogFormat.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/TransferOptions.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/CollectionToStringMapConverter.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/CompositeConverter.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/DefaultingFieldExtractor.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/FieldExtractor.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/MapFilteringConverter.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/MapFlattener.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/MapToStringArrayConverter.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/ObjectMapperConverter.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/ObjectToNumberConverter.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/ObjectToStringConverter.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/RegexNamedGroupsExtractor.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/RemovingFieldExtractor.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/SimpleFieldExtractor.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/StreamToStringMapConverter.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/StringToStringMapConverter.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/convert/ZsetToStringMapConverter.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/processor/CompositeItemStreamItemProcessor.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/processor/DataStructureItemProcessor.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/processor/FilteringProcessor.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/processor/MapAccessor.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/processor/MapProcessor.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/processor/SpelProcessor.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/AbstractCollectionCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/AbstractKeyCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/AbstractRedisCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/EvalCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/ExpireCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/FilteringOptions.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/GeoaddCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/HsetCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/LpushCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/NoopCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/RpushCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/SaddCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/SetCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/Sugadd.java (93%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/SugaddCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/XaddCommand.java (100%) rename {riot-core => core/riot-core}/src/main/java/com/redislabs/riot/redis/ZaddCommand.java (100%) rename {riot-core => core/riot-core}/src/test/java/com/redislabs/riot/TestConverters.java (100%) create mode 100644 core/riot-test/gradle.properties create mode 100644 core/riot-test/riot-test.gradle rename {test => core/riot-test}/src/main/java/com/redislabs/riot/AbstractRiotIntegrationTest.java (100%) rename {test => core/riot-test}/src/main/java/com/redislabs/riot/AbstractRiotTest.java (97%) rename {test => core/riot-test}/src/main/java/com/redislabs/riot/DataGenerator.java (100%) create mode 100644 docs/guide/guide.gradle rename docs/{ => guide/src/docs}/getting_started.adoc (100%) rename docs/{ => guide/src/docs}/images/architecture.excalidraw (100%) rename docs/{ => guide/src/docs}/images/architecture.png (100%) rename docs/{ => guide/src/docs}/images/favicon.png (100%) rename docs/{ => guide/src/docs}/images/favicon.svg (100%) rename docs/{ => guide/src/docs}/images/mapping.excalidraw (100%) rename docs/{ => guide/src/docs}/images/mapping.png (100%) rename docs/{ => guide/src/docs}/images/riot.svg (100%) rename docs/{ => guide/src/docs}/index.adoc (100%) rename docs/{ => guide/src/docs}/preamble.adoc (100%) rename docs/{ => guide/src/docs}/processing.adoc (100%) rename docs/{ => guide/src/docs}/redis-commands.adoc (100%) delete mode 100644 riot-gen/build.gradle delete mode 100644 riot-redis/build.gradle delete mode 100644 riot-stream/build.gradle delete mode 100644 test/build.gradle diff --git a/build.gradle b/build.gradle index 0ec417f7e..1b30179f8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,73 +1,112 @@ -plugins { - id 'jacoco' - id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' - id 'org.jreleaser' version '0.4.0' - id 'com.github.ben-manes.versions' version '0.39.0' - id 'org.asciidoctor.jvm.convert' - id 'org.ajoberstar.git-publish' version '3.0.0' -} +config { + info { + description = 'Redis Input/Output Tools' + inceptionYear = '2020' + vendor = 'Redis Labs' + tags = ['redis', 'data', 'import', 'export', 'generator', 'file', 'sql', 'replication'] + links { + website = 'https://github.com/redis-developer/${project.rootProject.name}' + issueTracker = 'https://github.com/redis-developer/${project.rootProject.name}/issues' + scm = 'https://github.com/redis-developer/${project.rootProject.name}.git' + } + + scm { + url = "https://github.com/redis-developer/${project.rootProject.name}" + connection = "scm:git:https://github.com/redis-developer/${project.rootProject.name}.git" + developerConnection = "scm:git:git@github.com:redis-developer/${project.rootProject.name}.git" + } -repositories { - mavenCentral() - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/redis-developer/registry") - credentials { - username = project.findProperty("github.username") ?: System.getenv("GITHUB_USERNAME") - password = project.findProperty("github.token") ?: System.getenv("GITHUB_TOKEN") + specification { + enabled = true + } + + implementation { + enabled = true + } + + people { + person { + id = 'jruaux' + name = 'Julien Ruaux' + roles = ['developer', 'author'] + } } } -} -asciidoctor { - sourceDir 'docs' - resources { - from ('docs/images') { - include 'riot.svg' - include 'architecture.png' - include 'mapping.png' - include 'favicon.svg' + licensing { + enabled = false + licenses { + license { + id = 'Apache-2.0' + } } - from("riot-file/src/test/resources/files") { - include '*.*' + } + + docs { + javadoc { + autoLinks { + enabled = false + } } } } -gitPublish { - repoUri = 'https://github.com/redis-developer/riot.git' - referenceRepoUri = 'file:///Users/jruaux/git/riot/' - branch = 'gh-pages' - contents { - from 'build/docs/asciidoc' +allprojects { + repositories { + gradlePluginPortal() + mavenCentral() + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/redis-developer/registry") + credentials { + username = project.findProperty("github.username") ?: System.getenv("GITHUB_USERNAME") + password = project.findProperty("github.token") ?: System.getenv("GITHUB_TOKEN") + } + } + } + + tasks.withType(GenerateModuleMetadata) { + enabled = false } } -sourceCompatibility = '1.8' -targetCompatibility = '1.8' +subprojects { + config { + info { + description = project.project_description + } + } -def isNonStable = { String version -> - def nonStableKeyword = ['PREVIEW'].any { it -> version.toUpperCase().contains(it) } - def stableKeyword = ['RELEASE', 'FINAL', 'GA', 'JRE8'].any { it -> version.toUpperCase().contains(it) } - def regex = /^[0-9,.v-]+([.-]r)?$/ - return nonStableKeyword || (!stableKeyword && !(version ==~ regex)) -} + dependencies { + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' + } + + configurations { + all*.exclude module: 'spring-boot-starter-logging' + } -tasks.named("dependencyUpdates").configure { - rejectVersionIf { - isNonStable(it.candidate.version) && !isNonStable(it.currentVersion) + test { + useJUnitPlatform() + } + + bootJar { + enabled = false + } + + jar { + enabled = true + archiveClassifier = '' } } + jreleaser { project { - name = 'riot' - description = 'Redis Input/Output Tools' longDescription = 'Get data in and out of Redis with RIOT' website = 'https://developer.redislabs.com/riot' - authors = ['Julien Ruaux'] - tags = ['redis'] - license = 'Apache-2.0' copyright = '2021 Julien Ruaux' java { multiProject = true @@ -75,18 +114,16 @@ jreleaser { } release { github { - username = 'jruaux' owner = 'redis-developer' overwrite = true } } - //noinspection GroovyAssignabilityCheck distributions { - ['db', 'file', 'gen', 'redis', 'stream'].each { n -> - "riot-$n" { + ['riot-db', 'riot-file', 'riot-gen', 'riot-redis', 'riot-stream'].each { n -> + "$n" { brew { active = 'release' - formulaName = "riot-${n}" + formulaName = "${n}" } scoop { active = 'release' @@ -96,12 +133,9 @@ jreleaser { } artifacts { artifact { - path = "{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip" + path = "connectors/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip" } } - java { - artifactId = "riot-${n}" - } } } } @@ -112,5 +146,3 @@ nexusPublishing { sonatype() } } - -gitPublishPush.dependsOn asciidoctor diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle deleted file mode 100644 index 66bcdccc5..000000000 --- a/buildSrc/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - id 'groovy-gradle-plugin' - id 'java-library' - id 'maven-publish' - id 'signing' -} - -repositories { - mavenCentral() - gradlePluginPortal() -} - -dependencies { - implementation 'org.springframework.boot:spring-boot-gradle-plugin:2.4.5' - implementation 'io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE' - implementation 'org.asciidoctor:asciidoctor-gradle-jvm:3.3.2' -} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/riot.connector-conventions.gradle b/buildSrc/src/main/groovy/riot.connector-conventions.gradle deleted file mode 100644 index 113fecf4e..000000000 --- a/buildSrc/src/main/groovy/riot.connector-conventions.gradle +++ /dev/null @@ -1,25 +0,0 @@ -plugins { - id 'org.asciidoctor.jvm.convert' - id 'application' -} - -repositories { - mavenCentral() - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/redis-developer/registry") - credentials { - username = project.findProperty("github.username") ?: System.getenv("GITHUB_USERNAME") - password = project.findProperty("github.token") ?: System.getenv("GITHUB_TOKEN") - } - } -} - -dependencies { - api project(':riot-core') - testImplementation project(':test') -} - -tasks.withType(Tar) { - compression = Compression.GZIP -} diff --git a/buildSrc/src/main/groovy/riot.java-conventions.gradle b/buildSrc/src/main/groovy/riot.java-conventions.gradle deleted file mode 100644 index b7d2fd1c6..000000000 --- a/buildSrc/src/main/groovy/riot.java-conventions.gradle +++ /dev/null @@ -1,60 +0,0 @@ -plugins { - id 'java-library' - id 'org.springframework.boot' - id 'io.spring.dependency-management' -} - -sourceCompatibility = "1.8" -targetCompatibility = "1.8" - -repositories { - mavenCentral() - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/redis-developer/registry") - credentials { - username = project.findProperty("github.username") ?: System.getenv("GITHUB_USERNAME") - password = project.findProperty("github.token") ?: System.getenv("GITHUB_TOKEN") - } - } -} - -bootJar { - enabled = false - classifier = 'boot' -} - -jar { - enabled = true -} - -dependencies { - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' - testCompileOnly 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - testImplementation 'org.junit.jupiter:junit-jupiter-engine' - testImplementation 'org.springframework.batch:spring-batch-test' - testImplementation 'org.hsqldb:hsqldb' -} - -configurations { - all*.exclude module: 'spring-boot-starter-logging' -} - -configurations.all { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - if (details.requested.group == 'io.lettuce') { - details.useVersion '6.1.1.RELEASE' - } - } -} - -test { - useJUnitPlatform() - testLogging { - events "failed" - exceptionFormat "full" - } -} diff --git a/buildSrc/src/main/groovy/riot.publish-conventions.gradle b/buildSrc/src/main/groovy/riot.publish-conventions.gradle deleted file mode 100644 index 4d139cc09..000000000 --- a/buildSrc/src/main/groovy/riot.publish-conventions.gradle +++ /dev/null @@ -1,71 +0,0 @@ -plugins { - id 'maven-publish' - id 'signing' - id 'jacoco' -} - -repositories { - mavenCentral() - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/redis-developer/registry") - credentials { - username = project.findProperty("github.username") ?: System.getenv("GITHUB_USERNAME") - password = project.findProperty("github.token") ?: System.getenv("GITHUB_TOKEN") - } - } -} - -jacocoTestReport { - reports { - xml.enabled true - html.enabled false - } -} - -java { - withJavadocJar() - withSourcesJar() -} - -publishing { - publications { - mavenJava(MavenPublication) { - from components.java - versionMapping { - usage('java-api') { - fromResolutionOf('runtimeClasspath') - } - usage('java-runtime') { - fromResolutionResult() - } - } - pom { - name = 'RIOT Core' - description = 'RIOT Core module ' - url = 'https://github.com/redis-developer/riot' - licenses { - license { - name = 'The Apache License, Version 2.0' - url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - developers { - developer { - id = 'jruaux' - name = 'Julien Ruaux' - } - } - scm { - connection = 'scm:git:git://github.com/redis-developer/riot.git' - developerConnection = 'scm:git:git@github.com:redis-developer/riot.git' - url = 'https://github.com/redis-developer/riot' - } - } - } - } -} - -signing { - sign publishing.publications.mavenJava -} diff --git a/connectors/riot-db/gradle.properties b/connectors/riot-db/gradle.properties new file mode 100644 index 000000000..5fd5a4bcd --- /dev/null +++ b/connectors/riot-db/gradle.properties @@ -0,0 +1 @@ +project_description = 'RIOT DB' diff --git a/riot-db/riot-db b/connectors/riot-db/riot-db similarity index 100% rename from riot-db/riot-db rename to connectors/riot-db/riot-db diff --git a/riot-db/build.gradle b/connectors/riot-db/riot-db.gradle similarity index 58% rename from riot-db/build.gradle rename to connectors/riot-db/riot-db.gradle index 401435bcc..b8c3ae685 100644 --- a/riot-db/build.gradle +++ b/connectors/riot-db/riot-db.gradle @@ -1,10 +1,16 @@ -plugins { - id 'riot.java-conventions' - id 'riot.publish-conventions' - id 'riot.connector-conventions' +application { + mainClassName = 'com.redislabs.riot.db.RiotDb' } +manifest { + attributes('Main-Class': application.mainClassName) +} + +bootDistZip.enabled = false +bootDistTar.enabled = false + dependencies { + api project(':riot-core') implementation 'org.springframework.boot:spring-boot-autoconfigure' implementation 'org.springframework:spring-jdbc' implementation 'com.zaxxer:HikariCP' @@ -14,15 +20,7 @@ dependencies { implementation 'mysql:mysql-connector-java' implementation 'org.postgresql:postgresql' implementation 'org.xerial:sqlite-jdbc:3.34.0' - testImplementation 'org.testcontainers:postgresql:1.15.3' - testImplementation 'org.testcontainers:oracle-xe:1.15.3' + testImplementation project(':riot-test') + testImplementation group: 'org.testcontainers', name: 'postgresql', version: testcontainersVersion + testImplementation group: 'org.testcontainers', name: 'oracle-xe', version: testcontainersVersion } - -application { - mainClassName = 'com.redislabs.riot.db.RiotDb' - applicationName = 'riot-db' -} - -asciidoctor { - outputDir "../build/docs/asciidoc/db/" -} \ No newline at end of file diff --git a/riot-db/src/docs/asciidoc/index.adoc b/connectors/riot-db/src/docs/asciidoc/index.adoc similarity index 100% rename from riot-db/src/docs/asciidoc/index.adoc rename to connectors/riot-db/src/docs/asciidoc/index.adoc diff --git a/riot-db/src/docs/asciidoc/order.json b/connectors/riot-db/src/docs/asciidoc/order.json similarity index 100% rename from riot-db/src/docs/asciidoc/order.json rename to connectors/riot-db/src/docs/asciidoc/order.json diff --git a/riot-db/src/main/java/com/redislabs/riot/db/DataSourceOptions.java b/connectors/riot-db/src/main/java/com/redislabs/riot/db/DataSourceOptions.java similarity index 100% rename from riot-db/src/main/java/com/redislabs/riot/db/DataSourceOptions.java rename to connectors/riot-db/src/main/java/com/redislabs/riot/db/DataSourceOptions.java diff --git a/riot-db/src/main/java/com/redislabs/riot/db/DatabaseExportCommand.java b/connectors/riot-db/src/main/java/com/redislabs/riot/db/DatabaseExportCommand.java similarity index 100% rename from riot-db/src/main/java/com/redislabs/riot/db/DatabaseExportCommand.java rename to connectors/riot-db/src/main/java/com/redislabs/riot/db/DatabaseExportCommand.java diff --git a/riot-db/src/main/java/com/redislabs/riot/db/DatabaseExportOptions.java b/connectors/riot-db/src/main/java/com/redislabs/riot/db/DatabaseExportOptions.java similarity index 100% rename from riot-db/src/main/java/com/redislabs/riot/db/DatabaseExportOptions.java rename to connectors/riot-db/src/main/java/com/redislabs/riot/db/DatabaseExportOptions.java diff --git a/riot-db/src/main/java/com/redislabs/riot/db/DatabaseImportCommand.java b/connectors/riot-db/src/main/java/com/redislabs/riot/db/DatabaseImportCommand.java similarity index 100% rename from riot-db/src/main/java/com/redislabs/riot/db/DatabaseImportCommand.java rename to connectors/riot-db/src/main/java/com/redislabs/riot/db/DatabaseImportCommand.java diff --git a/riot-db/src/main/java/com/redislabs/riot/db/DatabaseImportOptions.java b/connectors/riot-db/src/main/java/com/redislabs/riot/db/DatabaseImportOptions.java similarity index 100% rename from riot-db/src/main/java/com/redislabs/riot/db/DatabaseImportOptions.java rename to connectors/riot-db/src/main/java/com/redislabs/riot/db/DatabaseImportOptions.java diff --git a/riot-db/src/main/java/com/redislabs/riot/db/RiotDb.java b/connectors/riot-db/src/main/java/com/redislabs/riot/db/RiotDb.java similarity index 100% rename from riot-db/src/main/java/com/redislabs/riot/db/RiotDb.java rename to connectors/riot-db/src/main/java/com/redislabs/riot/db/RiotDb.java diff --git a/riot-db/src/test/java/com/redislabs/riot/db/AbstractDatabaseTest.java b/connectors/riot-db/src/test/java/com/redislabs/riot/db/AbstractDatabaseTest.java similarity index 100% rename from riot-db/src/test/java/com/redislabs/riot/db/AbstractDatabaseTest.java rename to connectors/riot-db/src/test/java/com/redislabs/riot/db/AbstractDatabaseTest.java diff --git a/riot-db/src/test/java/com/redislabs/riot/db/ScriptRunner.java b/connectors/riot-db/src/test/java/com/redislabs/riot/db/ScriptRunner.java similarity index 100% rename from riot-db/src/test/java/com/redislabs/riot/db/ScriptRunner.java rename to connectors/riot-db/src/test/java/com/redislabs/riot/db/ScriptRunner.java diff --git a/riot-db/src/test/java/com/redislabs/riot/db/TestOracle.java b/connectors/riot-db/src/test/java/com/redislabs/riot/db/TestOracle.java similarity index 100% rename from riot-db/src/test/java/com/redislabs/riot/db/TestOracle.java rename to connectors/riot-db/src/test/java/com/redislabs/riot/db/TestOracle.java diff --git a/riot-db/src/test/java/com/redislabs/riot/db/TestPostgreSQL.java b/connectors/riot-db/src/test/java/com/redislabs/riot/db/TestPostgreSQL.java similarity index 100% rename from riot-db/src/test/java/com/redislabs/riot/db/TestPostgreSQL.java rename to connectors/riot-db/src/test/java/com/redislabs/riot/db/TestPostgreSQL.java diff --git a/riot-db/src/test/resources/export-postgresql b/connectors/riot-db/src/test/resources/export-postgresql similarity index 100% rename from riot-db/src/test/resources/export-postgresql rename to connectors/riot-db/src/test/resources/export-postgresql diff --git a/riot-db/src/test/resources/import-postgresql b/connectors/riot-db/src/test/resources/import-postgresql similarity index 100% rename from riot-db/src/test/resources/import-postgresql rename to connectors/riot-db/src/test/resources/import-postgresql diff --git a/riot-db/src/test/resources/import-postgresql-set b/connectors/riot-db/src/test/resources/import-postgresql-set similarity index 100% rename from riot-db/src/test/resources/import-postgresql-set rename to connectors/riot-db/src/test/resources/import-postgresql-set diff --git a/riot-db/src/test/resources/northwind.sql b/connectors/riot-db/src/test/resources/northwind.sql similarity index 100% rename from riot-db/src/test/resources/northwind.sql rename to connectors/riot-db/src/test/resources/northwind.sql diff --git a/riot-db/src/test/resources/oracle.sql b/connectors/riot-db/src/test/resources/oracle.sql similarity index 100% rename from riot-db/src/test/resources/oracle.sql rename to connectors/riot-db/src/test/resources/oracle.sql diff --git a/connectors/riot-file/gradle.properties b/connectors/riot-file/gradle.properties new file mode 100644 index 000000000..11f416dcd --- /dev/null +++ b/connectors/riot-file/gradle.properties @@ -0,0 +1 @@ +project_description = 'RIOT File' diff --git a/riot-file/riot-file b/connectors/riot-file/riot-file similarity index 100% rename from riot-file/riot-file rename to connectors/riot-file/riot-file diff --git a/riot-file/build.gradle b/connectors/riot-file/riot-file.gradle similarity index 72% rename from riot-file/build.gradle rename to connectors/riot-file/riot-file.gradle index 9279a5624..23465154f 100644 --- a/riot-file/build.gradle +++ b/connectors/riot-file/riot-file.gradle @@ -1,23 +1,21 @@ -plugins { - id 'riot.java-conventions' - id 'riot.publish-conventions' - id 'riot.connector-conventions' +application { + mainClassName = 'com.redislabs.riot.file.RiotFile' } +manifest { + attributes('Main-Class': application.mainClassName) +} + +bootDistZip.enabled = false +bootDistTar.enabled = false + dependencies { + api project(':riot-core') implementation 'org.springframework:spring-oxm' implementation 'org.ruaux:spring-batch-resource:1.3.3' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' implementation 'org.springframework.cloud:spring-cloud-aws-context:2.2.6.RELEASE' implementation 'org.springframework.cloud:spring-cloud-aws-autoconfigure:2.2.6.RELEASE' implementation 'org.springframework.cloud:spring-cloud-gcp-starter-storage:1.2.8.RELEASE' + testImplementation project(':riot-test') } - -application { - mainClassName = 'com.redislabs.riot.file.RiotFile' - applicationName = 'riot-file' -} - -asciidoctor { - outputDir "../build/docs/asciidoc/file/" -} \ No newline at end of file diff --git a/riot-file/src/docs/asciidoc/index.adoc b/connectors/riot-file/src/docs/asciidoc/index.adoc similarity index 100% rename from riot-file/src/docs/asciidoc/index.adoc rename to connectors/riot-file/src/docs/asciidoc/index.adoc diff --git a/riot-file/src/docs/asciidoc/redis-dump.json b/connectors/riot-file/src/docs/asciidoc/redis-dump.json similarity index 100% rename from riot-file/src/docs/asciidoc/redis-dump.json rename to connectors/riot-file/src/docs/asciidoc/redis-dump.json diff --git a/riot-file/src/main/java/com/redislabs/riot/file/DataStructureItemProcessor.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/DataStructureItemProcessor.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/DataStructureItemProcessor.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/DataStructureItemProcessor.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/DumpFileImportCommand.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/DumpFileImportCommand.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/DumpFileImportCommand.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/DumpFileImportCommand.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/DumpFileImportOptions.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/DumpFileImportOptions.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/DumpFileImportOptions.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/DumpFileImportOptions.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/DumpFileType.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/DumpFileType.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/DumpFileType.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/DumpFileType.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/FileExportCommand.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/FileExportCommand.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/FileExportCommand.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/FileExportCommand.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/FileExportOptions.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/FileExportOptions.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/FileExportOptions.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/FileExportOptions.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/FileImportCommand.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/FileImportCommand.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/FileImportCommand.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/FileImportCommand.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/FileImportOptions.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/FileImportOptions.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/FileImportOptions.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/FileImportOptions.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/FileOptions.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/FileOptions.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/FileOptions.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/FileOptions.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/FileUtils.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/FileUtils.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/FileUtils.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/FileUtils.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/GZIPInputStreamResource.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/GZIPInputStreamResource.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/GZIPInputStreamResource.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/GZIPInputStreamResource.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/GZIPOutputStreamResource.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/GZIPOutputStreamResource.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/GZIPOutputStreamResource.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/GZIPOutputStreamResource.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/GcsOptions.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/GcsOptions.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/GcsOptions.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/GcsOptions.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/HeaderCallbackHandler.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/HeaderCallbackHandler.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/HeaderCallbackHandler.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/HeaderCallbackHandler.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/MapFieldSetMapper.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/MapFieldSetMapper.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/MapFieldSetMapper.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/MapFieldSetMapper.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/RiotFile.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/RiotFile.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/RiotFile.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/RiotFile.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/S3Options.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/S3Options.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/S3Options.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/S3Options.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/SimpleAWSCredentialsProvider.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/SimpleAWSCredentialsProvider.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/SimpleAWSCredentialsProvider.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/SimpleAWSCredentialsProvider.java diff --git a/riot-file/src/main/java/com/redislabs/riot/file/UncustomizedUrlResource.java b/connectors/riot-file/src/main/java/com/redislabs/riot/file/UncustomizedUrlResource.java similarity index 100% rename from riot-file/src/main/java/com/redislabs/riot/file/UncustomizedUrlResource.java rename to connectors/riot-file/src/main/java/com/redislabs/riot/file/UncustomizedUrlResource.java diff --git a/riot-file/src/test/java/com/redislabs/riot/file/TestFile.java b/connectors/riot-file/src/test/java/com/redislabs/riot/file/TestFile.java similarity index 100% rename from riot-file/src/test/java/com/redislabs/riot/file/TestFile.java rename to connectors/riot-file/src/test/java/com/redislabs/riot/file/TestFile.java diff --git a/riot-file/src/test/java/com/redislabs/riot/file/TestSugadd.java b/connectors/riot-file/src/test/java/com/redislabs/riot/file/TestSugadd.java similarity index 95% rename from riot-file/src/test/java/com/redislabs/riot/file/TestSugadd.java rename to connectors/riot-file/src/test/java/com/redislabs/riot/file/TestSugadd.java index 9202bd879..b570388ce 100644 --- a/riot-file/src/test/java/com/redislabs/riot/file/TestSugadd.java +++ b/connectors/riot-file/src/test/java/com/redislabs/riot/file/TestSugadd.java @@ -1,7 +1,7 @@ package com.redislabs.riot.file; import com.redislabs.mesclun.RedisModulesClient; -import com.redislabs.mesclun.StatefulRedisModulesConnection; +import com.redislabs.mesclun.api.StatefulRedisModulesConnection; import com.redislabs.mesclun.search.Suggestion; import com.redislabs.mesclun.search.SuggetOptions; import com.redislabs.riot.AbstractRiotTest; diff --git a/riot-file/src/test/resources/export-json b/connectors/riot-file/src/test/resources/export-json similarity index 100% rename from riot-file/src/test/resources/export-json rename to connectors/riot-file/src/test/resources/export-json diff --git a/riot-file/src/test/resources/export-json-gz b/connectors/riot-file/src/test/resources/export-json-gz similarity index 100% rename from riot-file/src/test/resources/export-json-gz rename to connectors/riot-file/src/test/resources/export-json-gz diff --git a/riot-file/src/test/resources/export-xml b/connectors/riot-file/src/test/resources/export-xml similarity index 100% rename from riot-file/src/test/resources/export-xml rename to connectors/riot-file/src/test/resources/export-xml diff --git a/riot-file/src/test/resources/files/accounts.fw b/connectors/riot-file/src/test/resources/files/accounts.fw similarity index 100% rename from riot-file/src/test/resources/files/accounts.fw rename to connectors/riot-file/src/test/resources/files/accounts.fw diff --git a/riot-file/src/test/resources/files/airports.csv b/connectors/riot-file/src/test/resources/files/airports.csv similarity index 100% rename from riot-file/src/test/resources/files/airports.csv rename to connectors/riot-file/src/test/resources/files/airports.csv diff --git a/riot-file/src/test/resources/files/bad.psv b/connectors/riot-file/src/test/resources/files/bad.psv similarity index 100% rename from riot-file/src/test/resources/files/bad.psv rename to connectors/riot-file/src/test/resources/files/bad.psv diff --git a/riot-file/src/test/resources/files/beers.csv b/connectors/riot-file/src/test/resources/files/beers.csv similarity index 100% rename from riot-file/src/test/resources/files/beers.csv rename to connectors/riot-file/src/test/resources/files/beers.csv diff --git a/riot-file/src/test/resources/files/beers.json b/connectors/riot-file/src/test/resources/files/beers.json similarity index 100% rename from riot-file/src/test/resources/files/beers.json rename to connectors/riot-file/src/test/resources/files/beers.json diff --git a/riot-file/src/test/resources/files/beers1.csv b/connectors/riot-file/src/test/resources/files/beers1.csv similarity index 100% rename from riot-file/src/test/resources/files/beers1.csv rename to connectors/riot-file/src/test/resources/files/beers1.csv diff --git a/riot-file/src/test/resources/files/beers2.csv b/connectors/riot-file/src/test/resources/files/beers2.csv similarity index 100% rename from riot-file/src/test/resources/files/beers2.csv rename to connectors/riot-file/src/test/resources/files/beers2.csv diff --git a/riot-file/src/test/resources/files/es_test-index.json b/connectors/riot-file/src/test/resources/files/es_test-index.json similarity index 100% rename from riot-file/src/test/resources/files/es_test-index.json rename to connectors/riot-file/src/test/resources/files/es_test-index.json diff --git a/riot-file/src/test/resources/files/lacity.csv b/connectors/riot-file/src/test/resources/files/lacity.csv similarity index 100% rename from riot-file/src/test/resources/files/lacity.csv rename to connectors/riot-file/src/test/resources/files/lacity.csv diff --git a/riot-file/src/test/resources/files/redis.json b/connectors/riot-file/src/test/resources/files/redis.json similarity index 100% rename from riot-file/src/test/resources/files/redis.json rename to connectors/riot-file/src/test/resources/files/redis.json diff --git a/riot-file/src/test/resources/files/sample.dat b/connectors/riot-file/src/test/resources/files/sample.dat similarity index 100% rename from riot-file/src/test/resources/files/sample.dat rename to connectors/riot-file/src/test/resources/files/sample.dat diff --git a/riot-file/src/test/resources/files/sample.psv b/connectors/riot-file/src/test/resources/files/sample.psv similarity index 100% rename from riot-file/src/test/resources/files/sample.psv rename to connectors/riot-file/src/test/resources/files/sample.psv diff --git a/riot-file/src/test/resources/files/sample.tsv b/connectors/riot-file/src/test/resources/files/sample.tsv similarity index 100% rename from riot-file/src/test/resources/files/sample.tsv rename to connectors/riot-file/src/test/resources/files/sample.tsv diff --git a/riot-file/src/test/resources/files/timestamp.json b/connectors/riot-file/src/test/resources/files/timestamp.json similarity index 100% rename from riot-file/src/test/resources/files/timestamp.json rename to connectors/riot-file/src/test/resources/files/timestamp.json diff --git a/riot-file/src/test/resources/files/trades.xml b/connectors/riot-file/src/test/resources/files/trades.xml similarity index 100% rename from riot-file/src/test/resources/files/trades.xml rename to connectors/riot-file/src/test/resources/files/trades.xml diff --git a/riot-file/src/test/resources/import-bad b/connectors/riot-file/src/test/resources/import-bad similarity index 100% rename from riot-file/src/test/resources/import-bad rename to connectors/riot-file/src/test/resources/import-bad diff --git a/riot-file/src/test/resources/import-csv b/connectors/riot-file/src/test/resources/import-csv similarity index 100% rename from riot-file/src/test/resources/import-csv rename to connectors/riot-file/src/test/resources/import-csv diff --git a/riot-file/src/test/resources/import-dump b/connectors/riot-file/src/test/resources/import-dump similarity index 100% rename from riot-file/src/test/resources/import-dump rename to connectors/riot-file/src/test/resources/import-dump diff --git a/riot-file/src/test/resources/import-exclude b/connectors/riot-file/src/test/resources/import-exclude similarity index 100% rename from riot-file/src/test/resources/import-exclude rename to connectors/riot-file/src/test/resources/import-exclude diff --git a/riot-file/src/test/resources/import-filter b/connectors/riot-file/src/test/resources/import-filter similarity index 100% rename from riot-file/src/test/resources/import-filter rename to connectors/riot-file/src/test/resources/import-filter diff --git a/riot-file/src/test/resources/import-fw b/connectors/riot-file/src/test/resources/import-fw similarity index 100% rename from riot-file/src/test/resources/import-fw rename to connectors/riot-file/src/test/resources/import-fw diff --git a/riot-file/src/test/resources/import-gcs b/connectors/riot-file/src/test/resources/import-gcs similarity index 100% rename from riot-file/src/test/resources/import-gcs rename to connectors/riot-file/src/test/resources/import-gcs diff --git a/riot-file/src/test/resources/import-geo-processor b/connectors/riot-file/src/test/resources/import-geo-processor similarity index 100% rename from riot-file/src/test/resources/import-geo-processor rename to connectors/riot-file/src/test/resources/import-geo-processor diff --git a/riot-file/src/test/resources/import-geoadd b/connectors/riot-file/src/test/resources/import-geoadd similarity index 100% rename from riot-file/src/test/resources/import-geoadd rename to connectors/riot-file/src/test/resources/import-geoadd diff --git a/riot-file/src/test/resources/import-glob b/connectors/riot-file/src/test/resources/import-glob similarity index 100% rename from riot-file/src/test/resources/import-glob rename to connectors/riot-file/src/test/resources/import-glob diff --git a/riot-file/src/test/resources/import-include b/connectors/riot-file/src/test/resources/import-include similarity index 100% rename from riot-file/src/test/resources/import-include rename to connectors/riot-file/src/test/resources/import-include diff --git a/riot-file/src/test/resources/import-json b/connectors/riot-file/src/test/resources/import-json similarity index 100% rename from riot-file/src/test/resources/import-json rename to connectors/riot-file/src/test/resources/import-json diff --git a/riot-file/src/test/resources/import-json-elastic b/connectors/riot-file/src/test/resources/import-json-elastic similarity index 100% rename from riot-file/src/test/resources/import-json-elastic rename to connectors/riot-file/src/test/resources/import-json-elastic diff --git a/riot-file/src/test/resources/import-json-gz b/connectors/riot-file/src/test/resources/import-json-gz similarity index 100% rename from riot-file/src/test/resources/import-json-gz rename to connectors/riot-file/src/test/resources/import-json-gz diff --git a/riot-file/src/test/resources/import-multi-commands b/connectors/riot-file/src/test/resources/import-multi-commands similarity index 100% rename from riot-file/src/test/resources/import-multi-commands rename to connectors/riot-file/src/test/resources/import-multi-commands diff --git a/riot-file/src/test/resources/import-process b/connectors/riot-file/src/test/resources/import-process similarity index 100% rename from riot-file/src/test/resources/import-process rename to connectors/riot-file/src/test/resources/import-process diff --git a/riot-file/src/test/resources/import-process-elvis b/connectors/riot-file/src/test/resources/import-process-elvis similarity index 100% rename from riot-file/src/test/resources/import-process-elvis rename to connectors/riot-file/src/test/resources/import-process-elvis diff --git a/riot-file/src/test/resources/import-psv b/connectors/riot-file/src/test/resources/import-psv similarity index 100% rename from riot-file/src/test/resources/import-psv rename to connectors/riot-file/src/test/resources/import-psv diff --git a/riot-file/src/test/resources/import-regex b/connectors/riot-file/src/test/resources/import-regex similarity index 100% rename from riot-file/src/test/resources/import-regex rename to connectors/riot-file/src/test/resources/import-regex diff --git a/riot-file/src/test/resources/import-s3 b/connectors/riot-file/src/test/resources/import-s3 similarity index 100% rename from riot-file/src/test/resources/import-s3 rename to connectors/riot-file/src/test/resources/import-s3 diff --git a/riot-file/src/test/resources/import-sugadd b/connectors/riot-file/src/test/resources/import-sugadd similarity index 100% rename from riot-file/src/test/resources/import-sugadd rename to connectors/riot-file/src/test/resources/import-sugadd diff --git a/riot-file/src/test/resources/import-tsv b/connectors/riot-file/src/test/resources/import-tsv similarity index 100% rename from riot-file/src/test/resources/import-tsv rename to connectors/riot-file/src/test/resources/import-tsv diff --git a/riot-file/src/test/resources/import-type b/connectors/riot-file/src/test/resources/import-type similarity index 100% rename from riot-file/src/test/resources/import-type rename to connectors/riot-file/src/test/resources/import-type diff --git a/riot-file/src/test/resources/import-xml b/connectors/riot-file/src/test/resources/import-xml similarity index 100% rename from riot-file/src/test/resources/import-xml rename to connectors/riot-file/src/test/resources/import-xml diff --git a/connectors/riot-gen/gradle.properties b/connectors/riot-gen/gradle.properties new file mode 100644 index 000000000..13cdee38d --- /dev/null +++ b/connectors/riot-gen/gradle.properties @@ -0,0 +1 @@ +project_description = 'RIOT Gen' diff --git a/riot-gen/riot-gen b/connectors/riot-gen/riot-gen similarity index 100% rename from riot-gen/riot-gen rename to connectors/riot-gen/riot-gen diff --git a/connectors/riot-gen/riot-gen.gradle b/connectors/riot-gen/riot-gen.gradle new file mode 100644 index 000000000..62c99c5aa --- /dev/null +++ b/connectors/riot-gen/riot-gen.gradle @@ -0,0 +1,19 @@ +application { + mainClassName = 'com.redislabs.riot.gen.RiotGen' +} + +manifest { + attributes('Main-Class': application.mainClassName) +} + +bootDistZip.enabled = false +bootDistTar.enabled = false + +dependencies { + api project(':riot-core') + implementation 'com.github.javafaker:javafaker:1.0.2' + testImplementation project(':riot-test') + testImplementation('org.springframework.boot:spring-boot-starter-test') { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } +} diff --git a/riot-gen/src/docs/asciidoc/index.adoc b/connectors/riot-gen/src/docs/asciidoc/index.adoc similarity index 100% rename from riot-gen/src/docs/asciidoc/index.adoc rename to connectors/riot-gen/src/docs/asciidoc/index.adoc diff --git a/riot-gen/src/main/java/com/redislabs/riot/gen/FakerHelpCommand.java b/connectors/riot-gen/src/main/java/com/redislabs/riot/gen/FakerHelpCommand.java similarity index 100% rename from riot-gen/src/main/java/com/redislabs/riot/gen/FakerHelpCommand.java rename to connectors/riot-gen/src/main/java/com/redislabs/riot/gen/FakerHelpCommand.java diff --git a/riot-gen/src/main/java/com/redislabs/riot/gen/FakerItemReader.java b/connectors/riot-gen/src/main/java/com/redislabs/riot/gen/FakerItemReader.java similarity index 100% rename from riot-gen/src/main/java/com/redislabs/riot/gen/FakerItemReader.java rename to connectors/riot-gen/src/main/java/com/redislabs/riot/gen/FakerItemReader.java diff --git a/riot-gen/src/main/java/com/redislabs/riot/gen/GenerateOptions.java b/connectors/riot-gen/src/main/java/com/redislabs/riot/gen/GenerateOptions.java similarity index 100% rename from riot-gen/src/main/java/com/redislabs/riot/gen/GenerateOptions.java rename to connectors/riot-gen/src/main/java/com/redislabs/riot/gen/GenerateOptions.java diff --git a/riot-gen/src/main/java/com/redislabs/riot/gen/Generator.java b/connectors/riot-gen/src/main/java/com/redislabs/riot/gen/Generator.java similarity index 100% rename from riot-gen/src/main/java/com/redislabs/riot/gen/Generator.java rename to connectors/riot-gen/src/main/java/com/redislabs/riot/gen/Generator.java diff --git a/riot-gen/src/main/java/com/redislabs/riot/gen/GeneratorImportCommand.java b/connectors/riot-gen/src/main/java/com/redislabs/riot/gen/GeneratorImportCommand.java similarity index 92% rename from riot-gen/src/main/java/com/redislabs/riot/gen/GeneratorImportCommand.java rename to connectors/riot-gen/src/main/java/com/redislabs/riot/gen/GeneratorImportCommand.java index 9a3dc4f97..4f7aa913c 100644 --- a/riot-gen/src/main/java/com/redislabs/riot/gen/GeneratorImportCommand.java +++ b/connectors/riot-gen/src/main/java/com/redislabs/riot/gen/GeneratorImportCommand.java @@ -1,10 +1,10 @@ package com.redislabs.riot.gen; import com.redislabs.mesclun.RedisModulesClient; -import com.redislabs.mesclun.StatefulRedisModulesConnection; +import com.redislabs.mesclun.api.StatefulRedisModulesConnection; +import com.redislabs.mesclun.api.sync.RediSearchCommands; import com.redislabs.mesclun.search.Field; import com.redislabs.mesclun.search.IndexInfo; -import com.redislabs.mesclun.search.RediSearchCommands; import com.redislabs.mesclun.search.RediSearchUtils; import com.redislabs.riot.AbstractImportCommand; import com.redislabs.riot.ProcessorOptions; @@ -59,7 +59,7 @@ private Generator> generator() { return generator; } - private String expression(Field field) { + private String expression(Field field) { switch (field.getType()) { case TEXT: return "lorem.paragraph"; @@ -77,8 +77,8 @@ private Map fieldsFromIndex(String index) { RedisModulesClient client = RedisModulesClient.create(getRedisOptions().uris().get(0)); try (StatefulRedisModulesConnection connection = client.connect()) { RediSearchCommands commands = connection.sync(); - IndexInfo info = RediSearchUtils.getInfo(commands.ftInfo(index)); - for (Field field : info.getFields()) { + IndexInfo info = RediSearchUtils.indexInfo(commands.indexInfo(index)); + for (Field field : info.getFields()) { fields.put(field.getName(), expression(field)); } } finally { diff --git a/riot-gen/src/main/java/com/redislabs/riot/gen/MapGenerator.java b/connectors/riot-gen/src/main/java/com/redislabs/riot/gen/MapGenerator.java similarity index 100% rename from riot-gen/src/main/java/com/redislabs/riot/gen/MapGenerator.java rename to connectors/riot-gen/src/main/java/com/redislabs/riot/gen/MapGenerator.java diff --git a/riot-gen/src/main/java/com/redislabs/riot/gen/MapWithMetadataGenerator.java b/connectors/riot-gen/src/main/java/com/redislabs/riot/gen/MapWithMetadataGenerator.java similarity index 100% rename from riot-gen/src/main/java/com/redislabs/riot/gen/MapWithMetadataGenerator.java rename to connectors/riot-gen/src/main/java/com/redislabs/riot/gen/MapWithMetadataGenerator.java diff --git a/riot-gen/src/main/java/com/redislabs/riot/gen/ReflectivePropertyAccessor.java b/connectors/riot-gen/src/main/java/com/redislabs/riot/gen/ReflectivePropertyAccessor.java similarity index 100% rename from riot-gen/src/main/java/com/redislabs/riot/gen/ReflectivePropertyAccessor.java rename to connectors/riot-gen/src/main/java/com/redislabs/riot/gen/ReflectivePropertyAccessor.java diff --git a/riot-gen/src/main/java/com/redislabs/riot/gen/RiotGen.java b/connectors/riot-gen/src/main/java/com/redislabs/riot/gen/RiotGen.java similarity index 100% rename from riot-gen/src/main/java/com/redislabs/riot/gen/RiotGen.java rename to connectors/riot-gen/src/main/java/com/redislabs/riot/gen/RiotGen.java diff --git a/riot-gen/src/main/java/com/redislabs/riot/gen/ThrottledItemReader.java b/connectors/riot-gen/src/main/java/com/redislabs/riot/gen/ThrottledItemReader.java similarity index 100% rename from riot-gen/src/main/java/com/redislabs/riot/gen/ThrottledItemReader.java rename to connectors/riot-gen/src/main/java/com/redislabs/riot/gen/ThrottledItemReader.java diff --git a/riot-gen/src/test/java/com/redislabs/riot/gen/BatchTestApplication.java b/connectors/riot-gen/src/test/java/com/redislabs/riot/gen/BatchTestApplication.java similarity index 100% rename from riot-gen/src/test/java/com/redislabs/riot/gen/BatchTestApplication.java rename to connectors/riot-gen/src/test/java/com/redislabs/riot/gen/BatchTestApplication.java diff --git a/riot-gen/src/test/java/com/redislabs/riot/gen/SpringBatchFakerTests.java b/connectors/riot-gen/src/test/java/com/redislabs/riot/gen/SpringBatchFakerTests.java similarity index 92% rename from riot-gen/src/test/java/com/redislabs/riot/gen/SpringBatchFakerTests.java rename to connectors/riot-gen/src/test/java/com/redislabs/riot/gen/SpringBatchFakerTests.java index fed2e8804..1d2d89aa7 100644 --- a/riot-gen/src/test/java/com/redislabs/riot/gen/SpringBatchFakerTests.java +++ b/connectors/riot-gen/src/test/java/com/redislabs/riot/gen/SpringBatchFakerTests.java @@ -12,6 +12,8 @@ import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemWriter; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; @@ -23,6 +25,7 @@ @SuppressWarnings("unused") @SpringBootTest(classes = BatchTestApplication.class) @RunWith(SpringRunner.class) +@EnableAutoConfiguration(exclude= DataSourceAutoConfiguration.class) public class SpringBatchFakerTests { @Autowired @@ -66,4 +69,4 @@ private void run(String name, ItemReader reader, ItemWriter writer) th jobLauncher.run(job, new JobParameters()); } -} \ No newline at end of file +} diff --git a/riot-gen/src/test/java/com/redislabs/riot/gen/TestGen.java b/connectors/riot-gen/src/test/java/com/redislabs/riot/gen/TestGen.java similarity index 98% rename from riot-gen/src/test/java/com/redislabs/riot/gen/TestGen.java rename to connectors/riot-gen/src/test/java/com/redislabs/riot/gen/TestGen.java index 87a149064..52e16daa9 100644 --- a/riot-gen/src/test/java/com/redislabs/riot/gen/TestGen.java +++ b/connectors/riot-gen/src/test/java/com/redislabs/riot/gen/TestGen.java @@ -1,7 +1,7 @@ package com.redislabs.riot.gen; import com.redislabs.mesclun.RedisModulesClient; -import com.redislabs.mesclun.StatefulRedisModulesConnection; +import com.redislabs.mesclun.api.StatefulRedisModulesConnection; import com.redislabs.mesclun.search.CreateOptions; import com.redislabs.mesclun.search.Document; import com.redislabs.mesclun.search.Field; diff --git a/riot-gen/src/test/resources/import-hset b/connectors/riot-gen/src/test/resources/import-hset similarity index 100% rename from riot-gen/src/test/resources/import-hset rename to connectors/riot-gen/src/test/resources/import-hset diff --git a/riot-gen/src/test/resources/import-infer b/connectors/riot-gen/src/test/resources/import-infer similarity index 100% rename from riot-gen/src/test/resources/import-infer rename to connectors/riot-gen/src/test/resources/import-infer diff --git a/riot-gen/src/test/resources/import-sadd b/connectors/riot-gen/src/test/resources/import-sadd similarity index 100% rename from riot-gen/src/test/resources/import-sadd rename to connectors/riot-gen/src/test/resources/import-sadd diff --git a/riot-gen/src/test/resources/import-xadd b/connectors/riot-gen/src/test/resources/import-xadd similarity index 100% rename from riot-gen/src/test/resources/import-xadd rename to connectors/riot-gen/src/test/resources/import-xadd diff --git a/riot-gen/src/test/resources/import-zadd b/connectors/riot-gen/src/test/resources/import-zadd similarity index 100% rename from riot-gen/src/test/resources/import-zadd rename to connectors/riot-gen/src/test/resources/import-zadd diff --git a/connectors/riot-redis/gradle.properties b/connectors/riot-redis/gradle.properties new file mode 100644 index 000000000..9122a3bed --- /dev/null +++ b/connectors/riot-redis/gradle.properties @@ -0,0 +1 @@ +project_description = 'RIOT Redis' diff --git a/riot-redis/riot-redis b/connectors/riot-redis/riot-redis similarity index 100% rename from riot-redis/riot-redis rename to connectors/riot-redis/riot-redis diff --git a/connectors/riot-redis/riot-redis.gradle b/connectors/riot-redis/riot-redis.gradle new file mode 100644 index 000000000..e106d9a62 --- /dev/null +++ b/connectors/riot-redis/riot-redis.gradle @@ -0,0 +1,24 @@ +application { + mainClassName = 'com.redislabs.riot.redis.RiotRedis' +} + +manifest { + attributes('Main-Class': application.mainClassName) +} + +bootDistZip.enabled = false +bootDistTar.enabled = false + +dependencies { + api project(':riot-core') + implementation 'org.latencyutils:LatencyUtils:2.0.3' + testImplementation project(':riot-test') +} + +//asciidoctor { +// resources { +// from("${sourceDir}") { +// include '*.png' +// } +// } +//} diff --git a/riot-redis/src/docs/asciidoc/index.adoc b/connectors/riot-redis/src/docs/asciidoc/index.adoc similarity index 100% rename from riot-redis/src/docs/asciidoc/index.adoc rename to connectors/riot-redis/src/docs/asciidoc/index.adoc diff --git a/riot-redis/src/docs/asciidoc/replication.excalidraw b/connectors/riot-redis/src/docs/asciidoc/replication.excalidraw similarity index 100% rename from riot-redis/src/docs/asciidoc/replication.excalidraw rename to connectors/riot-redis/src/docs/asciidoc/replication.excalidraw diff --git a/riot-redis/src/docs/asciidoc/replication.png b/connectors/riot-redis/src/docs/asciidoc/replication.png similarity index 100% rename from riot-redis/src/docs/asciidoc/replication.png rename to connectors/riot-redis/src/docs/asciidoc/replication.png diff --git a/riot-redis/src/main/java/com/redislabs/riot/redis/AbstractRedisCommand.java b/connectors/riot-redis/src/main/java/com/redislabs/riot/redis/AbstractRedisCommand.java similarity index 100% rename from riot-redis/src/main/java/com/redislabs/riot/redis/AbstractRedisCommand.java rename to connectors/riot-redis/src/main/java/com/redislabs/riot/redis/AbstractRedisCommand.java diff --git a/riot-redis/src/main/java/com/redislabs/riot/redis/AbstractReplicateCommand.java b/connectors/riot-redis/src/main/java/com/redislabs/riot/redis/AbstractReplicateCommand.java similarity index 100% rename from riot-redis/src/main/java/com/redislabs/riot/redis/AbstractReplicateCommand.java rename to connectors/riot-redis/src/main/java/com/redislabs/riot/redis/AbstractReplicateCommand.java diff --git a/riot-redis/src/main/java/com/redislabs/riot/redis/AbstractTargetCommand.java b/connectors/riot-redis/src/main/java/com/redislabs/riot/redis/AbstractTargetCommand.java similarity index 100% rename from riot-redis/src/main/java/com/redislabs/riot/redis/AbstractTargetCommand.java rename to connectors/riot-redis/src/main/java/com/redislabs/riot/redis/AbstractTargetCommand.java diff --git a/riot-redis/src/main/java/com/redislabs/riot/redis/CompareCommand.java b/connectors/riot-redis/src/main/java/com/redislabs/riot/redis/CompareCommand.java similarity index 100% rename from riot-redis/src/main/java/com/redislabs/riot/redis/CompareCommand.java rename to connectors/riot-redis/src/main/java/com/redislabs/riot/redis/CompareCommand.java diff --git a/riot-redis/src/main/java/com/redislabs/riot/redis/CompareOptions.java b/connectors/riot-redis/src/main/java/com/redislabs/riot/redis/CompareOptions.java similarity index 100% rename from riot-redis/src/main/java/com/redislabs/riot/redis/CompareOptions.java rename to connectors/riot-redis/src/main/java/com/redislabs/riot/redis/CompareOptions.java diff --git a/riot-redis/src/main/java/com/redislabs/riot/redis/InfoCommand.java b/connectors/riot-redis/src/main/java/com/redislabs/riot/redis/InfoCommand.java similarity index 100% rename from riot-redis/src/main/java/com/redislabs/riot/redis/InfoCommand.java rename to connectors/riot-redis/src/main/java/com/redislabs/riot/redis/InfoCommand.java diff --git a/riot-redis/src/main/java/com/redislabs/riot/redis/LatencyCommand.java b/connectors/riot-redis/src/main/java/com/redislabs/riot/redis/LatencyCommand.java similarity index 98% rename from riot-redis/src/main/java/com/redislabs/riot/redis/LatencyCommand.java rename to connectors/riot-redis/src/main/java/com/redislabs/riot/redis/LatencyCommand.java index 65624ebb9..c3599faa7 100644 --- a/riot-redis/src/main/java/com/redislabs/riot/redis/LatencyCommand.java +++ b/connectors/riot-redis/src/main/java/com/redislabs/riot/redis/LatencyCommand.java @@ -50,7 +50,7 @@ protected void execute(BaseRedisCommands commands) { CommandMetrics.CommandLatency latency = new CommandMetrics.CommandLatency( unit.convert(histogram.getMinValue(), TimeUnit.NANOSECONDS), unit.convert(histogram.getMaxValue(), TimeUnit.NANOSECONDS), percentiles); - System.out.println(latency.toString()); + System.out.println(latency); } } } diff --git a/riot-redis/src/main/java/com/redislabs/riot/redis/PingCommand.java b/connectors/riot-redis/src/main/java/com/redislabs/riot/redis/PingCommand.java similarity index 100% rename from riot-redis/src/main/java/com/redislabs/riot/redis/PingCommand.java rename to connectors/riot-redis/src/main/java/com/redislabs/riot/redis/PingCommand.java diff --git a/riot-redis/src/main/java/com/redislabs/riot/redis/ReplicateDataStructureCommand.java b/connectors/riot-redis/src/main/java/com/redislabs/riot/redis/ReplicateDataStructureCommand.java similarity index 100% rename from riot-redis/src/main/java/com/redislabs/riot/redis/ReplicateDataStructureCommand.java rename to connectors/riot-redis/src/main/java/com/redislabs/riot/redis/ReplicateDataStructureCommand.java diff --git a/riot-redis/src/main/java/com/redislabs/riot/redis/ReplicateKeyDumpCommand.java b/connectors/riot-redis/src/main/java/com/redislabs/riot/redis/ReplicateKeyDumpCommand.java similarity index 100% rename from riot-redis/src/main/java/com/redislabs/riot/redis/ReplicateKeyDumpCommand.java rename to connectors/riot-redis/src/main/java/com/redislabs/riot/redis/ReplicateKeyDumpCommand.java diff --git a/riot-redis/src/main/java/com/redislabs/riot/redis/ReplicationMode.java b/connectors/riot-redis/src/main/java/com/redislabs/riot/redis/ReplicationMode.java similarity index 100% rename from riot-redis/src/main/java/com/redislabs/riot/redis/ReplicationMode.java rename to connectors/riot-redis/src/main/java/com/redislabs/riot/redis/ReplicationMode.java diff --git a/riot-redis/src/main/java/com/redislabs/riot/redis/ReplicationOptions.java b/connectors/riot-redis/src/main/java/com/redislabs/riot/redis/ReplicationOptions.java similarity index 100% rename from riot-redis/src/main/java/com/redislabs/riot/redis/ReplicationOptions.java rename to connectors/riot-redis/src/main/java/com/redislabs/riot/redis/ReplicationOptions.java diff --git a/riot-redis/src/main/java/com/redislabs/riot/redis/RiotRedis.java b/connectors/riot-redis/src/main/java/com/redislabs/riot/redis/RiotRedis.java similarity index 100% rename from riot-redis/src/main/java/com/redislabs/riot/redis/RiotRedis.java rename to connectors/riot-redis/src/main/java/com/redislabs/riot/redis/RiotRedis.java diff --git a/riot-redis/src/test/java/com/redis/riot/redis/TestReplicate.java b/connectors/riot-redis/src/test/java/com/redis/riot/redis/TestReplicate.java similarity index 100% rename from riot-redis/src/test/java/com/redis/riot/redis/TestReplicate.java rename to connectors/riot-redis/src/test/java/com/redis/riot/redis/TestReplicate.java diff --git a/riot-redis/src/test/resources/replicate b/connectors/riot-redis/src/test/resources/replicate similarity index 100% rename from riot-redis/src/test/resources/replicate rename to connectors/riot-redis/src/test/resources/replicate diff --git a/riot-redis/src/test/resources/replicate-cluster-live b/connectors/riot-redis/src/test/resources/replicate-cluster-live similarity index 100% rename from riot-redis/src/test/resources/replicate-cluster-live rename to connectors/riot-redis/src/test/resources/replicate-cluster-live diff --git a/riot-redis/src/test/resources/replicate-live b/connectors/riot-redis/src/test/resources/replicate-live similarity index 100% rename from riot-redis/src/test/resources/replicate-live rename to connectors/riot-redis/src/test/resources/replicate-live diff --git a/riot-redis/src/test/resources/replicate-live-value b/connectors/riot-redis/src/test/resources/replicate-live-value similarity index 100% rename from riot-redis/src/test/resources/replicate-live-value rename to connectors/riot-redis/src/test/resources/replicate-live-value diff --git a/connectors/riot-stream/gradle.properties b/connectors/riot-stream/gradle.properties new file mode 100644 index 000000000..45595333c --- /dev/null +++ b/connectors/riot-stream/gradle.properties @@ -0,0 +1 @@ +project_description = 'RIOT Stream' diff --git a/riot-stream/riot-stream b/connectors/riot-stream/riot-stream similarity index 100% rename from riot-stream/riot-stream rename to connectors/riot-stream/riot-stream diff --git a/connectors/riot-stream/riot-stream.gradle b/connectors/riot-stream/riot-stream.gradle new file mode 100644 index 000000000..8ececcc74 --- /dev/null +++ b/connectors/riot-stream/riot-stream.gradle @@ -0,0 +1,27 @@ +repositories { + maven { + url "https://packages.confluent.io/maven" + } +} + +application { + mainClassName = 'com.redislabs.riot.stream.RiotStream' +} + +manifest { + attributes('Main-Class': application.mainClassName) +} + +bootDistZip.enabled = false +bootDistTar.enabled = false + +dependencies { + api project(':riot-core') + implementation 'org.springframework.kafka:spring-kafka' + implementation 'org.springframework.boot:spring-boot-autoconfigure' + implementation 'org.apache.avro:avro:1.10.2' + implementation 'io.confluent:kafka-avro-serializer:6.2.0' + implementation 'io.confluent:kafka-protobuf-serializer:6.2.0' + testImplementation project(':riot-test') + testImplementation group: 'org.testcontainers', name: 'kafka', version: testcontainersVersion +} diff --git a/riot-stream/src/docs/asciidoc/index.adoc b/connectors/riot-stream/src/docs/asciidoc/index.adoc similarity index 100% rename from riot-stream/src/docs/asciidoc/index.adoc rename to connectors/riot-stream/src/docs/asciidoc/index.adoc diff --git a/riot-stream/src/main/java/com/redislabs/riot/stream/AvroToMapConverter.java b/connectors/riot-stream/src/main/java/com/redislabs/riot/stream/AvroToMapConverter.java similarity index 100% rename from riot-stream/src/main/java/com/redislabs/riot/stream/AvroToMapConverter.java rename to connectors/riot-stream/src/main/java/com/redislabs/riot/stream/AvroToMapConverter.java diff --git a/riot-stream/src/main/java/com/redislabs/riot/stream/JsonToMapConverter.java b/connectors/riot-stream/src/main/java/com/redislabs/riot/stream/JsonToMapConverter.java similarity index 100% rename from riot-stream/src/main/java/com/redislabs/riot/stream/JsonToMapConverter.java rename to connectors/riot-stream/src/main/java/com/redislabs/riot/stream/JsonToMapConverter.java diff --git a/riot-stream/src/main/java/com/redislabs/riot/stream/KafkaOptions.java b/connectors/riot-stream/src/main/java/com/redislabs/riot/stream/KafkaOptions.java similarity index 100% rename from riot-stream/src/main/java/com/redislabs/riot/stream/KafkaOptions.java rename to connectors/riot-stream/src/main/java/com/redislabs/riot/stream/KafkaOptions.java diff --git a/riot-stream/src/main/java/com/redislabs/riot/stream/RiotStream.java b/connectors/riot-stream/src/main/java/com/redislabs/riot/stream/RiotStream.java similarity index 100% rename from riot-stream/src/main/java/com/redislabs/riot/stream/RiotStream.java rename to connectors/riot-stream/src/main/java/com/redislabs/riot/stream/RiotStream.java diff --git a/riot-stream/src/main/java/com/redislabs/riot/stream/StreamExportCommand.java b/connectors/riot-stream/src/main/java/com/redislabs/riot/stream/StreamExportCommand.java similarity index 100% rename from riot-stream/src/main/java/com/redislabs/riot/stream/StreamExportCommand.java rename to connectors/riot-stream/src/main/java/com/redislabs/riot/stream/StreamExportCommand.java diff --git a/riot-stream/src/main/java/com/redislabs/riot/stream/StreamImportCommand.java b/connectors/riot-stream/src/main/java/com/redislabs/riot/stream/StreamImportCommand.java similarity index 100% rename from riot-stream/src/main/java/com/redislabs/riot/stream/StreamImportCommand.java rename to connectors/riot-stream/src/main/java/com/redislabs/riot/stream/StreamImportCommand.java diff --git a/riot-stream/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemReader.java b/connectors/riot-stream/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemReader.java similarity index 100% rename from riot-stream/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemReader.java rename to connectors/riot-stream/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemReader.java diff --git a/riot-stream/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemReaderBuilder.java b/connectors/riot-stream/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemReaderBuilder.java similarity index 100% rename from riot-stream/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemReaderBuilder.java rename to connectors/riot-stream/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemReaderBuilder.java diff --git a/riot-stream/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemWriter.java b/connectors/riot-stream/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemWriter.java similarity index 100% rename from riot-stream/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemWriter.java rename to connectors/riot-stream/src/main/java/com/redislabs/riot/stream/kafka/KafkaItemWriter.java diff --git a/riot-stream/src/main/java/com/redislabs/riot/stream/processor/AbstractProducerProcessor.java b/connectors/riot-stream/src/main/java/com/redislabs/riot/stream/processor/AbstractProducerProcessor.java similarity index 100% rename from riot-stream/src/main/java/com/redislabs/riot/stream/processor/AbstractProducerProcessor.java rename to connectors/riot-stream/src/main/java/com/redislabs/riot/stream/processor/AbstractProducerProcessor.java diff --git a/riot-stream/src/main/java/com/redislabs/riot/stream/processor/AvroProducerProcessor.java b/connectors/riot-stream/src/main/java/com/redislabs/riot/stream/processor/AvroProducerProcessor.java similarity index 100% rename from riot-stream/src/main/java/com/redislabs/riot/stream/processor/AvroProducerProcessor.java rename to connectors/riot-stream/src/main/java/com/redislabs/riot/stream/processor/AvroProducerProcessor.java diff --git a/riot-stream/src/main/java/com/redislabs/riot/stream/processor/JsonProducerProcessor.java b/connectors/riot-stream/src/main/java/com/redislabs/riot/stream/processor/JsonProducerProcessor.java similarity index 100% rename from riot-stream/src/main/java/com/redislabs/riot/stream/processor/JsonProducerProcessor.java rename to connectors/riot-stream/src/main/java/com/redislabs/riot/stream/processor/JsonProducerProcessor.java diff --git a/riot-stream/src/test/java/com/redislabs/riot/stream/TestKafka.java b/connectors/riot-stream/src/test/java/com/redislabs/riot/stream/TestKafka.java similarity index 100% rename from riot-stream/src/test/java/com/redislabs/riot/stream/TestKafka.java rename to connectors/riot-stream/src/test/java/com/redislabs/riot/stream/TestKafka.java diff --git a/riot-stream/src/test/resources/export b/connectors/riot-stream/src/test/resources/export similarity index 100% rename from riot-stream/src/test/resources/export rename to connectors/riot-stream/src/test/resources/export diff --git a/riot-stream/src/test/resources/import b/connectors/riot-stream/src/test/resources/import similarity index 100% rename from riot-stream/src/test/resources/import rename to connectors/riot-stream/src/test/resources/import diff --git a/core/riot-core/gradle.properties b/core/riot-core/gradle.properties new file mode 100644 index 000000000..57aba7541 --- /dev/null +++ b/core/riot-core/gradle.properties @@ -0,0 +1 @@ +project_description = 'RIOT Core' diff --git a/riot-core/build.gradle b/core/riot-core/riot-core.gradle similarity index 52% rename from riot-core/build.gradle rename to core/riot-core/riot-core.gradle index f9015b778..26a98f94b 100644 --- a/riot-core/build.gradle +++ b/core/riot-core/riot-core.gradle @@ -1,22 +1,5 @@ -plugins { - id 'riot.java-conventions' - id 'riot.publish-conventions' -} - -repositories { - mavenCentral() - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/redis-developer/registry") - credentials { - username = project.findProperty("github.username") ?: System.getenv("GITHUB_USERNAME") - password = project.findProperty("github.token") ?: System.getenv("GITHUB_TOKEN") - } - } -} - dependencies { - api 'com.redislabs:mesclun:1.2.6' + api 'com.redislabs:mesclun:1.3.3' api 'com.redislabs:spring-batch-redis:2.12.2' api 'org.springframework.batch:spring-batch-core' api 'org.slf4j:slf4j-api' @@ -24,7 +7,6 @@ dependencies { api group: 'info.picocli', name: 'picocli', version: picocliVersion annotationProcessor group: 'info.picocli', name: 'picocli-codegen', version: picocliVersion implementation 'me.tongfei:progressbar:0.9.1' - implementation 'org.latencyutils:LatencyUtils:2.0.3' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' } diff --git a/riot-core/src/main/java/com/redislabs/riot/AbstractExportCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/AbstractExportCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/AbstractExportCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/AbstractExportCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/AbstractFlushingTransferCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/AbstractFlushingTransferCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/AbstractFlushingTransferCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/AbstractFlushingTransferCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/AbstractImportCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/AbstractImportCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/AbstractImportCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/AbstractImportCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/AbstractTaskCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/AbstractTaskCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/AbstractTaskCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/AbstractTaskCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/AbstractTransferCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/AbstractTransferCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/AbstractTransferCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/AbstractTransferCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/DataType.java b/core/riot-core/src/main/java/com/redislabs/riot/DataType.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/DataType.java rename to core/riot-core/src/main/java/com/redislabs/riot/DataType.java diff --git a/riot-core/src/main/java/com/redislabs/riot/FlushingTransferOptions.java b/core/riot-core/src/main/java/com/redislabs/riot/FlushingTransferOptions.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/FlushingTransferOptions.java rename to core/riot-core/src/main/java/com/redislabs/riot/FlushingTransferOptions.java diff --git a/riot-core/src/main/java/com/redislabs/riot/GenerateCompletionCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/GenerateCompletionCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/GenerateCompletionCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/GenerateCompletionCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/HelpCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/HelpCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/HelpCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/HelpCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/ManifestVersionProvider.java b/core/riot-core/src/main/java/com/redislabs/riot/ManifestVersionProvider.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/ManifestVersionProvider.java rename to core/riot-core/src/main/java/com/redislabs/riot/ManifestVersionProvider.java diff --git a/riot-core/src/main/java/com/redislabs/riot/OneLineLogFormat.java b/core/riot-core/src/main/java/com/redislabs/riot/OneLineLogFormat.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/OneLineLogFormat.java rename to core/riot-core/src/main/java/com/redislabs/riot/OneLineLogFormat.java diff --git a/riot-core/src/main/java/com/redislabs/riot/ProcessorOptions.java b/core/riot-core/src/main/java/com/redislabs/riot/ProcessorOptions.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/ProcessorOptions.java rename to core/riot-core/src/main/java/com/redislabs/riot/ProcessorOptions.java diff --git a/riot-core/src/main/java/com/redislabs/riot/ProgressMonitor.java b/core/riot-core/src/main/java/com/redislabs/riot/ProgressMonitor.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/ProgressMonitor.java rename to core/riot-core/src/main/java/com/redislabs/riot/ProgressMonitor.java diff --git a/riot-core/src/main/java/com/redislabs/riot/RedisCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/RedisCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/RedisCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/RedisCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/RedisOptions.java b/core/riot-core/src/main/java/com/redislabs/riot/RedisOptions.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/RedisOptions.java rename to core/riot-core/src/main/java/com/redislabs/riot/RedisOptions.java diff --git a/riot-core/src/main/java/com/redislabs/riot/RedisReaderOptions.java b/core/riot-core/src/main/java/com/redislabs/riot/RedisReaderOptions.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/RedisReaderOptions.java rename to core/riot-core/src/main/java/com/redislabs/riot/RedisReaderOptions.java diff --git a/riot-core/src/main/java/com/redislabs/riot/RiotApp.java b/core/riot-core/src/main/java/com/redislabs/riot/RiotApp.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/RiotApp.java rename to core/riot-core/src/main/java/com/redislabs/riot/RiotApp.java diff --git a/riot-core/src/main/java/com/redislabs/riot/RiotCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/RiotCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/RiotCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/RiotCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/RiotCommandLine.java b/core/riot-core/src/main/java/com/redislabs/riot/RiotCommandLine.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/RiotCommandLine.java rename to core/riot-core/src/main/java/com/redislabs/riot/RiotCommandLine.java diff --git a/riot-core/src/main/java/com/redislabs/riot/RiotStepBuilder.java b/core/riot-core/src/main/java/com/redislabs/riot/RiotStepBuilder.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/RiotStepBuilder.java rename to core/riot-core/src/main/java/com/redislabs/riot/RiotStepBuilder.java diff --git a/riot-core/src/main/java/com/redislabs/riot/StackTraceOneLineLogFormat.java b/core/riot-core/src/main/java/com/redislabs/riot/StackTraceOneLineLogFormat.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/StackTraceOneLineLogFormat.java rename to core/riot-core/src/main/java/com/redislabs/riot/StackTraceOneLineLogFormat.java diff --git a/riot-core/src/main/java/com/redislabs/riot/TransferOptions.java b/core/riot-core/src/main/java/com/redislabs/riot/TransferOptions.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/TransferOptions.java rename to core/riot-core/src/main/java/com/redislabs/riot/TransferOptions.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/CollectionToStringMapConverter.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/CollectionToStringMapConverter.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/CollectionToStringMapConverter.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/CollectionToStringMapConverter.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/CompositeConverter.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/CompositeConverter.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/CompositeConverter.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/CompositeConverter.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/DefaultingFieldExtractor.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/DefaultingFieldExtractor.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/DefaultingFieldExtractor.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/DefaultingFieldExtractor.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/FieldExtractor.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/FieldExtractor.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/FieldExtractor.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/FieldExtractor.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/MapFilteringConverter.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/MapFilteringConverter.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/MapFilteringConverter.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/MapFilteringConverter.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/MapFlattener.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/MapFlattener.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/MapFlattener.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/MapFlattener.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/MapToStringArrayConverter.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/MapToStringArrayConverter.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/MapToStringArrayConverter.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/MapToStringArrayConverter.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/ObjectMapperConverter.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/ObjectMapperConverter.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/ObjectMapperConverter.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/ObjectMapperConverter.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/ObjectToNumberConverter.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/ObjectToNumberConverter.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/ObjectToNumberConverter.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/ObjectToNumberConverter.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/ObjectToStringConverter.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/ObjectToStringConverter.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/ObjectToStringConverter.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/ObjectToStringConverter.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/RegexNamedGroupsExtractor.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/RegexNamedGroupsExtractor.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/RegexNamedGroupsExtractor.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/RegexNamedGroupsExtractor.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/RemovingFieldExtractor.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/RemovingFieldExtractor.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/RemovingFieldExtractor.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/RemovingFieldExtractor.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/SimpleFieldExtractor.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/SimpleFieldExtractor.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/SimpleFieldExtractor.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/SimpleFieldExtractor.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/StreamToStringMapConverter.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/StreamToStringMapConverter.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/StreamToStringMapConverter.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/StreamToStringMapConverter.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/StringToStringMapConverter.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/StringToStringMapConverter.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/StringToStringMapConverter.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/StringToStringMapConverter.java diff --git a/riot-core/src/main/java/com/redislabs/riot/convert/ZsetToStringMapConverter.java b/core/riot-core/src/main/java/com/redislabs/riot/convert/ZsetToStringMapConverter.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/convert/ZsetToStringMapConverter.java rename to core/riot-core/src/main/java/com/redislabs/riot/convert/ZsetToStringMapConverter.java diff --git a/riot-core/src/main/java/com/redislabs/riot/processor/CompositeItemStreamItemProcessor.java b/core/riot-core/src/main/java/com/redislabs/riot/processor/CompositeItemStreamItemProcessor.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/processor/CompositeItemStreamItemProcessor.java rename to core/riot-core/src/main/java/com/redislabs/riot/processor/CompositeItemStreamItemProcessor.java diff --git a/riot-core/src/main/java/com/redislabs/riot/processor/DataStructureItemProcessor.java b/core/riot-core/src/main/java/com/redislabs/riot/processor/DataStructureItemProcessor.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/processor/DataStructureItemProcessor.java rename to core/riot-core/src/main/java/com/redislabs/riot/processor/DataStructureItemProcessor.java diff --git a/riot-core/src/main/java/com/redislabs/riot/processor/FilteringProcessor.java b/core/riot-core/src/main/java/com/redislabs/riot/processor/FilteringProcessor.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/processor/FilteringProcessor.java rename to core/riot-core/src/main/java/com/redislabs/riot/processor/FilteringProcessor.java diff --git a/riot-core/src/main/java/com/redislabs/riot/processor/MapAccessor.java b/core/riot-core/src/main/java/com/redislabs/riot/processor/MapAccessor.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/processor/MapAccessor.java rename to core/riot-core/src/main/java/com/redislabs/riot/processor/MapAccessor.java diff --git a/riot-core/src/main/java/com/redislabs/riot/processor/MapProcessor.java b/core/riot-core/src/main/java/com/redislabs/riot/processor/MapProcessor.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/processor/MapProcessor.java rename to core/riot-core/src/main/java/com/redislabs/riot/processor/MapProcessor.java diff --git a/riot-core/src/main/java/com/redislabs/riot/processor/SpelProcessor.java b/core/riot-core/src/main/java/com/redislabs/riot/processor/SpelProcessor.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/processor/SpelProcessor.java rename to core/riot-core/src/main/java/com/redislabs/riot/processor/SpelProcessor.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/AbstractCollectionCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/AbstractCollectionCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/AbstractCollectionCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/AbstractCollectionCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/AbstractKeyCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/AbstractKeyCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/AbstractKeyCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/AbstractKeyCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/AbstractRedisCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/AbstractRedisCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/AbstractRedisCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/AbstractRedisCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/EvalCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/EvalCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/EvalCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/EvalCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/ExpireCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/ExpireCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/ExpireCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/ExpireCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/FilteringOptions.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/FilteringOptions.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/FilteringOptions.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/FilteringOptions.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/GeoaddCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/GeoaddCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/GeoaddCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/GeoaddCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/HsetCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/HsetCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/HsetCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/HsetCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/LpushCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/LpushCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/LpushCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/LpushCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/NoopCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/NoopCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/NoopCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/NoopCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/RpushCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/RpushCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/RpushCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/RpushCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/SaddCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/SaddCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/SaddCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/SaddCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/SetCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/SetCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/SetCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/SetCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/Sugadd.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/Sugadd.java similarity index 93% rename from riot-core/src/main/java/com/redislabs/riot/redis/Sugadd.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/Sugadd.java index 551bc748f..dc3de6d0f 100644 --- a/riot-core/src/main/java/com/redislabs/riot/redis/Sugadd.java +++ b/core/riot-core/src/main/java/com/redislabs/riot/redis/Sugadd.java @@ -1,6 +1,6 @@ package com.redislabs.riot.redis; -import com.redislabs.mesclun.RedisModulesAsyncCommands; +import com.redislabs.mesclun.api.async.RedisModulesAsyncCommands; import com.redislabs.mesclun.search.SugaddOptions; import io.lettuce.core.RedisFuture; import io.lettuce.core.api.async.BaseRedisAsyncCommands; @@ -33,7 +33,7 @@ public RedisFuture execute(BaseRedisAsyncCommands commands, T if (payload == null && !increment) { return ((RedisModulesAsyncCommands) commands).sugadd(key.convert(item), string.convert(item), score); } - SugaddOptions.SugaddOptionsBuilder options = SugaddOptions.builder(); + SugaddOptions.SugaddOptionsBuilder options = SugaddOptions.builder(); options.increment(increment); if (payload != null) { options.payload(payload.convert(item)); @@ -61,4 +61,4 @@ public Sugadd build() { } -} \ No newline at end of file +} diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/SugaddCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/SugaddCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/SugaddCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/SugaddCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/XaddCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/XaddCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/XaddCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/XaddCommand.java diff --git a/riot-core/src/main/java/com/redislabs/riot/redis/ZaddCommand.java b/core/riot-core/src/main/java/com/redislabs/riot/redis/ZaddCommand.java similarity index 100% rename from riot-core/src/main/java/com/redislabs/riot/redis/ZaddCommand.java rename to core/riot-core/src/main/java/com/redislabs/riot/redis/ZaddCommand.java diff --git a/riot-core/src/test/java/com/redislabs/riot/TestConverters.java b/core/riot-core/src/test/java/com/redislabs/riot/TestConverters.java similarity index 100% rename from riot-core/src/test/java/com/redislabs/riot/TestConverters.java rename to core/riot-core/src/test/java/com/redislabs/riot/TestConverters.java diff --git a/core/riot-test/gradle.properties b/core/riot-test/gradle.properties new file mode 100644 index 000000000..5e3a0a5a4 --- /dev/null +++ b/core/riot-test/gradle.properties @@ -0,0 +1 @@ +project_description = 'RIOT Test' diff --git a/core/riot-test/riot-test.gradle b/core/riot-test/riot-test.gradle new file mode 100644 index 000000000..3164bb66a --- /dev/null +++ b/core/riot-test/riot-test.gradle @@ -0,0 +1,19 @@ +config { + docs { + javadoc { + enabled = false + } + } +} + +dependencies { + implementation project(':riot-core') + implementation 'org.codehaus.plexus:plexus-utils:3.3.0' + api 'org.junit.jupiter:junit-jupiter-api' + api 'org.junit.jupiter:junit-jupiter-params' + api 'org.junit.jupiter:junit-jupiter-engine' + annotationProcessor group: 'info.picocli', name: 'picocli-codegen', version: picocliVersion + api 'com.redislabs:testcontainers-redis:1.1.6' + api group: 'org.testcontainers', name: 'junit-jupiter', version: testcontainersVersion + implementation 'commons-io:commons-io:2.8.0' +} diff --git a/test/src/main/java/com/redislabs/riot/AbstractRiotIntegrationTest.java b/core/riot-test/src/main/java/com/redislabs/riot/AbstractRiotIntegrationTest.java similarity index 100% rename from test/src/main/java/com/redislabs/riot/AbstractRiotIntegrationTest.java rename to core/riot-test/src/main/java/com/redislabs/riot/AbstractRiotIntegrationTest.java diff --git a/test/src/main/java/com/redislabs/riot/AbstractRiotTest.java b/core/riot-test/src/main/java/com/redislabs/riot/AbstractRiotTest.java similarity index 97% rename from test/src/main/java/com/redislabs/riot/AbstractRiotTest.java rename to core/riot-test/src/main/java/com/redislabs/riot/AbstractRiotTest.java index 04d3979d0..1c6f60fb0 100644 --- a/test/src/main/java/com/redislabs/riot/AbstractRiotTest.java +++ b/core/riot-test/src/main/java/com/redislabs/riot/AbstractRiotTest.java @@ -1,7 +1,6 @@ package com.redislabs.riot; import com.redislabs.testcontainers.RedisClusterContainer; -import com.redislabs.testcontainers.RedisContainer; import com.redislabs.testcontainers.RedisServer; import io.lettuce.core.RedisURI; import org.apache.commons.io.IOUtils; diff --git a/test/src/main/java/com/redislabs/riot/DataGenerator.java b/core/riot-test/src/main/java/com/redislabs/riot/DataGenerator.java similarity index 100% rename from test/src/main/java/com/redislabs/riot/DataGenerator.java rename to core/riot-test/src/main/java/com/redislabs/riot/DataGenerator.java diff --git a/docs/guide/guide.gradle b/docs/guide/guide.gradle new file mode 100644 index 000000000..e69de29bb diff --git a/docs/getting_started.adoc b/docs/guide/src/docs/getting_started.adoc similarity index 100% rename from docs/getting_started.adoc rename to docs/guide/src/docs/getting_started.adoc diff --git a/docs/images/architecture.excalidraw b/docs/guide/src/docs/images/architecture.excalidraw similarity index 100% rename from docs/images/architecture.excalidraw rename to docs/guide/src/docs/images/architecture.excalidraw diff --git a/docs/images/architecture.png b/docs/guide/src/docs/images/architecture.png similarity index 100% rename from docs/images/architecture.png rename to docs/guide/src/docs/images/architecture.png diff --git a/docs/images/favicon.png b/docs/guide/src/docs/images/favicon.png similarity index 100% rename from docs/images/favicon.png rename to docs/guide/src/docs/images/favicon.png diff --git a/docs/images/favicon.svg b/docs/guide/src/docs/images/favicon.svg similarity index 100% rename from docs/images/favicon.svg rename to docs/guide/src/docs/images/favicon.svg diff --git a/docs/images/mapping.excalidraw b/docs/guide/src/docs/images/mapping.excalidraw similarity index 100% rename from docs/images/mapping.excalidraw rename to docs/guide/src/docs/images/mapping.excalidraw diff --git a/docs/images/mapping.png b/docs/guide/src/docs/images/mapping.png similarity index 100% rename from docs/images/mapping.png rename to docs/guide/src/docs/images/mapping.png diff --git a/docs/images/riot.svg b/docs/guide/src/docs/images/riot.svg similarity index 100% rename from docs/images/riot.svg rename to docs/guide/src/docs/images/riot.svg diff --git a/docs/index.adoc b/docs/guide/src/docs/index.adoc similarity index 100% rename from docs/index.adoc rename to docs/guide/src/docs/index.adoc diff --git a/docs/preamble.adoc b/docs/guide/src/docs/preamble.adoc similarity index 100% rename from docs/preamble.adoc rename to docs/guide/src/docs/preamble.adoc diff --git a/docs/processing.adoc b/docs/guide/src/docs/processing.adoc similarity index 100% rename from docs/processing.adoc rename to docs/guide/src/docs/processing.adoc diff --git a/docs/redis-commands.adoc b/docs/guide/src/docs/redis-commands.adoc similarity index 100% rename from docs/redis-commands.adoc rename to docs/guide/src/docs/redis-commands.adoc diff --git a/gradle.properties b/gradle.properties index 3a714f1a4..e2efb4954 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,10 @@ -group = com.redislabs -version = 2.11.5 -sourceCompatibility = 1.8 -targetCompatibility = 1.8 -picocliVersion = 4.6.1 \ No newline at end of file +group = com.redislabs +version = 2.11.4-SNAPSHOT +kordampPluginVersion = 0.46.0 +kordampBuildVersion = 2.5.0 +jreleaserPluginVersion = 0.4.0 +nexusPluginVersion = 1.1.0 +picocliVersion = 4.6.1 +testcontainersVersion = 1.15.3-REDISLABS +protobufVersion = 3.14.0 +googleHttpVersion = 1.38.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643ee..69a971507 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c8..744e882ed 100755 --- a/gradlew +++ b/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) diff --git a/riot-gen/build.gradle b/riot-gen/build.gradle deleted file mode 100644 index 02908b76b..000000000 --- a/riot-gen/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id 'riot.java-conventions' - id 'riot.publish-conventions' - id 'riot.connector-conventions' -} - -dependencies { - implementation 'com.github.javafaker:javafaker:1.0.2' - testImplementation('org.springframework.boot:spring-boot-starter-test') { - exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' - } -} - -application { - mainClassName = 'com.redislabs.riot.gen.RiotGen' - applicationName = 'riot-gen' -} - -asciidoctor { - outputDir "../build/docs/asciidoc/gen/" -} \ No newline at end of file diff --git a/riot-redis/build.gradle b/riot-redis/build.gradle deleted file mode 100644 index 07767ca5c..000000000 --- a/riot-redis/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ -plugins { - id 'riot.java-conventions' - id 'riot.publish-conventions' - id 'riot.connector-conventions' -} - -dependencies { - implementation 'org.latencyutils:LatencyUtils:2.0.3' -} - -application { - mainClassName = 'com.redislabs.riot.redis.RiotRedis' - applicationName = 'riot-redis' -} - -asciidoctor { - outputDir "../build/docs/asciidoc/redis/" - resources { - from("${sourceDir}") { - include '*.png' - } - } -} \ No newline at end of file diff --git a/riot-stream/build.gradle b/riot-stream/build.gradle deleted file mode 100644 index 5ccdb94ea..000000000 --- a/riot-stream/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -plugins { - id 'riot.java-conventions' - id 'riot.publish-conventions' - id 'riot.connector-conventions' -} - -repositories { - maven { - url "https://packages.confluent.io/maven" - } -} - -dependencies { - implementation 'org.springframework.kafka:spring-kafka' - implementation 'org.apache.avro:avro:1.10.2' - implementation 'io.confluent:kafka-avro-serializer:6.1.1' - implementation 'io.confluent:kafka-protobuf-serializer:6.1.1' - implementation 'org.springframework.boot:spring-boot-autoconfigure' - testImplementation 'org.testcontainers:kafka:1.15.3' -} - -application { - mainClassName = 'com.redislabs.riot.stream.RiotStream' - applicationName = 'riot-stream' -} - -asciidoctor { - outputDir "../build/docs/asciidoc/stream/" -} diff --git a/settings.gradle b/settings.gradle index d86679f1c..1fe0d8b03 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,60 @@ +buildscript { + repositories { + gradlePluginPortal() + mavenCentral() + mavenLocal() + } + dependencies { + classpath "org.kordamp.gradle:java-project-gradle-plugin:$kordampPluginVersion" + classpath "org.kordamp.gradle:kordamp-parentbuild:$kordampBuildVersion" + classpath "io.github.gradle-nexus:publish-plugin:$nexusPluginVersion" + classpath "org.jreleaser:jreleaser-gradle-plugin:$jreleaserPluginVersion" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.5.1" + classpath "io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE" + } +} +apply plugin: 'org.kordamp.gradle.kordamp-parentbuild' + rootProject.name = 'riot' -include 'riot-core', 'test', 'riot-db', 'riot-file', 'riot-gen', 'riot-redis', 'riot-stream' \ No newline at end of file + +projects { + directories = ['core', 'connectors'] + + plugins { + all { + id 'idea' + } + path(':') { + id 'org.kordamp.gradle.java-project' + id 'org.jreleaser' + id 'io.github.gradle-nexus.publish-plugin' + } + dirs(['core', 'connectors']) { + id 'java-library' + id 'org.springframework.boot' + id 'io.spring.dependency-management' + } + dirs(['connectors']) { + id 'application' + } + } +} + +enforce { + mergeStrategy = 'append' + + rule(enforcer.rules.ForceDependencies) { r -> + r.dependencies.addAll "info.picocli:picocli:$picocliVersion", + "org.hdrhistogram:HdrHistogram:2.1.12", + "com.google.api:gax:1.60.1", + "com.google.api.grpc:proto-google-common-protos:2.0.1", + "com.google.code.findbugs:jsr305:3.0.2", + "com.google.errorprone:error_prone_annotations:2.4.0", + "com.google.guava:guava:30.0-android", + "com.google.http-client:google-http-client:$googleHttpVersion", + "com.google.http-client:google-http-client-jackson2:$googleHttpVersion", + "com.google.protobuf:protobuf-java:$protobufVersion", + "com.google.protobuf:protobuf-java-util:$protobufVersion", + "io.grpc:grpc-context:1.34.0" + } +} diff --git a/test/build.gradle b/test/build.gradle deleted file mode 100644 index e9f155e7b..000000000 --- a/test/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - id 'riot.java-conventions' -} - -repositories { - mavenCentral() - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/redis-developer/registry") - credentials { - username = project.findProperty("github.username") ?: System.getenv("GITHUB_USERNAME") - password = project.findProperty("github.token") ?: System.getenv("GITHUB_TOKEN") - } - } -} - -dependencies { - implementation project(':riot-core') - implementation 'org.codehaus.plexus:plexus-utils:3.3.0' - api 'org.junit.jupiter:junit-jupiter-api' - api 'org.junit.jupiter:junit-jupiter-params' - api 'org.junit.jupiter:junit-jupiter-engine' - implementation group: 'info.picocli', name: 'picocli', version: picocliVersion - annotationProcessor group: 'info.picocli', name: 'picocli-codegen', version: picocliVersion - api 'com.redislabs:testcontainers-redis:1.1.6' - api 'org.testcontainers:junit-jupiter:1.15.3' - implementation 'commons-io:commons-io:2.8.0' -}