refactor: introduce externalSystem

.github/workflows/release.yml

@@ -266,11 +266,11 @@ jobs:
       FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
       FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
 
-  mongodb-target-system-api:
+  mongodb-external-system-api:
     needs: [ build ]
     uses: ./.github/workflows/module-release-graalvm.yml
     with:
-      module: mongodb-target-system-api
+      module: mongodb-external-system-api
     secrets:
       FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
       FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
@@ -504,7 +504,7 @@ jobs:
       flamingock-importer,
       flamingock-springboot-integration,
       nontransactional-target-system,
-      mongodb-target-system-api,
+      mongodb-external-system-api,
       mongodb-sync-target-system,
       mongodb-springdata-target-system,
       sql-target-system,

buildSrc/src/main/kotlin/flamingock.project-structure.gradle.kts

@@ -35,7 +35,7 @@ val pluginProjects = setOf(
 
 val targetSystemProjects = setOf(
     "nontransactional-target-system",
-    "mongodb-target-system-api",
+    "mongodb-external-system-api",
     "mongodb-sync-target-system",
     "mongodb-springdata-target-system",
     "sql-target-system",

cli/flamingock-cli/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
     implementation(project(":core:flamingock-core"))
     implementation(project(":community:flamingock-community"))
     implementation(project(":utils:sql-util"))
-    implementation(project(":core:target-systems:mongodb-target-system-api"))
+    implementation(project(":core:target-systems:mongodb-external-system-api"))
 
     // CLI framework
     implementation("info.picocli:picocli:4.7.5")

cli/flamingock-cli/src/main/java/io/flamingock/cli/service/AuditService.java

@@ -39,7 +39,7 @@
 import io.flamingock.internal.core.configuration.core.CoreConfiguration;
 import io.flamingock.internal.core.configuration.community.CommunityConfiguration;
 import io.flamingock.internal.core.context.SimpleContext;
-import io.flamingock.internal.core.store.AuditStore;
+import io.flamingock.internal.core.external.store.AuditStore;
 import io.flamingock.targetsystem.dynamodb.DynamoDBTargetSystem;
 import io.flamingock.targetsystem.couchbase.CouchbaseTargetSystem;
 import io.flamingock.targetsystem.sql.SqlTargetSystem;

cloud/flamingock-cloud/src/main/java/io/flamingock/cloud/CloudAuditPersistenceImpl.java

@@ -16,19 +16,17 @@
 package io.flamingock.cloud;
 
 import io.flamingock.internal.common.core.audit.AuditEntry;
-import io.flamingock.internal.common.core.audit.AuditSnapshotBuilder;
 import io.flamingock.internal.common.core.audit.issue.AuditEntryIssue;
 import io.flamingock.internal.common.core.context.ContextContributor;
 import io.flamingock.internal.util.Result;
 import io.flamingock.internal.util.id.EnvironmentId;
 import io.flamingock.internal.util.id.JwtProperty;
 import io.flamingock.internal.util.id.ServiceId;
-import io.flamingock.internal.core.store.audit.cloud.CloudAuditPersistence;
+import io.flamingock.internal.core.external.store.audit.cloud.CloudAuditPersistence;
 import io.flamingock.internal.common.core.context.ContextInjectable;
-import io.flamingock.internal.core.store.audit.LifecycleAuditWriter;
+import io.flamingock.internal.core.external.store.audit.LifecycleAuditWriter;
 import io.flamingock.internal.core.plan.ExecutionPlanner;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 

cloud/flamingock-cloud/src/main/java/io/flamingock/cloud/CloudAuditStoreImpl.java

@@ -15,6 +15,7 @@
  */
 package io.flamingock.cloud;
 
+import io.flamingock.internal.util.Constants;
 import io.flamingock.internal.util.JsonObjectMapper;
 import io.flamingock.internal.util.id.RunnerId;
 import io.flamingock.internal.util.TimeService;
@@ -23,7 +24,7 @@
 import io.flamingock.internal.util.id.ServiceId;
 import io.flamingock.internal.core.configuration.cloud.CloudConfigurable;
 import io.flamingock.internal.core.configuration.core.CoreConfigurable;
-import io.flamingock.internal.core.store.CloudAuditStore;
+import io.flamingock.internal.core.external.store.CloudAuditStore;
 import io.flamingock.internal.common.cloud.auth.AuthResponse;
 import io.flamingock.cloud.audit.HtttpAuditWriter;
 import io.flamingock.cloud.auth.AuthManager;
@@ -34,7 +35,7 @@
 import io.flamingock.cloud.planner.CloudExecutionPlanner;
 import io.flamingock.cloud.planner.client.ExecutionPlannerClient;
 import io.flamingock.cloud.planner.client.HttpExecutionPlannerClient;
-import io.flamingock.internal.core.store.audit.LifecycleAuditWriter;
+import io.flamingock.internal.core.external.store.audit.LifecycleAuditWriter;
 import io.flamingock.internal.core.plan.ExecutionPlanner;
 import io.flamingock.internal.common.core.context.ContextResolver;
 import org.apache.http.impl.client.HttpClients;
@@ -48,6 +49,10 @@ public class CloudAuditStoreImpl implements CloudAuditStore {
     private static final Logger logger = FlamingockLoggerFactory.getLogger("CloudAuditStore");
     private CloudAuditPersistenceImpl persistence;
 
+    @Override
+    public String getId() {
+        return Constants.DEFAULT_CLOUD_AUDIT_STORE;
+    }
 
     @Override
     public void initialize(ContextResolver baseContext) {

cloud/flamingock-cloud/src/main/java/io/flamingock/cloud/audit/CloudAuditWriter.java

@@ -16,10 +16,10 @@
 package io.flamingock.cloud.audit;
 
 import io.flamingock.internal.util.Result;
-import io.flamingock.internal.core.store.audit.LifecycleAuditWriter;
-import io.flamingock.internal.core.store.audit.domain.ExecutionAuditContextBundle;
-import io.flamingock.internal.core.store.audit.domain.RollbackAuditContextBundle;
-import io.flamingock.internal.core.store.audit.domain.StartExecutionAuditContextBundle;
+import io.flamingock.internal.core.external.store.audit.LifecycleAuditWriter;
+import io.flamingock.internal.core.external.store.audit.domain.ExecutionAuditContextBundle;
+import io.flamingock.internal.core.external.store.audit.domain.RollbackAuditContextBundle;
+import io.flamingock.internal.core.external.store.audit.domain.StartExecutionAuditContextBundle;
 
 public interface CloudAuditWriter extends LifecycleAuditWriter {
 

cloud/flamingock-cloud/src/main/java/io/flamingock/cloud/lock/CloudLockService.java

@@ -18,10 +18,10 @@
 import io.flamingock.internal.common.cloud.lock.LockExtensionRequest;
 import io.flamingock.internal.common.cloud.lock.LockResponse;
 import io.flamingock.cloud.lock.client.LockServiceClient;
-import io.flamingock.internal.core.store.lock.LockAcquisition;
-import io.flamingock.internal.core.store.lock.LockKey;
-import io.flamingock.internal.core.store.lock.LockService;
-import io.flamingock.internal.core.store.lock.LockServiceException;
+import io.flamingock.internal.core.external.store.lock.LockAcquisition;
+import io.flamingock.internal.core.external.store.lock.LockKey;
+import io.flamingock.internal.core.external.store.lock.LockService;
+import io.flamingock.internal.core.external.store.lock.LockServiceException;
 import io.flamingock.internal.util.id.RunnerId;
 import io.flamingock.internal.util.ServerException;
 import io.flamingock.internal.util.log.FlamingockLoggerFactory;

cloud/flamingock-cloud/src/main/java/io/flamingock/cloud/lock/client/HttpLockServiceClient.java

@@ -18,7 +18,7 @@
 import io.flamingock.cloud.auth.AuthManager;
 import io.flamingock.internal.common.cloud.lock.LockExtensionRequest;
 import io.flamingock.internal.common.cloud.lock.LockResponse;
-import io.flamingock.internal.core.store.lock.LockKey;
+import io.flamingock.internal.core.external.store.lock.LockKey;
 import io.flamingock.internal.util.id.RunnerId;
 import io.flamingock.internal.util.http.Http;
 

cloud/flamingock-cloud/src/main/java/io/flamingock/cloud/lock/client/LockServiceClient.java

@@ -17,7 +17,7 @@
 
 import io.flamingock.internal.common.cloud.lock.LockExtensionRequest;
 import io.flamingock.internal.common.cloud.lock.LockResponse;
-import io.flamingock.internal.core.store.lock.LockKey;
+import io.flamingock.internal.core.external.store.lock.LockKey;
 import io.flamingock.internal.util.id.RunnerId;
 
 public interface LockServiceClient {

cloud/flamingock-cloud/src/main/java/io/flamingock/cloud/planner/CloudExecutionPlanMapper.java

@@ -29,8 +29,8 @@
 import io.flamingock.internal.core.configuration.core.CoreConfigurable;
 import io.flamingock.internal.common.core.recovery.action.ChangeAction;
 import io.flamingock.internal.common.core.recovery.action.ChangeActionMap;
-import io.flamingock.internal.core.store.lock.Lock;
-import io.flamingock.internal.core.store.lock.LockKey;
+import io.flamingock.internal.core.external.store.lock.Lock;
+import io.flamingock.internal.core.external.store.lock.LockKey;
 import io.flamingock.internal.core.pipeline.execution.ExecutableStage;
 import io.flamingock.internal.core.pipeline.loaded.stage.AbstractLoadedStage;
 import io.flamingock.internal.common.core.task.TaskDescriptor;

cloud/flamingock-cloud/src/main/java/io/flamingock/cloud/planner/CloudExecutionPlanner.java

@@ -23,14 +23,14 @@
 import io.flamingock.internal.common.cloud.planner.request.ExecutionPlanRequest;
 import io.flamingock.internal.common.cloud.planner.response.ExecutionPlanResponse;
 import io.flamingock.internal.common.cloud.vo.TargetSystemAuditMarkType;
-import io.flamingock.internal.core.targets.mark.TargetSystemAuditMark;
+import io.flamingock.internal.core.external.targets.mark.TargetSystemAuditMark;
 import io.flamingock.cloud.lock.CloudLockService;
 import io.flamingock.cloud.planner.client.ExecutionPlannerClient;
-import io.flamingock.internal.core.targets.mark.TargetSystemAuditMarker;
+import io.flamingock.internal.core.external.targets.mark.TargetSystemAuditMarker;
 import io.flamingock.internal.core.configuration.core.CoreConfigurable;
 import io.flamingock.internal.core.plan.ExecutionPlan;
 import io.flamingock.internal.core.plan.ExecutionPlanner;
-import io.flamingock.internal.core.store.lock.LockException;
+import io.flamingock.internal.core.external.store.lock.LockException;
 import io.flamingock.internal.core.pipeline.execution.ExecutableStage;
 import io.flamingock.internal.core.pipeline.loaded.stage.AbstractLoadedStage;
 import io.flamingock.internal.util.log.FlamingockLoggerFactory;

cloud/flamingock-cloud/src/test/java/io/flamingock/core/cloud/CloudAuditPersistenceTest.java

@@ -27,7 +27,7 @@
 import io.flamingock.internal.core.builder.CloudChangeRunnerBuilder;
 import io.flamingock.internal.core.builder.FlamingockFactory;
 import io.flamingock.internal.common.cloud.audit.AuditEntryRequest;
-import io.flamingock.internal.core.store.lock.LockException;
+import io.flamingock.internal.core.external.store.lock.LockException;
 import io.flamingock.internal.core.runner.Runner;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;

cloud/flamingock-cloud/src/test/java/io/flamingock/core/cloud/CloudTransactionTest.java

@@ -24,7 +24,7 @@
 import io.flamingock.internal.core.builder.FlamingockFactory;
 import io.flamingock.internal.common.cloud.audit.AuditEntryRequest;
 import io.flamingock.internal.common.cloud.vo.TargetSystemAuditMarkType;
-import io.flamingock.internal.core.targets.mark.TargetSystemAuditMark;
+import io.flamingock.internal.core.external.targets.mark.TargetSystemAuditMark;
 import io.flamingock.internal.core.runner.Runner;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;

cloud/flamingock-cloud/src/test/java/io/flamingock/core/cloud/utils/TestCloudTargetSystem.java

@@ -17,9 +17,9 @@
 
 import io.flamingock.internal.common.core.context.ContextResolver;
 import io.flamingock.internal.core.runtime.ExecutionRuntime;
-import io.flamingock.internal.core.targets.mark.TargetSystemAuditMark;
-import io.flamingock.internal.core.targets.mark.TargetSystemAuditMarker;
-import io.flamingock.internal.core.targets.TransactionalTargetSystem;
+import io.flamingock.internal.core.external.targets.mark.TargetSystemAuditMark;
+import io.flamingock.internal.core.external.targets.mark.TargetSystemAuditMarker;
+import io.flamingock.internal.core.external.targets.TransactionalTargetSystem;
 import io.flamingock.internal.core.transaction.TransactionWrapper;
 import org.mockito.Mockito;
 

community/flamingock-auditstore-couchbase/build.gradle.kts

@@ -1,10 +1,11 @@
 dependencies {
     api(project(":core:flamingock-core"))
-    api(project(":core:target-systems:couchbase-target-system"))
+    api(project(":core:target-systems:couchbase-external-system-api"))
     implementation(project(":utils:couchbase-util"))
 
     compileOnly("com.couchbase.client:java-client:3.6.0")
 
+    testImplementation(project(":core:target-systems:couchbase-target-system"))
     testImplementation("org.testcontainers:testcontainers-couchbase:2.0.2")
     testImplementation("org.testcontainers:testcontainers-junit-jupiter:2.0.2")
 }

community/flamingock-auditstore-couchbase/src/main/java/io/flamingock/store/couchbase/CouchbaseAuditStore.java

@@ -18,27 +18,28 @@
 import com.couchbase.client.core.io.CollectionIdentifier;
 import com.couchbase.client.java.Bucket;
 import com.couchbase.client.java.Cluster;
-import io.flamingock.store.couchbase.internal.CouchbaseLockService;
+import io.flamingock.internal.common.core.context.ContextResolver;
 import io.flamingock.internal.common.core.error.FlamingockException;
-import io.flamingock.internal.util.constants.CommunityPersistenceConstants;
-import io.flamingock.internal.core.store.lock.community.CommunityLockService;
+import io.flamingock.internal.core.configuration.community.CommunityConfigurable;
+import io.flamingock.internal.core.external.store.CommunityAuditStore;
+import io.flamingock.internal.core.external.store.audit.community.CommunityAuditPersistence;
+import io.flamingock.internal.core.external.store.lock.community.CommunityLockService;
+import io.flamingock.internal.util.Constants;
 import io.flamingock.internal.util.TimeService;
+import io.flamingock.internal.util.constants.CommunityPersistenceConstants;
 import io.flamingock.internal.util.id.RunnerId;
-import io.flamingock.internal.core.configuration.community.CommunityConfigurable;
-import io.flamingock.internal.core.store.audit.community.CommunityAuditPersistence;
-import io.flamingock.internal.core.store.CommunityAuditStore;
-import io.flamingock.internal.common.core.context.ContextResolver;
 import io.flamingock.store.couchbase.internal.CouchbaseAuditPersistence;
-import io.flamingock.targetsystem.couchbase.CouchbaseTargetSystem;
+import io.flamingock.store.couchbase.internal.CouchbaseLockService;
+import io.flamingock.externalsystem.couchbase.api.CouchbaseExternalSystem;
 
 public class CouchbaseAuditStore implements CommunityAuditStore {
 
+    private final Cluster cluster;
+    private final String bucketName;
     private RunnerId runnerId;
     private CommunityConfigurable communityConfiguration;
     private CouchbaseAuditPersistence persistence;
     private CouchbaseLockService lockService;
-    private final Cluster cluster;
-    private final String bucketName;
     private Bucket bucket;
     private String scopeName = CollectionIdentifier.DEFAULT_SCOPE;
     private String auditRepositoryName = CommunityPersistenceConstants.DEFAULT_AUDIT_STORE_NAME;
@@ -53,18 +54,23 @@ private CouchbaseAuditStore(Cluster cluster, String bucketName) {
 
     /**
      * Creates a {@link CouchbaseAuditStore} using the same Couchbase cluster and
-     * bucket configured in the given {@link CouchbaseTargetSystem}.
+     * bucket configured in the given {@link CouchbaseExternalSystem}.
      * <p>
      * Only the underlying Couchbase instance (cluster + bucket name) is reused.
      * No additional target-system configuration is carried over.
      *
      * @param targetSystem the target system from which to derive the cluster and bucket
      * @return a new audit store bound to the same Couchbase instance as the target system
      */
-    public static CouchbaseAuditStore from(CouchbaseTargetSystem targetSystem) {
+    public static CouchbaseAuditStore from(CouchbaseExternalSystem targetSystem) {
         return new CouchbaseAuditStore(targetSystem.getCluster(), targetSystem.getBucketName());
     }
 
+    @Override
+    public String getId() {
+        return Constants.DEFAULT_COUCHBASE_AUDIT_STORE;
+    }
+
     public CouchbaseAuditStore withScopeName(String scopeName) {
         this.scopeName = scopeName;
         return this;

community/flamingock-auditstore-couchbase/src/main/java/io/flamingock/store/couchbase/CouchbaseConfiguration.java

@@ -17,7 +17,7 @@
 
 import com.couchbase.client.core.io.CollectionIdentifier;
 import io.flamingock.internal.util.constants.CommunityPersistenceConstants;
-import io.flamingock.internal.core.store.audit.community.CommunityAuditStoreConfigurable;
+import io.flamingock.internal.core.external.store.audit.community.CommunityAuditStoreConfigurable;
 import io.flamingock.internal.common.core.context.ContextResolver;
 
 public class CouchbaseConfiguration implements CommunityAuditStoreConfigurable {

community/flamingock-auditstore-couchbase/src/main/java/io/flamingock/store/couchbase/internal/CouchbaseAuditPersistence.java

@@ -19,7 +19,7 @@
 import com.couchbase.client.java.Cluster;
 import io.flamingock.internal.common.core.audit.AuditEntry;
 import io.flamingock.internal.core.configuration.community.CommunityConfigurable;
-import io.flamingock.internal.core.store.audit.community.AbstractCommunityAuditPersistence;
+import io.flamingock.internal.core.external.store.audit.community.AbstractCommunityAuditPersistence;
 import io.flamingock.internal.util.Result;
 import io.flamingock.internal.util.id.RunnerId;
 

community/flamingock-auditstore-couchbase/src/main/java/io/flamingock/store/couchbase/internal/CouchbaseAuditor.java

@@ -28,7 +28,7 @@
 import io.flamingock.internal.common.couchbase.CouchbaseAuditMapper;
 import io.flamingock.internal.common.couchbase.CouchbaseCollectionHelper;
 import io.flamingock.internal.common.couchbase.CouchbaseCollectionInitializator;
-import io.flamingock.internal.core.store.audit.LifecycleAuditWriter;
+import io.flamingock.internal.core.external.store.audit.LifecycleAuditWriter;
 import io.flamingock.internal.util.Result;
 import io.flamingock.internal.util.log.FlamingockLoggerFactory;
 import org.slf4j.Logger;

community/flamingock-auditstore-couchbase/src/main/java/io/flamingock/store/couchbase/internal/CouchbaseLockService.java

@@ -24,12 +24,12 @@
 import com.couchbase.client.java.kv.ReplaceOptions;
 import io.flamingock.internal.common.couchbase.CouchbaseCollectionInitializator;
 import io.flamingock.internal.common.couchbase.CouchbaseLockMapper;
-import io.flamingock.internal.core.store.lock.community.CommunityLockService;
-import io.flamingock.internal.core.store.lock.LockAcquisition;
-import io.flamingock.internal.core.store.lock.community.CommunityLockEntry;
-import io.flamingock.internal.core.store.lock.LockKey;
-import io.flamingock.internal.core.store.lock.LockServiceException;
-import io.flamingock.internal.core.store.lock.LockStatus;
+import io.flamingock.internal.core.external.store.lock.community.CommunityLockService;
+import io.flamingock.internal.core.external.store.lock.LockAcquisition;
+import io.flamingock.internal.core.external.store.lock.community.CommunityLockEntry;
+import io.flamingock.internal.core.external.store.lock.LockKey;
+import io.flamingock.internal.core.external.store.lock.LockServiceException;
+import io.flamingock.internal.core.external.store.lock.LockStatus;
 import io.flamingock.internal.util.id.RunnerId;
 import io.flamingock.internal.util.TimeService;
 import io.flamingock.internal.util.log.FlamingockLoggerFactory;

community/flamingock-auditstore-dynamodb/build.gradle.kts

@@ -2,12 +2,14 @@ dependencies {
     implementation(project(":utils:dynamodb-util"))
     implementation(project(":core:flamingock-core"))
 
-    api(project(":core:target-systems:dynamodb-target-system"))
+
+    api(project(":core:target-systems:dynamodb-external-system-api"))
 
     compileOnly("software.amazon.awssdk:dynamodb-enhanced:2.25.29")
 
 
     testImplementation(project(":utils:test-util"))
+    testImplementation(project(":core:target-systems:dynamodb-target-system"))
     testImplementation(project(":core:target-systems:nontransactional-target-system"))
 
     testImplementation("software.amazon.awssdk:url-connection-client:2.24.11")