build: Introduced modules file, db, and faker

core/riot-core/gradle.properties

@@ -15,5 +15,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-project_description = RIOT Engine
-automatic.module.name = com.redis.riot.engine
+project_description = RIOT Core
+automatic.module.name = com.redis.riot.core

core/riot-core/riot-core.gradle

@@ -26,30 +26,13 @@ dependencies {
     api 'org.slf4j:jcl-over-slf4j'
     api group: 'com.redis', name: 'lettucemod', version: lettucemodVersion
     api group: 'com.redis', name: 'spring-batch-redis', version: springBatchRedisVersion
-    api group: 'net.datafaker', name: 'datafaker', version: datafakerVersion
     api 'org.springframework.batch:spring-batch-core'
     api 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
     implementation group: 'org.latencyutils', name: 'LatencyUtils', version: latencyutilsVersion    
     implementation 'org.apache.commons:commons-pool2'    
-    implementation 'org.springframework.boot:spring-boot-autoconfigure'
-    implementation 'org.springframework:spring-jdbc'
-    implementation 'org.springframework:spring-oxm'
-    implementation group: 'org.springframework.cloud', name: 'spring-cloud-aws-context', version: awsVersion
-    implementation group: 'org.springframework.cloud', name: 'spring-cloud-aws-autoconfigure', version: awsVersion
-    implementation (group: 'org.springframework.cloud', name: 'spring-cloud-gcp-starter-storage', version: gcpVersion) {
-        exclude group: 'javax.annotation', module: 'javax.annotation-api'
-    }    
-    implementation 'com.mysql:mysql-connector-j'
-    implementation 'org.postgresql:postgresql'
-    implementation group: 'com.ibm.db2', name: 'jcc', version: db2Version
-    implementation group: 'com.microsoft.sqlserver', name: 'mssql-jdbc', version: mssqlVersion
-    implementation group: 'com.oracle.ojdbc', name: 'ojdbc8', version: oracleVersion
-    implementation group: 'org.xerial', name: 'sqlite-jdbc', version: sqliteVersion
     testImplementation 'org.slf4j:slf4j-simple'
     testImplementation group: 'com.redis', name: 'spring-batch-redis', version: springBatchRedisVersion, classifier: 'tests'
     testImplementation group: 'org.awaitility', name: 'awaitility', version: awaitilityVersion
-    testImplementation group: 'org.testcontainers', name: 'postgresql', version: testcontainersVersion
-    testImplementation group: 'org.testcontainers', name: 'oracle-xe', version: testcontainersVersion
 }
 
 compileJava {

core/riot-core/src/main/java/com/redis/riot/core/AbstractKeyValueImport.java

@@ -1,6 +1,7 @@
 package com.redis.riot.core;
 
 import com.redis.spring.batch.RedisItemWriter;
+import com.redis.spring.batch.ValueType;
 
 import io.lettuce.core.AbstractRedisClient;
 import io.lettuce.core.codec.StringCodec;
@@ -19,6 +20,7 @@ public void setRedisWriterOptions(RedisWriterOptions redisWriterOptions) {
 
     protected RedisItemWriter<String, String> writer() {
         RedisItemWriter<String, String> writer = new RedisItemWriter<>(client, StringCodec.UTF8);
+        writer.setValueType(ValueType.STRUCT);
         redisWriterOptions.configure(writer);
         return writer;
     }

core/riot-core/src/main/java/com/redis/riot/core/replicate/KeyComparisonStatusCountItemWriter.java → core/riot-core/src/main/java/com/redis/riot/core/KeyComparisonStatusCountItemWriter.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core.replicate;
+package com.redis.riot.core;
 
 import java.util.List;
 import java.util.Map;

core/riot-core/src/main/java/com/redis/riot/core/replicate/KeyValueWriteListener.java → core/riot-core/src/main/java/com/redis/riot/core/KeyValueWriteListener.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core.replicate;
+package com.redis.riot.core;
 
 import java.util.List;
 import java.util.function.Function;

core/riot-core/src/main/java/com/redis/riot/core/replicate/Replication.java → core/riot-core/src/main/java/com/redis/riot/core/Replication.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core.replicate;
+package com.redis.riot.core;
 
 import java.time.Duration;
 
@@ -18,11 +18,6 @@
 
 import com.redis.lettucemod.api.StatefulRedisModulesConnection;
 import com.redis.lettucemod.util.RedisModulesUtils;
-import com.redis.riot.core.AbstractExport;
-import com.redis.riot.core.KeyValueOperatorOptions;
-import com.redis.riot.core.RedisReaderOptions;
-import com.redis.riot.core.RedisWriterOptions;
-import com.redis.riot.core.StepBuilder;
 import com.redis.spring.batch.KeyValue;
 import com.redis.spring.batch.RedisItemReader;
 import com.redis.spring.batch.RedisItemReader.Mode;

core/riot-core/src/main/java/com/redis/riot/core/replicate/ReplicationMode.java → core/riot-core/src/main/java/com/redis/riot/core/ReplicationMode.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core.replicate;
+package com.redis.riot.core;
 
 public enum ReplicationMode {
     SNAPSHOT, LIVE, LIVEONLY, COMPARE

core/riot-core/src/test/java/com/redis/riot/core/ReplicationTests.java

@@ -18,7 +18,6 @@
 import org.springframework.batch.item.support.ListItemWriter;
 import org.springframework.expression.Expression;
 
-import com.redis.riot.core.replicate.Replication;
 import com.redis.spring.batch.test.AbstractTargetTestBase;
 import com.redis.spring.batch.util.KeyComparisonItemReader;
 

core/riot-db/gradle.properties

@@ -0,0 +1,19 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright 2022-2023 The RIOT authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+project_description = RIOT DB
+automatic.module.name = com.redis.riot.db

core/riot-db/riot-db.gradle

@@ -0,0 +1,49 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2020-2023 The RIOT authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+config {
+    licensing {
+        enabled = false
+    }
+}
+
+dependencies {
+    implementation project(':riot-core')
+    implementation 'org.springframework.boot:spring-boot-autoconfigure'
+    implementation 'org.springframework:spring-jdbc'
+    implementation 'com.mysql:mysql-connector-j'
+    implementation 'org.postgresql:postgresql'
+    implementation group: 'com.ibm.db2', name: 'jcc', version: db2Version
+    implementation group: 'com.microsoft.sqlserver', name: 'mssql-jdbc', version: mssqlVersion
+    implementation group: 'com.oracle.ojdbc', name: 'ojdbc8', version: oracleVersion
+    implementation group: 'org.xerial', name: 'sqlite-jdbc', version: sqliteVersion
+    testImplementation group: 'com.redis', name: 'spring-batch-redis', version: springBatchRedisVersion, classifier: 'tests'
+    testImplementation group: 'org.testcontainers', name: 'postgresql', version: testcontainersVersion
+    testImplementation group: 'org.testcontainers', name: 'oracle-xe', version: testcontainersVersion
+}
+
+compileJava {
+    options.compilerArgs += ["-AprojectPath=${project.group}/${project.name}"]
+}
+
+if (!(project.findProperty('automatic.module.name.skip') ?: false).toBoolean()) {
+    jar {
+        manifest {
+            attributes('Automatic-Module-Name': project.findProperty('automatic.module.name'))
+        }
+    }
+}

core/riot-core/src/main/java/com/redis/riot/core/db/DataSourceOptions.java → core/riot-db/src/main/java/com/redis/riot/db/DataSourceOptions.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core.db;
+package com.redis.riot.db;
 
 public class DataSourceOptions {
 

core/riot-core/src/main/java/com/redis/riot/core/db/DatabaseExport.java → core/riot-db/src/main/java/com/redis/riot/db/DatabaseExport.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core.db;
+package com.redis.riot.db;
 
 import java.util.Map;
 

core/riot-core/src/main/java/com/redis/riot/core/db/DatabaseImport.java → core/riot-db/src/main/java/com/redis/riot/db/DatabaseImport.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core.db;
+package com.redis.riot.db;
 
 import java.util.Map;
 

core/riot-core/src/main/java/com/redis/riot/core/db/DatabaseUtils.java → core/riot-db/src/main/java/com/redis/riot/db/DatabaseUtils.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core.db;
+package com.redis.riot.db;
 
 import javax.sql.DataSource;
 

core/riot-core/src/test/java/com/redis/riot/core/DatabaseTests.java → core/riot-db/src/test/java/com/redis/riot/db/DatabaseTests.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core;
+package com.redis.riot.db;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -14,7 +14,6 @@
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.testcontainers.containers.JdbcDatabaseContainer;
 
-import com.redis.riot.core.db.DataSourceOptions;
 import com.redis.spring.batch.test.AbstractTestBase;
 import com.redis.testcontainers.RedisServer;
 import com.redis.testcontainers.RedisStackContainer;

core/riot-core/src/test/java/com/redis/riot/core/PostgresTests.java → core/riot-db/src/test/java/com/redis/riot/db/PostgresTests.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core;
+package com.redis.riot.db;
 
 import java.io.IOException;
 import java.sql.ResultSet;

core/riot-core/src/test/java/com/redis/riot/core/SqlScriptRunner.java → core/riot-db/src/test/java/com/redis/riot/db/SqlScriptRunner.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core;
+package com.redis.riot.db;
 
 import java.io.IOException;
 import java.io.LineNumberReader;

core/riot-faker/gradle.properties

@@ -0,0 +1,19 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright 2022-2023 The RIOT authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+project_description = RIOT Faker
+automatic.module.name = com.redis.riot.faker

core/riot-faker/riot-faker.gradle

@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2020-2023 The RIOT authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+config {
+    licensing {
+        enabled = false
+    }
+}
+
+dependencies {
+    implementation project(':riot-core')
+    implementation group: 'net.datafaker', name: 'datafaker', version: datafakerVersion
+}
+
+compileJava {
+    options.compilerArgs += ["-AprojectPath=${project.group}/${project.name}"]
+}
+
+if (!(project.findProperty('automatic.module.name.skip') ?: false).toBoolean()) {
+    jar {
+        manifest {
+            attributes('Automatic-Module-Name': project.findProperty('automatic.module.name'))
+        }
+    }
+}

core/riot-core/src/main/java/com/redis/riot/core/faker/FakerImport.java → core/riot-faker/src/main/java/com/redis/riot/faker/FakerImport.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core.faker;
+package com.redis.riot.faker;
 
 import java.util.LinkedHashMap;
 import java.util.Locale;

core/riot-core/src/main/java/com/redis/riot/core/faker/FakerItemReader.java → core/riot-faker/src/main/java/com/redis/riot/faker/FakerItemReader.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core.faker;
+package com.redis.riot.faker;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;

core/riot-core/src/main/java/com/redis/riot/core/faker/ReflectivePropertyAccessor.java → core/riot-faker/src/main/java/com/redis/riot/faker/ReflectivePropertyAccessor.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core.faker;
+package com.redis.riot.faker;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;

core/riot-core/src/test/java/com/redis/riot/core/FakerReaderTests.java → core/riot-faker/src/test/java/com/redis/riot/faker/FakerReaderTests.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core;
+package com.redis.riot.faker;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -8,7 +8,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.batch.item.ExecutionContext;
 
-import com.redis.riot.core.faker.FakerItemReader;
+import com.redis.riot.faker.FakerItemReader;
 import com.redis.spring.batch.util.BatchUtils;
 
 class FakerReaderTests {

core/riot-file/gradle.properties

@@ -0,0 +1,19 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright 2022-2023 The RIOT authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+project_description = RIOT File
+automatic.module.name = com.redis.riot.file

core/riot-file/riot-file.gradle

@@ -0,0 +1,45 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2020-2023 The RIOT authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+config {
+    licensing {
+        enabled = false
+    }
+}
+
+dependencies {
+    implementation project(':riot-core')
+    implementation 'org.springframework:spring-oxm'
+    implementation group: 'org.springframework.cloud', name: 'spring-cloud-aws-context', version: awsVersion
+    implementation group: 'org.springframework.cloud', name: 'spring-cloud-aws-autoconfigure', version: awsVersion
+    implementation (group: 'org.springframework.cloud', name: 'spring-cloud-gcp-starter-storage', version: gcpVersion) {
+        exclude group: 'javax.annotation', module: 'javax.annotation-api'
+    }
+    testImplementation group: 'com.redis', name: 'spring-batch-redis', version: springBatchRedisVersion, classifier: 'tests'
+}
+
+compileJava {
+    options.compilerArgs += ["-AprojectPath=${project.group}/${project.name}"]
+}
+
+if (!(project.findProperty('automatic.module.name.skip') ?: false).toBoolean()) {
+    jar {
+        manifest {
+            attributes('Automatic-Module-Name': project.findProperty('automatic.module.name'))
+        }
+    }
+}

core/riot-core/src/main/java/com/redis/riot/core/file/AmazonS3Options.java → core/riot-file/src/main/java/com/redis/riot/file/AmazonS3Options.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core.file;
+package com.redis.riot.file;
 
 public class AmazonS3Options {
 

core/riot-core/src/main/java/com/redis/riot/core/file/AmazonS3ProtocolResolver.java → core/riot-file/src/main/java/com/redis/riot/file/AmazonS3ProtocolResolver.java

@@ -1,4 +1,4 @@
-package com.redis.riot.core.file;
+package com.redis.riot.file;
 
 import org.springframework.cloud.aws.core.io.s3.SimpleStorageProtocolResolver;