chore: Refactor for modules to release (#118)

.github/workflows/release.yml

@@ -44,15 +44,81 @@ jobs:
         run: ./gradlew clean build
 
       - name: Perform publish
-        run: ./gradlew publish
+        run: ./gradlew publish -PreleaseBundle=all
         env:
           JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
           JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD }}
 
-      - name: Release to Maven Central portal
+      - name: Release core projects to Maven Central portal
         run: |
           for i in {1..3}; do
-            if ./gradlew jreleaserFullRelease --no-daemon --stacktrace; then
+            if ./gradlew jreleaserFullRelease -PreleaseBundle=core --no-daemon --stacktrace; then
+              exit 0
+            fi
+            if [ $i -eq 3 ]; then
+              echo "Failed release after 3 attempts"
+              exit 1
+            fi
+            echo
+            echo "********************************************************************************** RELEASE ATTEMPT($((i + 1))) **********************************************************************************"
+            sleep 5
+          done
+        env:
+          JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
+          JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
+          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD }}
+          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
+          JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
+          JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
+
+      - name: Release driver projects to Maven Central portal
+        run: |
+          for i in {1..3}; do
+            if ./gradlew jreleaserFullRelease -PreleaseBundle=driver --no-daemon --stacktrace; then
+              exit 0
+            fi
+            if [ $i -eq 3 ]; then
+              echo "Failed release after 3 attempts"
+              exit 1
+            fi
+            echo
+            echo "********************************************************************************** RELEASE ATTEMPT($((i + 1))) **********************************************************************************"
+            sleep 5
+          done
+        env:
+          JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
+          JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
+          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD }}
+          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
+          JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
+          JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
+
+      - name: Release template projects to Maven Central portal
+        run: |
+          for i in {1..3}; do
+            if ./gradlew jreleaserFullRelease -PreleaseBundle=template --no-daemon --stacktrace; then
+              exit 0
+            fi
+            if [ $i -eq 3 ]; then
+              echo "Failed release after 3 attempts"
+              exit 1
+            fi
+            echo
+            echo "********************************************************************************** RELEASE ATTEMPT($((i + 1))) **********************************************************************************"
+            sleep 5
+          done
+        env:
+          JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
+          JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
+          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD }}
+          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
+          JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
+          JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
+
+      - name: Release transactioner projects to Maven Central portal
+        run: |
+          for i in {1..3}; do
+            if ./gradlew jreleaserFullRelease -PreleaseBundle=transactioner --no-daemon --stacktrace; then
               exit 0
             fi
             if [ $i -eq 3 ]; then

build.gradle.kts

@@ -28,53 +28,81 @@ plugins {
 
 allprojects {
     group = "io.flamingock"
-    version = "0.0.12-beta"
+    version = "0.0.13-beta"
 
     apply(plugin = "org.jetbrains.kotlin.jvm")
 
 }
 
-val projectsToRelease = setOf(
+val coreProjects = setOf(
     "flamingock-core",
     "flamingock-core-api",
+    "flamingock-core-template",
     "flamingock-springboot-v2-runner",
     "flamingock-springboot-v3-runner",
+    "utils"
+)
+
+val localDriverProjects = setOf(
+    "driver-common",
     "couchbase-driver",
     "couchbase-springboot-v2-driver",
     "dynamodb-driver",
+    "mongodb-facade",
     "mongodb-springdata-v2-driver",
     "mongodb-springdata-v3-driver",
     "mongodb-springdata-v4-driver",
     "mongodb-sync-v4-driver",
-    "mongodb-v3-driver",
+    "mongodb-v3-driver"
+)
+
+val templateProjects = setOf(
     "sql-template",
-    "sql-springboot-template",
+    "sql-springboot-template"
+)
+
+
+val transactionerProjects = setOf(
     "sql-cloud-transactioner"
 )
 
+val allProjects = coreProjects + localDriverProjects + templateProjects + transactionerProjects
 
-val projectNameMaxLength = projectsToRelease.maxOf { it.length }
+
+val projectNameMaxLength = coreProjects.maxOf { it.length }
 val tabWidth = 8 //Usually 8 spaces)
 val statusPosition = ((projectNameMaxLength / tabWidth) + 1) * tabWidth
 
 val httpClient: HttpClient = HttpClient.newHttpClient()
 val mavenUsername: String? = System.getenv("JRELEASER_MAVENCENTRAL_USERNAME")
 val mavenPassword: String? = System.getenv("JRELEASER_MAVENCENTRAL_PASSWORD")
-val encodedCredentials: String? = if(mavenUsername != null && mavenPassword != null)Base64.getEncoder()
+val encodedCredentials: String? = if (mavenUsername != null && mavenPassword != null) Base64.getEncoder()
     .encodeToString("$mavenUsername:$mavenPassword".toByteArray()) else null
+val releaseBundle: String? = project.findProperty("releaseBundle") as String?
+val projectsToRelease = when(releaseBundle) {
+    "core" -> coreProjects
+    "driver" -> localDriverProjects
+    "template" -> templateProjects
+    "transactioner" -> transactionerProjects
+    "all" -> allProjects
+    else -> setOf()
+}
 
 
 val isReleasing = getIsReleasing()
 
+if(isReleasing) {
+    logger.lifecycle("Release bundle: $releaseBundle")
+}
+
 subprojects {
     apply(plugin = "java-library")
 
-
     val tabsPrefix = getTabsPrefix()
-    if(isReleasing) {
+    if (isReleasing) {
         if (project.isReleasable()) {
-            if(!project.getIfAlreadyReleasedFromCentralPortal()) {
-                logger.lifecycle("${project.name}${tabsPrefix}[ \uD83D\uDE80 PUBLISHING ]")
+            if (!project.getIfAlreadyReleasedFromCentralPortal()) {
+                logger.lifecycle("${project.name}${tabsPrefix}\uD83D\uDE80 PUBLISHING")
                 java {
                     withSourcesJar()
                     withJavadocJar()
@@ -219,10 +247,10 @@ subprojects {
                     }
                 }
             } else {
-                logger.lifecycle("${project.name}${tabsPrefix}[ ✅ ALREADY PUBLISHED ]")
+                logger.lifecycle("${project.name}${tabsPrefix}✅  ALREADY PUBLISHED")
             }
         } else {
-            logger.lifecycle("${project.name}${tabsPrefix}[ \uD83D\uDCA4 NOT RELEASABLE ]")
+            logger.debug("${project.name}${tabsPrefix}\uD83D\uDCA4 NOT RELEASABLE")
         }
     }
 
@@ -278,14 +306,10 @@ subprojects {
 
 fun Project.isReleasable(): Boolean = projectsToRelease.contains(name)
 
-fun Project.getIfAlreadyReleasedFromCentralPortal() : Boolean {
+fun Project.getIfAlreadyReleasedFromCentralPortal(): Boolean {
     val url = "https://central.sonatype.com/api/v1/publisher/published?namespace=${group}&name=$name&version=$version"
-    val request = HttpRequest.newBuilder()
-        .uri(URI.create(url))
-        .header("accept", "application/json")
-        .header("Authorization", "Basic $encodedCredentials")
-        .GET()
-        .build()
+    val request = HttpRequest.newBuilder().uri(URI.create(url)).header("accept", "application/json")
+        .header("Authorization", "Basic $encodedCredentials").GET().build()
 
 
     val response = httpClient.send(request, HttpResponse.BodyHandlers.ofString())
@@ -307,13 +331,6 @@ fun Project.getIfAlreadyReleasedFromCentralPortal() : Boolean {
 }
 
 
-fun getTabsPrefix(): String {
-    val currentPosition = project.name.length
-    val tabsNeeded = ((statusPosition - currentPosition + tabWidth - 1) / tabWidth) + 1
-    return "\t".repeat(tabsNeeded)
-}
-
-
 val String.isPalindrome: Boolean
     get() = this == this.reversed()
 
@@ -323,5 +340,5 @@ fun Project.getTabsPrefix(): String {
     return "\t".repeat(tabsNeeded)
 }
 
-fun Project.getIsReleasing() = gradle.startParameter.taskNames.contains("jreleaserFullRelease") ||
-        gradle.startParameter.taskNames.contains("publish")
+fun Project.getIsReleasing() =
+    gradle.startParameter.taskNames.contains("jreleaserFullRelease") || gradle.startParameter.taskNames.contains("publish")

internal/legacy-importer-mongodb/build.gradle.kts → cloud-importers/mongodb-sync4-cloud-importer/build.gradle.kts

@@ -1,7 +1,7 @@
 val jacksonVersion = "2.16.0"
 dependencies {
-    api(project(":utils"))
-    api(project(":flamingock-core-api"))
+    implementation(project(":utils"))
+    implementation(project(":flamingock-core-api"))
 
     implementation("org.mongodb:mongodb-driver-sync:4.3.3")
     implementation(project(":flamingock-core"))

internal/legacy-importer-mongodb/src/main/java/flamingock/internal/legacy/importer/mongodb/ImporterService.java → cloud-importers/mongodb-sync4-cloud-importer/src/main/java/io/flamingock/importer/cloud/mongodb/ImporterService.java

@@ -1,4 +1,4 @@
-package flamingock.internal.legacy.importer.mongodb;
+package io.flamingock.importer.cloud.mongodb;
 
 import io.flamingock.commons.utils.http.Http;
 

internal/legacy-importer-mongodb/src/main/java/flamingock/internal/legacy/importer/mongodb/MongoDBLegacyImportConfiguration.java → cloud-importers/mongodb-sync4-cloud-importer/src/main/java/io/flamingock/importer/cloud/mongodb/MongoDBLegacyImportConfiguration.java

@@ -1,4 +1,4 @@
-package flamingock.internal.legacy.importer.mongodb;
+package io.flamingock.importer.cloud.mongodb;
 
 import io.flamingock.commons.utils.id.EnvironmentId;
 import io.flamingock.commons.utils.id.ServiceId;

internal/legacy-importer-mongodb/src/main/java/flamingock/internal/legacy/importer/mongodb/MongoDBLegacyImporter.java → cloud-importers/mongodb-sync4-cloud-importer/src/main/java/io/flamingock/importer/cloud/mongodb/MongoDBLegacyImporter.java

@@ -1,4 +1,4 @@
-package flamingock.internal.legacy.importer.mongodb;
+package io.flamingock.importer.cloud.mongodb;
 
 import io.flamingock.core.api.CloudSystemModule;
 import io.flamingock.core.runtime.dependency.Dependency;

internal/legacy-importer-mongodb/src/main/java/flamingock/internal/legacy/importer/mongodb/MongockLegacyImporterChangeUnit.java → cloud-importers/mongodb-sync4-cloud-importer/src/main/java/io/flamingock/importer/cloud/mongodb/MongockLegacyImporterChangeUnit.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package flamingock.internal.legacy.importer.mongodb;
+package io.flamingock.importer.cloud.mongodb;
 
 
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
-import io.changock.migration.api.annotations.NonLockGuarded;
 import io.flamingock.commons.utils.JsonObjectMapper;
 import io.flamingock.commons.utils.RunnerId;
 import io.flamingock.commons.utils.http.Http;
 import io.flamingock.core.api.annotations.ChangeUnit;
 import io.flamingock.core.api.annotations.Execution;
+import io.flamingock.core.api.annotations.NonLockGuarded;
 import io.flamingock.core.api.annotations.SystemChange;
 import org.apache.http.impl.client.HttpClients;
 import org.bson.Document;

cloud-transactioners/sql-cloud-transactioner/src/test/java/io/flamingock/cloud/transaction/sql/changes/happypath/HappyCreateTableClientsChange.java

@@ -16,9 +16,10 @@
 
 package io.flamingock.cloud.transaction.sql.changes.happypath;
 
-import io.changock.migration.api.annotations.NonLockGuarded;
+
 import io.flamingock.core.api.annotations.ChangeUnit;
 import io.flamingock.core.api.annotations.Execution;
+import io.flamingock.core.api.annotations.NonLockGuarded;
 
 import java.sql.Connection;
 import java.sql.SQLException;

cloud-transactioners/sql-cloud-transactioner/src/test/java/io/flamingock/cloud/transaction/sql/changes/happypath/HappyInsertClientsChange.java

@@ -16,7 +16,7 @@
 
 package io.flamingock.cloud.transaction.sql.changes.happypath;
 
-import io.changock.migration.api.annotations.NonLockGuarded;
+import io.flamingock.core.api.annotations.NonLockGuarded;
 import io.flamingock.core.api.annotations.ChangeUnit;
 import io.flamingock.core.api.annotations.Execution;
 

cloud-transactioners/sql-cloud-transactioner/src/test/java/io/flamingock/cloud/transaction/sql/changes/unhappypath/UnhappyCreateTableClientsChange.java

@@ -16,7 +16,7 @@
 
 package io.flamingock.cloud.transaction.sql.changes.unhappypath;
 
-import io.changock.migration.api.annotations.NonLockGuarded;
+import io.flamingock.core.api.annotations.NonLockGuarded;
 import io.flamingock.core.api.annotations.ChangeUnit;
 import io.flamingock.core.api.annotations.Execution;
 

cloud-transactioners/sql-cloud-transactioner/src/test/java/io/flamingock/cloud/transaction/sql/changes/unhappypath/UnhappyInsertionClientsChange.java

@@ -16,7 +16,7 @@
 
 package io.flamingock.cloud.transaction.sql.changes.unhappypath;
 
-import io.changock.migration.api.annotations.NonLockGuarded;
+import io.flamingock.core.api.annotations.NonLockGuarded;
 import io.flamingock.core.api.annotations.ChangeUnit;
 import io.flamingock.core.api.annotations.Execution;
 

examples/databases/legacy-mongodb-importer/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
     implementation("com.mysql:mysql-connector-j:8.2.0")
     implementation(project(":templates:sql-template"))
 
-    implementation(project(":internal:legacy-importer-mongodb"))
+    implementation(project(":cloud-importers:mongodb-sync4-cloud-importer"))
 
     implementation(project(":local-drivers:mongodb:mongodb-sync-v4-driver"))
     implementation("org.mongodb:mongodb-driver-sync:$mongodbVersion")

examples/databases/legacy-mongodb-importer/src/main/java/io/flamingock/examples/mysql/standalone/LegacyImporterMongoDBApplication.java

@@ -20,7 +20,7 @@
 import com.mongodb.MongoClientSettings;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
-import flamingock.internal.legacy.importer.mongodb.MongoDBLegacyImporter;
+import io.flamingock.importer.cloud.mongodb.MongoDBLegacyImporter;
 import io.flamingock.core.configurator.standalone.FlamingockStandalone;
 import org.bson.codecs.configuration.CodecRegistries;
 import org.bson.codecs.configuration.CodecRegistry;
@@ -51,9 +51,6 @@ public void run(MongoClient mongoClient, String databaseName) throws ClassNotFou
                     .setEnvironment(ENVIRONMENT)
                     .setService(SERVICE_NAME)
                     .addSystemModule(new MongoDBLegacyImporter(MONGODB_CHANGELOG_COLLECTION))
-                    .setLockAcquiredForMillis(6 * 1000L)//this is just to show how is set. Default value is still 60 * 1000L
-                    .setLockQuitTryingAfterMillis(10 * 1000L)//this is just to show how is set. Default value is still 3 * 60 * 1000L
-                    .setLockTryFrequencyMillis(3000L)//this is just to show how is set. Default value is still 1000L
                     .addDependency(mongoClient.getDatabase(databaseName))
                     .build()
                     .run();

examples/databases/legacy-mongodb-importer/src/test/java/SuccessExecutionImporterTest.java

@@ -18,8 +18,8 @@
 import com.mongodb.MongoClientSettings;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
-import flamingock.internal.legacy.importer.mongodb.MongoDBLegacyImporter;
-import flamingock.internal.legacy.importer.mongodb.MongockLegacyImporterChangeUnit;
+import io.flamingock.importer.cloud.mongodb.MongoDBLegacyImporter;
+import io.flamingock.importer.cloud.mongodb.MongockLegacyImporterChangeUnit;
 import io.flamingock.common.test.cloud.AuditEntryExpectation;
 import io.flamingock.common.test.cloud.MockRunnerServer;
 import io.flamingock.common.test.cloud.MongockLegacyAuditEntry;

examples/databases/mysql-standalone/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
     implementation("com.mysql:mysql-connector-j:8.2.0")
     implementation(project(":templates:sql-template"))
 
-    implementation(project(":internal:legacy-importer-mongodb"))
+    implementation(project(":cloud-importers:mongodb-sync4-cloud-importer"))
 
     implementation("org.slf4j:slf4j-simple:2.0.6")
 

examples/databases/mysql-standalone/src/main/java/io/flamingock/examples/mysql/standalone/MysqlStandaloneApplication.java

@@ -16,7 +16,6 @@
 
 package io.flamingock.examples.mysql.standalone;
 
-import flamingock.internal.legacy.importer.mongodb.MongoDBLegacyImporter;
 import io.flamingock.cloud.transaction.sql.SqlCloudTransactioner;
 import io.flamingock.cloud.transaction.sql.SqlDialect;
 import io.flamingock.core.cloud.transaction.CloudTransactioner;

flamingock-core/build.gradle.kts

@@ -1,8 +1,7 @@
 val jacksonVersion = "2.16.0"
 dependencies {
     api(project(":flamingock-core-api"))
-    api(project(":flamingock-core-cloud-api"))
-    api(project(":flamingock-template"))
+    api(project(":flamingock-core-template"))
     api(project(":utils"))
     api("javax.inject:javax.inject:1")
     api("org.reflections:reflections:0.10.1")

flamingock-core/src/main/java/io/flamingock/core/cloud/planner/ExecutionPlanMapper.java

@@ -33,7 +33,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;