diff --git a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/DashboardStore.java b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/DashboardStore.java similarity index 81% rename from conductor-server/src/main/java/io/appform/conductor/server/dashboards/DashboardStore.java rename to conductor-console/src/main/java/io/appform/conductor/console/dashboards/DashboardStore.java index d682c59..747018c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/DashboardStore.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/DashboardStore.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.appform.conductor.server.dashboards; +package io.appform.conductor.console.dashboards; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.Throws; -import io.appform.conductor.server.dashboards.model.Dashboard; -import io.appform.conductor.server.dashboards.model.DashboardSpec; -import io.appform.conductor.server.dashboards.model.SpecVersion; -import io.appform.conductor.server.reporting.impl.models.StoredReport; +import io.appform.conductor.console.dashboards.model.Dashboard; +import io.appform.conductor.console.dashboards.model.DashboardSpec; +import io.appform.conductor.console.dashboards.model.SpecVersion; +import io.appform.conductor.console.reporting.impl.models.StoredReport; import java.util.List; import java.util.Optional; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/impl/DBDashboardStore.java b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/impl/DBDashboardStore.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/dashboards/impl/DBDashboardStore.java rename to conductor-console/src/main/java/io/appform/conductor/console/dashboards/impl/DBDashboardStore.java index 93d23e4..f76578c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/impl/DBDashboardStore.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/impl/DBDashboardStore.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package io.appform.conductor.server.dashboards.impl; +package io.appform.conductor.console.dashboards.impl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.Throws; -import io.appform.conductor.server.dashboards.DashboardStore; -import io.appform.conductor.server.dashboards.impl.model.StoredDashboard; -import io.appform.conductor.server.dashboards.model.Dashboard; -import io.appform.conductor.server.dashboards.model.DashboardSpec; -import io.appform.conductor.server.dashboards.model.SpecVersion; -import io.appform.conductor.server.reporting.impl.models.StoredReport; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.console.dashboards.DashboardStore; +import io.appform.conductor.console.dashboards.impl.model.StoredDashboard; +import io.appform.conductor.console.dashboards.model.Dashboard; +import io.appform.conductor.console.dashboards.model.DashboardSpec; +import io.appform.conductor.console.dashboards.model.SpecVersion; +import io.appform.conductor.console.reporting.impl.models.StoredReport; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.dropwizard.sharding.dao.LookupDao; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/impl/model/StoredDashboard.java b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/impl/model/StoredDashboard.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/dashboards/impl/model/StoredDashboard.java rename to conductor-console/src/main/java/io/appform/conductor/console/dashboards/impl/model/StoredDashboard.java index ee0de56..a4c0c83 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/impl/model/StoredDashboard.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/impl/model/StoredDashboard.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.dashboards.impl.model; +package io.appform.conductor.console.dashboards.impl.model; -import io.appform.conductor.server.dashboards.model.SpecVersion; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.console.dashboards.model.SpecVersion; +import io.appform.conductor.core.utils.Constants; import io.appform.dropwizard.sharding.sharding.LookupKey; import lombok.*; import lombok.experimental.FieldNameConstants; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/Dashboard.java b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/Dashboard.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/Dashboard.java rename to conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/Dashboard.java index bbec124..8b0790f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/Dashboard.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/Dashboard.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.dashboards.model; +package io.appform.conductor.console.dashboards.model; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/DashboardRow.java b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/DashboardRow.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/DashboardRow.java rename to conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/DashboardRow.java index c081749..3283eae 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/DashboardRow.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/DashboardRow.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.dashboards.model; +package io.appform.conductor.console.dashboards.model; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/DashboardSpec.java b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/DashboardSpec.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/DashboardSpec.java rename to conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/DashboardSpec.java index bbfd4a0..c65bc24 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/DashboardSpec.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/DashboardSpec.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.dashboards.model; +package io.appform.conductor.console.dashboards.model; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/DashboardWidget.java b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/DashboardWidget.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/DashboardWidget.java rename to conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/DashboardWidget.java index 3463c15..b01f879 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/DashboardWidget.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/DashboardWidget.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.dashboards.model; +package io.appform.conductor.console.dashboards.model; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/SpecVersion.java b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/SpecVersion.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/SpecVersion.java rename to conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/SpecVersion.java index 123dd1b..6eff68e 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/SpecVersion.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/SpecVersion.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.dashboards.model; +package io.appform.conductor.console.dashboards.model; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/WidgetQueryResponse.java b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/WidgetQueryResponse.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/WidgetQueryResponse.java rename to conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/WidgetQueryResponse.java index a3c61c3..bf07dc3 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/dashboards/model/WidgetQueryResponse.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/dashboards/model/WidgetQueryResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.dashboards.model; +package io.appform.conductor.console.dashboards.model; import lombok.*; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/reporting/EventGeneratingReportStore.java b/conductor-console/src/main/java/io/appform/conductor/console/reporting/EventGeneratingReportStore.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/reporting/EventGeneratingReportStore.java rename to conductor-console/src/main/java/io/appform/conductor/console/reporting/EventGeneratingReportStore.java index 1ec4277..748c30a 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/reporting/EventGeneratingReportStore.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/reporting/EventGeneratingReportStore.java @@ -1,5 +1,6 @@ -package io.appform.conductor.server.reporting; +package io.appform.conductor.console.reporting; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.events.impl.reporting.ReportCreatedEvent; import io.appform.conductor.model.events.impl.reporting.ReportDeletedEvent; @@ -9,8 +10,7 @@ import io.appform.conductor.model.reporting.ReportRun; import io.appform.conductor.model.reporting.ReportRunResult; import io.appform.conductor.model.reporting.ReportState; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; +import io.appform.conductor.core.eventmanagement.EventBus; import lombok.val; import javax.inject.Inject; @@ -28,7 +28,7 @@ public class EventGeneratingReportStore implements ReportStore { private final ReportStore reportStore; @Inject - public EventGeneratingReportStore(EventBus eventBus, @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) ReportStore reportStore) { + public EventGeneratingReportStore(EventBus eventBus, @Named(Constants.ROOT_IMPLEMENTATION_NAME) ReportStore reportStore) { this.eventBus = eventBus; this.reportStore = reportStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/reporting/ReportContext.java b/conductor-console/src/main/java/io/appform/conductor/console/reporting/ReportContext.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/reporting/ReportContext.java rename to conductor-console/src/main/java/io/appform/conductor/console/reporting/ReportContext.java index c7bbb08..91eccef 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/reporting/ReportContext.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/reporting/ReportContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.reporting; +package io.appform.conductor.console.reporting; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/reporting/ReportManager.java b/conductor-console/src/main/java/io/appform/conductor/console/reporting/ReportManager.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/reporting/ReportManager.java rename to conductor-console/src/main/java/io/appform/conductor/console/reporting/ReportManager.java index c5337f4..7bc1516 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/reporting/ReportManager.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/reporting/ReportManager.java @@ -14,9 +14,14 @@ * limitations under the License. */ -package io.appform.conductor.server.reporting; +package io.appform.conductor.console.reporting; import com.google.common.base.Strings; +import io.appform.conductor.core.comms.MailSender; +import io.appform.conductor.core.eventmanagement.EventStore; +import io.appform.conductor.core.parser.CQLEngine; +import io.appform.conductor.core.ticketmanagement.TicketManager; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.reporting.Report; import io.appform.conductor.model.reporting.ReportRun; @@ -26,13 +31,8 @@ import io.appform.conductor.model.ticket.analytics.TicketListResponse; import io.appform.conductor.model.ticket.analytics.TicketQueryResponse; import io.appform.conductor.model.ticket.analytics.TicketQueryResponseVisitor; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.comms.MailSender; -import io.appform.conductor.server.eventmanagement.EventBus; -import io.appform.conductor.server.eventmanagement.EventStore; -import io.appform.conductor.server.parser.CQLEngine; -import io.appform.conductor.server.ticketmanagement.TicketManager; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.eventmanagement.EventBus; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.signals.signals.ScheduledSignal; import io.dropwizard.lifecycle.Managed; import lombok.RequiredArgsConstructor; @@ -53,7 +53,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; -import static io.appform.conductor.server.utils.ConductorServerUtils.tabulateTicketQueryResponse; +import static io.appform.conductor.core.utils.ConductorServerUtils.tabulateTicketQueryResponse; /** * @@ -86,7 +86,7 @@ public ReportManager( CQLEngine cqlEngine, TicketManager ticketManager, EventStore eventStore, MailSender mailSender, - @Named(ConductorModule.BACKGROUND_JOBS_POOL_NAME) ExecutorService reportRunnerPool) { + @Named(Constants.BACKGROUND_JOBS_POOL_NAME) ExecutorService reportRunnerPool) { this.reportStore = reportStore; this.eventBus = eventBus; this.cqlEngine = cqlEngine; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/reporting/ReportStore.java b/conductor-console/src/main/java/io/appform/conductor/console/reporting/ReportStore.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/reporting/ReportStore.java rename to conductor-console/src/main/java/io/appform/conductor/console/reporting/ReportStore.java index 0fce921..6b70bbc 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/reporting/ReportStore.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/reporting/ReportStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.reporting; +package io.appform.conductor.console.reporting; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.reporting.Report; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/reporting/impl/DBReportStore.java b/conductor-console/src/main/java/io/appform/conductor/console/reporting/impl/DBReportStore.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/reporting/impl/DBReportStore.java rename to conductor-console/src/main/java/io/appform/conductor/console/reporting/impl/DBReportStore.java index 76548ec..19ea84b 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/reporting/impl/DBReportStore.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/reporting/impl/DBReportStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.reporting.impl; +package io.appform.conductor.console.reporting.impl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -27,12 +27,12 @@ import io.appform.conductor.model.reporting.ReportRun; import io.appform.conductor.model.reporting.ReportRunResult; import io.appform.conductor.model.reporting.ReportState; -import io.appform.conductor.server.reporting.ReportContext; -import io.appform.conductor.server.reporting.ReportStore; -import io.appform.conductor.server.reporting.impl.models.StoredReport; -import io.appform.conductor.server.reporting.impl.models.StoredReportContext; -import io.appform.conductor.server.reporting.impl.models.StoredReportRun; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.console.reporting.ReportContext; +import io.appform.conductor.console.reporting.ReportStore; +import io.appform.conductor.console.reporting.impl.models.StoredReport; +import io.appform.conductor.console.reporting.impl.models.StoredReportContext; +import io.appform.conductor.console.reporting.impl.models.StoredReportRun; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.dropwizard.sharding.dao.LookupDao; import io.appform.dropwizard.sharding.dao.RelationalDao; import lombok.RequiredArgsConstructor; @@ -48,7 +48,7 @@ import java.util.*; import static io.appform.conductor.model.error.ConductorErrorCode.STORE_RELATED_ENTITY_LIST_ERROR; -import static io.appform.conductor.server.utils.ConductorServerUtils.nextExecutionTimeForCron; +import static io.appform.conductor.core.utils.ConductorServerUtils.nextExecutionTimeForCron; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/reporting/impl/models/StoredReport.java b/conductor-console/src/main/java/io/appform/conductor/console/reporting/impl/models/StoredReport.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/reporting/impl/models/StoredReport.java rename to conductor-console/src/main/java/io/appform/conductor/console/reporting/impl/models/StoredReport.java index 75b130e..817194b 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/reporting/impl/models/StoredReport.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/reporting/impl/models/StoredReport.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.reporting.impl.models; +package io.appform.conductor.console.reporting.impl.models; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.reporting.ReportState; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.utils.persistence.StringListConverter; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.persistence.StringListConverter; import io.appform.dropwizard.sharding.sharding.LookupKey; import lombok.*; import lombok.experimental.FieldNameConstants; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/reporting/impl/models/StoredReportContext.java b/conductor-console/src/main/java/io/appform/conductor/console/reporting/impl/models/StoredReportContext.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/reporting/impl/models/StoredReportContext.java rename to conductor-console/src/main/java/io/appform/conductor/console/reporting/impl/models/StoredReportContext.java index 0adce09..1e5e2d7 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/reporting/impl/models/StoredReportContext.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/reporting/impl/models/StoredReportContext.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.appform.conductor.server.reporting.impl.models; +package io.appform.conductor.console.reporting.impl.models; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import lombok.*; import lombok.experimental.FieldNameConstants; import org.hibernate.Hibernate; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/reporting/impl/models/StoredReportRun.java b/conductor-console/src/main/java/io/appform/conductor/console/reporting/impl/models/StoredReportRun.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/reporting/impl/models/StoredReportRun.java rename to conductor-console/src/main/java/io/appform/conductor/console/reporting/impl/models/StoredReportRun.java index 795198e..dae9184 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/reporting/impl/models/StoredReportRun.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/reporting/impl/models/StoredReportRun.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.reporting.impl.models; +package io.appform.conductor.console.reporting.impl.models; import io.appform.conductor.model.reporting.ReportRun; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import lombok.*; import lombok.experimental.FieldNameConstants; import org.hibernate.Hibernate; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/HandlebarsHelperBundle.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/HandlebarsHelperBundle.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/HandlebarsHelperBundle.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/HandlebarsHelperBundle.java index 275f4d5..c488327 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/HandlebarsHelperBundle.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/HandlebarsHelperBundle.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.ui; +package io.appform.conductor.console.ui; import com.github.jknack.handlebars.Helper; -import io.appform.conductor.server.utils.HandlebarsUtils; -import io.appform.conductor.server.utils.dev.IgnoreGenerated; +import io.appform.conductor.core.utils.HandlebarsUtils; +import io.appform.conductor.core.utils.dev.IgnoreGenerated; import io.dropwizard.Configuration; import io.dropwizard.ConfiguredBundle; import io.dropwizard.setup.Bootstrap; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/HandlebarsViewRenderer.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/HandlebarsViewRenderer.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/HandlebarsViewRenderer.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/HandlebarsViewRenderer.java index 9ca0cc5..765cae1 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/HandlebarsViewRenderer.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/HandlebarsViewRenderer.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.appform.conductor.server.ui; +package io.appform.conductor.console.ui; import com.github.jknack.handlebars.Template; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import io.appform.conductor.server.utils.HandlebarsUtils; -import io.appform.conductor.server.utils.dev.IgnoreGenerated; +import io.appform.conductor.core.utils.HandlebarsUtils; +import io.appform.conductor.core.utils.dev.IgnoreGenerated; import io.dropwizard.views.View; import io.dropwizard.views.ViewRenderer; import lombok.extern.slf4j.Slf4j; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/ActivationView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/ActivationView.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/ActivationView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/ActivationView.java index 354c53b..93a53d7 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/ActivationView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/ActivationView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views; +package io.appform.conductor.console.ui.views; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/BaseLoggedInView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/BaseLoggedInView.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/BaseLoggedInView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/BaseLoggedInView.java index 139a43d..845f2f7 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/BaseLoggedInView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/BaseLoggedInView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views; +package io.appform.conductor.console.ui.views; import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.events.analytics.ObjectReference; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/HomeView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/HomeView.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/HomeView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/HomeView.java index 91f5ecb..2e5c39c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/HomeView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/HomeView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views; +package io.appform.conductor.console.ui.views; import io.appform.conductor.model.ticket.analytics.TicketGist; import io.appform.conductor.model.usermgmt.User; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/ActionListView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/ActionListView.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/ActionListView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/ActionListView.java index 3480567..1a0248f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/ActionListView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/ActionListView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.actions; +package io.appform.conductor.console.ui.views.actions; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.actions.ActionType; import io.appform.conductor.model.usermgmt.User; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/AddTicketActionFragment.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/AddTicketActionFragment.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/AddTicketActionFragment.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/AddTicketActionFragment.java index a4b2292..3d72171 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/AddTicketActionFragment.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/AddTicketActionFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.actions.fragments; +package io.appform.conductor.console.ui.views.actions.fragments; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.actions.Scope; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/ChangePriorityActionFragment.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/ChangePriorityActionFragment.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/ChangePriorityActionFragment.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/ChangePriorityActionFragment.java index 086a6f3..81cab9d 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/ChangePriorityActionFragment.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/ChangePriorityActionFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.actions.fragments; +package io.appform.conductor.console.ui.views.actions.fragments; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.actions.Scope; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/RouteToGroupActionFragment.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/RouteToGroupActionFragment.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/RouteToGroupActionFragment.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/RouteToGroupActionFragment.java index fe19b47..d3638c8 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/RouteToGroupActionFragment.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/RouteToGroupActionFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.actions.fragments; +package io.appform.conductor.console.ui.views.actions.fragments; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.actions.Scope; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/SetFieldActionFragment.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/SetFieldActionFragment.java similarity index 90% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/SetFieldActionFragment.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/SetFieldActionFragment.java index 8072397..527c02c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/SetFieldActionFragment.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/SetFieldActionFragment.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.ui.views.actions.fragments; +package io.appform.conductor.console.ui.views.actions.fragments; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.actions.Scope; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/WebHookActionFragment.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/WebHookActionFragment.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/WebHookActionFragment.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/WebHookActionFragment.java index f3b3582..59a7c58 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/actions/fragments/WebHookActionFragment.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/actions/fragments/WebHookActionFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.actions.fragments; +package io.appform.conductor.console.ui.views.actions.fragments; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.actions.Scope; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/admin/RolesListView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/admin/RolesListView.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/admin/RolesListView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/admin/RolesListView.java index b149947..4e8243d 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/admin/RolesListView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/admin/RolesListView.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.admin; +package io.appform.conductor.console.ui.views.admin; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import io.appform.conductor.model.auth.Permission; import io.appform.conductor.model.auth.Role; import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.events.analytics.ObjectReference; -import io.appform.conductor.server.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/admin/UserAdminView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/admin/UserAdminView.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/admin/UserAdminView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/admin/UserAdminView.java index 23d4bfe..faad612 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/admin/UserAdminView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/admin/UserAdminView.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.admin; +package io.appform.conductor.console.ui.views.admin; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import io.appform.conductor.model.auth.Role; import io.appform.conductor.model.events.analytics.ObjectReference; import io.appform.conductor.model.events.impl.ReferredObjectType; @@ -23,8 +24,7 @@ import io.appform.conductor.model.usermgmt.Group; import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.usermgmt.UserSessionDetails; -import io.appform.conductor.server.attributes.values.AttributeManager.MaterializedAttributeValue; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.core.attributes.values.AttributeManager.MaterializedAttributeValue; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/common/EventsListFragment.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/common/EventsListFragment.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/common/EventsListFragment.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/common/EventsListFragment.java index 6ed93c2..c715bb1 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/common/EventsListFragment.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/common/EventsListFragment.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.common; +package io.appform.conductor.console.ui.views.common; import io.appform.conductor.model.events.Event; -import io.appform.conductor.server.utils.Pair; +import io.appform.conductor.core.utils.Pair; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/AttributeDefMgmtView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/AttributeDefMgmtView.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/AttributeDefMgmtView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/AttributeDefMgmtView.java index 00cb21c..1c55aa8 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/AttributeDefMgmtView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/AttributeDefMgmtView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.attributes.AttributeScopeType; import io.appform.conductor.model.attributes.AttributeType; import io.appform.conductor.model.attributes.definition.AttributeDefinition; import io.appform.conductor.model.usermgmt.User; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/DashboardListView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/DashboardListView.java similarity index 88% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/DashboardListView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/DashboardListView.java index f35fd57..85d78ce 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/DashboardListView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/DashboardListView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.events.analytics.ObjectReference; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.usermgmt.User; -import io.appform.conductor.server.dashboards.model.Dashboard; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.dashboards.model.Dashboard; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/DashboardView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/DashboardView.java similarity index 88% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/DashboardView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/DashboardView.java index 9640068..faadf4b 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/DashboardView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/DashboardView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.events.analytics.ObjectReference; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.usermgmt.User; -import io.appform.conductor.server.dashboards.model.Dashboard; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.dashboards.model.Dashboard; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/GroupListView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/GroupListView.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/GroupListView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/GroupListView.java index cf5f0c2..e9a9f9a 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/GroupListView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/GroupListView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.skills.SkillValue; import io.appform.conductor.model.usermgmt.Group; @@ -22,7 +22,7 @@ import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.events.analytics.ObjectReference; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/IngressTranslatorListView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/IngressTranslatorListView.java similarity index 88% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/IngressTranslatorListView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/IngressTranslatorListView.java index 4b82f5f..16080b6 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/IngressTranslatorListView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/IngressTranslatorListView.java @@ -1,11 +1,11 @@ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.events.analytics.ObjectReference; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.ingress.IngressTranslator; import io.appform.conductor.model.usermgmt.User; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/IngressTranslatorView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/IngressTranslatorView.java similarity index 89% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/IngressTranslatorView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/IngressTranslatorView.java index 9a38611..cfedf53 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/IngressTranslatorView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/IngressTranslatorView.java @@ -1,11 +1,11 @@ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.events.analytics.ObjectReference; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.ingress.IngressTranslator; import io.appform.conductor.model.usermgmt.User; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/NewDashboardView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/NewDashboardView.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/NewDashboardView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/NewDashboardView.java index 34a3af7..ed9ba61 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/NewDashboardView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/NewDashboardView.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.events.analytics.ObjectReference; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.usermgmt.User; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/SchemaListView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/SchemaListView.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/SchemaListView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/SchemaListView.java index 2f88f1d..f92d3c0 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/SchemaListView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/SchemaListView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.events.analytics.ObjectReference; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.schema.Schema; import io.appform.conductor.model.usermgmt.User; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/SchemaView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/SchemaView.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/SchemaView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/SchemaView.java index dd54f64..11b3426 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/SchemaView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/SchemaView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.schema.FieldSchema; import io.appform.conductor.model.schema.FieldType; @@ -22,7 +22,7 @@ import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.events.analytics.ObjectReference; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/SkillListView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/SkillListView.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/SkillListView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/SkillListView.java index 0ac54e8..717b9bd 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/SkillListView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/SkillListView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.skills.SkillDefinition; import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.events.analytics.ObjectReference; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowCreateView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowCreateView.java similarity index 90% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowCreateView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowCreateView.java index 6d58a4b..105f3c0 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowCreateView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowCreateView.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.schema.Schema; import io.appform.conductor.model.usermgmt.User; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowDetailsView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowDetailsView.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowDetailsView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowDetailsView.java index 0b264c5..5945e7c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowDetailsView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowDetailsView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.schema.Schema; @@ -23,7 +23,7 @@ import io.appform.conductor.model.workflow.Workflow; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.events.analytics.ObjectReference; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowImportView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowImportView.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowImportView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowImportView.java index d7ea49b..09702ff 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowImportView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowImportView.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.workflow.ImportWorkflowResult; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowListView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowListView.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowListView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowListView.java index cb8d34a..52a7b2c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowListView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowListView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.workflow.Workflow; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.events.analytics.ObjectReference; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowStateView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowStateView.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowStateView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowStateView.java index 2e95d8b..1a6eb18 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/manage/WorkflowStateView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/manage/WorkflowStateView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.manage; +package io.appform.conductor.console.ui.views.manage; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.schema.FieldSchema; import io.appform.conductor.model.schema.TicketState; import io.appform.conductor.model.usermgmt.User; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/reports/ReportListView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/reports/ReportListView.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/reports/ReportListView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/reports/ReportListView.java index dcfb8ff..4862a07 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/reports/ReportListView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/reports/ReportListView.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.reports; +package io.appform.conductor.console.ui.views.reports; import io.appform.conductor.model.reporting.Report; import io.appform.conductor.model.reporting.ReportRun; import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.events.analytics.ObjectReference; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/subjects/SubjectDetailsView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/subjects/SubjectDetailsView.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/subjects/SubjectDetailsView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/subjects/SubjectDetailsView.java index e166307..372fddf 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/subjects/SubjectDetailsView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/subjects/SubjectDetailsView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.subjects; +package io.appform.conductor.console.ui.views.subjects; import io.appform.conductor.model.events.analytics.ObjectReference; import io.appform.conductor.model.events.impl.ReferredObjectType; @@ -23,8 +23,8 @@ import io.appform.conductor.model.subject.SubjectIDType; import io.appform.conductor.model.ticket.analytics.TicketGist; import io.appform.conductor.model.usermgmt.User; -import io.appform.conductor.server.attributes.values.AttributeManager; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.core.attributes.values.AttributeManager; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/subjects/SubjectListView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/subjects/SubjectListView.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/subjects/SubjectListView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/subjects/SubjectListView.java index 129c410..27696ba 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/subjects/SubjectListView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/subjects/SubjectListView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.subjects; +package io.appform.conductor.console.ui.views.subjects; import io.appform.conductor.model.subject.Gender; import io.appform.conductor.model.subject.SubjectIDType; @@ -22,7 +22,7 @@ import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.events.analytics.ObjectReference; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tasks/RunActionOnCQLSelectView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tasks/RunActionOnCQLSelectView.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/tasks/RunActionOnCQLSelectView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/tasks/RunActionOnCQLSelectView.java index e5f6624..60c4dac 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tasks/RunActionOnCQLSelectView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tasks/RunActionOnCQLSelectView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.tasks; +package io.appform.conductor.console.ui.views.tasks; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.tasks.TaskMode; @@ -22,7 +22,7 @@ import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.events.analytics.ObjectReference; import io.appform.conductor.model.tasks.Task; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tasks/RunActionOnSelectedTicketsView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tasks/RunActionOnSelectedTicketsView.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/tasks/RunActionOnSelectedTicketsView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/tasks/RunActionOnSelectedTicketsView.java index 5ae04b4..d01ecc8 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tasks/RunActionOnSelectedTicketsView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tasks/RunActionOnSelectedTicketsView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.tasks; +package io.appform.conductor.console.ui.views.tasks; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.schema.TicketState; @@ -26,7 +26,7 @@ import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.events.analytics.ObjectReference; import io.appform.conductor.model.tasks.Task; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tasks/TaskListView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tasks/TaskListView.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/tasks/TaskListView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/tasks/TaskListView.java index b1f1c0e..9352f51 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tasks/TaskListView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tasks/TaskListView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.tasks; +package io.appform.conductor.console.ui.views.tasks; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.usermgmt.User; @@ -22,7 +22,7 @@ import io.appform.conductor.model.events.analytics.ObjectReference; import io.appform.conductor.model.tasks.Task; import io.appform.conductor.model.tasks.TaskType; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketCreateView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketCreateView.java similarity index 88% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketCreateView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketCreateView.java index 1a72164..93ba18c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketCreateView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketCreateView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.tickets; +package io.appform.conductor.console.ui.views.tickets; +import io.appform.conductor.core.ticketmanagement.TicketSkeletonListResult; import io.appform.conductor.model.subject.SubjectIDType; import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.workflow.Workflow; -import io.appform.conductor.server.ticketmanagement.TicketSkeletonListResult; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketDetailsView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketDetailsView.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketDetailsView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketDetailsView.java index 604d694..43e83ae 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketDetailsView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketDetailsView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.tickets; +package io.appform.conductor.console.ui.views.tickets; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.events.analytics.ObjectReference; @@ -26,8 +26,8 @@ import io.appform.conductor.model.usermgmt.Group; import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.workflow.Workflow; -import io.appform.conductor.server.ticketmanagement.RelatedTicketSummary; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.core.ticketmanagement.RelatedTicketSummary; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketFieldView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketFieldView.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketFieldView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketFieldView.java index de52723..ef43aba 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketFieldView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketFieldView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.tickets; +package io.appform.conductor.console.ui.views.tickets; import io.appform.conductor.model.schema.FieldSchema; import io.appform.conductor.model.schema.FieldType; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketQueryView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketQueryView.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketQueryView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketQueryView.java index 21ad748..a5a9db5 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketQueryView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketQueryView.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.tickets; +package io.appform.conductor.console.ui.views.tickets; import io.appform.conductor.model.ticket.analytics.TicketListResponse; import io.appform.conductor.model.usermgmt.User; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.Builder; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketSearchView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketSearchView.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketSearchView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketSearchView.java index f3b7b2f..cbead3f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketSearchView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketSearchView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.tickets; +package io.appform.conductor.console.ui.views.tickets; import io.appform.conductor.model.schema.TicketState; import io.appform.conductor.model.ticket.TicketPriority; @@ -22,7 +22,7 @@ import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.workflow.Workflow; import io.appform.conductor.model.ticket.analytics.TicketListResponse; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.Builder; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketsView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketsView.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketsView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketsView.java index 97e16f1..56e113e 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/TicketsView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/TicketsView.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.tickets; +package io.appform.conductor.console.ui.views.tickets; import io.appform.conductor.model.subject.SubjectIDType; import io.appform.conductor.model.usermgmt.Group; import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.workflow.Workflow; import io.appform.conductor.model.ticket.analytics.TicketListResponse; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/fragments/CommentsFragment.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/fragments/CommentsFragment.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/fragments/CommentsFragment.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/fragments/CommentsFragment.java index 9c9ad63..4543d6d 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/tickets/fragments/CommentsFragment.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/tickets/fragments/CommentsFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.tickets.fragments; +package io.appform.conductor.console.ui.views.tickets.fragments; import io.appform.conductor.model.ticket.TicketSummary; import io.appform.conductor.model.ticket.comments.Comment; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/user/UserAccountView.java b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/user/UserAccountView.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/views/user/UserAccountView.java rename to conductor-console/src/main/java/io/appform/conductor/console/ui/views/user/UserAccountView.java index faead44..aca2db3 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/views/user/UserAccountView.java +++ b/conductor-console/src/main/java/io/appform/conductor/console/ui/views/user/UserAccountView.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.ui.views.user; +package io.appform.conductor.console.ui.views.user; import io.appform.conductor.model.events.analytics.ObjectReference; import io.appform.conductor.model.events.impl.ReferredObjectType; import io.appform.conductor.model.usermgmt.User; -import io.appform.conductor.server.ui.views.BaseLoggedInView; +import io.appform.conductor.console.ui.views.BaseLoggedInView; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/ActionExecutor.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/ActionExecutor.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/ActionExecutor.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/ActionExecutor.java index eaa5dde..e5564b6 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/ActionExecutor.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/ActionExecutor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.actionmanagement; +package io.appform.conductor.core.actionmanagement; import com.fasterxml.jackson.databind.JsonNode; import io.appform.conductor.model.actions.Action; @@ -25,7 +25,7 @@ import io.appform.conductor.model.ticket.TicketDetails; import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.workflow.Workflow; -import io.appform.conductor.server.actionmanagement.executors.*; +import io.appform.conductor.core.actionmanagement.executors.*; import lombok.RequiredArgsConstructor; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/ActionStore.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/ActionStore.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/ActionStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/ActionStore.java index b1f8e0b..78914c1 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/ActionStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/ActionStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.actionmanagement; +package io.appform.conductor.core.actionmanagement; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.actions.Scope; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/EventGeneratingActionStore.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/EventGeneratingActionStore.java similarity index 90% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/EventGeneratingActionStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/EventGeneratingActionStore.java index b809d88..feae87b 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/EventGeneratingActionStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/EventGeneratingActionStore.java @@ -1,9 +1,9 @@ -package io.appform.conductor.server.actionmanagement; +package io.appform.conductor.core.actionmanagement; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.actions.Scope; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.eventmanagement.EventBus; import io.appform.conductor.model.events.impl.actions.ActionCreatedEvent; import io.appform.conductor.model.events.impl.actions.ActionDeletedEvent; import io.appform.conductor.model.events.impl.actions.ActionUpdatedEvent; @@ -23,7 +23,7 @@ public class EventGeneratingActionStore implements ActionStore { private final ActionStore actionStore; @Inject - public EventGeneratingActionStore(EventBus eventBus, @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) ActionStore actionStore) { + public EventGeneratingActionStore(EventBus eventBus, @Named(Constants.ROOT_IMPLEMENTATION_NAME) ActionStore actionStore) { this.eventBus = eventBus; this.actionStore = actionStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/AddCommentActionExecutor.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/AddCommentActionExecutor.java similarity index 86% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/AddCommentActionExecutor.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/AddCommentActionExecutor.java index e5e83ad..abbd321 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/AddCommentActionExecutor.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/AddCommentActionExecutor.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.appform.conductor.server.actionmanagement.executors; +package io.appform.conductor.core.actionmanagement.executors; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Strings; import io.appform.conductor.model.actions.ActionExecutionResult; import io.appform.conductor.model.actions.impl.AddCommentAction; -import io.appform.conductor.server.actionmanagement.ActionExecutor; -import io.appform.conductor.server.templateengines.TemplateEngine; -import io.appform.conductor.server.ticketmanagement.TicketStore; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.actionmanagement.ActionExecutor; +import io.appform.conductor.core.templateengines.TemplateEngine; +import io.appform.conductor.core.ticketmanagement.TicketStore; +import io.appform.conductor.core.utils.ConductorServerUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/AddTicketActionActionExecutor.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/AddTicketActionActionExecutor.java similarity index 88% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/AddTicketActionActionExecutor.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/AddTicketActionActionExecutor.java index 1ac7675..044da7d 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/AddTicketActionActionExecutor.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/AddTicketActionActionExecutor.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.appform.conductor.server.actionmanagement.executors; +package io.appform.conductor.core.actionmanagement.executors; import io.appform.conductor.model.actions.ActionExecutionResult; import io.appform.conductor.model.actions.impl.AddTicketAction; import io.appform.conductor.model.actions.impl.RouteToGroupAction; -import io.appform.conductor.server.actionmanagement.ActionExecutor; -import io.appform.conductor.server.actionmanagement.ActionStore; -import io.appform.conductor.server.ticketmanagement.TicketStore; +import io.appform.conductor.core.actionmanagement.ActionExecutor; +import io.appform.conductor.core.actionmanagement.ActionStore; +import io.appform.conductor.core.ticketmanagement.TicketStore; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/ChangePriorityActionExecutor.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/ChangePriorityActionExecutor.java similarity index 89% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/ChangePriorityActionExecutor.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/ChangePriorityActionExecutor.java index 506a64e..97cbb35 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/ChangePriorityActionExecutor.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/ChangePriorityActionExecutor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.actionmanagement.executors; +package io.appform.conductor.core.actionmanagement.executors; import io.appform.conductor.model.actions.ActionExecutionResult; import io.appform.conductor.model.actions.impl.ChangePriorityAction; -import io.appform.conductor.server.actionmanagement.ActionExecutor; -import io.appform.conductor.server.ticketmanagement.TicketStore; +import io.appform.conductor.core.actionmanagement.ActionExecutor; +import io.appform.conductor.core.ticketmanagement.TicketStore; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/RouteToGroupActionExecutor.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/RouteToGroupActionExecutor.java similarity index 88% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/RouteToGroupActionExecutor.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/RouteToGroupActionExecutor.java index dd5e22e..bef1f08 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/RouteToGroupActionExecutor.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/RouteToGroupActionExecutor.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.actionmanagement.executors; +package io.appform.conductor.core.actionmanagement.executors; import io.appform.conductor.model.actions.ActionExecutionResult; import io.appform.conductor.model.actions.impl.RouteToGroupAction; -import io.appform.conductor.server.actionmanagement.ActionExecutor; -import io.appform.conductor.server.ticketmanagement.TicketStore; -import io.appform.conductor.server.usermanagement.GroupStore; +import io.appform.conductor.core.actionmanagement.ActionExecutor; +import io.appform.conductor.core.ticketmanagement.TicketStore; +import io.appform.conductor.core.interfaces.GroupStore; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/SetFieldActionExecutor.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/SetFieldActionExecutor.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/SetFieldActionExecutor.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/SetFieldActionExecutor.java index 5f8b095..7db17d0 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/SetFieldActionExecutor.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/SetFieldActionExecutor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.actionmanagement.executors; +package io.appform.conductor.core.actionmanagement.executors; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; @@ -25,12 +25,12 @@ import io.appform.conductor.model.schema.FieldSchemaVisitor; import io.appform.conductor.model.schema.fields.*; import io.appform.conductor.model.ticket.fields.FieldValue; -import io.appform.conductor.server.actionmanagement.ActionExecutor; -import io.appform.conductor.server.templateengines.TemplateEngine; -import io.appform.conductor.server.ticketmanagement.TicketFieldData; -import io.appform.conductor.server.ticketmanagement.TicketFieldMapper; -import io.appform.conductor.server.ticketmanagement.TicketStore; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.actionmanagement.ActionExecutor; +import io.appform.conductor.core.templateengines.TemplateEngine; +import io.appform.conductor.core.ticketmanagement.TicketFieldData; +import io.appform.conductor.core.ticketmanagement.TicketFieldMapper; +import io.appform.conductor.core.ticketmanagement.TicketStore; +import io.appform.conductor.core.utils.ConductorServerUtils; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/WebhookActionExecutor.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/WebhookActionExecutor.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/WebhookActionExecutor.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/WebhookActionExecutor.java index 692da24..2042914 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/executors/WebhookActionExecutor.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/executors/WebhookActionExecutor.java @@ -1,12 +1,12 @@ -package io.appform.conductor.server.actionmanagement.executors; +package io.appform.conductor.core.actionmanagement.executors; import com.fasterxml.jackson.databind.ObjectMapper; import io.appform.conductor.model.actions.ActionExecutionResult; import io.appform.conductor.model.actions.impl.WebhookAction; -import io.appform.conductor.server.actionmanagement.ActionExecutor; -import io.appform.conductor.server.templateengines.TemplateEngine; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.actionmanagement.ActionExecutor; +import io.appform.conductor.core.templateengines.TemplateEngine; +import io.appform.conductor.core.utils.ConductorServerUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/DBActionStore.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/DBActionStore.java similarity index 98% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/DBActionStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/DBActionStore.java index 417f1e4..c27ff39 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/DBActionStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/DBActionStore.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.actionmanagement.impl; +package io.appform.conductor.core.actionmanagement.impl; import com.google.common.collect.Sets; import com.google.common.reflect.TypeToken; @@ -8,9 +8,9 @@ import io.appform.conductor.model.actions.impl.*; import io.appform.conductor.model.error.Throws; import io.appform.conductor.model.workflow.Template; -import io.appform.conductor.server.actionmanagement.ActionStore; -import io.appform.conductor.server.actionmanagement.impl.models.*; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.actionmanagement.ActionStore; +import io.appform.conductor.core.actionmanagement.impl.models.*; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.dropwizard.sharding.dao.LookupDao; import io.appform.functionmetrics.MonitoredFunction; import lombok.RequiredArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredAction.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredAction.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredAction.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredAction.java index 3dffb0b..e09b4bd 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredAction.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredAction.java @@ -1,8 +1,8 @@ -package io.appform.conductor.server.actionmanagement.impl.models; +package io.appform.conductor.core.actionmanagement.impl.models; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.actions.ActionType; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import io.appform.dropwizard.sharding.sharding.LookupKey; import lombok.*; import lombok.experimental.FieldNameConstants; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredActionVisitor.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredActionVisitor.java similarity index 86% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredActionVisitor.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredActionVisitor.java index 3a88941..e6cef95 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredActionVisitor.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredActionVisitor.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.actionmanagement.impl.models; +package io.appform.conductor.core.actionmanagement.impl.models; public interface StoredActionVisitor { diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredAddCommentAction.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredAddCommentAction.java similarity index 87% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredAddCommentAction.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredAddCommentAction.java index 23be9b2..3de43fa 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredAddCommentAction.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredAddCommentAction.java @@ -1,9 +1,9 @@ -package io.appform.conductor.server.actionmanagement.impl.models; +package io.appform.conductor.core.actionmanagement.impl.models; import io.appform.conductor.model.actions.ActionType; import io.appform.conductor.model.workflow.Template; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.utils.persistence.TemplateConverter; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.persistence.TemplateConverter; import lombok.*; import lombok.experimental.FieldNameConstants; import org.hibernate.Hibernate; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredAddTicketAction.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredAddTicketAction.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredAddTicketAction.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredAddTicketAction.java index 3871a98..87719e9 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredAddTicketAction.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredAddTicketAction.java @@ -1,7 +1,7 @@ -package io.appform.conductor.server.actionmanagement.impl.models; +package io.appform.conductor.core.actionmanagement.impl.models; import io.appform.conductor.model.actions.ActionType; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import lombok.*; import lombok.experimental.FieldNameConstants; import org.hibernate.Hibernate; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredChangePriorityAction.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredChangePriorityAction.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredChangePriorityAction.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredChangePriorityAction.java index dd314c1..df48069 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredChangePriorityAction.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredChangePriorityAction.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.actionmanagement.impl.models; +package io.appform.conductor.core.actionmanagement.impl.models; import io.appform.conductor.model.actions.ActionType; import io.appform.conductor.model.ticket.TicketPriority; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredRouteToGroupAction.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredRouteToGroupAction.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredRouteToGroupAction.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredRouteToGroupAction.java index 22c0b49..f8a8888 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredRouteToGroupAction.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredRouteToGroupAction.java @@ -1,7 +1,7 @@ -package io.appform.conductor.server.actionmanagement.impl.models; +package io.appform.conductor.core.actionmanagement.impl.models; import io.appform.conductor.model.actions.ActionType; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import lombok.*; import lombok.experimental.FieldNameConstants; import org.hibernate.Hibernate; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredSetFieldAction.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredSetFieldAction.java similarity index 88% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredSetFieldAction.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredSetFieldAction.java index 3dbba42..2bcea5c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredSetFieldAction.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredSetFieldAction.java @@ -1,9 +1,9 @@ -package io.appform.conductor.server.actionmanagement.impl.models; +package io.appform.conductor.core.actionmanagement.impl.models; import io.appform.conductor.model.actions.ActionType; import io.appform.conductor.model.workflow.Template; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.utils.persistence.TemplateConverter; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.persistence.TemplateConverter; import lombok.*; import lombok.experimental.FieldNameConstants; import org.hibernate.Hibernate; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredWebhookAction.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredWebhookAction.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredWebhookAction.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredWebhookAction.java index 02451c5..abdd0da 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredWebhookAction.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredWebhookAction.java @@ -1,10 +1,10 @@ -package io.appform.conductor.server.actionmanagement.impl.models; +package io.appform.conductor.core.actionmanagement.impl.models; import io.appform.conductor.model.actions.ActionType; import io.appform.conductor.model.actions.impl.WebhookAction; import io.appform.conductor.model.workflow.Template; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.utils.persistence.TemplateConverter; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.persistence.TemplateConverter; import lombok.*; import lombok.experimental.FieldNameConstants; import org.hibernate.Hibernate; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredWebhookActionHeaderTemplate.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredWebhookActionHeaderTemplate.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredWebhookActionHeaderTemplate.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredWebhookActionHeaderTemplate.java index 1dab0a3..1da2c48 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/StoredWebhookActionHeaderTemplate.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/StoredWebhookActionHeaderTemplate.java @@ -1,9 +1,9 @@ -package io.appform.conductor.server.actionmanagement.impl.models; +package io.appform.conductor.core.actionmanagement.impl.models; import com.fasterxml.jackson.annotation.JsonIgnore; import io.appform.conductor.model.workflow.Template; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.utils.persistence.TemplateConverter; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.persistence.TemplateConverter; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/WebhookActionSuccessCodesConverter.java b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/WebhookActionSuccessCodesConverter.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/WebhookActionSuccessCodesConverter.java rename to conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/WebhookActionSuccessCodesConverter.java index 6dfb592..9d9e18a 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/actionmanagement/impl/models/WebhookActionSuccessCodesConverter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/actionmanagement/impl/models/WebhookActionSuccessCodesConverter.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.actionmanagement.impl.models; +package io.appform.conductor.core.actionmanagement.impl.models; import javax.persistence.AttributeConverter; import javax.persistence.Converter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/AttributeDefinitionStore.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/AttributeDefinitionStore.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/AttributeDefinitionStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/AttributeDefinitionStore.java index 5687f14..8106293 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/AttributeDefinitionStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/AttributeDefinitionStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.definition; +package io.appform.conductor.core.attributes.definition; import io.appform.conductor.model.attributes.definition.AttributeDefinition; import io.appform.conductor.model.attributes.AttributeScopeType; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/CachingAttributeDefinitionStore.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/CachingAttributeDefinitionStore.java similarity index 90% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/CachingAttributeDefinitionStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/CachingAttributeDefinitionStore.java index 7b521a7..d99df6f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/CachingAttributeDefinitionStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/CachingAttributeDefinitionStore.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.definition.impl; +package io.appform.conductor.core.attributes.definition.impl; import io.appform.conductor.model.attributes.definition.AttributeDefinition; -import io.appform.conductor.server.ConductorModule; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.attributes.AttributeScopeType; -import io.appform.conductor.server.attributes.definition.AttributeDefinitionStore; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.utils.Pair; +import io.appform.conductor.core.attributes.definition.AttributeDefinitionStore; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.core.utils.Pair; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -50,7 +50,7 @@ public class CachingAttributeDefinitionStore implements AttributeDefinitionStore @Inject public CachingAttributeDefinitionStore( - @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) AttributeDefinitionStore root, + @Named(Constants.ROOT_IMPLEMENTATION_NAME) AttributeDefinitionStore root, final HazelcastClient hazelcastClient) { this.root = root; this.cacheProvider = hazelcastClient.loadingCache( diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/DBAttributeDefinitionStore.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/DBAttributeDefinitionStore.java similarity index 98% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/DBAttributeDefinitionStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/DBAttributeDefinitionStore.java index d86bd92..1249dda 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/DBAttributeDefinitionStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/DBAttributeDefinitionStore.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.definition.impl; +package io.appform.conductor.core.attributes.definition.impl; import io.appform.conductor.model.attributes.definition.AttributeDefinition; import io.appform.conductor.model.attributes.definition.AttributeDefinitionVisitor; import io.appform.conductor.model.attributes.definition.impl.*; import io.appform.conductor.model.error.Throws; import io.appform.conductor.model.attributes.AttributeScopeType; -import io.appform.conductor.server.attributes.definition.AttributeDefinitionStore; -import io.appform.conductor.server.attributes.definition.impl.models.*; +import io.appform.conductor.core.attributes.definition.AttributeDefinitionStore; +import io.appform.conductor.core.attributes.definition.impl.models.*; import io.appform.dropwizard.sharding.dao.RelationalDao; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/EventGeneratingAttributeDefinitionStore.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/EventGeneratingAttributeDefinitionStore.java similarity index 87% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/EventGeneratingAttributeDefinitionStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/EventGeneratingAttributeDefinitionStore.java index 5b292e6..4f4f708 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/EventGeneratingAttributeDefinitionStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/EventGeneratingAttributeDefinitionStore.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.definition.impl; +package io.appform.conductor.core.attributes.definition.impl; import io.appform.conductor.model.attributes.AttributeScopeType; import io.appform.conductor.model.attributes.definition.AttributeDefinition; import io.appform.conductor.model.events.impl.attributes.AttributeDefinitionDeletedEvent; import io.appform.conductor.model.events.impl.attributes.AttributeDefinitionSavedEvent; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.attributes.definition.AttributeDefinitionStore; -import io.appform.conductor.server.eventmanagement.EventBus; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.attributes.definition.AttributeDefinitionStore; +import io.appform.conductor.core.eventmanagement.EventBus; import lombok.val; import javax.inject.Inject; @@ -42,7 +42,7 @@ public class EventGeneratingAttributeDefinitionStore implements AttributeDefinit @Inject public EventGeneratingAttributeDefinitionStore( EventBus eventBus, - @Named(ConductorModule.CACHED_IMPLEMENTATION_NAME) AttributeDefinitionStore root) { + @Named(Constants.CACHED_IMPLEMENTATION_NAME) AttributeDefinitionStore root) { this.eventBus = eventBus; this.root = root; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredAttributeDefinition.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredAttributeDefinition.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredAttributeDefinition.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredAttributeDefinition.java index 6524ee5..9d353f7 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredAttributeDefinition.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredAttributeDefinition.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.definition.impl.models; +package io.appform.conductor.core.attributes.definition.impl.models; import io.appform.conductor.model.attributes.AttributeType; import io.appform.conductor.model.attributes.AttributeScopeType; -import io.appform.conductor.server.schemamanagement.impl.models.StoredFieldSchema; +import io.appform.conductor.core.schemamanagement.impl.models.StoredFieldSchema; import lombok.*; import lombok.experimental.FieldNameConstants; import org.hibernate.Hibernate; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredAttributeDefinitionVisitor.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredAttributeDefinitionVisitor.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredAttributeDefinitionVisitor.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredAttributeDefinitionVisitor.java index ccd0929..17c7d9f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredAttributeDefinitionVisitor.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredAttributeDefinitionVisitor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.definition.impl.models; +package io.appform.conductor.core.attributes.definition.impl.models; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredChoiceAttributeDefinition.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredChoiceAttributeDefinition.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredChoiceAttributeDefinition.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredChoiceAttributeDefinition.java index 3bc8b38..3717a0d 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredChoiceAttributeDefinition.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredChoiceAttributeDefinition.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.definition.impl.models; +package io.appform.conductor.core.attributes.definition.impl.models; import io.appform.conductor.model.attributes.AttributeType; -import io.appform.conductor.server.utils.persistence.StringSetConverter; +import io.appform.conductor.core.utils.persistence.StringSetConverter; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredDateAttributeDefinition.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredDateAttributeDefinition.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredDateAttributeDefinition.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredDateAttributeDefinition.java index e41274f..4c6cff5 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredDateAttributeDefinition.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredDateAttributeDefinition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.definition.impl.models; +package io.appform.conductor.core.attributes.definition.impl.models; import io.appform.conductor.model.attributes.AttributeType; import lombok.Getter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredLinkAttributeDefinition.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredLinkAttributeDefinition.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredLinkAttributeDefinition.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredLinkAttributeDefinition.java index 1a32424..7c8e0b3 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredLinkAttributeDefinition.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredLinkAttributeDefinition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.definition.impl.models; +package io.appform.conductor.core.attributes.definition.impl.models; import io.appform.conductor.model.attributes.AttributeType; import lombok.Getter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredNumberAttributeDefinition.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredNumberAttributeDefinition.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredNumberAttributeDefinition.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredNumberAttributeDefinition.java index 60a6968..b319189 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredNumberAttributeDefinition.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredNumberAttributeDefinition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.definition.impl.models; +package io.appform.conductor.core.attributes.definition.impl.models; import io.appform.conductor.model.attributes.AttributeType; import lombok.Getter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredStringAttributeDefinition.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredStringAttributeDefinition.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredStringAttributeDefinition.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredStringAttributeDefinition.java index ca30000..7ae6235 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/definition/impl/models/StoredStringAttributeDefinition.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/definition/impl/models/StoredStringAttributeDefinition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.definition.impl.models; +package io.appform.conductor.core.attributes.definition.impl.models; import io.appform.conductor.model.attributes.AttributeType; import lombok.Getter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/AttributeManager.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/AttributeManager.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/values/AttributeManager.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/values/AttributeManager.java index b0cf91c..616dab6 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/AttributeManager.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/AttributeManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.values; +package io.appform.conductor.core.attributes.values; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; @@ -27,8 +27,8 @@ import io.appform.conductor.model.attributes.value.AttributeValue; import io.appform.conductor.model.attributes.value.AttributeValueVisitor; import io.appform.conductor.model.attributes.value.impl.*; -import io.appform.conductor.server.attributes.definition.AttributeDefinitionStore; -import io.appform.conductor.server.utils.Pair; +import io.appform.conductor.core.attributes.definition.AttributeDefinitionStore; +import io.appform.conductor.core.utils.Pair; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.Value; @@ -47,8 +47,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import static io.appform.conductor.server.attributes.values.AttributeManager.AttributeValidationStatus.AttributeValidationResult.failure; -import static io.appform.conductor.server.attributes.values.AttributeManager.AttributeValidationStatus.AttributeValidationResult.success; +import static io.appform.conductor.core.attributes.values.AttributeManager.AttributeValidationStatus.AttributeValidationResult.failure; +import static io.appform.conductor.core.attributes.values.AttributeManager.AttributeValidationStatus.AttributeValidationResult.success; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/AttributeValueStore.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/AttributeValueStore.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/values/AttributeValueStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/values/AttributeValueStore.java index 9517712..be0a4bd 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/AttributeValueStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/AttributeValueStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.values; +package io.appform.conductor.core.attributes.values; import io.appform.conductor.model.attributes.AttributeScopeType; import io.appform.conductor.model.attributes.value.AttributeValue; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/DBAttributeValueStore.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/DBAttributeValueStore.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/DBAttributeValueStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/DBAttributeValueStore.java index 86375fe..8dcc565 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/DBAttributeValueStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/DBAttributeValueStore.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.values.impl; +package io.appform.conductor.core.attributes.values.impl; import io.appform.conductor.model.attributes.AttributeScopeType; import io.appform.conductor.model.attributes.value.AttributeValue; import io.appform.conductor.model.attributes.value.AttributeValueVisitor; import io.appform.conductor.model.attributes.value.impl.*; import io.appform.conductor.model.error.Throws; -import io.appform.conductor.server.attributes.values.AttributeValueStore; -import io.appform.conductor.server.attributes.values.impl.models.*; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.attributes.values.AttributeValueStore; +import io.appform.conductor.core.attributes.values.impl.models.*; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.dropwizard.sharding.dao.RelationalDao; import io.appform.functionmetrics.MonitoredFunction; import lombok.RequiredArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/EventGeneratingAttributeValueStore.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/EventGeneratingAttributeValueStore.java similarity index 85% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/EventGeneratingAttributeValueStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/EventGeneratingAttributeValueStore.java index 43ca1c4..40337f3 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/EventGeneratingAttributeValueStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/EventGeneratingAttributeValueStore.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.values.impl; +package io.appform.conductor.core.attributes.values.impl; import io.appform.conductor.model.attributes.AttributeScopeType; import io.appform.conductor.model.attributes.value.AttributeValue; import io.appform.conductor.model.events.impl.attributes.AttributeValueSavedEvent; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.attributes.values.AttributeValueStore; -import io.appform.conductor.server.eventmanagement.EventBus; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.attributes.values.AttributeValueStore; +import io.appform.conductor.core.eventmanagement.EventBus; import lombok.val; import javax.inject.Inject; @@ -40,7 +40,7 @@ public class EventGeneratingAttributeValueStore implements AttributeValueStore { @Inject public EventGeneratingAttributeValueStore( EventBus eventBus, - @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) AttributeValueStore root) { + @Named(Constants.ROOT_IMPLEMENTATION_NAME) AttributeValueStore root) { this.eventBus = eventBus; this.root = root; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredAttributeValue.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredAttributeValue.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredAttributeValue.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredAttributeValue.java index b98688b..44b4e3a 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredAttributeValue.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredAttributeValue.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.values.impl.models; +package io.appform.conductor.core.attributes.values.impl.models; import io.appform.conductor.model.attributes.AttributeScopeType; import io.appform.conductor.model.attributes.AttributeType; -import io.appform.conductor.server.schemamanagement.impl.models.StoredFieldSchema; +import io.appform.conductor.core.schemamanagement.impl.models.StoredFieldSchema; import lombok.*; import lombok.experimental.FieldNameConstants; import org.hibernate.Hibernate; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredAttributeValueVisitor.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredAttributeValueVisitor.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredAttributeValueVisitor.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredAttributeValueVisitor.java index 15816cb..538476b 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredAttributeValueVisitor.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredAttributeValueVisitor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.values.impl.models; +package io.appform.conductor.core.attributes.values.impl.models; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredChoiceAttributeValue.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredChoiceAttributeValue.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredChoiceAttributeValue.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredChoiceAttributeValue.java index 1ab3a44..08eed3f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredChoiceAttributeValue.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredChoiceAttributeValue.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.values.impl.models; +package io.appform.conductor.core.attributes.values.impl.models; import io.appform.conductor.model.attributes.AttributeType; -import io.appform.conductor.server.utils.persistence.StringListConverter; +import io.appform.conductor.core.utils.persistence.StringListConverter; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredDateAttributeValue.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredDateAttributeValue.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredDateAttributeValue.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredDateAttributeValue.java index 4e29a45..3497990 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredDateAttributeValue.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredDateAttributeValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.values.impl.models; +package io.appform.conductor.core.attributes.values.impl.models; import io.appform.conductor.model.attributes.AttributeType; import lombok.Getter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredLinkAttributeValue.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredLinkAttributeValue.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredLinkAttributeValue.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredLinkAttributeValue.java index 3fb3285..2aae523 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredLinkAttributeValue.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredLinkAttributeValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.values.impl.models; +package io.appform.conductor.core.attributes.values.impl.models; import io.appform.conductor.model.attributes.AttributeType; import lombok.Getter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredNumberAttributeValue.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredNumberAttributeValue.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredNumberAttributeValue.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredNumberAttributeValue.java index 60a6057..f10e89f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredNumberAttributeValue.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredNumberAttributeValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.values.impl.models; +package io.appform.conductor.core.attributes.values.impl.models; import io.appform.conductor.model.attributes.AttributeType; import lombok.Getter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredStringAttributeValue.java b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredStringAttributeValue.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredStringAttributeValue.java rename to conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredStringAttributeValue.java index 84274d4..1dd4b10 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/attributes/values/impl/models/StoredStringAttributeValue.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/attributes/values/impl/models/StoredStringAttributeValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.attributes.values.impl.models; +package io.appform.conductor.core.attributes.values.impl.models; import io.appform.conductor.model.attributes.AttributeType; import lombok.Getter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/AuthSetterFilter.java b/conductor-core/src/main/java/io/appform/conductor/core/auth/AuthSetterFilter.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/AuthSetterFilter.java rename to conductor-core/src/main/java/io/appform/conductor/core/auth/AuthSetterFilter.java index bf7c719..f15783f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/AuthSetterFilter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/auth/AuthSetterFilter.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package io.appform.conductor.server.auth; +package io.appform.conductor.core.auth; -import io.appform.conductor.server.usermanagement.CurrentUserSessionStore; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/ConductorUser.java b/conductor-core/src/main/java/io/appform/conductor/core/auth/ConductorUser.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/ConductorUser.java rename to conductor-core/src/main/java/io/appform/conductor/core/auth/ConductorUser.java index 4e669ae..68dcdbf 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/ConductorUser.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/auth/ConductorUser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.auth; +package io.appform.conductor.core.auth; import io.appform.conductor.model.usermgmt.UserSession; import lombok.NonNull; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/CurrentUserSessionStore.java b/conductor-core/src/main/java/io/appform/conductor/core/auth/CurrentUserSessionStore.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/CurrentUserSessionStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/auth/CurrentUserSessionStore.java index 940809a..aea2c06 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/CurrentUserSessionStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/auth/CurrentUserSessionStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement; +package io.appform.conductor.core.auth; import io.appform.conductor.model.usermgmt.UserSession; import lombok.experimental.UtilityClass; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/RoleStore.java b/conductor-core/src/main/java/io/appform/conductor/core/auth/RoleStore.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/RoleStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/auth/RoleStore.java index 3de9294..7389d53 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/RoleStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/auth/RoleStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.auth; +package io.appform.conductor.core.auth; import io.appform.conductor.model.auth.Permission; import io.appform.conductor.model.auth.Role; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/UserRoleMappingStore.java b/conductor-core/src/main/java/io/appform/conductor/core/auth/UserRoleMappingStore.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/UserRoleMappingStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/auth/UserRoleMappingStore.java index 3206239..c211569 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/UserRoleMappingStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/auth/UserRoleMappingStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.auth; +package io.appform.conductor.core.auth; import java.util.Optional; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/comms/MailSender.java b/conductor-core/src/main/java/io/appform/conductor/core/comms/MailSender.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/comms/MailSender.java rename to conductor-core/src/main/java/io/appform/conductor/core/comms/MailSender.java index 151508e..b7179dc 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/comms/MailSender.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/comms/MailSender.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.comms; +package io.appform.conductor.core.comms; import com.google.common.base.Strings; -import io.appform.conductor.server.config.MailConfig; +import io.appform.conductor.core.config.MailConfig; import io.appform.functionmetrics.MonitoredFunction; import io.appform.signals.signals.ConsumingFireForgetSignal; import jakarta.activation.FileDataSource; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/config/AppConfig.java b/conductor-core/src/main/java/io/appform/conductor/core/config/AppConfig.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/config/AppConfig.java rename to conductor-core/src/main/java/io/appform/conductor/core/config/AppConfig.java index 57daab4..30eeee7 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/config/AppConfig.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/config/AppConfig.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.appform.conductor.server.config; +package io.appform.conductor.core.config; -import io.appform.conductor.server.config.hz.ClusterConfig; +import io.appform.conductor.core.config.hz.ClusterConfig; import io.appform.dropwizard.sharding.config.ShardedHibernateFactory; import io.dropwizard.Configuration; import lombok.Data; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/config/AuthConfig.java b/conductor-core/src/main/java/io/appform/conductor/core/config/AuthConfig.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/config/AuthConfig.java rename to conductor-core/src/main/java/io/appform/conductor/core/config/AuthConfig.java index ace5459..b8026fb 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/config/AuthConfig.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/config/AuthConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.config; +package io.appform.conductor.core.config; import io.dropwizard.util.Duration; import lombok.Data; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/config/MailConfig.java b/conductor-core/src/main/java/io/appform/conductor/core/config/MailConfig.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/config/MailConfig.java rename to conductor-core/src/main/java/io/appform/conductor/core/config/MailConfig.java index 500d096..de82f60 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/config/MailConfig.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/config/MailConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.config; +package io.appform.conductor.core.config; import lombok.Builder; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/AwsClusterDiscoveryConfig.java b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/AwsClusterDiscoveryConfig.java similarity index 98% rename from conductor-server/src/main/java/io/appform/conductor/server/config/hz/AwsClusterDiscoveryConfig.java rename to conductor-core/src/main/java/io/appform/conductor/core/config/hz/AwsClusterDiscoveryConfig.java index 5e06bd2..ecbe7c1 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/AwsClusterDiscoveryConfig.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/AwsClusterDiscoveryConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.appform.conductor.server.config.hz; +package io.appform.conductor.core.config.hz; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/AwsECSDiscoveryConfig.java b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/AwsECSDiscoveryConfig.java similarity index 98% rename from conductor-server/src/main/java/io/appform/conductor/server/config/hz/AwsECSDiscoveryConfig.java rename to conductor-core/src/main/java/io/appform/conductor/core/config/hz/AwsECSDiscoveryConfig.java index b0adc34..ff19cb9 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/AwsECSDiscoveryConfig.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/AwsECSDiscoveryConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.appform.conductor.server.config.hz; +package io.appform.conductor.core.config.hz; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/ClusterConfig.java b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/ClusterConfig.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/config/hz/ClusterConfig.java rename to conductor-core/src/main/java/io/appform/conductor/core/config/hz/ClusterConfig.java index 33f91b1..6d1044d 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/ClusterConfig.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/ClusterConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.appform.conductor.server.config.hz; +package io.appform.conductor.core.config.hz; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/ClusterDiscoveryConfig.java b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/ClusterDiscoveryConfig.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/config/hz/ClusterDiscoveryConfig.java rename to conductor-core/src/main/java/io/appform/conductor/core/config/hz/ClusterDiscoveryConfig.java index 873867a..fc73c6a 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/ClusterDiscoveryConfig.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/ClusterDiscoveryConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.appform.conductor.server.config.hz; +package io.appform.conductor.core.config.hz; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/ClusterDiscoveryConfigVisitor.java b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/ClusterDiscoveryConfigVisitor.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/config/hz/ClusterDiscoveryConfigVisitor.java rename to conductor-core/src/main/java/io/appform/conductor/core/config/hz/ClusterDiscoveryConfigVisitor.java index 33d1505..4dfd7c2 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/ClusterDiscoveryConfigVisitor.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/ClusterDiscoveryConfigVisitor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.config.hz; +package io.appform.conductor.core.config.hz; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/ClusterDiscoveryType.java b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/ClusterDiscoveryType.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/config/hz/ClusterDiscoveryType.java rename to conductor-core/src/main/java/io/appform/conductor/core/config/hz/ClusterDiscoveryType.java index ebcfc4f..112384a 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/ClusterDiscoveryType.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/ClusterDiscoveryType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.appform.conductor.server.config.hz; +package io.appform.conductor.core.config.hz; public enum ClusterDiscoveryType { SIMPLE, diff --git a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/KubernetesClusterDiscoveryConfig.java b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/KubernetesClusterDiscoveryConfig.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/config/hz/KubernetesClusterDiscoveryConfig.java rename to conductor-core/src/main/java/io/appform/conductor/core/config/hz/KubernetesClusterDiscoveryConfig.java index 8a2c48c..a1d0c78 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/KubernetesClusterDiscoveryConfig.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/KubernetesClusterDiscoveryConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.appform.conductor.server.config.hz; +package io.appform.conductor.core.config.hz; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/SimpleClusterDiscoveryConfig.java b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/SimpleClusterDiscoveryConfig.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/config/hz/SimpleClusterDiscoveryConfig.java rename to conductor-core/src/main/java/io/appform/conductor/core/config/hz/SimpleClusterDiscoveryConfig.java index a3fb409..6e68c84 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/config/hz/SimpleClusterDiscoveryConfig.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/config/hz/SimpleClusterDiscoveryConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.appform.conductor.server.config.hz; +package io.appform.conductor.core.config.hz; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventBus.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventBus.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventBus.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventBus.java index 9e96936..32e96dc 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventBus.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventBus.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement; +package io.appform.conductor.core.eventmanagement; import io.appform.conductor.model.events.Event; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventHandler.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventHandler.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventHandler.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventHandler.java index 81eb6d2..3c08225 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventHandler.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement; +package io.appform.conductor.core.eventmanagement; import io.appform.conductor.model.events.Event; import io.appform.conductor.model.events.EventType; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventHandlerImplementation.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventHandlerImplementation.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventHandlerImplementation.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventHandlerImplementation.java index 830239f..9902e1f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventHandlerImplementation.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventHandlerImplementation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement; +package io.appform.conductor.core.eventmanagement; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventLoader.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventLoader.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventLoader.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventLoader.java index 8ff80e4..29482d9 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventLoader.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement; +package io.appform.conductor.core.eventmanagement; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventRecorder.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventRecorder.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventRecorder.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventRecorder.java index 939f75c..2d6d04d 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventRecorder.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventRecorder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement; +package io.appform.conductor.core.eventmanagement; import io.appform.conductor.model.events.Event; import lombok.RequiredArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventStore.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventStore.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventStore.java index 1550d9e..70efcb2 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement; +package io.appform.conductor.core.eventmanagement; import io.appform.conductor.model.events.Event; import io.appform.conductor.model.events.analytics.EventFilters; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventVisitorAdapter.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventVisitorAdapter.java similarity index 99% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventVisitorAdapter.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventVisitorAdapter.java index 6ee043c..6698416 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/EventVisitorAdapter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/EventVisitorAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement; +package io.appform.conductor.core.eventmanagement; import io.appform.conductor.model.events.EventVisitor; import io.appform.conductor.model.events.impl.actions.ActionCreatedEvent; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/bus/FilteringEventConsumer.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/bus/FilteringEventConsumer.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/bus/FilteringEventConsumer.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/bus/FilteringEventConsumer.java index 8c6ef58..708e7fa 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/bus/FilteringEventConsumer.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/bus/FilteringEventConsumer.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement.bus; +package io.appform.conductor.core.eventmanagement.bus; import io.appform.conductor.model.events.Event; -import io.appform.conductor.server.eventmanagement.EventHandler; +import io.appform.conductor.core.eventmanagement.EventHandler; import io.appform.conductor.model.events.EventType; import io.appform.signals.signalhandlers.SignalConsumer; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/bus/SignalDrivenEventBus.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/bus/SignalDrivenEventBus.java similarity index 88% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/bus/SignalDrivenEventBus.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/bus/SignalDrivenEventBus.java index f14db54..7b6aa81 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/bus/SignalDrivenEventBus.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/bus/SignalDrivenEventBus.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement.bus; +package io.appform.conductor.core.eventmanagement.bus; import io.appform.conductor.model.events.Event; import io.appform.conductor.model.events.EventType; -import io.appform.conductor.server.eventmanagement.EventBus; -import io.appform.conductor.server.eventmanagement.EventHandler; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.eventmanagement.EventBus; +import io.appform.conductor.core.eventmanagement.EventHandler; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.signals.signals.ConsumingFireForgetSignal; import javax.inject.Inject; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/handlers/EventLogger.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/handlers/EventLogger.java similarity index 82% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/handlers/EventLogger.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/handlers/EventLogger.java index ab9c9f1..e763a80 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/handlers/EventLogger.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/handlers/EventLogger.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement.handlers; +package io.appform.conductor.core.eventmanagement.handlers; import io.appform.conductor.model.events.Event; -import io.appform.conductor.server.eventmanagement.EventHandler; -import io.appform.conductor.server.eventmanagement.EventHandlerImplementation; +import io.appform.conductor.core.eventmanagement.EventHandler; +import io.appform.conductor.core.eventmanagement.EventHandlerImplementation; import lombok.extern.slf4j.Slf4j; import javax.inject.Singleton; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/query/EventFilter.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/query/EventFilter.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/query/EventFilter.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/query/EventFilter.java index e3f9744..d640ba9 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/query/EventFilter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/query/EventFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement.query; +package io.appform.conductor.core.eventmanagement.query; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/query/EventFilterType.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/query/EventFilterType.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/query/EventFilterType.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/query/EventFilterType.java index cfc2a1f..57f9a03 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/query/EventFilterType.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/query/EventFilterType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement.query; +package io.appform.conductor.core.eventmanagement.query; import io.appform.conductor.model.events.Event; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/query/EventQueryOpType.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/query/EventQueryOpType.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/query/EventQueryOpType.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/query/EventQueryOpType.java index d02bc22..bed462f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/query/EventQueryOpType.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/query/EventQueryOpType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement.query; +package io.appform.conductor.core.eventmanagement.query; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/query/EventQueryRequest.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/query/EventQueryRequest.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/query/EventQueryRequest.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/query/EventQueryRequest.java index f771125..ce596dc 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/query/EventQueryRequest.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/query/EventQueryRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement.query; +package io.appform.conductor.core.eventmanagement.query; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/store/DBEventStore.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/store/DBEventStore.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/store/DBEventStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/store/DBEventStore.java index 061dda7..fa2d1d1 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/store/DBEventStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/store/DBEventStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement.store; +package io.appform.conductor.core.eventmanagement.store; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Strings; @@ -23,12 +23,12 @@ import io.appform.conductor.model.events.analytics.impl.EventGroupResponse; import io.appform.conductor.model.ticket.analytics.GroupingElement; import io.appform.conductor.model.events.Event; -import io.appform.conductor.server.eventmanagement.EventStore; +import io.appform.conductor.core.eventmanagement.EventStore; import io.appform.conductor.model.events.analytics.EventFilters; import io.appform.conductor.model.events.analytics.impl.EventListResponse; -import io.appform.conductor.server.eventmanagement.store.models.StoredEvent; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.Pair; +import io.appform.conductor.core.eventmanagement.store.models.StoredEvent; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.Pair; import io.appform.dropwizard.sharding.dao.RelationalDao; import io.appform.dropwizard.sharding.scroll.ScrollPointer; import lombok.RequiredArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/store/models/StoredEvent.java b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/store/models/StoredEvent.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/store/models/StoredEvent.java rename to conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/store/models/StoredEvent.java index 1999907..ed1a288 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/eventmanagement/store/models/StoredEvent.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/eventmanagement/store/models/StoredEvent.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.eventmanagement.store.models; +package io.appform.conductor.core.eventmanagement.store.models; import io.appform.conductor.model.events.EventType; import io.appform.conductor.model.events.impl.ReferredObjectType; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/hazelcast/HazelcastClient.java b/conductor-core/src/main/java/io/appform/conductor/core/hazelcast/HazelcastClient.java similarity index 99% rename from conductor-server/src/main/java/io/appform/conductor/server/hazelcast/HazelcastClient.java rename to conductor-core/src/main/java/io/appform/conductor/core/hazelcast/HazelcastClient.java index dc5fe8e..5e135e8 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/hazelcast/HazelcastClient.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/hazelcast/HazelcastClient.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.appform.conductor.server.hazelcast; +package io.appform.conductor.core.hazelcast; import com.google.common.base.Strings; import com.hazelcast.cache.HazelcastCachingProvider; import com.hazelcast.config.*; import com.hazelcast.core.Hazelcast; import com.hazelcast.core.HazelcastInstance; -import io.appform.conductor.server.config.hz.*; +import io.appform.conductor.core.config.hz.*; import io.dropwizard.lifecycle.Managed; import io.dropwizard.lifecycle.ServerLifecycleListener; import lombok.Getter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/CollisionChecker.java b/conductor-core/src/main/java/io/appform/conductor/core/id/CollisionChecker.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/id/CollisionChecker.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/CollisionChecker.java index 641c9fc..005ce7c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/CollisionChecker.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/CollisionChecker.java @@ -15,7 +15,7 @@ * */ -package io.appform.conductor.server.id; +package io.appform.conductor.core.id; import lombok.extern.slf4j.Slf4j; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/Id.java b/conductor-core/src/main/java/io/appform/conductor/core/id/Id.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/id/Id.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/Id.java index 8de1e26..18daee8 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/Id.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/Id.java @@ -15,7 +15,7 @@ * */ -package io.appform.conductor.server.id; +package io.appform.conductor.core.id; import lombok.*; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/IdConstants.java b/conductor-core/src/main/java/io/appform/conductor/core/id/IdConstants.java similarity index 81% rename from conductor-server/src/main/java/io/appform/conductor/server/id/IdConstants.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/IdConstants.java index 3675ee4..bd9a7e1 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/IdConstants.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/IdConstants.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.id; +package io.appform.conductor.core.id; import lombok.experimental.UtilityClass; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/IdGenerator.java b/conductor-core/src/main/java/io/appform/conductor/core/id/IdGenerator.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/id/IdGenerator.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/IdGenerator.java index f13df89..95b3628 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/IdGenerator.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/IdGenerator.java @@ -15,14 +15,14 @@ * */ -package io.appform.conductor.server.id; +package io.appform.conductor.core.id; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import io.appform.conductor.server.id.constraints.IdValidationConstraint; -import io.appform.conductor.server.id.formatter.IdFormatter; -import io.appform.conductor.server.id.formatter.IdFormatters; -import io.appform.conductor.server.id.request.IdGenerationRequest; +import io.appform.conductor.core.id.constraints.IdValidationConstraint; +import io.appform.conductor.core.id.formatter.IdFormatter; +import io.appform.conductor.core.id.formatter.IdFormatters; +import io.appform.conductor.core.id.request.IdGenerationRequest; import lombok.Value; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/IdUtils.java b/conductor-core/src/main/java/io/appform/conductor/core/id/IdUtils.java similarity index 90% rename from conductor-server/src/main/java/io/appform/conductor/server/id/IdUtils.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/IdUtils.java index 39de15d..52cc870 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/IdUtils.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/IdUtils.java @@ -1,12 +1,12 @@ -package io.appform.conductor.server.id; +package io.appform.conductor.core.id; import com.google.common.collect.Sets; import com.google.inject.Inject; import com.google.inject.Singleton; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.ConductorException; -import io.appform.conductor.server.id.constraints.impl.SameShardConstraint; -import io.appform.conductor.server.id.constraints.impl.ShardProvider; +import io.appform.conductor.core.id.constraints.impl.SameShardConstraint; +import io.appform.conductor.core.id.constraints.impl.ShardProvider; import io.appform.dropwizard.sharding.utils.ShardCalculator; import io.appform.functionmetrics.MonitoredFunction; import lombok.extern.slf4j.Slf4j; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/IdValidationConstraint.java b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/IdValidationConstraint.java similarity index 89% rename from conductor-server/src/main/java/io/appform/conductor/server/id/constraints/IdValidationConstraint.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/constraints/IdValidationConstraint.java index 60683cc..bbca523 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/IdValidationConstraint.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/IdValidationConstraint.java @@ -15,9 +15,9 @@ * */ -package io.appform.conductor.server.id.constraints; +package io.appform.conductor.core.id.constraints; -import io.appform.conductor.server.id.Id; +import io.appform.conductor.core.id.Id; /** diff --git a/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/IdComponentProvider.java b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/IdComponentProvider.java new file mode 100644 index 0000000..024220e --- /dev/null +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/IdComponentProvider.java @@ -0,0 +1,10 @@ +package io.appform.conductor.core.id.constraints.impl; + + +import io.appform.conductor.core.id.Id; + +public interface IdComponentProvider { + + T provide(Id id); + +} \ No newline at end of file diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/JavaHashCodeBasedKeyPartitioner.java b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/JavaHashCodeBasedKeyPartitioner.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/JavaHashCodeBasedKeyPartitioner.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/JavaHashCodeBasedKeyPartitioner.java index 189a90e..a0b06ae 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/JavaHashCodeBasedKeyPartitioner.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/JavaHashCodeBasedKeyPartitioner.java @@ -15,10 +15,10 @@ * */ -package io.appform.conductor.server.id.constraints.impl; +package io.appform.conductor.core.id.constraints.impl; -import io.appform.conductor.server.id.Id; +import io.appform.conductor.core.id.Id; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/KeyPartitioner.java b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/KeyPartitioner.java similarity index 88% rename from conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/KeyPartitioner.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/KeyPartitioner.java index 6535d1a..198786e 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/KeyPartitioner.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/KeyPartitioner.java @@ -15,9 +15,9 @@ * */ -package io.appform.conductor.server.id.constraints.impl; +package io.appform.conductor.core.id.constraints.impl; -import io.appform.conductor.server.id.Id; +import io.appform.conductor.core.id.Id; /** diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/MurmurBasedKeyPartitioner.java b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/MurmurBasedKeyPartitioner.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/MurmurBasedKeyPartitioner.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/MurmurBasedKeyPartitioner.java index 50a4aa6..30a6b31 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/MurmurBasedKeyPartitioner.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/MurmurBasedKeyPartitioner.java @@ -15,10 +15,10 @@ * */ -package io.appform.conductor.server.id.constraints.impl; +package io.appform.conductor.core.id.constraints.impl; import com.google.common.hash.Hashing; -import io.appform.conductor.server.id.Id; +import io.appform.conductor.core.id.Id; import java.nio.charset.StandardCharsets; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/PartitionValidator.java b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/PartitionValidator.java similarity index 89% rename from conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/PartitionValidator.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/PartitionValidator.java index 5281419..c61ccd6 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/PartitionValidator.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/PartitionValidator.java @@ -15,11 +15,11 @@ * */ -package io.appform.conductor.server.id.constraints.impl; +package io.appform.conductor.core.id.constraints.impl; import com.google.common.base.Preconditions; -import io.appform.conductor.server.id.Id; -import io.appform.conductor.server.id.constraints.IdValidationConstraint; +import io.appform.conductor.core.id.Id; +import io.appform.conductor.core.id.constraints.IdValidationConstraint; import lombok.extern.slf4j.Slf4j; /** diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/SameShardConstraint.java b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/SameShardConstraint.java similarity index 72% rename from conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/SameShardConstraint.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/SameShardConstraint.java index dfc5fc0..09cf586 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/SameShardConstraint.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/SameShardConstraint.java @@ -1,8 +1,8 @@ -package io.appform.conductor.server.id.constraints.impl; +package io.appform.conductor.core.id.constraints.impl; -import io.appform.conductor.server.id.Id; -import io.appform.conductor.server.id.constraints.IdValidationConstraint; +import io.appform.conductor.core.id.Id; +import io.appform.conductor.core.id.constraints.IdValidationConstraint; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/ShardProvider.java b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/ShardProvider.java similarity index 54% rename from conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/ShardProvider.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/ShardProvider.java index 8095a92..58581fb 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/ShardProvider.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/constraints/impl/ShardProvider.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.id.constraints.impl; +package io.appform.conductor.core.id.constraints.impl; public interface ShardProvider { diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/formatter/Base36IdFormatter.java b/conductor-core/src/main/java/io/appform/conductor/core/id/formatter/Base36IdFormatter.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/id/formatter/Base36IdFormatter.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/formatter/Base36IdFormatter.java index 6953cb7..53a1a98 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/formatter/Base36IdFormatter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/formatter/Base36IdFormatter.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.id.formatter; +package io.appform.conductor.core.id.formatter; import org.joda.time.DateTime; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/formatter/DefaultIdFormatter.java b/conductor-core/src/main/java/io/appform/conductor/core/id/formatter/DefaultIdFormatter.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/id/formatter/DefaultIdFormatter.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/formatter/DefaultIdFormatter.java index d7c5c09..f3b60cf 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/formatter/DefaultIdFormatter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/formatter/DefaultIdFormatter.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.id.formatter; +package io.appform.conductor.core.id.formatter; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/formatter/IdFormatter.java b/conductor-core/src/main/java/io/appform/conductor/core/id/formatter/IdFormatter.java similarity index 79% rename from conductor-server/src/main/java/io/appform/conductor/server/id/formatter/IdFormatter.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/formatter/IdFormatter.java index f29cfee..8aaea9e 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/formatter/IdFormatter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/formatter/IdFormatter.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.id.formatter; +package io.appform.conductor.core.id.formatter; import org.joda.time.DateTime; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/formatter/IdFormatters.java b/conductor-core/src/main/java/io/appform/conductor/core/id/formatter/IdFormatters.java similarity index 89% rename from conductor-server/src/main/java/io/appform/conductor/server/id/formatter/IdFormatters.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/formatter/IdFormatters.java index c0d5afa..3896d3c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/formatter/IdFormatters.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/formatter/IdFormatters.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.id.formatter; +package io.appform.conductor.core.id.formatter; import lombok.experimental.UtilityClass; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/request/IdGenerationRequest.java b/conductor-core/src/main/java/io/appform/conductor/core/id/request/IdGenerationRequest.java similarity index 58% rename from conductor-server/src/main/java/io/appform/conductor/server/id/request/IdGenerationRequest.java rename to conductor-core/src/main/java/io/appform/conductor/core/id/request/IdGenerationRequest.java index 33da484..cb0565d 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/request/IdGenerationRequest.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/id/request/IdGenerationRequest.java @@ -1,7 +1,7 @@ -package io.appform.conductor.server.id.request; +package io.appform.conductor.core.id.request; -import io.appform.conductor.server.id.constraints.IdValidationConstraint; -import io.appform.conductor.server.id.formatter.IdFormatter; +import io.appform.conductor.core.id.constraints.IdValidationConstraint; +import io.appform.conductor.core.id.formatter.IdFormatter; import lombok.Builder; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/EventGeneratingIngressTranslatorStore.java b/conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/EventGeneratingIngressTranslatorStore.java similarity index 87% rename from conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/EventGeneratingIngressTranslatorStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/EventGeneratingIngressTranslatorStore.java index c395758..ecdb2ae 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/EventGeneratingIngressTranslatorStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/EventGeneratingIngressTranslatorStore.java @@ -1,12 +1,12 @@ -package io.appform.conductor.server.ingressmanagement; +package io.appform.conductor.core.ingressmanagement; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.events.impl.ingress.IngressTranslatorCreatedEvent; import io.appform.conductor.model.events.impl.ingress.IngressTranslatorDeletedEvent; import io.appform.conductor.model.ingress.IngressTranslator; import io.appform.conductor.model.workflow.Template; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.eventmanagement.EventBus; import lombok.val; import javax.inject.Inject; @@ -24,7 +24,7 @@ public class EventGeneratingIngressTranslatorStore implements IngressTranslatorS @Inject public EventGeneratingIngressTranslatorStore(EventBus eventBus, - @Named(ConductorModule.CACHED_IMPLEMENTATION_NAME) IngressTranslatorStore ingressTranslatorStore) { + @Named(Constants.CACHED_IMPLEMENTATION_NAME) IngressTranslatorStore ingressTranslatorStore) { this.eventBus = eventBus; this.ingressTranslatorStore = ingressTranslatorStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/IngressTranslatorStore.java b/conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/IngressTranslatorStore.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/IngressTranslatorStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/IngressTranslatorStore.java index f75c356..5e1a0ed 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/IngressTranslatorStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/IngressTranslatorStore.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.ingressmanagement; +package io.appform.conductor.core.ingressmanagement; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.ingress.IngressTranslator; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/impl/CachingIngressTranslatorStore.java b/conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/impl/CachingIngressTranslatorStore.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/impl/CachingIngressTranslatorStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/impl/CachingIngressTranslatorStore.java index 06e4c78..54da926 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/impl/CachingIngressTranslatorStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/impl/CachingIngressTranslatorStore.java @@ -1,11 +1,11 @@ -package io.appform.conductor.server.ingressmanagement.impl; +package io.appform.conductor.core.ingressmanagement.impl; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.ingress.IngressTranslator; import io.appform.conductor.model.workflow.Template; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.ingressmanagement.IngressTranslatorStore; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.core.ingressmanagement.IngressTranslatorStore; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -29,7 +29,7 @@ public class CachingIngressTranslatorStore implements IngressTranslatorStore { @Inject public CachingIngressTranslatorStore( - @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) final IngressTranslatorStore root, + @Named(Constants.ROOT_IMPLEMENTATION_NAME) final IngressTranslatorStore root, final HazelcastClient hazelcastClient) { this.root = root; this.ingressTranslatorCacheProvider = hazelcastClient.loadingCache( diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/impl/DBIngressTranslatorStore.java b/conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/impl/DBIngressTranslatorStore.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/impl/DBIngressTranslatorStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/impl/DBIngressTranslatorStore.java index d3ec841..3b79c89 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/impl/DBIngressTranslatorStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/impl/DBIngressTranslatorStore.java @@ -1,13 +1,13 @@ -package io.appform.conductor.server.ingressmanagement.impl; +package io.appform.conductor.core.ingressmanagement.impl; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.Throws; import io.appform.conductor.model.ingress.IngressTranslator; import io.appform.conductor.model.workflow.Template; -import io.appform.conductor.server.actionmanagement.impl.models.StoredAction; -import io.appform.conductor.server.ingressmanagement.IngressTranslatorStore; -import io.appform.conductor.server.ingressmanagement.impl.models.StoredIngressTranslator; +import io.appform.conductor.core.actionmanagement.impl.models.StoredAction; +import io.appform.conductor.core.ingressmanagement.IngressTranslatorStore; +import io.appform.conductor.core.ingressmanagement.impl.models.StoredIngressTranslator; import io.appform.dropwizard.sharding.dao.LookupDao; import io.appform.functionmetrics.MonitoredFunction; import lombok.RequiredArgsConstructor; @@ -23,7 +23,7 @@ import static io.appform.conductor.model.error.ConductorErrorCode.STORE_UPDATE_ERROR; import static io.appform.conductor.model.error.ConductorErrorCode.STORE_WRITE_ERROR; -import static io.appform.conductor.server.utils.ConductorServerUtils.readableId; +import static io.appform.conductor.core.utils.ConductorServerUtils.readableId; @Singleton @RequiredArgsConstructor(onConstructor_ = {@Inject}) diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/impl/models/StoredIngressTranslator.java b/conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/impl/models/StoredIngressTranslator.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/impl/models/StoredIngressTranslator.java rename to conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/impl/models/StoredIngressTranslator.java index b7858ff..22d7719 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ingressmanagement/impl/models/StoredIngressTranslator.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ingressmanagement/impl/models/StoredIngressTranslator.java @@ -1,9 +1,9 @@ -package io.appform.conductor.server.ingressmanagement.impl.models; +package io.appform.conductor.core.ingressmanagement.impl.models; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.workflow.Template; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.utils.persistence.TemplateConverter; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.persistence.TemplateConverter; import io.appform.dropwizard.sharding.sharding.LookupKey; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/GroupStore.java b/conductor-core/src/main/java/io/appform/conductor/core/interfaces/GroupStore.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/GroupStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/interfaces/GroupStore.java index 595da4d..e8d16b0 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/GroupStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/interfaces/GroupStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement; +package io.appform.conductor.core.interfaces; import io.appform.conductor.model.usermgmt.Group; diff --git a/conductor-core/src/main/java/io/appform/conductor/core/interfaces/UserLifecycleManager.java b/conductor-core/src/main/java/io/appform/conductor/core/interfaces/UserLifecycleManager.java new file mode 100644 index 0000000..92ce841 --- /dev/null +++ b/conductor-core/src/main/java/io/appform/conductor/core/interfaces/UserLifecycleManager.java @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2023 Santanu Sinha + * + * 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 + * + * http://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. + */ + +package io.appform.conductor.core.interfaces; + +import io.appform.conductor.model.skills.SkillDefinition; +import io.appform.conductor.model.skills.SkillValue; +import io.appform.conductor.model.usermgmt.*; +import lombok.NonNull; + +import java.util.List; +import java.util.Optional; +import java.util.Set; + +public interface UserLifecycleManager { + Optional userDetails(@NonNull final String userId); + + List listGroups(); + + boolean addUserToGroup(String groupId, String userId); + + boolean removeUserFromGroup(String groupId, String userId); + + Optional createSystemUser(String name, String email); + + Optional createHumanUser(String name, String email, String password); + + Optional startSystemUserSession(final String userId); + + Optional jwtForSession(String userId, String sessionId); + + boolean completeUserSession(final String userId, final String sessionId); + + List listSkillValues(); + + Optional createGroup(String name, String description, GroupType type, Set requiredSkills); + + Optional readGroup(final String groupId); + + Optional updateGroup( + final String groupId, + final String description, + final GroupType type, + final Set requiredSkills); + + boolean deleteGroup(String groupId); + + boolean addUserSkill(String userId, Skill skill); + + Optional getSkill(final String skillId); + + List listSkillDefinitions(); + + boolean removeUserSkill(String userId, Skill skill); + + Optional removeSkillValue( + final String skillId, + final String valueId); + + Optional addSkillValue( + final String skillId, + final String value); + + boolean deleteSkillDefinition(final String skillId); + + Optional createSkill(final String name); + + Optional updateSkillDefinition( + final String skillId, + final String name); + + Optional openToken(String userId); + + Optional showToken(String token); + + Optional activateUser(String token, String password); + + Optional loginUser(String email, String password); + + boolean logoutUser(UserSession session); + + Optional updateUserName(String userId, String name); + + boolean changePassword(String userId, String oldPassword, String newPassword); + + Optional validateToken(String token); + + List findUsersForGroup(String groupId, int start, int limit); + + List getSkillsForUser(String userId); +} diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/UserStore.java b/conductor-core/src/main/java/io/appform/conductor/core/interfaces/UserStore.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/UserStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/interfaces/UserStore.java index c9b125d..69511c9 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/UserStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/interfaces/UserStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement; +package io.appform.conductor.core.interfaces; import io.appform.conductor.model.usermgmt.UserState; import io.appform.conductor.model.usermgmt.UserSummary; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/parser/CQLEngine.java b/conductor-core/src/main/java/io/appform/conductor/core/parser/CQLEngine.java similarity index 99% rename from conductor-server/src/main/java/io/appform/conductor/server/parser/CQLEngine.java rename to conductor-core/src/main/java/io/appform/conductor/core/parser/CQLEngine.java index ca7dba7..a83bad9 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/parser/CQLEngine.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/parser/CQLEngine.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.parser; +package io.appform.conductor.core.parser; import com.google.common.base.Preconditions; import com.google.common.base.Strings; @@ -37,12 +37,12 @@ import io.appform.conductor.model.ticket.filter.TicketFilter; import io.appform.conductor.model.ticket.filter.fieldfilters.*; import io.appform.conductor.model.ticket.filter.ticketfilters.*; -import io.appform.conductor.server.eventmanagement.EventStore; -import io.appform.conductor.server.schemamanagement.impl.SchemaStore; -import io.appform.conductor.server.ticketmanagement.TicketManager; -import io.appform.conductor.server.ticketmanagement.TicketSkeleton; -import io.appform.conductor.server.utils.Pair; -import io.appform.conductor.server.workflowmanagement.WorkflowStore; +import io.appform.conductor.core.eventmanagement.EventStore; +import io.appform.conductor.core.schemamanagement.impl.SchemaStore; +import io.appform.conductor.core.ticketmanagement.TicketManager; +import io.appform.conductor.core.ticketmanagement.TicketSkeleton; +import io.appform.conductor.core.utils.Pair; +import io.appform.conductor.core.workflowmanagement.WorkflowStore; import io.dropwizard.util.Duration; import lombok.*; import lombok.extern.slf4j.Slf4j; @@ -68,7 +68,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static io.appform.conductor.server.utils.ConductorServerUtils.lowerSnake; +import static io.appform.conductor.core.utils.ConductorServerUtils.lowerSnake; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/parser/CQLEventFilterFunction.java b/conductor-core/src/main/java/io/appform/conductor/core/parser/CQLEventFilterFunction.java similarity index 89% rename from conductor-server/src/main/java/io/appform/conductor/server/parser/CQLEventFilterFunction.java rename to conductor-core/src/main/java/io/appform/conductor/core/parser/CQLEventFilterFunction.java index f2c96ce..bb1ee86 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/parser/CQLEventFilterFunction.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/parser/CQLEventFilterFunction.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.parser; +package io.appform.conductor.core.parser; import io.appform.conductor.model.events.analytics.EventFilters; import net.sf.jsqlparser.expression.operators.relational.ExpressionList; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/parser/CQLFilterFunctionRegistry.java b/conductor-core/src/main/java/io/appform/conductor/core/parser/CQLFilterFunctionRegistry.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/parser/CQLFilterFunctionRegistry.java rename to conductor-core/src/main/java/io/appform/conductor/core/parser/CQLFilterFunctionRegistry.java index 3ce044c..c40af00 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/parser/CQLFilterFunctionRegistry.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/parser/CQLFilterFunctionRegistry.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.parser; +package io.appform.conductor.core.parser; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.events.analytics.EventFilters; @@ -8,8 +8,8 @@ import io.appform.conductor.model.ticket.filter.TicketFieldFilter; import io.appform.conductor.model.ticket.filter.TicketFilter; import io.appform.conductor.model.ticket.filter.ticketfilters.TicketExternalReferenceEquals; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.Pair; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.Pair; import io.dropwizard.util.Duration; import lombok.SneakyThrows; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/parser/CQLTicketFilterFunction.java b/conductor-core/src/main/java/io/appform/conductor/core/parser/CQLTicketFilterFunction.java similarity index 80% rename from conductor-server/src/main/java/io/appform/conductor/server/parser/CQLTicketFilterFunction.java rename to conductor-core/src/main/java/io/appform/conductor/core/parser/CQLTicketFilterFunction.java index 0cbec62..b04ed10 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/parser/CQLTicketFilterFunction.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/parser/CQLTicketFilterFunction.java @@ -1,8 +1,8 @@ -package io.appform.conductor.server.parser; +package io.appform.conductor.core.parser; import io.appform.conductor.model.ticket.filter.TicketFieldFilter; import io.appform.conductor.model.ticket.filter.TicketFilter; -import io.appform.conductor.server.utils.Pair; +import io.appform.conductor.core.utils.Pair; import net.sf.jsqlparser.expression.operators.relational.ExpressionList; import java.util.List; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/parser/CQLUtils.java b/conductor-core/src/main/java/io/appform/conductor/core/parser/CQLUtils.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/parser/CQLUtils.java rename to conductor-core/src/main/java/io/appform/conductor/core/parser/CQLUtils.java index 8181aae..afe218b 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/parser/CQLUtils.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/parser/CQLUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.parser; +package io.appform.conductor.core.parser; import lombok.experimental.UtilityClass; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ruleengines/HopeRuleEvaluator.java b/conductor-core/src/main/java/io/appform/conductor/core/ruleengines/HopeRuleEvaluator.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/ruleengines/HopeRuleEvaluator.java rename to conductor-core/src/main/java/io/appform/conductor/core/ruleengines/HopeRuleEvaluator.java index 1537930..1460987 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ruleengines/HopeRuleEvaluator.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ruleengines/HopeRuleEvaluator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ruleengines; +package io.appform.conductor.core.ruleengines; import com.fasterxml.jackson.databind.JsonNode; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ruleengines/JsonRuleEvaluator.java b/conductor-core/src/main/java/io/appform/conductor/core/ruleengines/JsonRuleEvaluator.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/ruleengines/JsonRuleEvaluator.java rename to conductor-core/src/main/java/io/appform/conductor/core/ruleengines/JsonRuleEvaluator.java index d90d8c0..765dc2d 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ruleengines/JsonRuleEvaluator.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ruleengines/JsonRuleEvaluator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ruleengines; +package io.appform.conductor.core.ruleengines; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ruleengines/RuleEngine.java b/conductor-core/src/main/java/io/appform/conductor/core/ruleengines/RuleEngine.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ruleengines/RuleEngine.java rename to conductor-core/src/main/java/io/appform/conductor/core/ruleengines/RuleEngine.java index 3b3fa70..24a724c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ruleengines/RuleEngine.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ruleengines/RuleEngine.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.ruleengines; +package io.appform.conductor.core.ruleengines; import com.fasterxml.jackson.databind.JsonNode; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.workflow.Rule; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.ConductorServerUtils; import lombok.val; import javax.inject.Inject; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ruleengines/RuleEvaluator.java b/conductor-core/src/main/java/io/appform/conductor/core/ruleengines/RuleEvaluator.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ruleengines/RuleEvaluator.java rename to conductor-core/src/main/java/io/appform/conductor/core/ruleengines/RuleEvaluator.java index ca2d26d..3142a80 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ruleengines/RuleEvaluator.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ruleengines/RuleEvaluator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ruleengines; +package io.appform.conductor.core.ruleengines; import com.fasterxml.jackson.databind.JsonNode; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/FieldSchemaBackwardsCompatibilityChecker.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/FieldSchemaBackwardsCompatibilityChecker.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/FieldSchemaBackwardsCompatibilityChecker.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/FieldSchemaBackwardsCompatibilityChecker.java index 228daef..5c4a895 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/FieldSchemaBackwardsCompatibilityChecker.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/FieldSchemaBackwardsCompatibilityChecker.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement; +package io.appform.conductor.core.schemamanagement; import io.appform.conductor.model.schema.FieldSchema; import io.appform.conductor.model.schema.FieldSchemaVisitor; import io.appform.conductor.model.schema.fields.*; -import io.appform.conductor.server.schemamanagement.impl.SchemaStore; +import io.appform.conductor.core.schemamanagement.impl.SchemaStore; import lombok.val; import org.apache.commons.lang3.ClassUtils; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/SchemaOpValidationResult.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/SchemaOpValidationResult.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/SchemaOpValidationResult.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/SchemaOpValidationResult.java index ba03318..34c3827 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/SchemaOpValidationResult.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/SchemaOpValidationResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement; +package io.appform.conductor.core.schemamanagement; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/CachingSchemaStore.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/CachingSchemaStore.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/CachingSchemaStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/CachingSchemaStore.java index 56fd46d..09d6642 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/CachingSchemaStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/CachingSchemaStore.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement.impl; +package io.appform.conductor.core.schemamanagement.impl; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.Throws; import io.appform.conductor.model.schema.FieldSchema; import io.appform.conductor.model.schema.Schema; import io.appform.conductor.model.schema.SchemaState; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.schemamanagement.impl.models.StoredSchemaSummary; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.core.schemamanagement.impl.models.StoredSchemaSummary; import io.appform.functionmetrics.MonitoredFunction; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -53,7 +53,7 @@ public class CachingSchemaStore implements SchemaStore { @Inject public CachingSchemaStore( - @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) SchemaStore root, + @Named(Constants.ROOT_IMPLEMENTATION_NAME) SchemaStore root, HazelcastClient hazelcastClient) { this.root = root; val cacheName = getClass().getSimpleName(); diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/DBSchemaStore.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/DBSchemaStore.java similarity index 98% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/DBSchemaStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/DBSchemaStore.java index 9da2a32..dba6111 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/DBSchemaStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/DBSchemaStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement.impl; +package io.appform.conductor.core.schemamanagement.impl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -22,8 +22,8 @@ import io.appform.conductor.model.error.Throws; import io.appform.conductor.model.schema.*; import io.appform.conductor.model.schema.fields.*; -import io.appform.conductor.server.schemamanagement.impl.models.*; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.schemamanagement.impl.models.*; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.dropwizard.sharding.dao.LookupDao; import io.appform.dropwizard.sharding.dao.RelationalDao; import io.appform.functionmetrics.MonitoredFunction; @@ -40,8 +40,8 @@ import java.util.Optional; import static io.appform.conductor.model.schema.SchemaState.INACTIVE; -import static io.appform.conductor.server.utils.ConductorServerUtils.lowerSnake; -import static io.appform.conductor.server.utils.ConductorServerUtils.operatingUserId; +import static io.appform.conductor.core.utils.ConductorServerUtils.lowerSnake; +import static io.appform.conductor.core.utils.ConductorServerUtils.operatingUserId; /** * DB based implementation for {@link SchemaStore} diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/EventGeneratingSchemaStore.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/EventGeneratingSchemaStore.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/EventGeneratingSchemaStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/EventGeneratingSchemaStore.java index 17141df..fff99ff 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/EventGeneratingSchemaStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/EventGeneratingSchemaStore.java @@ -1,10 +1,10 @@ -package io.appform.conductor.server.schemamanagement.impl; +package io.appform.conductor.core.schemamanagement.impl; import io.appform.conductor.model.schema.FieldSchema; import io.appform.conductor.model.schema.Schema; import io.appform.conductor.model.schema.SchemaState; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.eventmanagement.EventBus; import io.appform.conductor.model.events.impl.schema.*; import lombok.val; @@ -20,7 +20,7 @@ public class EventGeneratingSchemaStore implements SchemaStore { private final SchemaStore schemaStore; @Inject - public EventGeneratingSchemaStore(EventBus eventBus, @Named(ConductorModule.CACHED_IMPLEMENTATION_NAME) SchemaStore schemaStore) { + public EventGeneratingSchemaStore(EventBus eventBus, @Named(Constants.CACHED_IMPLEMENTATION_NAME) SchemaStore schemaStore) { this.eventBus = eventBus; this.schemaStore = schemaStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/SchemaStore.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/SchemaStore.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/SchemaStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/SchemaStore.java index a646e35..374edac 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/SchemaStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/SchemaStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement.impl; +package io.appform.conductor.core.schemamanagement.impl; import io.appform.conductor.model.schema.FieldSchema; import io.appform.conductor.model.schema.Schema; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredBooleanFieldSchema.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredBooleanFieldSchema.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredBooleanFieldSchema.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredBooleanFieldSchema.java index 567811b..933dc16 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredBooleanFieldSchema.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredBooleanFieldSchema.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement.impl.models; +package io.appform.conductor.core.schemamanagement.impl.models; import io.appform.conductor.model.schema.FieldType; import io.appform.conductor.model.workflow.Rule; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredChoiceFieldSchema.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredChoiceFieldSchema.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredChoiceFieldSchema.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredChoiceFieldSchema.java index 607ccc8..6ef2d3f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredChoiceFieldSchema.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredChoiceFieldSchema.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement.impl.models; +package io.appform.conductor.core.schemamanagement.impl.models; import io.appform.conductor.model.schema.FieldType; import io.appform.conductor.model.workflow.Rule; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredDateFieldSchema.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredDateFieldSchema.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredDateFieldSchema.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredDateFieldSchema.java index 4f39a27..784b872 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredDateFieldSchema.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredDateFieldSchema.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement.impl.models; +package io.appform.conductor.core.schemamanagement.impl.models; import io.appform.conductor.model.schema.FieldType; import io.appform.conductor.model.workflow.Rule; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredFieldSchema.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredFieldSchema.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredFieldSchema.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredFieldSchema.java index 72f56d4..a4269ec 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredFieldSchema.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredFieldSchema.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement.impl.models; +package io.appform.conductor.core.schemamanagement.impl.models; import io.appform.conductor.model.schema.FieldType; import io.appform.conductor.model.workflow.Rule; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.utils.persistence.RuleConverter; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.persistence.RuleConverter; import lombok.*; import lombok.experimental.FieldNameConstants; import org.hibernate.Hibernate; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredFieldSchemaVisitor.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredFieldSchemaVisitor.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredFieldSchemaVisitor.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredFieldSchemaVisitor.java index c5ef723..5fa6f57 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredFieldSchemaVisitor.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredFieldSchemaVisitor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement.impl.models; +package io.appform.conductor.core.schemamanagement.impl.models; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredFieldSchemaVisitorAdapter.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredFieldSchemaVisitorAdapter.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredFieldSchemaVisitorAdapter.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredFieldSchemaVisitorAdapter.java index 1ed9f1c..af461c7 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredFieldSchemaVisitorAdapter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredFieldSchemaVisitorAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement.impl.models; +package io.appform.conductor.core.schemamanagement.impl.models; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredLocationFieldSchema.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredLocationFieldSchema.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredLocationFieldSchema.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredLocationFieldSchema.java index 2f4efbd..965879c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredLocationFieldSchema.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredLocationFieldSchema.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement.impl.models; +package io.appform.conductor.core.schemamanagement.impl.models; import io.appform.conductor.model.schema.FieldType; import io.appform.conductor.model.workflow.Rule; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredNumberFieldSchema.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredNumberFieldSchema.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredNumberFieldSchema.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredNumberFieldSchema.java index 11bb5ae..2bea09f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredNumberFieldSchema.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredNumberFieldSchema.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement.impl.models; +package io.appform.conductor.core.schemamanagement.impl.models; import io.appform.conductor.model.schema.FieldType; import io.appform.conductor.model.workflow.Rule; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredSchemaSummary.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredSchemaSummary.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredSchemaSummary.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredSchemaSummary.java index d6a30b2..2212102 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredSchemaSummary.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredSchemaSummary.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement.impl.models; +package io.appform.conductor.core.schemamanagement.impl.models; import io.appform.conductor.model.schema.SchemaState; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import io.appform.dropwizard.sharding.sharding.LookupKey; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredStringFieldSchema.java b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredStringFieldSchema.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredStringFieldSchema.java rename to conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredStringFieldSchema.java index cf2f7b6..9a0d992 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/schemamanagement/impl/models/StoredStringFieldSchema.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/schemamanagement/impl/models/StoredStringFieldSchema.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.schemamanagement.impl.models; +package io.appform.conductor.core.schemamanagement.impl.models; import io.appform.conductor.model.schema.FieldType; import io.appform.conductor.model.workflow.Rule; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/EventGeneratingSubjectStore.java b/conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/EventGeneratingSubjectStore.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/EventGeneratingSubjectStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/EventGeneratingSubjectStore.java index 2908d58..4d8abbd 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/EventGeneratingSubjectStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/EventGeneratingSubjectStore.java @@ -1,8 +1,8 @@ -package io.appform.conductor.server.subjectmanagement; +package io.appform.conductor.core.subjectmanagement; import io.appform.conductor.model.subject.*; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.eventmanagement.EventBus; import io.appform.conductor.model.events.impl.subject.*; import lombok.val; @@ -20,7 +20,7 @@ public class EventGeneratingSubjectStore implements SubjectStore { private final SubjectStore subjectStore; @Inject - public EventGeneratingSubjectStore(EventBus eventBus, @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) SubjectStore subjectStore) { + public EventGeneratingSubjectStore(EventBus eventBus, @Named(Constants.ROOT_IMPLEMENTATION_NAME) SubjectStore subjectStore) { this.eventBus = eventBus; this.subjectStore = subjectStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/SubjectIDVerifier.java b/conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/SubjectIDVerifier.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/SubjectIDVerifier.java rename to conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/SubjectIDVerifier.java index 54315f3..5024182 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/SubjectIDVerifier.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/SubjectIDVerifier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.subjectmanagement; +package io.appform.conductor.core.subjectmanagement; import io.appform.conductor.model.subject.SubjectIDVerificationStatus; import io.appform.conductor.model.subject.SubjectID; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/SubjectStore.java b/conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/SubjectStore.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/SubjectStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/SubjectStore.java index eecbe80..6f83613 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/SubjectStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/SubjectStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.subjectmanagement; +package io.appform.conductor.core.subjectmanagement; import io.appform.conductor.model.subject.*; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/impl/DBSubjectStore.java b/conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/impl/DBSubjectStore.java similarity index 98% rename from conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/impl/DBSubjectStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/impl/DBSubjectStore.java index f79ebf4..a380b82 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/impl/DBSubjectStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/impl/DBSubjectStore.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.appform.conductor.server.subjectmanagement.impl; +package io.appform.conductor.core.subjectmanagement.impl; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.Throws; import io.appform.conductor.model.subject.*; -import io.appform.conductor.server.subjectmanagement.SubjectStore; -import io.appform.conductor.server.subjectmanagement.impl.models.StoredAddress; -import io.appform.conductor.server.subjectmanagement.impl.models.StoredSubjectID; -import io.appform.conductor.server.subjectmanagement.impl.models.StoredSubjectSummary; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.subjectmanagement.SubjectStore; +import io.appform.conductor.core.subjectmanagement.impl.models.StoredAddress; +import io.appform.conductor.core.subjectmanagement.impl.models.StoredSubjectID; +import io.appform.conductor.core.subjectmanagement.impl.models.StoredSubjectSummary; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.dropwizard.sharding.dao.LookupDao; import io.appform.dropwizard.sharding.dao.RelationalDao; import io.appform.functionmetrics.MonitoredFunction; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/impl/models/StoredAddress.java b/conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/impl/models/StoredAddress.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/impl/models/StoredAddress.java rename to conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/impl/models/StoredAddress.java index 9fecce5..53e6651 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/impl/models/StoredAddress.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/impl/models/StoredAddress.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.subjectmanagement.impl.models; +package io.appform.conductor.core.subjectmanagement.impl.models; import io.appform.conductor.model.subject.AddressType; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/impl/models/StoredSubjectID.java b/conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/impl/models/StoredSubjectID.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/impl/models/StoredSubjectID.java rename to conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/impl/models/StoredSubjectID.java index 017dc5f..d0106ce 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/impl/models/StoredSubjectID.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/impl/models/StoredSubjectID.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.subjectmanagement.impl.models; +package io.appform.conductor.core.subjectmanagement.impl.models; import io.appform.conductor.model.subject.SubjectIDType; import io.appform.conductor.model.subject.SubjectIDVerificationStatus; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/impl/models/StoredSubjectSummary.java b/conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/impl/models/StoredSubjectSummary.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/impl/models/StoredSubjectSummary.java rename to conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/impl/models/StoredSubjectSummary.java index 99593f8..6b21530 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/subjectmanagement/impl/models/StoredSubjectSummary.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/subjectmanagement/impl/models/StoredSubjectSummary.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.subjectmanagement.impl.models; +package io.appform.conductor.core.subjectmanagement.impl.models; import io.appform.conductor.model.subject.Gender; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import io.appform.dropwizard.sharding.sharding.LookupKey; import lombok.Getter; import lombok.Setter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/ConductorTaskScheduler.java b/conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/ConductorTaskScheduler.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/ConductorTaskScheduler.java rename to conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/ConductorTaskScheduler.java index 415f21a..a05af38 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/ConductorTaskScheduler.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/ConductorTaskScheduler.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.taskmanagement; +package io.appform.conductor.core.taskmanagement; import io.appform.conductor.model.tasks.*; -import io.appform.conductor.server.taskmanagement.impl.RunActionOnCQLSelectExecutor; -import io.appform.conductor.server.taskmanagement.impl.RunActionOnSelectedTicketsExecutor; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.taskmanagement.impl.RunActionOnCQLSelectExecutor; +import io.appform.conductor.core.taskmanagement.impl.RunActionOnSelectedTicketsExecutor; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.kaal.KaalScheduler; import io.appform.kaal.KaalTask; import io.appform.kaal.KaalTaskData; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/EventGeneratingTaskStore.java b/conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/EventGeneratingTaskStore.java similarity index 89% rename from conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/EventGeneratingTaskStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/EventGeneratingTaskStore.java index 173f011..e2cfcc9 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/EventGeneratingTaskStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/EventGeneratingTaskStore.java @@ -1,11 +1,11 @@ -package io.appform.conductor.server.taskmanagement; +package io.appform.conductor.core.taskmanagement; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.events.impl.task.TaskCreatedEvent; import io.appform.conductor.model.events.impl.task.TaskDeletedEvent; import io.appform.conductor.model.events.impl.task.TaskUpdatedEvent; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.eventmanagement.EventBus; import io.appform.conductor.model.tasks.Task; import lombok.val; @@ -22,7 +22,7 @@ public class EventGeneratingTaskStore implements TaskStore { private final TaskStore taskStore; @Inject - public EventGeneratingTaskStore(EventBus eventBus, @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) TaskStore taskStore) { + public EventGeneratingTaskStore(EventBus eventBus, @Named(Constants.ROOT_IMPLEMENTATION_NAME) TaskStore taskStore) { this.eventBus = eventBus; this.taskStore = taskStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/TaskStore.java b/conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/TaskStore.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/TaskStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/TaskStore.java index 42a771f..49ca259 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/TaskStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/TaskStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.taskmanagement; +package io.appform.conductor.core.taskmanagement; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.tasks.Task; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/impl/DBTaskStore.java b/conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/impl/DBTaskStore.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/impl/DBTaskStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/impl/DBTaskStore.java index a8fc9b1..b3af20d 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/impl/DBTaskStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/impl/DBTaskStore.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package io.appform.conductor.server.taskmanagement.impl; +package io.appform.conductor.core.taskmanagement.impl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.Throws; -import io.appform.conductor.server.taskmanagement.TaskStore; -import io.appform.conductor.server.taskmanagement.impl.models.StoredTask; +import io.appform.conductor.core.taskmanagement.TaskStore; +import io.appform.conductor.core.taskmanagement.impl.models.StoredTask; import io.appform.conductor.model.tasks.Task; import io.appform.conductor.model.tasks.TaskSpec; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.dropwizard.sharding.dao.LookupDao; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/impl/RunActionOnCQLSelectExecutor.java b/conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/impl/RunActionOnCQLSelectExecutor.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/impl/RunActionOnCQLSelectExecutor.java rename to conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/impl/RunActionOnCQLSelectExecutor.java index 0a1a4c8..48673f3 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/impl/RunActionOnCQLSelectExecutor.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/impl/RunActionOnCQLSelectExecutor.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package io.appform.conductor.server.taskmanagement.impl; +package io.appform.conductor.core.taskmanagement.impl; import io.appform.conductor.model.tasks.TaskMode; import io.appform.conductor.model.ticket.analytics.TicketGroupResponse; import io.appform.conductor.model.ticket.analytics.TicketListResponse; import io.appform.conductor.model.ticket.analytics.TicketQueryResponseVisitor; -import io.appform.conductor.server.eventmanagement.EventStore; -import io.appform.conductor.server.parser.CQLEngine; -import io.appform.conductor.server.taskmanagement.ConductorTaskScheduler; +import io.appform.conductor.core.eventmanagement.EventStore; +import io.appform.conductor.core.parser.CQLEngine; +import io.appform.conductor.core.taskmanagement.ConductorTaskScheduler; import io.appform.conductor.model.tasks.RunActionOnCQLSelectTaskSpec; import io.appform.conductor.model.tasks.Task; import io.appform.conductor.model.tasks.TaskRunStatus; -import io.appform.conductor.server.ticketmanagement.TicketManager; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.ticketmanagement.TicketManager; +import io.appform.conductor.core.utils.ConductorServerUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/impl/RunActionOnSelectedTicketsExecutor.java b/conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/impl/RunActionOnSelectedTicketsExecutor.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/impl/RunActionOnSelectedTicketsExecutor.java rename to conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/impl/RunActionOnSelectedTicketsExecutor.java index d174109..19074dd 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/impl/RunActionOnSelectedTicketsExecutor.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/impl/RunActionOnSelectedTicketsExecutor.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.appform.conductor.server.taskmanagement.impl; +package io.appform.conductor.core.taskmanagement.impl; import io.appform.conductor.model.tasks.TaskMode; -import io.appform.conductor.server.taskmanagement.ConductorTaskScheduler; +import io.appform.conductor.core.taskmanagement.ConductorTaskScheduler; import io.appform.conductor.model.tasks.RunActionOnSelectedTicketsTaskSpec; import io.appform.conductor.model.tasks.Task; import io.appform.conductor.model.tasks.TaskRunStatus; -import io.appform.conductor.server.ticketmanagement.TicketManager; +import io.appform.conductor.core.ticketmanagement.TicketManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/impl/models/StoredTask.java b/conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/impl/models/StoredTask.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/impl/models/StoredTask.java rename to conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/impl/models/StoredTask.java index c57634a..f832690 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/taskmanagement/impl/models/StoredTask.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/taskmanagement/impl/models/StoredTask.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.taskmanagement.impl.models; +package io.appform.conductor.core.taskmanagement.impl.models; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.tasks.TaskMode; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.tasks.TaskState; import io.appform.conductor.model.tasks.TaskType; import io.appform.conductor.model.tasks.TaskRunStatus; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/templateengines/FixedObjectTemplateEvaluator.java b/conductor-core/src/main/java/io/appform/conductor/core/templateengines/FixedObjectTemplateEvaluator.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/templateengines/FixedObjectTemplateEvaluator.java rename to conductor-core/src/main/java/io/appform/conductor/core/templateengines/FixedObjectTemplateEvaluator.java index 1144f83..d2d97f9 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/templateengines/FixedObjectTemplateEvaluator.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/templateengines/FixedObjectTemplateEvaluator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.templateengines; +package io.appform.conductor.core.templateengines; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/templateengines/FixedTextTemplateEvaluator.java b/conductor-core/src/main/java/io/appform/conductor/core/templateengines/FixedTextTemplateEvaluator.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/templateengines/FixedTextTemplateEvaluator.java rename to conductor-core/src/main/java/io/appform/conductor/core/templateengines/FixedTextTemplateEvaluator.java index 70aa77c..55074c3 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/templateengines/FixedTextTemplateEvaluator.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/templateengines/FixedTextTemplateEvaluator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.templateengines; +package io.appform.conductor.core.templateengines; import com.fasterxml.jackson.databind.JsonNode; import io.appform.conductor.model.workflow.Template; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/templateengines/HandlebarsTextTemplateEvaluator.java b/conductor-core/src/main/java/io/appform/conductor/core/templateengines/HandlebarsTextTemplateEvaluator.java similarity index 88% rename from conductor-server/src/main/java/io/appform/conductor/server/templateengines/HandlebarsTextTemplateEvaluator.java rename to conductor-core/src/main/java/io/appform/conductor/core/templateengines/HandlebarsTextTemplateEvaluator.java index ea80675..7b6bd56 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/templateengines/HandlebarsTextTemplateEvaluator.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/templateengines/HandlebarsTextTemplateEvaluator.java @@ -1,10 +1,10 @@ -package io.appform.conductor.server.templateengines; +package io.appform.conductor.core.templateengines; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import io.appform.conductor.model.workflow.Template; -import io.appform.conductor.server.utils.HandlebarsUtils; +import io.appform.conductor.core.utils.HandlebarsUtils; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/templateengines/ObjectTemplateEvaluator.java b/conductor-core/src/main/java/io/appform/conductor/core/templateengines/ObjectTemplateEvaluator.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/templateengines/ObjectTemplateEvaluator.java rename to conductor-core/src/main/java/io/appform/conductor/core/templateengines/ObjectTemplateEvaluator.java index 7ed4927..edee226 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/templateengines/ObjectTemplateEvaluator.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/templateengines/ObjectTemplateEvaluator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.templateengines; +package io.appform.conductor.core.templateengines; import com.fasterxml.jackson.databind.JsonNode; import io.appform.conductor.model.workflow.Template; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/templateengines/StringSubstitutionTextTemplateEvaluator.java b/conductor-core/src/main/java/io/appform/conductor/core/templateengines/StringSubstitutionTextTemplateEvaluator.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/templateengines/StringSubstitutionTextTemplateEvaluator.java rename to conductor-core/src/main/java/io/appform/conductor/core/templateengines/StringSubstitutionTextTemplateEvaluator.java index f47a00c..7e71bb2 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/templateengines/StringSubstitutionTextTemplateEvaluator.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/templateengines/StringSubstitutionTextTemplateEvaluator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.templateengines; +package io.appform.conductor.core.templateengines; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/templateengines/TemplateEngine.java b/conductor-core/src/main/java/io/appform/conductor/core/templateengines/TemplateEngine.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/templateengines/TemplateEngine.java rename to conductor-core/src/main/java/io/appform/conductor/core/templateengines/TemplateEngine.java index 7d2f044..6783d5a 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/templateengines/TemplateEngine.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/templateengines/TemplateEngine.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.templateengines; +package io.appform.conductor.core.templateengines; import com.fasterxml.jackson.databind.JsonNode; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.workflow.Template; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.ConductorServerUtils; import lombok.val; import javax.inject.Inject; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/templateengines/TextTemplateEvaluator.java b/conductor-core/src/main/java/io/appform/conductor/core/templateengines/TextTemplateEvaluator.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/templateengines/TextTemplateEvaluator.java rename to conductor-core/src/main/java/io/appform/conductor/core/templateengines/TextTemplateEvaluator.java index feba70c..903b803 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/templateengines/TextTemplateEvaluator.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/templateengines/TextTemplateEvaluator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.templateengines; +package io.appform.conductor.core.templateengines; import com.fasterxml.jackson.databind.JsonNode; import io.appform.conductor.model.workflow.Template; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/EvaluationData.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/EvaluationData.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/EvaluationData.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/EvaluationData.java index 23e3a03..a1f95da 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/EvaluationData.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/EvaluationData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ticketmanagement; +package io.appform.conductor.core.ticketmanagement; import io.appform.conductor.model.ticket.TicketDetails; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/EventGeneratingTicketStore.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/EventGeneratingTicketStore.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/EventGeneratingTicketStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/EventGeneratingTicketStore.java index c25bce8..a6944f7 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/EventGeneratingTicketStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/EventGeneratingTicketStore.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.ticketmanagement; +package io.appform.conductor.core.ticketmanagement; import com.google.common.base.Strings; import com.google.common.net.MediaType; @@ -13,8 +13,8 @@ import io.appform.conductor.model.ticket.comments.Comment; import io.appform.conductor.model.ticket.filter.TicketFieldFilter; import io.appform.conductor.model.ticket.filter.TicketFilter; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.eventmanagement.EventBus; import io.appform.conductor.model.events.impl.ticket.*; import lombok.NonNull; import lombok.val; @@ -37,7 +37,7 @@ public class EventGeneratingTicketStore implements TicketStore { @Inject public EventGeneratingTicketStore( EventBus eventBus, - @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) TicketStore ticketStore) { + @Named(Constants.ROOT_IMPLEMENTATION_NAME) TicketStore ticketStore) { this.eventBus = eventBus; this.ticketStore = ticketStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/RelatedTicket.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/RelatedTicket.java similarity index 77% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/RelatedTicket.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/RelatedTicket.java index 051e8f7..68bd870 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/RelatedTicket.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/RelatedTicket.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.ticketmanagement; +package io.appform.conductor.core.ticketmanagement; import io.appform.conductor.model.ticket.TicketRelationship; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/RelatedTicketSummary.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/RelatedTicketSummary.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/RelatedTicketSummary.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/RelatedTicketSummary.java index 3292787..4e8c068 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/RelatedTicketSummary.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/RelatedTicketSummary.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ticketmanagement; +package io.appform.conductor.core.ticketmanagement; import io.appform.conductor.model.ticket.TicketRelationship; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketFieldData.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketFieldData.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketFieldData.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketFieldData.java index 85cc62d..977f794 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketFieldData.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketFieldData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ticketmanagement; +package io.appform.conductor.core.ticketmanagement; import io.appform.conductor.model.ticket.fields.FieldValue; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketFieldMapper.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketFieldMapper.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketFieldMapper.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketFieldMapper.java index 48ae4a3..1765024 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketFieldMapper.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketFieldMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ticketmanagement; +package io.appform.conductor.core.ticketmanagement; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.base.Strings; @@ -25,9 +25,9 @@ import io.appform.conductor.model.schema.fields.*; import io.appform.conductor.model.ticket.fields.FieldValue; import io.appform.conductor.model.ticket.fields.impl.*; -import io.appform.conductor.server.schemamanagement.SchemaOpValidationResult; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.Pair; +import io.appform.conductor.core.schemamanagement.SchemaOpValidationResult; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.Pair; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketManager.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketManager.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketManager.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketManager.java index 1487cf2..b0268f1 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketManager.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ticketmanagement; +package io.appform.conductor.core.ticketmanagement; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; @@ -53,28 +53,28 @@ import io.appform.conductor.model.usermgmt.UserSummary; import io.appform.conductor.model.workflow.TicketStateTransition; import io.appform.conductor.model.workflow.Workflow; -import io.appform.conductor.server.actionmanagement.ActionExecutor; -import io.appform.conductor.server.actionmanagement.ActionStore; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.ingressmanagement.IngressTranslatorStore; -import io.appform.conductor.server.ruleengines.RuleEngine; -import io.appform.conductor.server.schemamanagement.impl.SchemaStore; -import io.appform.conductor.server.subjectmanagement.SubjectStore; -import io.appform.conductor.server.templateengines.TemplateEngine; -import io.appform.conductor.server.ticketmanagement.statemachine.TicketStateMachine; -import io.appform.conductor.server.ticketmanagement.statemachine.TransitionHandler; -import io.appform.conductor.server.ticketmanagement.statemachine.models.TicketStateMachineContext; -import io.appform.conductor.server.ticketmanagement.statemachine.models.TriggerData; -import io.appform.conductor.server.ticketmanagement.statemachine.models.strategy.TicketMetaDataFetchStrategy; -import io.appform.conductor.server.ticketmanagement.statemachine.models.strategy.TicketStateMachineContextBuilderStrategy; -import io.appform.conductor.server.ticketmanagement.statemachine.models.strategy.TriggerStrategy; -import io.appform.conductor.server.usermanagement.GroupStore; -import io.appform.conductor.server.usermanagement.UserLifecycleManager; -import io.appform.conductor.server.usermanagement.UserStore; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.TriConsumer; -import io.appform.conductor.server.workflowmanagement.WorkflowSelector; -import io.appform.conductor.server.workflowmanagement.WorkflowStore; +import io.appform.conductor.core.actionmanagement.ActionExecutor; +import io.appform.conductor.core.actionmanagement.ActionStore; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.core.ingressmanagement.IngressTranslatorStore; +import io.appform.conductor.core.ruleengines.RuleEngine; +import io.appform.conductor.core.schemamanagement.impl.SchemaStore; +import io.appform.conductor.core.subjectmanagement.SubjectStore; +import io.appform.conductor.core.templateengines.TemplateEngine; +import io.appform.conductor.core.ticketmanagement.statemachine.TicketStateMachine; +import io.appform.conductor.core.ticketmanagement.statemachine.TransitionHandler; +import io.appform.conductor.core.ticketmanagement.statemachine.models.TicketStateMachineContext; +import io.appform.conductor.core.ticketmanagement.statemachine.models.TriggerData; +import io.appform.conductor.core.ticketmanagement.statemachine.models.strategy.TicketMetaDataFetchStrategy; +import io.appform.conductor.core.ticketmanagement.statemachine.models.strategy.TicketStateMachineContextBuilderStrategy; +import io.appform.conductor.core.ticketmanagement.statemachine.models.strategy.TriggerStrategy; +import io.appform.conductor.core.interfaces.GroupStore; +import io.appform.conductor.core.interfaces.UserLifecycleManager; +import io.appform.conductor.core.interfaces.UserStore; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.TriConsumer; +import io.appform.conductor.core.workflowmanagement.WorkflowSelector; +import io.appform.conductor.core.workflowmanagement.WorkflowStore; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketSkeleton.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketSkeleton.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketSkeleton.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketSkeleton.java index d9ba130..98ff308 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketSkeleton.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketSkeleton.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ticketmanagement; +package io.appform.conductor.core.ticketmanagement; import io.appform.conductor.model.ticket.TicketPriority; import io.appform.conductor.model.ticket.ExternalReferenceID; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketSkeletonListResult.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketSkeletonListResult.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketSkeletonListResult.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketSkeletonListResult.java index c7143d9..7495ef7 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketSkeletonListResult.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketSkeletonListResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ticketmanagement; +package io.appform.conductor.core.ticketmanagement; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketStore.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketStore.java similarity index 99% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketStore.java index e1fb282..cdead74 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/TicketStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/TicketStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ticketmanagement; +package io.appform.conductor.core.ticketmanagement; import com.google.common.collect.ImmutableList; import com.google.common.net.MediaType; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/DBTicketStore.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/DBTicketStore.java similarity index 98% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/DBTicketStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/DBTicketStore.java index d6c3975..d795d3c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/DBTicketStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/DBTicketStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ticketmanagement.impl; +package io.appform.conductor.core.ticketmanagement.impl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -37,15 +37,15 @@ import io.appform.conductor.model.ticket.filter.TicketFilterVisitor; import io.appform.conductor.model.ticket.filter.fieldfilters.*; import io.appform.conductor.model.ticket.filter.ticketfilters.*; -import io.appform.conductor.server.ticketmanagement.*; -import io.appform.conductor.server.ticketmanagement.impl.models.StoredRelatedTicket; -import io.appform.conductor.server.ticketmanagement.impl.models.StoredTicketSkeleton; -import io.appform.conductor.server.ticketmanagement.impl.models.comments.StoredAttachment; -import io.appform.conductor.server.ticketmanagement.impl.models.comments.StoredComment; -import io.appform.conductor.server.ticketmanagement.impl.models.fields.StoredEmbeddedFieldValue; -import io.appform.conductor.server.ticketmanagement.impl.models.fields.StoredFieldValue; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.Pair; +import io.appform.conductor.core.ticketmanagement.*; +import io.appform.conductor.core.ticketmanagement.impl.models.StoredRelatedTicket; +import io.appform.conductor.core.ticketmanagement.impl.models.StoredTicketSkeleton; +import io.appform.conductor.core.ticketmanagement.impl.models.comments.StoredAttachment; +import io.appform.conductor.core.ticketmanagement.impl.models.comments.StoredComment; +import io.appform.conductor.core.ticketmanagement.impl.models.fields.StoredEmbeddedFieldValue; +import io.appform.conductor.core.ticketmanagement.impl.models.fields.StoredFieldValue; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.Pair; import io.appform.dropwizard.sharding.dao.LookupDao; import io.appform.dropwizard.sharding.dao.RelationalDao; import io.appform.functionmetrics.MonitoredFunction; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/StoredRelatedTicket.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/StoredRelatedTicket.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/StoredRelatedTicket.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/StoredRelatedTicket.java index 7d01c3f..c2d88f0 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/StoredRelatedTicket.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/StoredRelatedTicket.java @@ -1,7 +1,7 @@ -package io.appform.conductor.server.ticketmanagement.impl.models; +package io.appform.conductor.core.ticketmanagement.impl.models; import io.appform.conductor.model.ticket.TicketRelationship; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/StoredTicketSkeleton.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/StoredTicketSkeleton.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/StoredTicketSkeleton.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/StoredTicketSkeleton.java index e4ac0c7..0b8e885 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/StoredTicketSkeleton.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/StoredTicketSkeleton.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.ticketmanagement.impl.models; +package io.appform.conductor.core.ticketmanagement.impl.models; import io.appform.conductor.model.ticket.TicketPriority; -import io.appform.conductor.server.ticketmanagement.impl.models.fields.StoredFieldValue; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.ticketmanagement.impl.models.fields.StoredFieldValue; +import io.appform.conductor.core.utils.Constants; import io.appform.dropwizard.sharding.sharding.LookupKey; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/comments/StoredAttachment.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/comments/StoredAttachment.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/comments/StoredAttachment.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/comments/StoredAttachment.java index c8d8f57..5a4f4d6 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/comments/StoredAttachment.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/comments/StoredAttachment.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.ticketmanagement.impl.models.comments; +package io.appform.conductor.core.ticketmanagement.impl.models.comments; import com.google.common.net.MediaType; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.utils.persistence.MediaTypeConverter; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.persistence.MediaTypeConverter; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/comments/StoredComment.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/comments/StoredComment.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/comments/StoredComment.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/comments/StoredComment.java index 94e07c6..99b6a84 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/comments/StoredComment.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/comments/StoredComment.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.appform.conductor.server.ticketmanagement.impl.models.comments; +package io.appform.conductor.core.ticketmanagement.impl.models.comments; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/fields/StoredEmbeddedFieldValue.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/fields/StoredEmbeddedFieldValue.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/fields/StoredEmbeddedFieldValue.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/fields/StoredEmbeddedFieldValue.java index 16fd3f7..4ad99fb 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/fields/StoredEmbeddedFieldValue.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/fields/StoredEmbeddedFieldValue.java @@ -1,10 +1,10 @@ -package io.appform.conductor.server.ticketmanagement.impl.models.fields; +package io.appform.conductor.core.ticketmanagement.impl.models.fields; import io.appform.conductor.model.schema.FieldType; import io.appform.conductor.model.ticket.fields.FieldValue; import io.appform.conductor.model.ticket.fields.FieldValueVisitor; import io.appform.conductor.model.ticket.fields.impl.*; -import io.appform.conductor.server.utils.persistence.StringListConverter; +import io.appform.conductor.core.utils.persistence.StringListConverter; import lombok.*; import lombok.experimental.FieldNameConstants; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/fields/StoredFieldValue.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/fields/StoredFieldValue.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/fields/StoredFieldValue.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/fields/StoredFieldValue.java index fd54ca1..771380f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/impl/models/fields/StoredFieldValue.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/impl/models/fields/StoredFieldValue.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.ticketmanagement.impl.models.fields; +package io.appform.conductor.core.ticketmanagement.impl.models.fields; -import io.appform.conductor.server.ticketmanagement.impl.models.StoredTicketSkeleton; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.ticketmanagement.impl.models.StoredTicketSkeleton; +import io.appform.conductor.core.utils.Constants; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/TicketStateMachine.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/TicketStateMachine.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/TicketStateMachine.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/TicketStateMachine.java index 1dd8bfe..9675684 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/TicketStateMachine.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/TicketStateMachine.java @@ -1,13 +1,13 @@ -package io.appform.conductor.server.ticketmanagement.statemachine; +package io.appform.conductor.core.ticketmanagement.statemachine; import com.fasterxml.jackson.databind.ObjectMapper; import io.appform.conductor.model.schema.TicketState; import io.appform.conductor.model.workflow.TicketStateTransition; -import io.appform.conductor.server.ruleengines.RuleEngine; -import io.appform.conductor.server.ticketmanagement.statemachine.models.TicketStateMachineContext; -import io.appform.conductor.server.ticketmanagement.statemachine.models.TriggerData; -import io.appform.conductor.server.ticketmanagement.statemachine.models.strategy.TriggerStrategy; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.ruleengines.RuleEngine; +import io.appform.conductor.core.ticketmanagement.statemachine.models.TicketStateMachineContext; +import io.appform.conductor.core.ticketmanagement.statemachine.models.TriggerData; +import io.appform.conductor.core.ticketmanagement.statemachine.models.strategy.TriggerStrategy; +import io.appform.conductor.core.utils.ConductorServerUtils; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/TransitionHandler.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/TransitionHandler.java similarity index 65% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/TransitionHandler.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/TransitionHandler.java index ffe3836..4762756 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/TransitionHandler.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/TransitionHandler.java @@ -1,8 +1,8 @@ -package io.appform.conductor.server.ticketmanagement.statemachine; +package io.appform.conductor.core.ticketmanagement.statemachine; import io.appform.conductor.model.workflow.TicketStateTransition; -import io.appform.conductor.server.ticketmanagement.statemachine.models.TicketStateMachineContext; -import io.appform.conductor.server.ticketmanagement.statemachine.models.TriggerData; +import io.appform.conductor.core.ticketmanagement.statemachine.models.TicketStateMachineContext; +import io.appform.conductor.core.ticketmanagement.statemachine.models.TriggerData; public interface TransitionHandler { diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/TicketStateMachineContext.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/TicketStateMachineContext.java similarity index 78% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/TicketStateMachineContext.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/TicketStateMachineContext.java index ef618cc..3adb19e 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/TicketStateMachineContext.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/TicketStateMachineContext.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.ticketmanagement.statemachine.models; +package io.appform.conductor.core.ticketmanagement.statemachine.models; import io.appform.conductor.model.schema.Schema; import io.appform.conductor.model.schema.TicketState; @@ -7,9 +7,9 @@ import io.appform.conductor.model.usermgmt.User; import io.appform.conductor.model.usermgmt.UserSummary; import io.appform.conductor.model.workflow.Workflow; -import io.appform.conductor.server.schemamanagement.SchemaOpValidationResult; -import io.appform.conductor.server.ticketmanagement.TicketFieldData; -import io.appform.conductor.server.ticketmanagement.TicketSkeleton; +import io.appform.conductor.core.schemamanagement.SchemaOpValidationResult; +import io.appform.conductor.core.ticketmanagement.TicketFieldData; +import io.appform.conductor.core.ticketmanagement.TicketSkeleton; import lombok.Data; import java.util.List; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/TriggerData.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/TriggerData.java similarity index 65% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/TriggerData.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/TriggerData.java index fdd2223..9bbaae2 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/TriggerData.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/TriggerData.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.ticketmanagement.statemachine.models; +package io.appform.conductor.core.ticketmanagement.statemachine.models; import com.fasterxml.jackson.databind.JsonNode; import lombok.Value; diff --git a/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/SchemaFetchStrategy.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/SchemaFetchStrategy.java new file mode 100644 index 0000000..b05ce6e --- /dev/null +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/SchemaFetchStrategy.java @@ -0,0 +1,6 @@ +package io.appform.conductor.core.ticketmanagement.statemachine.models.strategy; + +public enum SchemaFetchStrategy { + FROM_WORKFLOW, + ; +} diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/SubjectFetchStrategy.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/SubjectFetchStrategy.java similarity index 55% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/SubjectFetchStrategy.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/SubjectFetchStrategy.java index 42d259d..0541210 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/SubjectFetchStrategy.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/SubjectFetchStrategy.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.ticketmanagement.statemachine.models.strategy; +package io.appform.conductor.core.ticketmanagement.statemachine.models.strategy; public enum SubjectFetchStrategy { FROM_PROVIDED_DATA, diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicektIdempotencyStrategy.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicektIdempotencyStrategy.java similarity index 50% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicektIdempotencyStrategy.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicektIdempotencyStrategy.java index 932cbab..75bb24b 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicektIdempotencyStrategy.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicektIdempotencyStrategy.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.ticketmanagement.statemachine.models.strategy; +package io.appform.conductor.core.ticketmanagement.statemachine.models.strategy; public enum TicektIdempotencyStrategy { IGNORE, diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicketFetchStrategy.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicketFetchStrategy.java similarity index 51% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicketFetchStrategy.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicketFetchStrategy.java index a5761e1..e91b075 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicketFetchStrategy.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicketFetchStrategy.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.ticketmanagement.statemachine.models.strategy; +package io.appform.conductor.core.ticketmanagement.statemachine.models.strategy; public enum TicketFetchStrategy { FROM_PROVIDED_ID, diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicketMetaDataFetchStrategy.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicketMetaDataFetchStrategy.java similarity index 57% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicketMetaDataFetchStrategy.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicketMetaDataFetchStrategy.java index 2a72705..8b0d175 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicketMetaDataFetchStrategy.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicketMetaDataFetchStrategy.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.ticketmanagement.statemachine.models.strategy; +package io.appform.conductor.core.ticketmanagement.statemachine.models.strategy; public enum TicketMetaDataFetchStrategy { FROM_TEMPLATE, diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicketStateMachineContextBuilderStrategy.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicketStateMachineContextBuilderStrategy.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicketStateMachineContextBuilderStrategy.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicketStateMachineContextBuilderStrategy.java index 16f6ab5..07d52cd 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicketStateMachineContextBuilderStrategy.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicketStateMachineContextBuilderStrategy.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.ticketmanagement.statemachine.models.strategy; +package io.appform.conductor.core.ticketmanagement.statemachine.models.strategy; import lombok.Getter; diff --git a/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicketTerminalStateStrategy.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicketTerminalStateStrategy.java new file mode 100644 index 0000000..8214ca4 --- /dev/null +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TicketTerminalStateStrategy.java @@ -0,0 +1,7 @@ +package io.appform.conductor.core.ticketmanagement.statemachine.models.strategy; + +public enum TicketTerminalStateStrategy { + ABORT, + CREATE_NEW, + ; +} diff --git a/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TriggerStrategy.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TriggerStrategy.java new file mode 100644 index 0000000..af53466 --- /dev/null +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/TriggerStrategy.java @@ -0,0 +1,7 @@ +package io.appform.conductor.core.ticketmanagement.statemachine.models.strategy; + +public enum TriggerStrategy { + EXECUTE_FIRST, + EXECUTE_ALL, + ; +} diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/WorkflowFetchStrategy.java b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/WorkflowFetchStrategy.java similarity index 54% rename from conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/WorkflowFetchStrategy.java rename to conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/WorkflowFetchStrategy.java index 8d2804c..f0adc8b 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/WorkflowFetchStrategy.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/ticketmanagement/statemachine/models/strategy/WorkflowFetchStrategy.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.ticketmanagement.statemachine.models.strategy; +package io.appform.conductor.core.ticketmanagement.statemachine.models.strategy; public enum WorkflowFetchStrategy { FROM_PROVIDED_ID, diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/ConductorServerUtils.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/ConductorServerUtils.java similarity index 98% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/ConductorServerUtils.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/ConductorServerUtils.java index edbd27e..fd64617 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/ConductorServerUtils.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/ConductorServerUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.utils; +package io.appform.conductor.core.utils; import com.cronutils.model.definition.CronDefinitionBuilder; import com.cronutils.model.time.ExecutionTime; @@ -47,12 +47,12 @@ import io.appform.conductor.model.ticket.fields.TicketField; import io.appform.conductor.model.ticket.fields.impl.*; import io.appform.conductor.model.usermgmt.User; -import io.appform.conductor.server.actionmanagement.ActionExecutor; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.id.IdGenerator; -import io.appform.conductor.server.parser.CQLEngine; -import io.appform.conductor.server.ticketmanagement.statemachine.models.TicketStateMachineContext; -import io.appform.conductor.server.usermanagement.CurrentUserSessionStore; +import io.appform.conductor.core.actionmanagement.ActionExecutor; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.core.id.IdGenerator; +import io.appform.conductor.core.parser.CQLEngine; +import io.appform.conductor.core.ticketmanagement.statemachine.models.TicketStateMachineContext; +import io.appform.conductor.core.auth.CurrentUserSessionStore; import lombok.NonNull; import lombok.SneakyThrows; import lombok.experimental.UtilityClass; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/Constants.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/Constants.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/Constants.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/Constants.java index a89fade..78242a4 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/Constants.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/Constants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.utils; +package io.appform.conductor.core.utils; import lombok.experimental.UtilityClass; @@ -24,6 +24,10 @@ @UtilityClass public class Constants { + public static final String ROOT_IMPLEMENTATION_NAME = "root"; + public static final String CACHED_IMPLEMENTATION_NAME = "cached"; + public static final String BACKGROUND_JOBS_POOL_NAME = "backgroundJobsPool"; + public static final String CREATED_DATE_DEFINITION = "datetime(3) DEFAULT current_timestamp(3)"; public static final String UPDATED_DATE_DEFINITION = "datetime(3) DEFAULT current_timestamp(3) ON UPDATE current_timestamp(3)"; public static final int MAX_DESCRIPTION_LENGTH = 512; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ui/CustomHelpers.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/CustomHelpers.java similarity index 99% rename from conductor-server/src/main/java/io/appform/conductor/server/ui/CustomHelpers.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/CustomHelpers.java index e2e7cfb..02a1ce7 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ui/CustomHelpers.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/CustomHelpers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.ui; +package io.appform.conductor.core.utils; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -33,8 +33,7 @@ import io.appform.conductor.model.schema.FieldType; import io.appform.conductor.model.schema.fields.ChoiceFieldSchema; import io.appform.conductor.model.utils.Displayable; -import io.appform.conductor.server.utils.StringUtils; -import io.appform.conductor.server.utils.dev.IgnoreGenerated; +import io.appform.conductor.core.utils.dev.IgnoreGenerated; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/HandlebarsUtils.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/HandlebarsUtils.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/HandlebarsUtils.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/HandlebarsUtils.java index 27ec7ee..be08e18 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/HandlebarsUtils.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/HandlebarsUtils.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.utils; +package io.appform.conductor.core.utils; import com.github.jknack.handlebars.Handlebars; import com.github.jknack.handlebars.Template; @@ -7,7 +7,7 @@ import com.github.jknack.handlebars.io.TemplateSource; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import io.appform.conductor.server.ui.CustomHelpers; +import io.appform.conductor.core.ui.CustomHelpers; import lombok.experimental.UtilityClass; @UtilityClass diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/Pair.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/Pair.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/Pair.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/Pair.java index d6b2387..e0e6800 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/Pair.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/Pair.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.utils; +package io.appform.conductor.core.utils; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/StringUtils.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/StringUtils.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/StringUtils.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/StringUtils.java index 36ce4d5..2101814 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/StringUtils.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/StringUtils.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.utils; +package io.appform.conductor.core.utils; import com.github.jknack.handlebars.internal.text.WordUtils; import com.google.common.base.Strings; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/TriConsumer.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/TriConsumer.java similarity index 89% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/TriConsumer.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/TriConsumer.java index 3fbc3b7..b9bfa83 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/TriConsumer.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/TriConsumer.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.utils; +package io.appform.conductor.core.utils; import java.util.Objects; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/dev/IgnoreGenerated.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/dev/IgnoreGenerated.java similarity index 88% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/dev/IgnoreGenerated.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/dev/IgnoreGenerated.java index d56fe79..3f63384 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/dev/IgnoreGenerated.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/dev/IgnoreGenerated.java @@ -1,4 +1,4 @@ -package io.appform.conductor.server.utils.dev; +package io.appform.conductor.core.utils.dev; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/JsonConverter.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/JsonConverter.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/JsonConverter.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/JsonConverter.java index 9a8b5a7..5223823 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/JsonConverter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/JsonConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.utils.persistence; +package io.appform.conductor.core.utils.persistence; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/MediaTypeConverter.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/MediaTypeConverter.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/MediaTypeConverter.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/MediaTypeConverter.java index 73d52a3..806d64e 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/MediaTypeConverter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/MediaTypeConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.utils.persistence; +package io.appform.conductor.core.utils.persistence; import com.google.common.base.Strings; import com.google.common.net.MediaType; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/PermissionsConverter.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/PermissionsConverter.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/PermissionsConverter.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/PermissionsConverter.java index b757b95..7eaa283 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/PermissionsConverter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/PermissionsConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.utils.persistence; +package io.appform.conductor.core.utils.persistence; import com.google.common.base.Strings; import io.appform.conductor.model.auth.Permission; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/RuleConverter.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/RuleConverter.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/RuleConverter.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/RuleConverter.java index 1f2b235..920b2ee 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/RuleConverter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/RuleConverter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.utils.persistence; +package io.appform.conductor.core.utils.persistence; import com.google.common.base.Strings; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.workflow.Rule; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.ConductorServerUtils; import lombok.val; import javax.persistence.AttributeConverter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/StringListConverter.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/StringListConverter.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/StringListConverter.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/StringListConverter.java index edd59d2..041c60a 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/StringListConverter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/StringListConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.utils.persistence; +package io.appform.conductor.core.utils.persistence; import com.google.common.base.Strings; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/StringSetConverter.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/StringSetConverter.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/StringSetConverter.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/StringSetConverter.java index bea4d98..35c4a31 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/StringSetConverter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/StringSetConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.utils.persistence; +package io.appform.conductor.core.utils.persistence; import com.google.common.base.Strings; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/TaskSpecConverter.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/TaskSpecConverter.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/TaskSpecConverter.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/TaskSpecConverter.java index 6e0fee8..ffdaeeb 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/TaskSpecConverter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/TaskSpecConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.utils.persistence; +package io.appform.conductor.core.utils.persistence; import com.fasterxml.jackson.databind.ObjectMapper; import io.appform.conductor.model.tasks.TaskSpec; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/TemplateConverter.java b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/TemplateConverter.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/TemplateConverter.java rename to conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/TemplateConverter.java index e1368a1..b84d4fc 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/utils/persistence/TemplateConverter.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/utils/persistence/TemplateConverter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.utils.persistence; +package io.appform.conductor.core.utils.persistence; import com.google.common.base.Strings; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.workflow.Template; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.ConductorServerUtils; import lombok.val; import javax.persistence.AttributeConverter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/WorkflowManager.java b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/WorkflowManager.java similarity index 98% rename from conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/WorkflowManager.java rename to conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/WorkflowManager.java index 8a253b8..74c3525 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/WorkflowManager.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/WorkflowManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.workflowmanagement; +package io.appform.conductor.core.workflowmanagement; import com.google.common.collect.Sets; import io.appform.conductor.model.actions.Action; @@ -25,13 +25,13 @@ import io.appform.conductor.model.schema.SchemaState; import io.appform.conductor.model.tasks.*; import io.appform.conductor.model.workflow.*; -import io.appform.conductor.server.actionmanagement.ActionStore; -import io.appform.conductor.server.schemamanagement.impl.SchemaStore; -import io.appform.conductor.server.taskmanagement.ConductorTaskScheduler; -import io.appform.conductor.server.taskmanagement.TaskStore; -import io.appform.conductor.server.ticketmanagement.TicketStore; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.Pair; +import io.appform.conductor.core.actionmanagement.ActionStore; +import io.appform.conductor.core.schemamanagement.impl.SchemaStore; +import io.appform.conductor.core.taskmanagement.ConductorTaskScheduler; +import io.appform.conductor.core.taskmanagement.TaskStore; +import io.appform.conductor.core.ticketmanagement.TicketStore; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.Pair; import lombok.RequiredArgsConstructor; import lombok.val; @@ -43,7 +43,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static io.appform.conductor.server.utils.ConductorServerUtils.*; +import static io.appform.conductor.core.utils.ConductorServerUtils.*; /** * Manages lifecycle of workflows diff --git a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/WorkflowSelector.java b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/WorkflowSelector.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/WorkflowSelector.java rename to conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/WorkflowSelector.java index 70db1d7..77a6407 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/WorkflowSelector.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/WorkflowSelector.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.appform.conductor.server.workflowmanagement; +package io.appform.conductor.core.workflowmanagement; import com.fasterxml.jackson.databind.JsonNode; import io.appform.conductor.model.workflow.Rule; import io.appform.conductor.model.workflow.Workflow; import io.appform.conductor.model.workflow.WorkflowState; -import io.appform.conductor.server.ruleengines.RuleEngine; -import io.appform.conductor.server.utils.Pair; +import io.appform.conductor.core.ruleengines.RuleEngine; +import io.appform.conductor.core.utils.Pair; import io.appform.signals.signals.ScheduledSignal; import io.dropwizard.lifecycle.Managed; import lombok.RequiredArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/WorkflowStore.java b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/WorkflowStore.java similarity index 98% rename from conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/WorkflowStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/WorkflowStore.java index 7bb3fd4..74c6b85 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/WorkflowStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/WorkflowStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.workflowmanagement; +package io.appform.conductor.core.workflowmanagement; import io.appform.conductor.model.workflow.*; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/CachingWorkflowStore.java b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/CachingWorkflowStore.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/CachingWorkflowStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/CachingWorkflowStore.java index 1c189d9..f80ee7f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/CachingWorkflowStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/CachingWorkflowStore.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.workflowmanagement.impl; +package io.appform.conductor.core.workflowmanagement.impl; import io.appform.conductor.model.workflow.*; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.workflowmanagement.WorkflowStore; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.core.workflowmanagement.WorkflowStore; import io.appform.functionmetrics.MonitoredFunction; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -50,7 +50,7 @@ public class CachingWorkflowStore implements WorkflowStore { @Inject public CachingWorkflowStore( - @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) final WorkflowStore root, + @Named(Constants.ROOT_IMPLEMENTATION_NAME) final WorkflowStore root, final HazelcastClient hazelcastClient) { this.root = root; val cacheName = getClass().getSimpleName(); diff --git a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/DBWorkflowStore.java b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/DBWorkflowStore.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/DBWorkflowStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/DBWorkflowStore.java index d1dfb16..fc77d07 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/DBWorkflowStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/DBWorkflowStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.workflowmanagement.impl; +package io.appform.conductor.core.workflowmanagement.impl; import com.google.common.base.Strings; import io.appform.conductor.model.error.ConductorErrorCode; @@ -22,11 +22,11 @@ import io.appform.conductor.model.error.Throws; import io.appform.conductor.model.schema.TicketState; import io.appform.conductor.model.workflow.*; -import io.appform.conductor.server.workflowmanagement.WorkflowStore; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredTicketState; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredTicketStateTransition; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredWorkflow; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredWorkflowSelectionRule; +import io.appform.conductor.core.workflowmanagement.WorkflowStore; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredTicketState; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredTicketStateTransition; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredWorkflow; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredWorkflowSelectionRule; import io.appform.dropwizard.sharding.dao.LookupDao; import io.appform.dropwizard.sharding.dao.RelationalDao; import io.appform.functionmetrics.MonitoredFunction; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/EventGeneratingWorkflowStore.java b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/EventGeneratingWorkflowStore.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/EventGeneratingWorkflowStore.java rename to conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/EventGeneratingWorkflowStore.java index 7e3a654..4486c29 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/EventGeneratingWorkflowStore.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/EventGeneratingWorkflowStore.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.workflowmanagement.impl; +package io.appform.conductor.core.workflowmanagement.impl; import io.appform.conductor.model.workflow.*; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.eventmanagement.EventBus; import io.appform.conductor.model.events.impl.workflow.*; -import io.appform.conductor.server.workflowmanagement.WorkflowStore; +import io.appform.conductor.core.workflowmanagement.WorkflowStore; import lombok.val; import javax.inject.Inject; @@ -37,7 +37,7 @@ public class EventGeneratingWorkflowStore implements WorkflowStore { private final WorkflowStore workflowStore; @Inject - public EventGeneratingWorkflowStore(EventBus eventBus, @Named(ConductorModule.CACHED_IMPLEMENTATION_NAME) WorkflowStore workflowStore) { + public EventGeneratingWorkflowStore(EventBus eventBus, @Named(Constants.CACHED_IMPLEMENTATION_NAME) WorkflowStore workflowStore) { this.eventBus = eventBus; this.workflowStore = workflowStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/models/StoredTicketState.java b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/models/StoredTicketState.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/models/StoredTicketState.java rename to conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/models/StoredTicketState.java index a061b8f..72bbd2d 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/models/StoredTicketState.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/models/StoredTicketState.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.workflowmanagement.impl.models; +package io.appform.conductor.core.workflowmanagement.impl.models; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.utils.persistence.StringListConverter; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.persistence.StringListConverter; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/models/StoredTicketStateTransition.java b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/models/StoredTicketStateTransition.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/models/StoredTicketStateTransition.java rename to conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/models/StoredTicketStateTransition.java index ea77240..ac0f16d 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/models/StoredTicketStateTransition.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/models/StoredTicketStateTransition.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.workflowmanagement.impl.models; +package io.appform.conductor.core.workflowmanagement.impl.models; import io.appform.conductor.model.workflow.Rule; import io.appform.conductor.model.workflow.TicketStateTransition; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.utils.persistence.RuleConverter; -import io.appform.conductor.server.utils.persistence.StringListConverter; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.persistence.RuleConverter; +import io.appform.conductor.core.utils.persistence.StringListConverter; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/models/StoredWorkflow.java b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/models/StoredWorkflow.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/models/StoredWorkflow.java rename to conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/models/StoredWorkflow.java index 7355dab..03ec981 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/models/StoredWorkflow.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/models/StoredWorkflow.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.appform.conductor.server.workflowmanagement.impl.models; +package io.appform.conductor.core.workflowmanagement.impl.models; import io.appform.conductor.model.schema.TicketState; import io.appform.conductor.model.workflow.Rule; import io.appform.conductor.model.workflow.Template; import io.appform.conductor.model.workflow.TicketStateTransition; import io.appform.conductor.model.workflow.WorkflowState; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.utils.persistence.StringListConverter; -import io.appform.conductor.server.utils.persistence.TemplateConverter; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.persistence.StringListConverter; +import io.appform.conductor.core.utils.persistence.TemplateConverter; import io.appform.dropwizard.sharding.sharding.LookupKey; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/models/StoredWorkflowSelectionRule.java b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/models/StoredWorkflowSelectionRule.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/models/StoredWorkflowSelectionRule.java rename to conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/models/StoredWorkflowSelectionRule.java index fcd8639..bb03ad1 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/workflowmanagement/impl/models/StoredWorkflowSelectionRule.java +++ b/conductor-core/src/main/java/io/appform/conductor/core/workflowmanagement/impl/models/StoredWorkflowSelectionRule.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.workflowmanagement.impl.models; +package io.appform.conductor.core.workflowmanagement.impl.models; import io.appform.conductor.model.workflow.Rule; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/App.java b/conductor-server/src/main/java/io/appform/conductor/server/App.java index 9884e5a..31ec062 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/App.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/App.java @@ -19,10 +19,10 @@ import com.google.inject.Stage; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.ConductorException; -import io.appform.conductor.server.config.AppConfig; -import io.appform.conductor.server.id.IdGenerator; -import io.appform.conductor.server.ui.HandlebarsViewRenderer; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.config.AppConfig; +import io.appform.conductor.core.id.IdGenerator; +import io.appform.conductor.console.ui.HandlebarsViewRenderer; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import io.appform.dropwizard.sharding.config.ShardedHibernateFactory; import io.appform.functionmetrics.FunctionMetricsManager; @@ -53,7 +53,7 @@ public void initialize(Bootstrap bootstrap) { bootstrap.setConfigurationSourceProvider( new SubstitutingSourceProvider(bootstrap.getConfigurationSourceProvider(), new EnvironmentVariableSubstitutor(true))); - val dbShardingBundle = new BalancedDBShardingBundle("io.appform.conductor.server") { + val dbShardingBundle = new BalancedDBShardingBundle("io.appform.conductor") { @Override protected ShardedHibernateFactory getConfig(AppConfig appConfig) { return appConfig.getDb(); @@ -63,7 +63,7 @@ protected ShardedHibernateFactory getConfig(AppConfig appConfig) { bootstrap.addBundle(new MultiPartBundle()); bootstrap.addBundle( GuiceBundle.builder() - .enableAutoConfig("io.appform.conductor.server") + .enableAutoConfig("io.appform.conductor") .modules(new ConductorModule(dbShardingBundle)) .installers(HealthCheckInstaller.class) .bundles(ServerPagesBundle.builder() diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ConductorModule.java b/conductor-server/src/main/java/io/appform/conductor/server/ConductorModule.java index 18b6e5a..7756b71 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/ConductorModule.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/ConductorModule.java @@ -21,98 +21,101 @@ import com.google.inject.Injector; import com.google.inject.Provides; import com.google.inject.name.Names; -import io.appform.conductor.server.actionmanagement.ActionStore; -import io.appform.conductor.server.actionmanagement.EventGeneratingActionStore; -import io.appform.conductor.server.actionmanagement.impl.DBActionStore; -import io.appform.conductor.server.actionmanagement.impl.models.StoredAction; -import io.appform.conductor.server.attributes.definition.AttributeDefinitionStore; -import io.appform.conductor.server.attributes.definition.impl.CachingAttributeDefinitionStore; -import io.appform.conductor.server.attributes.definition.impl.DBAttributeDefinitionStore; -import io.appform.conductor.server.attributes.definition.impl.EventGeneratingAttributeDefinitionStore; -import io.appform.conductor.server.attributes.definition.impl.models.StoredAttributeDefinition; -import io.appform.conductor.server.attributes.values.AttributeValueStore; -import io.appform.conductor.server.attributes.values.impl.DBAttributeValueStore; -import io.appform.conductor.server.attributes.values.impl.models.StoredAttributeValue; -import io.appform.conductor.server.auth.EventGeneratingRoleStore; -import io.appform.conductor.server.auth.EventGeneratingUserRoleMappingStore; -import io.appform.conductor.server.auth.RoleStore; -import io.appform.conductor.server.auth.UserRoleMappingStore; -import io.appform.conductor.server.auth.impl.CachingRoleStore; -import io.appform.conductor.server.auth.impl.CachingUserRoleMappingStore; -import io.appform.conductor.server.auth.impl.DBRoleStore; -import io.appform.conductor.server.auth.impl.DBUserRoleMappingStore; -import io.appform.conductor.server.auth.impl.models.StoredRole; -import io.appform.conductor.server.auth.impl.models.StoredUserRoleMapping; -import io.appform.conductor.server.config.AppConfig; -import io.appform.conductor.server.config.AuthConfig; -import io.appform.conductor.server.config.MailConfig; -import io.appform.conductor.server.config.hz.ClusterConfig; -import io.appform.conductor.server.config.hz.SimpleClusterDiscoveryConfig; -import io.appform.conductor.server.dashboards.DashboardStore; -import io.appform.conductor.server.dashboards.impl.DBDashboardStore; -import io.appform.conductor.server.dashboards.impl.model.StoredDashboard; -import io.appform.conductor.server.eventmanagement.EventBus; -import io.appform.conductor.server.eventmanagement.EventHandler; -import io.appform.conductor.server.eventmanagement.EventHandlerImplementation; -import io.appform.conductor.server.eventmanagement.EventStore; -import io.appform.conductor.server.eventmanagement.bus.SignalDrivenEventBus; -import io.appform.conductor.server.eventmanagement.store.DBEventStore; -import io.appform.conductor.server.eventmanagement.store.models.StoredEvent; -import io.appform.conductor.server.ingressmanagement.EventGeneratingIngressTranslatorStore; -import io.appform.conductor.server.ingressmanagement.IngressTranslatorStore; -import io.appform.conductor.server.ingressmanagement.impl.CachingIngressTranslatorStore; -import io.appform.conductor.server.ingressmanagement.impl.DBIngressTranslatorStore; -import io.appform.conductor.server.ingressmanagement.impl.models.StoredIngressTranslator; -import io.appform.conductor.server.reporting.EventGeneratingReportStore; -import io.appform.conductor.server.reporting.ReportStore; -import io.appform.conductor.server.reporting.impl.DBReportStore; -import io.appform.conductor.server.reporting.impl.models.StoredReport; -import io.appform.conductor.server.reporting.impl.models.StoredReportContext; -import io.appform.conductor.server.reporting.impl.models.StoredReportRun; -import io.appform.conductor.server.schemamanagement.impl.CachingSchemaStore; -import io.appform.conductor.server.schemamanagement.impl.DBSchemaStore; -import io.appform.conductor.server.schemamanagement.impl.EventGeneratingSchemaStore; -import io.appform.conductor.server.schemamanagement.impl.SchemaStore; -import io.appform.conductor.server.schemamanagement.impl.models.StoredFieldSchema; -import io.appform.conductor.server.schemamanagement.impl.models.StoredSchemaSummary; -import io.appform.conductor.server.skillmanagement.EventGeneratingSkillStore; -import io.appform.conductor.server.skillmanagement.SkillStore; -import io.appform.conductor.server.skillmanagement.impl.CachingSkillStore; -import io.appform.conductor.server.skillmanagement.impl.DBSkillStore; -import io.appform.conductor.server.skillmanagement.impl.models.StoredSkillDefinition; -import io.appform.conductor.server.skillmanagement.impl.models.StoredSkillValue; -import io.appform.conductor.server.skillmanagement.impl.models.StoredUserSkillAssociation; -import io.appform.conductor.server.subjectmanagement.EventGeneratingSubjectStore; -import io.appform.conductor.server.subjectmanagement.SubjectStore; -import io.appform.conductor.server.subjectmanagement.impl.DBSubjectStore; -import io.appform.conductor.server.subjectmanagement.impl.models.StoredAddress; -import io.appform.conductor.server.subjectmanagement.impl.models.StoredSubjectID; -import io.appform.conductor.server.subjectmanagement.impl.models.StoredSubjectSummary; -import io.appform.conductor.server.taskmanagement.EventGeneratingTaskStore; -import io.appform.conductor.server.taskmanagement.TaskStore; -import io.appform.conductor.server.taskmanagement.impl.DBTaskStore; -import io.appform.conductor.server.taskmanagement.impl.models.StoredTask; -import io.appform.conductor.server.ticketmanagement.EventGeneratingTicketStore; -import io.appform.conductor.server.ticketmanagement.TicketStore; -import io.appform.conductor.server.ticketmanagement.impl.DBTicketStore; -import io.appform.conductor.server.ticketmanagement.impl.models.StoredRelatedTicket; -import io.appform.conductor.server.ticketmanagement.impl.models.StoredTicketSkeleton; -import io.appform.conductor.server.ticketmanagement.impl.models.comments.StoredAttachment; -import io.appform.conductor.server.ticketmanagement.impl.models.comments.StoredComment; -import io.appform.conductor.server.ticketmanagement.impl.models.fields.StoredFieldValue; -import io.appform.conductor.server.usermanagement.*; -import io.appform.conductor.server.usermanagement.impl.*; -import io.appform.conductor.server.usermanagement.impl.models.*; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.dev.IgnoreGenerated; -import io.appform.conductor.server.workflowmanagement.impl.CachingWorkflowStore; -import io.appform.conductor.server.workflowmanagement.impl.EventGeneratingWorkflowStore; -import io.appform.conductor.server.workflowmanagement.WorkflowStore; -import io.appform.conductor.server.workflowmanagement.impl.DBWorkflowStore; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredTicketState; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredTicketStateTransition; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredWorkflow; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredWorkflowSelectionRule; +import io.appform.conductor.core.actionmanagement.ActionStore; +import io.appform.conductor.core.actionmanagement.EventGeneratingActionStore; +import io.appform.conductor.core.actionmanagement.impl.DBActionStore; +import io.appform.conductor.core.actionmanagement.impl.models.StoredAction; +import io.appform.conductor.core.attributes.definition.AttributeDefinitionStore; +import io.appform.conductor.core.attributes.definition.impl.CachingAttributeDefinitionStore; +import io.appform.conductor.core.attributes.definition.impl.DBAttributeDefinitionStore; +import io.appform.conductor.core.attributes.definition.impl.EventGeneratingAttributeDefinitionStore; +import io.appform.conductor.core.attributes.definition.impl.models.StoredAttributeDefinition; +import io.appform.conductor.core.attributes.values.AttributeValueStore; +import io.appform.conductor.core.attributes.values.impl.DBAttributeValueStore; +import io.appform.conductor.core.attributes.values.impl.models.StoredAttributeValue; +import io.appform.conductor.core.interfaces.GroupStore; +import io.appform.conductor.core.interfaces.UserLifecycleManager; +import io.appform.conductor.core.interfaces.UserStore; +import io.appform.conductor.user.auth.EventGeneratingRoleStore; +import io.appform.conductor.user.auth.EventGeneratingUserRoleMappingStore; +import io.appform.conductor.core.auth.RoleStore; +import io.appform.conductor.core.auth.UserRoleMappingStore; +import io.appform.conductor.user.auth.impl.CachingRoleStore; +import io.appform.conductor.user.auth.impl.CachingUserRoleMappingStore; +import io.appform.conductor.user.auth.impl.DBRoleStore; +import io.appform.conductor.user.auth.impl.DBUserRoleMappingStore; +import io.appform.conductor.user.auth.impl.models.StoredRole; +import io.appform.conductor.user.auth.impl.models.StoredUserRoleMapping; +import io.appform.conductor.core.config.AppConfig; +import io.appform.conductor.core.config.AuthConfig; +import io.appform.conductor.core.config.MailConfig; +import io.appform.conductor.core.config.hz.ClusterConfig; +import io.appform.conductor.core.config.hz.SimpleClusterDiscoveryConfig; +import io.appform.conductor.console.dashboards.DashboardStore; +import io.appform.conductor.console.dashboards.impl.DBDashboardStore; +import io.appform.conductor.console.dashboards.impl.model.StoredDashboard; +import io.appform.conductor.core.eventmanagement.EventBus; +import io.appform.conductor.core.eventmanagement.EventHandler; +import io.appform.conductor.core.eventmanagement.EventHandlerImplementation; +import io.appform.conductor.core.eventmanagement.EventStore; +import io.appform.conductor.core.eventmanagement.bus.SignalDrivenEventBus; +import io.appform.conductor.core.eventmanagement.store.DBEventStore; +import io.appform.conductor.core.eventmanagement.store.models.StoredEvent; +import io.appform.conductor.core.ingressmanagement.EventGeneratingIngressTranslatorStore; +import io.appform.conductor.core.ingressmanagement.IngressTranslatorStore; +import io.appform.conductor.core.ingressmanagement.impl.CachingIngressTranslatorStore; +import io.appform.conductor.core.ingressmanagement.impl.DBIngressTranslatorStore; +import io.appform.conductor.core.ingressmanagement.impl.models.StoredIngressTranslator; +import io.appform.conductor.console.reporting.EventGeneratingReportStore; +import io.appform.conductor.console.reporting.ReportStore; +import io.appform.conductor.console.reporting.impl.DBReportStore; +import io.appform.conductor.console.reporting.impl.models.StoredReport; +import io.appform.conductor.console.reporting.impl.models.StoredReportContext; +import io.appform.conductor.console.reporting.impl.models.StoredReportRun; +import io.appform.conductor.core.schemamanagement.impl.CachingSchemaStore; +import io.appform.conductor.core.schemamanagement.impl.DBSchemaStore; +import io.appform.conductor.core.schemamanagement.impl.EventGeneratingSchemaStore; +import io.appform.conductor.core.schemamanagement.impl.SchemaStore; +import io.appform.conductor.core.schemamanagement.impl.models.StoredFieldSchema; +import io.appform.conductor.core.schemamanagement.impl.models.StoredSchemaSummary; +import io.appform.conductor.user.skillmanagement.EventGeneratingSkillStore; +import io.appform.conductor.user.skillmanagement.SkillStore; +import io.appform.conductor.user.skillmanagement.impl.CachingSkillStore; +import io.appform.conductor.user.skillmanagement.impl.DBSkillStore; +import io.appform.conductor.user.skillmanagement.impl.models.StoredSkillDefinition; +import io.appform.conductor.user.skillmanagement.impl.models.StoredSkillValue; +import io.appform.conductor.user.skillmanagement.impl.models.StoredUserSkillAssociation; +import io.appform.conductor.core.subjectmanagement.EventGeneratingSubjectStore; +import io.appform.conductor.core.subjectmanagement.SubjectStore; +import io.appform.conductor.core.subjectmanagement.impl.DBSubjectStore; +import io.appform.conductor.core.subjectmanagement.impl.models.StoredAddress; +import io.appform.conductor.core.subjectmanagement.impl.models.StoredSubjectID; +import io.appform.conductor.core.subjectmanagement.impl.models.StoredSubjectSummary; +import io.appform.conductor.core.taskmanagement.EventGeneratingTaskStore; +import io.appform.conductor.core.taskmanagement.TaskStore; +import io.appform.conductor.core.taskmanagement.impl.DBTaskStore; +import io.appform.conductor.core.taskmanagement.impl.models.StoredTask; +import io.appform.conductor.core.ticketmanagement.EventGeneratingTicketStore; +import io.appform.conductor.core.ticketmanagement.TicketStore; +import io.appform.conductor.core.ticketmanagement.impl.DBTicketStore; +import io.appform.conductor.core.ticketmanagement.impl.models.StoredRelatedTicket; +import io.appform.conductor.core.ticketmanagement.impl.models.StoredTicketSkeleton; +import io.appform.conductor.core.ticketmanagement.impl.models.comments.StoredAttachment; +import io.appform.conductor.core.ticketmanagement.impl.models.comments.StoredComment; +import io.appform.conductor.core.ticketmanagement.impl.models.fields.StoredFieldValue; +import io.appform.conductor.user.usermanagement.*; +import io.appform.conductor.user.usermanagement.impl.*; +import io.appform.conductor.user.usermanagement.impl.models.*; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.dev.IgnoreGenerated; +import io.appform.conductor.core.workflowmanagement.impl.CachingWorkflowStore; +import io.appform.conductor.core.workflowmanagement.impl.EventGeneratingWorkflowStore; +import io.appform.conductor.core.workflowmanagement.WorkflowStore; +import io.appform.conductor.core.workflowmanagement.impl.DBWorkflowStore; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredTicketState; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredTicketStateTransition; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredWorkflow; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredWorkflowSelectionRule; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import io.appform.dropwizard.sharding.dao.LookupDao; import io.appform.dropwizard.sharding.dao.RelationalDao; @@ -179,6 +182,8 @@ protected void configure() { .to(CachingUserRoleMappingStore.class); bind(UserRoleMappingStore.class).to(EventGeneratingUserRoleMappingStore.class); + bind(UserLifecycleManager.class).to(UserLifecycleManagerImpl.class); + bind(SkillStore.class).annotatedWith(Names.named(ROOT_IMPLEMENTATION_NAME)).to(DBSkillStore.class); bind(SkillStore.class).annotatedWith(Names.named(CACHED_IMPLEMENTATION_NAME)).to(CachingSkillStore.class); bind(SkillStore.class).to(EventGeneratingSkillStore.class); diff --git a/conductor-server/src/main/java/io/appform/conductor/server/errorhandlers/CatchAllExceptionHandler.java b/conductor-server/src/main/java/io/appform/conductor/server/errorhandlers/CatchAllExceptionHandler.java index c237d78..ee03fee 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/errorhandlers/CatchAllExceptionHandler.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/errorhandlers/CatchAllExceptionHandler.java @@ -3,7 +3,7 @@ import io.appform.conductor.model.apis.ConductorApiResponse; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.ConductorException; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.ConductorServerUtils; import lombok.extern.slf4j.Slf4j; import lombok.val; import ru.vyarus.dropwizard.guice.module.installer.feature.jersey.JerseyManaged; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/errorhandlers/JerseryViolationHandler.java b/conductor-server/src/main/java/io/appform/conductor/server/errorhandlers/JerseryViolationHandler.java index b990de2..c50f8d2 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/errorhandlers/JerseryViolationHandler.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/errorhandlers/JerseryViolationHandler.java @@ -2,7 +2,7 @@ import io.appform.conductor.model.apis.ConductorApiResponse; import io.appform.conductor.model.error.ConductorErrorCode; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.dropwizard.jersey.validation.JerseyViolationException; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/IdComponentProvider.java b/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/IdComponentProvider.java deleted file mode 100644 index 1a500e6..0000000 --- a/conductor-server/src/main/java/io/appform/conductor/server/id/constraints/impl/IdComponentProvider.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.appform.conductor.server.id.constraints.impl; - - -import io.appform.conductor.server.id.Id; - -public interface IdComponentProvider { - - T provide(Id id); - -} \ No newline at end of file diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/apis/Analytics.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/apis/Analytics.java index 9e6cf57..27b6699 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/apis/Analytics.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/apis/Analytics.java @@ -32,12 +32,12 @@ import io.appform.conductor.model.ticket.analytics.*; import io.appform.conductor.model.ticket.filter.TicketFilter; import io.appform.conductor.model.ticket.filter.ticketfilters.*; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.dashboards.model.WidgetQueryResponse; -import io.appform.conductor.server.eventmanagement.EventStore; -import io.appform.conductor.server.parser.CQLEngine; -import io.appform.conductor.server.ticketmanagement.TicketManager; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.console.dashboards.model.WidgetQueryResponse; +import io.appform.conductor.core.eventmanagement.EventStore; +import io.appform.conductor.core.parser.CQLEngine; +import io.appform.conductor.core.ticketmanagement.TicketManager; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.dropwizard.auth.Auth; import lombok.NonNull; import lombok.RequiredArgsConstructor; @@ -58,7 +58,7 @@ import java.util.*; import java.util.concurrent.atomic.AtomicReference; -import static io.appform.conductor.server.utils.ConductorServerUtils.dateFormatsForTimeResolution; +import static io.appform.conductor.core.utils.ConductorServerUtils.dateFormatsForTimeResolution; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/apis/Ingress.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/apis/Ingress.java index 03ed32e..5f2bd02 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/apis/Ingress.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/apis/Ingress.java @@ -1,7 +1,7 @@ package io.appform.conductor.server.resources.apis; import com.fasterxml.jackson.databind.JsonNode; -import io.appform.conductor.server.ticketmanagement.TicketManager; +import io.appform.conductor.core.ticketmanagement.TicketManager; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/apis/Tickets.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/apis/Tickets.java index 2984df9..3389859 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/apis/Tickets.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/apis/Tickets.java @@ -19,8 +19,8 @@ import io.appform.conductor.model.apis.ConductorApiResponse; import io.appform.conductor.model.ticket.TicketPriority; import io.appform.conductor.model.ticket.analytics.TicketListResponse; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.ticketmanagement.TicketManager; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.core.ticketmanagement.TicketManager; import io.dropwizard.auth.Auth; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Actions.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Actions.java index afe30a8..732bdcc 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Actions.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Actions.java @@ -24,20 +24,20 @@ import io.appform.conductor.model.actions.impl.WebhookAction; import io.appform.conductor.model.actions.impl.SetFieldAction; import io.appform.conductor.model.ticket.TicketPriority; -import io.appform.conductor.server.actionmanagement.ActionStore; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.schemamanagement.impl.SchemaStore; -import io.appform.conductor.server.ui.views.actions.ActionListView; -import io.appform.conductor.server.ui.views.actions.fragments.AddTicketActionFragment; -import io.appform.conductor.server.ui.views.actions.fragments.ChangePriorityActionFragment; -import io.appform.conductor.server.ui.views.actions.fragments.RouteToGroupActionFragment; -import io.appform.conductor.server.ui.views.actions.fragments.WebHookActionFragment; -import io.appform.conductor.server.ui.views.actions.fragments.SetFieldActionFragment; -import io.appform.conductor.server.usermanagement.GroupStore; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.utils.Pair; -import io.appform.conductor.server.workflowmanagement.WorkflowStore; +import io.appform.conductor.core.actionmanagement.ActionStore; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.core.schemamanagement.impl.SchemaStore; +import io.appform.conductor.console.ui.views.actions.ActionListView; +import io.appform.conductor.console.ui.views.actions.fragments.AddTicketActionFragment; +import io.appform.conductor.console.ui.views.actions.fragments.ChangePriorityActionFragment; +import io.appform.conductor.console.ui.views.actions.fragments.RouteToGroupActionFragment; +import io.appform.conductor.console.ui.views.actions.fragments.WebHookActionFragment; +import io.appform.conductor.console.ui.views.actions.fragments.SetFieldActionFragment; +import io.appform.conductor.core.interfaces.GroupStore; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.Pair; +import io.appform.conductor.core.workflowmanagement.WorkflowStore; import io.dropwizard.auth.Auth; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -56,7 +56,7 @@ import java.util.*; import java.util.stream.Collectors; -import static io.appform.conductor.server.utils.ConductorServerUtils.*; +import static io.appform.conductor.core.utils.ConductorServerUtils.*; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Admin.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Admin.java index 6dd2772..c6fb01e 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Admin.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Admin.java @@ -16,23 +16,24 @@ package io.appform.conductor.server.resources.ui; +import io.appform.conductor.core.auth.RoleStore; +import io.appform.conductor.core.auth.UserRoleMappingStore; +import io.appform.conductor.core.interfaces.UserLifecycleManager; +import io.appform.conductor.core.interfaces.UserStore; import io.appform.conductor.model.attributes.AttributeScopeType; import io.appform.conductor.model.auth.Permission; import io.appform.conductor.model.usermgmt.GroupType; import io.appform.conductor.model.usermgmt.UserState; -import io.appform.conductor.server.attributes.values.AttributeManager; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.auth.RoleStore; -import io.appform.conductor.server.auth.UserRoleMappingStore; -import io.appform.conductor.server.config.AuthConfig; -import io.appform.conductor.server.skillmanagement.SkillStore; -import io.appform.conductor.server.ui.views.admin.RolesListView; -import io.appform.conductor.server.ui.views.admin.UserAdminView; -import io.appform.conductor.server.usermanagement.GroupStore; -import io.appform.conductor.server.usermanagement.SessionStore; -import io.appform.conductor.server.usermanagement.UserLifecycleManager; -import io.appform.conductor.server.usermanagement.UserStore; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.attributes.values.AttributeManager; +import io.appform.conductor.core.auth.ConductorUser; + +import io.appform.conductor.core.config.AuthConfig; +import io.appform.conductor.console.ui.views.admin.RolesListView; +import io.appform.conductor.console.ui.views.admin.UserAdminView; +import io.appform.conductor.core.interfaces.GroupStore; +import io.appform.conductor.user.skillmanagement.SkillStore; +import io.appform.conductor.user.usermanagement.SessionStore; +import io.appform.conductor.core.utils.Constants; import io.dropwizard.auth.Auth; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -53,7 +54,7 @@ import javax.ws.rs.core.Response; import java.util.*; -import static io.appform.conductor.server.utils.ConductorServerUtils.*; +import static io.appform.conductor.core.utils.ConductorServerUtils.*; /** * Administration ui diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Dashboards.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Dashboards.java index b385953..7406e65 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Dashboards.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Dashboards.java @@ -20,17 +20,17 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import io.appform.conductor.model.auth.Permission; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.dashboards.DashboardStore; -import io.appform.conductor.server.dashboards.model.DashboardRow; -import io.appform.conductor.server.dashboards.model.DashboardSpec; -import io.appform.conductor.server.dashboards.model.DashboardWidget; -import io.appform.conductor.server.dashboards.model.SpecVersion; -import io.appform.conductor.server.ui.views.manage.DashboardListView; -import io.appform.conductor.server.ui.views.manage.DashboardView; -import io.appform.conductor.server.ui.views.manage.NewDashboardView; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.console.dashboards.DashboardStore; +import io.appform.conductor.console.dashboards.model.DashboardRow; +import io.appform.conductor.console.dashboards.model.DashboardSpec; +import io.appform.conductor.console.dashboards.model.DashboardWidget; +import io.appform.conductor.console.dashboards.model.SpecVersion; +import io.appform.conductor.console.ui.views.manage.DashboardListView; +import io.appform.conductor.console.ui.views.manage.DashboardView; +import io.appform.conductor.console.ui.views.manage.NewDashboardView; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.Constants; import io.dropwizard.auth.Auth; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -49,7 +49,7 @@ import javax.ws.rs.core.Response; import java.util.*; -import static io.appform.conductor.server.utils.ConductorServerUtils.*; +import static io.appform.conductor.core.utils.ConductorServerUtils.*; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Events.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Events.java index 261714e..95cd91d 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Events.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Events.java @@ -26,11 +26,11 @@ import io.appform.conductor.model.events.analytics.impl.EventListRequest; import io.appform.conductor.model.events.analytics.impl.EventListResponse; import io.appform.conductor.model.events.impl.ReferredObjectType; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.eventmanagement.EventStore; -import io.appform.conductor.server.ui.views.common.EventsListFragment; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.Pair; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.core.eventmanagement.EventStore; +import io.appform.conductor.console.ui.views.common.EventsListFragment; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.Pair; import io.dropwizard.auth.Auth; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -53,8 +53,8 @@ import java.util.List; import java.util.Map; -import static io.appform.conductor.server.utils.ConductorServerUtils.fail; -import static io.appform.conductor.server.utils.ConductorServerUtils.render; +import static io.appform.conductor.core.utils.ConductorServerUtils.fail; +import static io.appform.conductor.core.utils.ConductorServerUtils.render; /** * {@link Event} related functionality diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Home.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Home.java index 1545fae..117c1dc 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Home.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Home.java @@ -23,12 +23,12 @@ import io.appform.conductor.model.ticket.filter.ticketfilters.TicketUnAssignedToUser; import io.appform.conductor.model.usermgmt.Group; import io.appform.conductor.model.workflow.WorkflowState; -import io.appform.conductor.server.auth.ConductorUser; +import io.appform.conductor.core.auth.ConductorUser; import io.appform.conductor.model.ticket.analytics.TicketGist; -import io.appform.conductor.server.ticketmanagement.TicketManager; -import io.appform.conductor.server.ui.views.HomeView; -import io.appform.conductor.server.usermanagement.GroupStore; -import io.appform.conductor.server.workflowmanagement.WorkflowStore; +import io.appform.conductor.core.ticketmanagement.TicketManager; +import io.appform.conductor.console.ui.views.HomeView; +import io.appform.conductor.core.interfaces.GroupStore; +import io.appform.conductor.core.workflowmanagement.WorkflowStore; import io.dropwizard.auth.Auth; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -47,7 +47,7 @@ import java.util.Set; import java.util.stream.Collectors; -import static io.appform.conductor.server.utils.ConductorServerUtils.render; +import static io.appform.conductor.core.utils.ConductorServerUtils.render; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Manage.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Manage.java index bbc3e6c..027e66a 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Manage.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Manage.java @@ -18,6 +18,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Strings; +import io.appform.conductor.core.interfaces.UserLifecycleManager; +import io.appform.conductor.core.workflowmanagement.WorkflowManager; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.auth.Permission; @@ -26,17 +28,15 @@ import io.appform.conductor.model.usermgmt.GroupType; import io.appform.conductor.model.usermgmt.Skill; import io.appform.conductor.model.workflow.*; -import io.appform.conductor.server.actionmanagement.ActionStore; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.config.AuthConfig; -import io.appform.conductor.server.ingressmanagement.IngressTranslatorStore; -import io.appform.conductor.server.schemamanagement.impl.SchemaStore; -import io.appform.conductor.server.ui.views.manage.*; -import io.appform.conductor.server.usermanagement.UserLifecycleManager; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.workflowmanagement.WorkflowManager; -import io.appform.conductor.server.workflowmanagement.WorkflowStore; +import io.appform.conductor.core.actionmanagement.ActionStore; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.core.config.AuthConfig; +import io.appform.conductor.core.ingressmanagement.IngressTranslatorStore; +import io.appform.conductor.core.schemamanagement.impl.SchemaStore; +import io.appform.conductor.console.ui.views.manage.*; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.workflowmanagement.WorkflowStore; import io.dropwizard.auth.Auth; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -60,7 +60,7 @@ import java.text.SimpleDateFormat; import java.util.*; -import static io.appform.conductor.server.utils.ConductorServerUtils.*; +import static io.appform.conductor.core.utils.ConductorServerUtils.*; /** * Administration ui diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Subjects.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Subjects.java index 48dee51..690dc25 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Subjects.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Subjects.java @@ -16,15 +16,15 @@ package io.appform.conductor.server.resources.ui; +import io.appform.conductor.core.attributes.values.AttributeManager; import io.appform.conductor.model.attributes.AttributeScopeType; import io.appform.conductor.model.subject.*; -import io.appform.conductor.server.attributes.values.AttributeManager; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.subjectmanagement.SubjectStore; -import io.appform.conductor.server.ticketmanagement.TicketManager; -import io.appform.conductor.server.ui.views.subjects.SubjectDetailsView; -import io.appform.conductor.server.ui.views.subjects.SubjectListView; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.core.subjectmanagement.SubjectStore; +import io.appform.conductor.core.ticketmanagement.TicketManager; +import io.appform.conductor.console.ui.views.subjects.SubjectDetailsView; +import io.appform.conductor.console.ui.views.subjects.SubjectListView; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.dropwizard.auth.Auth; import lombok.RequiredArgsConstructor; import lombok.val; @@ -41,7 +41,7 @@ import javax.ws.rs.core.Response; import java.util.List; -import static io.appform.conductor.server.utils.ConductorServerUtils.*; +import static io.appform.conductor.core.utils.ConductorServerUtils.*; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Tickets.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Tickets.java index 287ff52..199bef7 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Tickets.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/Tickets.java @@ -26,17 +26,17 @@ import io.appform.conductor.model.ticket.filter.TicketFilter; import io.appform.conductor.model.ticket.filter.ticketfilters.*; import io.appform.conductor.model.workflow.WorkflowState; -import io.appform.conductor.server.actionmanagement.ActionStore; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.parser.CQLEngine; -import io.appform.conductor.server.schemamanagement.impl.SchemaStore; -import io.appform.conductor.server.ticketmanagement.TicketManager; -import io.appform.conductor.server.ticketmanagement.TicketSkeletonListResult; -import io.appform.conductor.server.ui.views.tickets.*; -import io.appform.conductor.server.ui.views.tickets.fragments.CommentsFragment; -import io.appform.conductor.server.usermanagement.GroupStore; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.workflowmanagement.WorkflowStore; +import io.appform.conductor.core.actionmanagement.ActionStore; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.core.parser.CQLEngine; +import io.appform.conductor.core.schemamanagement.impl.SchemaStore; +import io.appform.conductor.core.ticketmanagement.TicketManager; +import io.appform.conductor.core.ticketmanagement.TicketSkeletonListResult; +import io.appform.conductor.console.ui.views.tickets.*; +import io.appform.conductor.console.ui.views.tickets.fragments.CommentsFragment; +import io.appform.conductor.core.interfaces.GroupStore; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.workflowmanagement.WorkflowStore; import io.dropwizard.auth.Auth; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -63,7 +63,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import static io.appform.conductor.server.utils.ConductorServerUtils.*; +import static io.appform.conductor.core.utils.ConductorServerUtils.*; /** * Ticket management UI diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/UIUserLifecycle.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/UIUserLifecycle.java index ba032d8..40d0d19 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/UIUserLifecycle.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/UIUserLifecycle.java @@ -16,14 +16,14 @@ package io.appform.conductor.server.resources.ui; +import io.appform.conductor.core.interfaces.UserLifecycleManager; import io.appform.conductor.model.usermgmt.UserSession; import io.appform.conductor.model.usermgmt.UserSummary; -import io.appform.conductor.server.auth.ConductorAuthFilter; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.ui.views.ActivationView; -import io.appform.conductor.server.ui.views.user.UserAccountView; -import io.appform.conductor.server.usermanagement.UserLifecycleManager; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.user.auth.ConductorAuthFilter; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.console.ui.views.ActivationView; +import io.appform.conductor.console.ui.views.user.UserAccountView; +import io.appform.conductor.core.utils.Constants; import io.dropwizard.auth.Auth; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -44,7 +44,7 @@ import javax.ws.rs.core.Response; import java.net.URI; -import static io.appform.conductor.server.utils.ConductorServerUtils.*; +import static io.appform.conductor.core.utils.ConductorServerUtils.*; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/manage/ManageAttributeDefinitions.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/manage/ManageAttributeDefinitions.java index c858e7d..64ae837 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/manage/ManageAttributeDefinitions.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/manage/ManageAttributeDefinitions.java @@ -20,11 +20,11 @@ import io.appform.conductor.model.attributes.AttributeType; import io.appform.conductor.model.attributes.definition.impl.*; import io.appform.conductor.model.auth.Permission; -import io.appform.conductor.server.attributes.definition.AttributeDefinitionStore; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.ui.views.manage.AttributeDefMgmtView; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.attributes.definition.AttributeDefinitionStore; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.console.ui.views.manage.AttributeDefMgmtView; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.Constants; import io.dropwizard.auth.Auth; import lombok.RequiredArgsConstructor; import lombok.val; @@ -45,7 +45,7 @@ import java.util.Arrays; import java.util.stream.Collectors; -import static io.appform.conductor.server.utils.ConductorServerUtils.*; +import static io.appform.conductor.core.utils.ConductorServerUtils.*; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/manage/ManageReports.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/manage/ManageReports.java index 15de69b..dc55c00 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/manage/ManageReports.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/manage/ManageReports.java @@ -18,11 +18,11 @@ import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.auth.Permission; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.reporting.ReportManager; -import io.appform.conductor.server.ui.views.reports.ReportListView; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.console.reporting.ReportManager; +import io.appform.conductor.console.ui.views.reports.ReportListView; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.Constants; import io.dropwizard.auth.Auth; import lombok.RequiredArgsConstructor; import org.hibernate.validator.constraints.Length; @@ -39,7 +39,7 @@ import java.util.Arrays; import java.util.List; -import static io.appform.conductor.server.utils.ConductorServerUtils.*; +import static io.appform.conductor.core.utils.ConductorServerUtils.*; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/manage/ManageTasks.java b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/manage/ManageTasks.java index 2482318..7797cb4 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/manage/ManageTasks.java +++ b/conductor-server/src/main/java/io/appform/conductor/server/resources/ui/manage/ManageTasks.java @@ -26,16 +26,16 @@ import io.appform.conductor.model.ticket.filter.TicketFilter; import io.appform.conductor.model.ticket.filter.TicketFilterType; import io.appform.conductor.model.ticket.filter.ticketfilters.*; -import io.appform.conductor.server.actionmanagement.ActionStore; -import io.appform.conductor.server.auth.ConductorUser; -import io.appform.conductor.server.taskmanagement.ConductorTaskScheduler; -import io.appform.conductor.server.taskmanagement.TaskStore; -import io.appform.conductor.server.ui.views.tasks.RunActionOnCQLSelectView; -import io.appform.conductor.server.ui.views.tasks.RunActionOnSelectedTicketsView; -import io.appform.conductor.server.ui.views.tasks.TaskListView; -import io.appform.conductor.server.usermanagement.GroupStore; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.workflowmanagement.WorkflowStore; +import io.appform.conductor.core.actionmanagement.ActionStore; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.core.taskmanagement.ConductorTaskScheduler; +import io.appform.conductor.core.taskmanagement.TaskStore; +import io.appform.conductor.console.ui.views.tasks.RunActionOnCQLSelectView; +import io.appform.conductor.console.ui.views.tasks.RunActionOnSelectedTicketsView; +import io.appform.conductor.console.ui.views.tasks.TaskListView; +import io.appform.conductor.core.interfaces.GroupStore; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.workflowmanagement.WorkflowStore; import io.dropwizard.auth.Auth; import io.dropwizard.util.Duration; import lombok.RequiredArgsConstructor; @@ -58,7 +58,7 @@ import java.util.Objects; import java.util.Set; -import static io.appform.conductor.server.utils.ConductorServerUtils.*; +import static io.appform.conductor.core.utils.ConductorServerUtils.*; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/SchemaFetchStrategy.java b/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/SchemaFetchStrategy.java deleted file mode 100644 index d299a03..0000000 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/SchemaFetchStrategy.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.appform.conductor.server.ticketmanagement.statemachine.models.strategy; - -public enum SchemaFetchStrategy { - FROM_WORKFLOW, - ; -} diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicketTerminalStateStrategy.java b/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicketTerminalStateStrategy.java deleted file mode 100644 index 8426201..0000000 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TicketTerminalStateStrategy.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.appform.conductor.server.ticketmanagement.statemachine.models.strategy; - -public enum TicketTerminalStateStrategy { - ABORT, - CREATE_NEW, - ; -} diff --git a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TriggerStrategy.java b/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TriggerStrategy.java deleted file mode 100644 index f6eb0d0..0000000 --- a/conductor-server/src/main/java/io/appform/conductor/server/ticketmanagement/statemachine/models/strategy/TriggerStrategy.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.appform.conductor.server.ticketmanagement.statemachine.models.strategy; - -public enum TriggerStrategy { - EXECUTE_FIRST, - EXECUTE_ALL, - ; -} diff --git a/conductor-server/src/test/java/io/appform/conductor/server/DBTestExtension.java b/conductor-server/src/test/java/io/appform/conductor/server/DBTestExtension.java index b9ddda2..e10821a 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/DBTestExtension.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/DBTestExtension.java @@ -71,7 +71,7 @@ public void beforeEach(ExtensionContext extensionContext) throws Exception { val entityClassPaths = extensionContext.getTestClass() .map(clazz -> clazz.getAnnotation(RelevantDBEntityPackages.class)) .map(annotation -> Arrays.asList(annotation.value())) - .orElse(List.of("io.appform.conductor.server")); + .orElse(List.of("io.appform.conductor")); bundle = new BalancedDBShardingBundle<>(entityClassPaths.toArray(new String[0])) { @Override protected ShardedHibernateFactory getConfig(TestConfig config) { diff --git a/conductor-server/src/test/java/io/appform/conductor/server/HazelcastTestExtension.java b/conductor-server/src/test/java/io/appform/conductor/server/HazelcastTestExtension.java index 3d632ff..e131e7c 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/HazelcastTestExtension.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/HazelcastTestExtension.java @@ -16,9 +16,9 @@ package io.appform.conductor.server; -import io.appform.conductor.server.config.hz.ClusterConfig; -import io.appform.conductor.server.config.hz.SimpleClusterDiscoveryConfig; -import io.appform.conductor.server.hazelcast.HazelcastClient; +import io.appform.conductor.core.config.hz.ClusterConfig; +import io.appform.conductor.core.config.hz.SimpleClusterDiscoveryConfig; +import io.appform.conductor.core.hazelcast.HazelcastClient; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.jupiter.api.extension.*; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/actionmanagement/executors/WebhookActionExecutorTest.java b/conductor-server/src/test/java/io/appform/conductor/server/actionmanagement/executors/WebhookActionExecutorTest.java index 810d93f..f1d5728 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/actionmanagement/executors/WebhookActionExecutorTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/actionmanagement/executors/WebhookActionExecutorTest.java @@ -3,6 +3,8 @@ import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; import com.github.tomakehurst.wiremock.junit5.WireMockTest; import com.github.tomakehurst.wiremock.matching.EqualToPattern; +import io.appform.conductor.core.actionmanagement.executors.WebhookActionExecutor; +import io.appform.conductor.core.templateengines.*; import io.appform.conductor.model.actions.ActionExecutionResult; import io.appform.conductor.model.actions.impl.WebhookAction; import io.appform.conductor.model.schema.FieldType; @@ -14,9 +16,9 @@ import io.appform.conductor.model.ticket.fields.TicketField; import io.appform.conductor.model.ticket.fields.impl.StringFieldValue; import io.appform.conductor.model.workflow.Template; -import io.appform.conductor.server.actionmanagement.ActionExecutor; +import io.appform.conductor.core.actionmanagement.ActionExecutor; import io.appform.conductor.server.templateengines.*; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.dropwizard.jackson.Jackson; import lombok.val; import org.junit.jupiter.api.Test; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/actionmanagement/impl/DBActionStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/actionmanagement/impl/DBActionStoreTest.java index a033642..89ee448 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/actionmanagement/impl/DBActionStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/actionmanagement/impl/DBActionStoreTest.java @@ -1,5 +1,6 @@ package io.appform.conductor.server.actionmanagement.impl; +import io.appform.conductor.core.actionmanagement.impl.DBActionStore; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.actions.impl.*; import io.appform.conductor.model.error.ConductorErrorCode; @@ -8,7 +9,7 @@ import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.actionmanagement.impl.models.StoredAction; +import io.appform.conductor.core.actionmanagement.impl.models.StoredAction; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import io.appform.dropwizard.sharding.dao.LookupDao; import lombok.val; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/attributes/definition/impl/EventGeneratingAttributeDefinitionStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/attributes/definition/impl/EventGeneratingAttributeDefinitionStoreTest.java index fda96cc..22db1ab 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/attributes/definition/impl/EventGeneratingAttributeDefinitionStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/attributes/definition/impl/EventGeneratingAttributeDefinitionStoreTest.java @@ -17,6 +17,9 @@ package io.appform.conductor.server.attributes.definition.impl; import com.google.common.collect.Sets; +import io.appform.conductor.core.attributes.definition.impl.CachingAttributeDefinitionStore; +import io.appform.conductor.core.attributes.definition.impl.DBAttributeDefinitionStore; +import io.appform.conductor.core.attributes.definition.impl.EventGeneratingAttributeDefinitionStore; import io.appform.conductor.model.attributes.definition.AttributeDefinition; import io.appform.conductor.model.attributes.definition.impl.StringAttributeDefinition; import io.appform.conductor.model.events.EventType; @@ -24,9 +27,9 @@ import io.appform.conductor.server.HazelcastTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.attributes.definition.impl.models.StoredAttributeDefinition; -import io.appform.conductor.server.eventmanagement.bus.SignalDrivenEventBus; -import io.appform.conductor.server.hazelcast.HazelcastClient; +import io.appform.conductor.core.attributes.definition.impl.models.StoredAttributeDefinition; +import io.appform.conductor.core.eventmanagement.bus.SignalDrivenEventBus; +import io.appform.conductor.core.hazelcast.HazelcastClient; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.val; import org.junit.jupiter.api.Test; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/attributes/values/impl/EventGeneratingAttributeValueStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/attributes/values/impl/EventGeneratingAttributeValueStoreTest.java index 7af7ba9..d803f4c 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/attributes/values/impl/EventGeneratingAttributeValueStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/attributes/values/impl/EventGeneratingAttributeValueStoreTest.java @@ -17,6 +17,8 @@ package io.appform.conductor.server.attributes.values.impl; import com.google.common.util.concurrent.MoreExecutors; +import io.appform.conductor.core.attributes.values.impl.DBAttributeValueStore; +import io.appform.conductor.core.attributes.values.impl.EventGeneratingAttributeValueStore; import io.appform.conductor.model.attributes.AttributeScopeType; import io.appform.conductor.model.attributes.definition.impl.*; import io.appform.conductor.model.attributes.value.impl.*; @@ -24,8 +26,8 @@ import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.attributes.values.impl.models.StoredAttributeValue; -import io.appform.conductor.server.eventmanagement.bus.SignalDrivenEventBus; +import io.appform.conductor.core.attributes.values.impl.models.StoredAttributeValue; +import io.appform.conductor.core.eventmanagement.bus.SignalDrivenEventBus; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.SneakyThrows; import lombok.val; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/auth/impl/CachingRoleStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/auth/impl/CachingRoleStoreTest.java index 5048849..67075d8 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/auth/impl/CachingRoleStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/auth/impl/CachingRoleStoreTest.java @@ -21,8 +21,10 @@ import io.appform.conductor.server.HazelcastTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.auth.impl.models.StoredRole; -import io.appform.conductor.server.hazelcast.HazelcastClient; +import io.appform.conductor.user.auth.impl.CachingRoleStore; +import io.appform.conductor.user.auth.impl.DBRoleStore; +import io.appform.conductor.user.auth.impl.models.StoredRole; +import io.appform.conductor.core.hazelcast.HazelcastClient; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.val; import org.junit.jupiter.api.Test; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/auth/impl/CachingUserRoleMappingStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/auth/impl/CachingUserRoleMappingStoreTest.java index b007961..62f4abb 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/auth/impl/CachingUserRoleMappingStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/auth/impl/CachingUserRoleMappingStoreTest.java @@ -20,8 +20,10 @@ import io.appform.conductor.server.HazelcastTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.auth.impl.models.StoredUserRoleMapping; -import io.appform.conductor.server.hazelcast.HazelcastClient; +import io.appform.conductor.user.auth.impl.CachingUserRoleMappingStore; +import io.appform.conductor.user.auth.impl.DBUserRoleMappingStore; +import io.appform.conductor.user.auth.impl.models.StoredUserRoleMapping; +import io.appform.conductor.core.hazelcast.HazelcastClient; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.val; import org.junit.jupiter.api.Test; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/dashboards/model/DashboardTest.java b/conductor-server/src/test/java/io/appform/conductor/server/dashboards/model/DashboardTest.java index 6ecf253..844f33a 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/dashboards/model/DashboardTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/dashboards/model/DashboardTest.java @@ -17,7 +17,10 @@ package io.appform.conductor.server.dashboards.model; import com.fasterxml.jackson.databind.ObjectMapper; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.console.dashboards.model.DashboardRow; +import io.appform.conductor.console.dashboards.model.DashboardSpec; +import io.appform.conductor.console.dashboards.model.DashboardWidget; +import io.appform.conductor.core.utils.ConductorServerUtils; import lombok.SneakyThrows; import lombok.val; import org.junit.jupiter.api.Test; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/eventmanagement/EventSerDeTest.java b/conductor-server/src/test/java/io/appform/conductor/server/eventmanagement/EventSerDeTest.java index bd6150f..e54bdb3 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/eventmanagement/EventSerDeTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/eventmanagement/EventSerDeTest.java @@ -23,7 +23,7 @@ import io.appform.conductor.model.reporting.ReportRun; import io.appform.conductor.model.reporting.ReportRunResult; import io.appform.conductor.model.events.impl.reporting.ReportExecutionCompletedEvent; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.ConductorServerUtils; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/id/IdGeneratorTest.java b/conductor-server/src/test/java/io/appform/conductor/server/id/IdGeneratorTest.java index 60bb804..5b602e0 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/id/IdGeneratorTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/id/IdGeneratorTest.java @@ -1,5 +1,7 @@ package io.appform.conductor.server.id; +import io.appform.conductor.core.id.Id; +import io.appform.conductor.core.id.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/ingressmanagement/AbstractIngressTranslatorStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/ingressmanagement/AbstractIngressTranslatorStoreTest.java index cd9ef67..bae673a 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/ingressmanagement/AbstractIngressTranslatorStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/ingressmanagement/AbstractIngressTranslatorStoreTest.java @@ -1,8 +1,9 @@ package io.appform.conductor.server.ingressmanagement; +import io.appform.conductor.core.ingressmanagement.IngressTranslatorStore; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.workflow.Template; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.ConductorServerUtils; import lombok.val; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/ingressmanagement/CachingIngressTranslatorStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/ingressmanagement/CachingIngressTranslatorStoreTest.java index a9943cc..fe2c9a0 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/ingressmanagement/CachingIngressTranslatorStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/ingressmanagement/CachingIngressTranslatorStoreTest.java @@ -4,10 +4,10 @@ import io.appform.conductor.server.HazelcastTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.ingressmanagement.impl.CachingIngressTranslatorStore; -import io.appform.conductor.server.ingressmanagement.impl.DBIngressTranslatorStore; -import io.appform.conductor.server.ingressmanagement.impl.models.StoredIngressTranslator; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.core.ingressmanagement.impl.CachingIngressTranslatorStore; +import io.appform.conductor.core.ingressmanagement.impl.DBIngressTranslatorStore; +import io.appform.conductor.core.ingressmanagement.impl.models.StoredIngressTranslator; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.SneakyThrows; import lombok.val; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/ingressmanagement/DBIngressTranslatorStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/ingressmanagement/DBIngressTranslatorStoreTest.java index 5e3fff8..bbad411 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/ingressmanagement/DBIngressTranslatorStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/ingressmanagement/DBIngressTranslatorStoreTest.java @@ -3,8 +3,8 @@ import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.ingressmanagement.impl.DBIngressTranslatorStore; -import io.appform.conductor.server.ingressmanagement.impl.models.StoredIngressTranslator; +import io.appform.conductor.core.ingressmanagement.impl.DBIngressTranslatorStore; +import io.appform.conductor.core.ingressmanagement.impl.models.StoredIngressTranslator; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.val; import org.junit.jupiter.api.Test; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/parser/CQLEngineTest.java b/conductor-server/src/test/java/io/appform/conductor/server/parser/CQLEngineTest.java index 6120098..83d2f6d 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/parser/CQLEngineTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/parser/CQLEngineTest.java @@ -16,6 +16,8 @@ package io.appform.conductor.server.parser; +import io.appform.conductor.core.parser.CQLEngine; +import io.appform.conductor.core.parser.CQLFilterFunctionRegistry; import io.appform.conductor.model.schema.Schema; import io.appform.conductor.model.schema.SchemaState; import io.appform.conductor.model.schema.TicketState; @@ -23,8 +25,8 @@ import io.appform.conductor.model.ticket.filter.TicketFilterType; import io.appform.conductor.model.ticket.filter.ticketfilters.TicketExternalReferenceEquals; import io.appform.conductor.model.workflow.*; -import io.appform.conductor.server.schemamanagement.impl.SchemaStore; -import io.appform.conductor.server.workflowmanagement.WorkflowStore; +import io.appform.conductor.core.schemamanagement.impl.SchemaStore; +import io.appform.conductor.core.workflowmanagement.WorkflowStore; import lombok.val; import org.junit.jupiter.api.Test; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/schemamanagement/impl/AbstractSchemaStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/schemamanagement/impl/AbstractSchemaStoreTest.java index 2f19ea8..8c3624a 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/schemamanagement/impl/AbstractSchemaStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/schemamanagement/impl/AbstractSchemaStoreTest.java @@ -17,6 +17,7 @@ package io.appform.conductor.server.schemamanagement.impl; import com.fasterxml.jackson.databind.ObjectMapper; +import io.appform.conductor.core.schemamanagement.impl.SchemaStore; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.ConductorException; import io.appform.conductor.model.schema.FieldSchema; @@ -24,7 +25,7 @@ import io.appform.conductor.model.schema.Schema; import io.appform.conductor.model.schema.SchemaState; import io.appform.conductor.model.schema.fields.*; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.ConductorServerUtils; import lombok.SneakyThrows; import lombok.val; import org.junit.jupiter.api.BeforeAll; @@ -32,7 +33,7 @@ import java.util.Date; import java.util.List; -import static io.appform.conductor.server.utils.ConductorServerUtils.configureMapper; +import static io.appform.conductor.core.utils.ConductorServerUtils.configureMapper; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/conductor-server/src/test/java/io/appform/conductor/server/schemamanagement/impl/CachingSchemaStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/schemamanagement/impl/CachingSchemaStoreTest.java index 91bf390..e345ae7 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/schemamanagement/impl/CachingSchemaStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/schemamanagement/impl/CachingSchemaStoreTest.java @@ -17,6 +17,8 @@ package io.appform.conductor.server.schemamanagement.impl; import com.fasterxml.jackson.databind.ObjectMapper; +import io.appform.conductor.core.schemamanagement.impl.CachingSchemaStore; +import io.appform.conductor.core.schemamanagement.impl.DBSchemaStore; import io.appform.conductor.model.schema.FieldSchema; import io.appform.conductor.model.schema.FieldType; import io.appform.conductor.model.schema.Schema; @@ -26,10 +28,10 @@ import io.appform.conductor.server.HazelcastTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.schemamanagement.impl.models.StoredFieldSchema; -import io.appform.conductor.server.schemamanagement.impl.models.StoredSchemaSummary; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.core.schemamanagement.impl.models.StoredFieldSchema; +import io.appform.conductor.core.schemamanagement.impl.models.StoredSchemaSummary; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.SneakyThrows; import lombok.val; @@ -40,7 +42,7 @@ import java.util.Date; import java.util.List; -import static io.appform.conductor.server.utils.ConductorServerUtils.configureMapper; +import static io.appform.conductor.core.utils.ConductorServerUtils.configureMapper; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/conductor-server/src/test/java/io/appform/conductor/server/schemamanagement/impl/DBSchemaStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/schemamanagement/impl/DBSchemaStoreTest.java index 8110ed2..5d67863 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/schemamanagement/impl/DBSchemaStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/schemamanagement/impl/DBSchemaStoreTest.java @@ -17,20 +17,21 @@ package io.appform.conductor.server.schemamanagement.impl; import com.fasterxml.jackson.databind.ObjectMapper; +import io.appform.conductor.core.schemamanagement.impl.DBSchemaStore; import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.schemamanagement.impl.models.StoredFieldSchema; -import io.appform.conductor.server.schemamanagement.impl.models.StoredSchemaSummary; +import io.appform.conductor.core.schemamanagement.impl.models.StoredFieldSchema; +import io.appform.conductor.core.schemamanagement.impl.models.StoredSchemaSummary; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import static io.appform.conductor.server.utils.ConductorServerUtils.configureMapper; +import static io.appform.conductor.core.utils.ConductorServerUtils.configureMapper; /** - * Test for {@link DBSchemaStore} + * Test for {@link io.appform.conductor.core.schemamanagement.impl.DBSchemaStore} */ @RelevantDBEntityPackages("io.appform.conductor.server.schemamanagement.impl.models") @ExtendWith(DBTestExtension.class) diff --git a/conductor-server/src/test/java/io/appform/conductor/server/skillmanagement/impl/DBSkillStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/skillmanagement/impl/DBSkillStoreTest.java index 361b0f6..3539bd3 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/skillmanagement/impl/DBSkillStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/skillmanagement/impl/DBSkillStoreTest.java @@ -22,9 +22,10 @@ import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.skillmanagement.impl.models.StoredSkillDefinition; -import io.appform.conductor.server.skillmanagement.impl.models.StoredSkillValue; -import io.appform.conductor.server.skillmanagement.impl.models.StoredUserSkillAssociation; +import io.appform.conductor.user.skillmanagement.impl.DBSkillStore; +import io.appform.conductor.user.skillmanagement.impl.models.StoredSkillDefinition; +import io.appform.conductor.user.skillmanagement.impl.models.StoredSkillValue; +import io.appform.conductor.user.skillmanagement.impl.models.StoredUserSkillAssociation; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.val; import org.junit.jupiter.api.Test; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/subjectmanagement/impl/DBSubjectStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/subjectmanagement/impl/DBSubjectStoreTest.java index bf63d0a..0b041a6 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/subjectmanagement/impl/DBSubjectStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/subjectmanagement/impl/DBSubjectStoreTest.java @@ -16,13 +16,14 @@ package io.appform.conductor.server.subjectmanagement.impl; +import io.appform.conductor.core.subjectmanagement.impl.DBSubjectStore; import io.appform.conductor.model.subject.*; import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.subjectmanagement.impl.models.StoredAddress; -import io.appform.conductor.server.subjectmanagement.impl.models.StoredSubjectID; -import io.appform.conductor.server.subjectmanagement.impl.models.StoredSubjectSummary; +import io.appform.conductor.core.subjectmanagement.impl.models.StoredAddress; +import io.appform.conductor.core.subjectmanagement.impl.models.StoredSubjectID; +import io.appform.conductor.core.subjectmanagement.impl.models.StoredSubjectSummary; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.val; import org.junit.jupiter.api.Test; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/taskmanagement/ConductorTaskSchedulerTest.java b/conductor-server/src/test/java/io/appform/conductor/server/taskmanagement/ConductorTaskSchedulerTest.java index 6a5e8b3..7d4f80e 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/taskmanagement/ConductorTaskSchedulerTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/taskmanagement/ConductorTaskSchedulerTest.java @@ -17,19 +17,20 @@ package io.appform.conductor.server.taskmanagement; import com.fasterxml.jackson.databind.ObjectMapper; +import io.appform.conductor.core.taskmanagement.ConductorTaskScheduler; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.tasks.*; import io.appform.conductor.model.ticket.TicketPriority; import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.taskmanagement.impl.DBTaskStore; -import io.appform.conductor.server.taskmanagement.impl.RunActionOnCQLSelectExecutor; -import io.appform.conductor.server.taskmanagement.impl.RunActionOnSelectedTicketsExecutor; -import io.appform.conductor.server.taskmanagement.impl.models.StoredTask; +import io.appform.conductor.core.taskmanagement.impl.DBTaskStore; +import io.appform.conductor.core.taskmanagement.impl.RunActionOnCQLSelectExecutor; +import io.appform.conductor.core.taskmanagement.impl.RunActionOnSelectedTicketsExecutor; +import io.appform.conductor.core.taskmanagement.impl.models.StoredTask; import io.appform.conductor.model.ticket.analytics.TicketGist; import io.appform.conductor.model.ticket.analytics.TicketListResponse; -import io.appform.conductor.server.ticketmanagement.TicketManager; +import io.appform.conductor.core.ticketmanagement.TicketManager; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.SneakyThrows; import lombok.val; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/taskmanagement/impl/DBTaskStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/taskmanagement/impl/DBTaskStoreTest.java index caf402a..16f0ee2 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/taskmanagement/impl/DBTaskStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/taskmanagement/impl/DBTaskStoreTest.java @@ -17,12 +17,13 @@ package io.appform.conductor.server.taskmanagement.impl; import com.fasterxml.jackson.databind.ObjectMapper; +import io.appform.conductor.core.taskmanagement.impl.DBTaskStore; import io.appform.conductor.model.actions.Scope; import io.appform.conductor.model.tasks.*; import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.taskmanagement.impl.models.StoredTask; +import io.appform.conductor.core.taskmanagement.impl.models.StoredTask; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.val; import org.junit.jupiter.api.Test; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/templateengines/HandlebarsTextTemplateEvaluatorTest.java b/conductor-server/src/test/java/io/appform/conductor/server/templateengines/HandlebarsTextTemplateEvaluatorTest.java index 35d8fab..8587243 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/templateengines/HandlebarsTextTemplateEvaluatorTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/templateengines/HandlebarsTextTemplateEvaluatorTest.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.*; import com.google.common.base.Strings; +import io.appform.conductor.core.templateengines.HandlebarsTextTemplateEvaluator; import io.appform.conductor.model.workflow.Template; import io.dropwizard.jackson.Jackson; import lombok.SneakyThrows; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/ticketmanagement/TicketManagerTest.java b/conductor-server/src/test/java/io/appform/conductor/server/ticketmanagement/TicketManagerTest.java index 6afba30..013c646 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/ticketmanagement/TicketManagerTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/ticketmanagement/TicketManagerTest.java @@ -17,6 +17,12 @@ package io.appform.conductor.server.ticketmanagement; import com.fasterxml.jackson.databind.ObjectMapper; +import io.appform.conductor.core.interfaces.UserLifecycleManager; +import io.appform.conductor.core.interfaces.UserStore; +import io.appform.conductor.core.templateengines.*; +import io.appform.conductor.core.ticketmanagement.TicketFieldMapper; +import io.appform.conductor.core.ticketmanagement.TicketManager; +import io.appform.conductor.core.workflowmanagement.WorkflowSelector; import io.appform.conductor.model.actions.Action; import io.appform.conductor.model.actions.ActionExecutionResult; import io.appform.conductor.model.schema.Schema; @@ -27,30 +33,26 @@ import io.appform.conductor.model.workflow.*; import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.actionmanagement.ActionExecutor; -import io.appform.conductor.server.actionmanagement.ActionStore; -import io.appform.conductor.server.ingressmanagement.IngressTranslatorStore; -import io.appform.conductor.server.ruleengines.HopeRuleEvaluator; -import io.appform.conductor.server.ruleengines.JsonRuleEvaluator; -import io.appform.conductor.server.ruleengines.RuleEngine; -import io.appform.conductor.server.schemamanagement.impl.SchemaStore; -import io.appform.conductor.server.subjectmanagement.impl.DBSubjectStore; -import io.appform.conductor.server.subjectmanagement.impl.models.StoredAddress; -import io.appform.conductor.server.subjectmanagement.impl.models.StoredSubjectID; -import io.appform.conductor.server.subjectmanagement.impl.models.StoredSubjectSummary; -import io.appform.conductor.server.templateengines.*; -import io.appform.conductor.server.ticketmanagement.impl.DBTicketStore; -import io.appform.conductor.server.ticketmanagement.impl.models.StoredRelatedTicket; -import io.appform.conductor.server.ticketmanagement.impl.models.StoredTicketSkeleton; -import io.appform.conductor.server.ticketmanagement.impl.models.comments.StoredAttachment; -import io.appform.conductor.server.ticketmanagement.impl.models.comments.StoredComment; -import io.appform.conductor.server.ticketmanagement.impl.models.fields.StoredFieldValue; -import io.appform.conductor.server.usermanagement.GroupStore; -import io.appform.conductor.server.usermanagement.UserLifecycleManager; -import io.appform.conductor.server.usermanagement.UserStore; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.workflowmanagement.WorkflowSelector; -import io.appform.conductor.server.workflowmanagement.WorkflowStore; +import io.appform.conductor.core.actionmanagement.ActionExecutor; +import io.appform.conductor.core.actionmanagement.ActionStore; +import io.appform.conductor.core.ingressmanagement.IngressTranslatorStore; +import io.appform.conductor.core.ruleengines.HopeRuleEvaluator; +import io.appform.conductor.core.ruleengines.JsonRuleEvaluator; +import io.appform.conductor.core.ruleengines.RuleEngine; +import io.appform.conductor.core.schemamanagement.impl.SchemaStore; +import io.appform.conductor.core.subjectmanagement.impl.DBSubjectStore; +import io.appform.conductor.core.subjectmanagement.impl.models.StoredAddress; +import io.appform.conductor.core.subjectmanagement.impl.models.StoredSubjectID; +import io.appform.conductor.core.subjectmanagement.impl.models.StoredSubjectSummary; +import io.appform.conductor.core.ticketmanagement.impl.DBTicketStore; +import io.appform.conductor.core.ticketmanagement.impl.models.StoredRelatedTicket; +import io.appform.conductor.core.ticketmanagement.impl.models.StoredTicketSkeleton; +import io.appform.conductor.core.ticketmanagement.impl.models.comments.StoredAttachment; +import io.appform.conductor.core.ticketmanagement.impl.models.comments.StoredComment; +import io.appform.conductor.core.ticketmanagement.impl.models.fields.StoredFieldValue; +import io.appform.conductor.core.interfaces.GroupStore; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.workflowmanagement.WorkflowStore; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.NonNull; import lombok.SneakyThrows; @@ -60,7 +62,7 @@ import java.util.*; -import static io.appform.conductor.server.utils.ConductorServerUtils.ticketToJsonNode; +import static io.appform.conductor.core.utils.ConductorServerUtils.ticketToJsonNode; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.*; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/ticketmanagement/impl/DBTicketStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/ticketmanagement/impl/DBTicketStoreTest.java index 749b2c2..49c1539 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/ticketmanagement/impl/DBTicketStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/ticketmanagement/impl/DBTicketStoreTest.java @@ -17,6 +17,7 @@ package io.appform.conductor.server.ticketmanagement.impl; import com.fasterxml.jackson.databind.ObjectMapper; +import io.appform.conductor.core.ticketmanagement.impl.DBTicketStore; import io.appform.conductor.model.schema.fields.NumberFieldSchema; import io.appform.conductor.model.schema.fields.StringFieldSchema; import io.appform.conductor.model.ticket.TicketPriority; @@ -28,12 +29,12 @@ import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.ticketmanagement.TicketFieldData; -import io.appform.conductor.server.ticketmanagement.impl.models.StoredRelatedTicket; -import io.appform.conductor.server.ticketmanagement.impl.models.StoredTicketSkeleton; -import io.appform.conductor.server.ticketmanagement.impl.models.comments.StoredAttachment; -import io.appform.conductor.server.ticketmanagement.impl.models.comments.StoredComment; -import io.appform.conductor.server.ticketmanagement.impl.models.fields.StoredFieldValue; +import io.appform.conductor.core.ticketmanagement.TicketFieldData; +import io.appform.conductor.core.ticketmanagement.impl.models.StoredRelatedTicket; +import io.appform.conductor.core.ticketmanagement.impl.models.StoredTicketSkeleton; +import io.appform.conductor.core.ticketmanagement.impl.models.comments.StoredAttachment; +import io.appform.conductor.core.ticketmanagement.impl.models.comments.StoredComment; +import io.appform.conductor.core.ticketmanagement.impl.models.fields.StoredFieldValue; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.val; import org.junit.jupiter.api.BeforeAll; @@ -43,7 +44,7 @@ import java.util.List; import java.util.Map; -import static io.appform.conductor.server.utils.ConductorServerUtils.configureMapper; +import static io.appform.conductor.core.utils.ConductorServerUtils.configureMapper; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/CachingGroupStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/CachingGroupStoreTest.java index 8c24cd1..4f63af0 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/CachingGroupStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/CachingGroupStoreTest.java @@ -22,9 +22,11 @@ import io.appform.conductor.server.HazelcastTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.usermanagement.impl.models.StoredGroup; -import io.appform.conductor.server.usermanagement.impl.models.StoredGroupUserMapping; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.user.usermanagement.impl.CachingGroupStore; +import io.appform.conductor.user.usermanagement.impl.DBGroupStore; +import io.appform.conductor.user.usermanagement.impl.models.StoredGroup; +import io.appform.conductor.user.usermanagement.impl.models.StoredGroupUserMapping; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.NonNull; import lombok.val; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/CachingSessionStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/CachingSessionStoreTest.java index 940552e..cd29e40 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/CachingSessionStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/CachingSessionStoreTest.java @@ -23,8 +23,10 @@ import io.appform.conductor.server.HazelcastTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.usermanagement.impl.models.StoredUserSessionDetails; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.user.usermanagement.impl.CachingSessionStore; +import io.appform.conductor.user.usermanagement.impl.DBSessionStore; +import io.appform.conductor.user.usermanagement.impl.models.StoredUserSessionDetails; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.val; import org.junit.jupiter.api.Test; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/CachingUserStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/CachingUserStoreTest.java index fc53322..31054b0 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/CachingUserStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/CachingUserStoreTest.java @@ -23,8 +23,10 @@ import io.appform.conductor.server.HazelcastTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.usermanagement.impl.models.StoredUser; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.user.usermanagement.impl.DBUserStore; +import io.appform.conductor.user.usermanagement.impl.models.StoredUser; +import io.appform.conductor.user.usermanagement.impl.CachingUserStore; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.val; import org.junit.jupiter.api.Test; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBGroupStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBGroupStoreTest.java index 1f88f59..ec6db4c 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBGroupStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBGroupStoreTest.java @@ -20,8 +20,9 @@ import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.usermanagement.impl.models.StoredGroup; -import io.appform.conductor.server.usermanagement.impl.models.StoredGroupUserMapping; +import io.appform.conductor.user.usermanagement.impl.DBGroupStore; +import io.appform.conductor.user.usermanagement.impl.models.StoredGroup; +import io.appform.conductor.user.usermanagement.impl.models.StoredGroupUserMapping; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import io.appform.dropwizard.sharding.dao.LookupDao; import io.appform.dropwizard.sharding.dao.RelationalDao; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBSessionStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBSessionStoreTest.java index b4ebc09..9b879ea 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBSessionStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBSessionStoreTest.java @@ -23,7 +23,8 @@ import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.usermanagement.impl.models.StoredUserSessionDetails; +import io.appform.conductor.user.usermanagement.impl.DBSessionStore; +import io.appform.conductor.user.usermanagement.impl.models.StoredUserSessionDetails; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import io.appform.dropwizard.sharding.dao.RelationalDao; import lombok.SneakyThrows; @@ -40,7 +41,7 @@ import static org.mockito.Mockito.*; /** - * Tests for {@link DBSessionStore} + * Tests for {@link io.appform.conductor.user.usermanagement.impl.DBSessionStore} */ @Slf4j @RelevantDBEntityPackages("io.appform.conductor.server.usermanagement.impl.models") diff --git a/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBUserPasswordAuthStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBUserPasswordAuthStoreTest.java index 5e46049..fe36359 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBUserPasswordAuthStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBUserPasswordAuthStoreTest.java @@ -19,9 +19,9 @@ import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.internalmodels.auth.UserPasswordAuthDetails; -import io.appform.conductor.server.usermanagement.impl.DBUserPasswordAuthStore; -import io.appform.conductor.server.usermanagement.impl.models.StoredUserPassword; +import io.appform.conductor.user.internalmodels.auth.UserPasswordAuthDetails; +import io.appform.conductor.user.usermanagement.impl.DBUserPasswordAuthStore; +import io.appform.conductor.user.usermanagement.impl.models.StoredUserPassword; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.val; import org.junit.jupiter.api.Test; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBUserStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBUserStoreTest.java index 971fccd..d42df54 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBUserStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/usermanagement/impl/DBUserStoreTest.java @@ -24,8 +24,8 @@ import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.usermanagement.impl.DBUserStore; -import io.appform.conductor.server.usermanagement.impl.models.StoredUser; +import io.appform.conductor.user.usermanagement.impl.DBUserStore; +import io.appform.conductor.user.usermanagement.impl.models.StoredUser; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import io.appform.dropwizard.sharding.dao.LookupDao; import lombok.SneakyThrows; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/WorkflowManagerTest.java b/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/WorkflowManagerTest.java index 7bcf0c9..8cbd0ae 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/WorkflowManagerTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/WorkflowManagerTest.java @@ -17,6 +17,7 @@ package io.appform.conductor.server.workflowmanagement; import com.fasterxml.jackson.databind.ObjectMapper; +import io.appform.conductor.core.workflowmanagement.WorkflowManager; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.ConductorException; import io.appform.conductor.model.schema.Schema; @@ -27,28 +28,28 @@ import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.actionmanagement.ActionStore; -import io.appform.conductor.server.actionmanagement.impl.DBActionStore; -import io.appform.conductor.server.actionmanagement.impl.models.StoredAction; -import io.appform.conductor.server.schemamanagement.impl.DBSchemaStore; -import io.appform.conductor.server.schemamanagement.impl.SchemaStore; -import io.appform.conductor.server.schemamanagement.impl.models.StoredFieldSchema; -import io.appform.conductor.server.schemamanagement.impl.models.StoredSchemaSummary; -import io.appform.conductor.server.taskmanagement.ConductorTaskScheduler; -import io.appform.conductor.server.taskmanagement.TaskStore; -import io.appform.conductor.server.taskmanagement.impl.DBTaskStore; -import io.appform.conductor.server.taskmanagement.impl.RunActionOnCQLSelectExecutor; -import io.appform.conductor.server.taskmanagement.impl.RunActionOnSelectedTicketsExecutor; -import io.appform.conductor.server.taskmanagement.impl.models.StoredTask; -import io.appform.conductor.server.ticketmanagement.TicketStore; -import io.appform.conductor.server.ticketmanagement.impl.DBTicketStore; -import io.appform.conductor.server.ticketmanagement.impl.models.StoredTicketSkeleton; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.workflowmanagement.impl.DBWorkflowStore; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredTicketState; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredTicketStateTransition; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredWorkflow; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredWorkflowSelectionRule; +import io.appform.conductor.core.actionmanagement.ActionStore; +import io.appform.conductor.core.actionmanagement.impl.DBActionStore; +import io.appform.conductor.core.actionmanagement.impl.models.StoredAction; +import io.appform.conductor.core.schemamanagement.impl.DBSchemaStore; +import io.appform.conductor.core.schemamanagement.impl.SchemaStore; +import io.appform.conductor.core.schemamanagement.impl.models.StoredFieldSchema; +import io.appform.conductor.core.schemamanagement.impl.models.StoredSchemaSummary; +import io.appform.conductor.core.taskmanagement.ConductorTaskScheduler; +import io.appform.conductor.core.taskmanagement.TaskStore; +import io.appform.conductor.core.taskmanagement.impl.DBTaskStore; +import io.appform.conductor.core.taskmanagement.impl.RunActionOnCQLSelectExecutor; +import io.appform.conductor.core.taskmanagement.impl.RunActionOnSelectedTicketsExecutor; +import io.appform.conductor.core.taskmanagement.impl.models.StoredTask; +import io.appform.conductor.core.ticketmanagement.TicketStore; +import io.appform.conductor.core.ticketmanagement.impl.DBTicketStore; +import io.appform.conductor.core.ticketmanagement.impl.models.StoredTicketSkeleton; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.workflowmanagement.impl.DBWorkflowStore; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredTicketState; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredTicketStateTransition; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredWorkflow; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredWorkflowSelectionRule; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import io.dropwizard.util.Resources; import lombok.val; @@ -66,7 +67,7 @@ import static org.mockito.Mockito.when; /** - * Tests for {@link WorkflowManager} + * Tests for {@link io.appform.conductor.core.workflowmanagement.WorkflowManager} */ @RelevantDBEntityPackages({"io.appform.conductor.server.workflowmanagement.impl.models", "io.appform.conductor.server.schemamanagement.impl.models", diff --git a/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/impl/AbstractWorkflowStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/impl/AbstractWorkflowStoreTest.java index b1d0970..541780c 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/impl/AbstractWorkflowStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/impl/AbstractWorkflowStoreTest.java @@ -19,7 +19,7 @@ import io.appform.conductor.model.workflow.Rule; import io.appform.conductor.model.workflow.Template; import io.appform.conductor.model.workflow.TicketStateTransition; -import io.appform.conductor.server.workflowmanagement.WorkflowStore; +import io.appform.conductor.core.workflowmanagement.WorkflowStore; import lombok.val; import java.util.List; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/impl/CachingWorkflowStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/impl/CachingWorkflowStoreTest.java index bb52ff6..73eee87 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/impl/CachingWorkflowStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/impl/CachingWorkflowStoreTest.java @@ -16,15 +16,17 @@ package io.appform.conductor.server.workflowmanagement.impl; +import io.appform.conductor.core.workflowmanagement.impl.CachingWorkflowStore; +import io.appform.conductor.core.workflowmanagement.impl.DBWorkflowStore; import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.HazelcastTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredTicketState; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredTicketStateTransition; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredWorkflow; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredWorkflowSelectionRule; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredTicketState; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredTicketStateTransition; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredWorkflow; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredWorkflowSelectionRule; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.SneakyThrows; import lombok.val; diff --git a/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/impl/DBWorkflowStoreTest.java b/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/impl/DBWorkflowStoreTest.java index 8fbd48e..7058477 100644 --- a/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/impl/DBWorkflowStoreTest.java +++ b/conductor-server/src/test/java/io/appform/conductor/server/workflowmanagement/impl/DBWorkflowStoreTest.java @@ -16,20 +16,21 @@ package io.appform.conductor.server.workflowmanagement.impl; +import io.appform.conductor.core.workflowmanagement.impl.DBWorkflowStore; import io.appform.conductor.server.DBTestExtension; import io.appform.conductor.server.RelevantDBEntityPackages; import io.appform.conductor.server.TestConfig; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredTicketState; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredTicketStateTransition; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredWorkflow; -import io.appform.conductor.server.workflowmanagement.impl.models.StoredWorkflowSelectionRule; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredTicketState; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredTicketStateTransition; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredWorkflow; +import io.appform.conductor.core.workflowmanagement.impl.models.StoredWorkflowSelectionRule; import io.appform.dropwizard.sharding.BalancedDBShardingBundle; import lombok.val; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; /** - * Tests for {@link DBWorkflowStore} + * Tests for {@link io.appform.conductor.core.workflowmanagement.impl.DBWorkflowStore} */ @RelevantDBEntityPackages("io.appform.conductor.server.workflowmanagement.impl.models") @ExtendWith(DBTestExtension.class) diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/AuthData.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/AuthData.java similarity index 76% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/AuthData.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/AuthData.java index bef8797..60cbb2f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/AuthData.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/AuthData.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.auth; +package io.appform.conductor.user.auth; import lombok.Value; /** - * Extracted auth data to be used by {@link io.appform.conductor.server.auth.ConductorAuthenticator} - * and {@link io.appform.conductor.server.auth.ConductorAuthorizer} + * Extracted auth data to be used by {@link ConductorAuthenticator} + * and {@link ConductorAuthorizer} */ @Value public class AuthData { diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/AuthSource.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/AuthSource.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/AuthSource.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/AuthSource.java index 94c294f..2744ea1 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/AuthSource.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/AuthSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.auth; +package io.appform.conductor.user.auth; /** * Source of the auth token diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/ConductorAuthFilter.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/ConductorAuthFilter.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/ConductorAuthFilter.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/ConductorAuthFilter.java index 24e2551..e8eadb1 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/ConductorAuthFilter.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/ConductorAuthFilter.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.auth; +package io.appform.conductor.user.auth; import com.google.common.base.Strings; +import io.appform.conductor.core.auth.ConductorUser; import io.dropwizard.auth.AuthFilter; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/ConductorAuthenticator.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/ConductorAuthenticator.java similarity index 88% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/ConductorAuthenticator.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/ConductorAuthenticator.java index 93881da..d7cab1e 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/ConductorAuthenticator.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/ConductorAuthenticator.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package io.appform.conductor.server.auth; +package io.appform.conductor.user.auth; -import io.appform.conductor.server.internalmodels.auth.UserTokenAuthData; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.user.internalmodels.auth.UserTokenAuthData; import io.dropwizard.auth.AuthenticationException; import io.dropwizard.auth.Authenticator; import lombok.RequiredArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/ConductorAuthorizer.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/ConductorAuthorizer.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/ConductorAuthorizer.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/ConductorAuthorizer.java index 93fd53b..b997193 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/ConductorAuthorizer.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/ConductorAuthorizer.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.auth; +package io.appform.conductor.user.auth; +import io.appform.conductor.core.auth.ConductorUser; import io.appform.conductor.model.auth.Permission; -import io.appform.conductor.server.config.AuthConfig; +import io.appform.conductor.core.config.AuthConfig; import io.dropwizard.auth.Authorizer; import lombok.RequiredArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/EventGeneratingRoleStore.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/EventGeneratingRoleStore.java similarity index 87% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/EventGeneratingRoleStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/EventGeneratingRoleStore.java index 12b605f..ff6fb7a 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/EventGeneratingRoleStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/EventGeneratingRoleStore.java @@ -1,9 +1,10 @@ -package io.appform.conductor.server.auth; +package io.appform.conductor.user.auth; +import io.appform.conductor.core.auth.RoleStore; +import io.appform.conductor.core.eventmanagement.EventBus; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.auth.Permission; import io.appform.conductor.model.auth.Role; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; import io.appform.conductor.model.events.impl.role.RoleCreatedEvent; import io.appform.conductor.model.events.impl.role.RoleDeletedEvent; import io.appform.conductor.model.events.impl.role.RoleUpdatedEvent; @@ -24,7 +25,7 @@ public class EventGeneratingRoleStore implements RoleStore { private final RoleStore roleStore; @Inject - public EventGeneratingRoleStore(EventBus eventBus, @Named(ConductorModule.CACHED_IMPLEMENTATION_NAME) RoleStore roleStore) { + public EventGeneratingRoleStore(EventBus eventBus, @Named(Constants.CACHED_IMPLEMENTATION_NAME) RoleStore roleStore) { this.eventBus = eventBus; this.roleStore = roleStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/EventGeneratingUserRoleMappingStore.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/EventGeneratingUserRoleMappingStore.java similarity index 81% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/EventGeneratingUserRoleMappingStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/EventGeneratingUserRoleMappingStore.java index 90d03fb..c3e447f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/EventGeneratingUserRoleMappingStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/EventGeneratingUserRoleMappingStore.java @@ -1,9 +1,10 @@ -package io.appform.conductor.server.auth; +package io.appform.conductor.user.auth; +import io.appform.conductor.core.auth.UserRoleMappingStore; +import io.appform.conductor.core.eventmanagement.EventBus; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.events.impl.user.UserRoleAssignedEvent; import io.appform.conductor.model.events.impl.user.UserRoleRevokedEvent; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; import lombok.val; import javax.inject.Inject; @@ -19,7 +20,7 @@ public class EventGeneratingUserRoleMappingStore implements UserRoleMappingStore @Inject public EventGeneratingUserRoleMappingStore( EventBus eventBus, - @Named(ConductorModule.CACHED_IMPLEMENTATION_NAME) UserRoleMappingStore userRoleMappingStore) { + @Named(Constants.CACHED_IMPLEMENTATION_NAME) UserRoleMappingStore userRoleMappingStore) { this.eventBus = eventBus; this.userRoleMappingStore = userRoleMappingStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/OAuthDynamicFeature.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/OAuthDynamicFeature.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/OAuthDynamicFeature.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/OAuthDynamicFeature.java index 7e84c4a..bac6212 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/OAuthDynamicFeature.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/OAuthDynamicFeature.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.auth; +package io.appform.conductor.user.auth; import com.google.common.base.Strings; -import io.appform.conductor.server.config.AuthConfig; +import io.appform.conductor.core.auth.ConductorUser; +import io.appform.conductor.core.config.AuthConfig; import io.dropwizard.auth.AuthDynamicFeature; import io.dropwizard.auth.AuthValueFactoryProvider; import io.dropwizard.auth.UnauthorizedHandler; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/UserAuthValidator.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/UserAuthValidator.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/UserAuthValidator.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/UserAuthValidator.java index 12a2d94..34da7e8 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/UserAuthValidator.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/UserAuthValidator.java @@ -14,18 +14,22 @@ * limitations under the License. */ -package io.appform.conductor.server.auth; +package io.appform.conductor.user.auth; import at.favre.lib.crypto.bcrypt.BCrypt; import com.google.common.base.Function; import com.google.common.base.Strings; +import io.appform.conductor.core.auth.RoleStore; +import io.appform.conductor.core.auth.UserRoleMappingStore; +import io.appform.conductor.core.config.AuthConfig; +import io.appform.conductor.core.interfaces.*; import io.appform.conductor.model.usermgmt.*; -import io.appform.conductor.server.config.AuthConfig; -import io.appform.conductor.server.internalmodels.auth.PasswordAuthData; -import io.appform.conductor.server.internalmodels.auth.UserAuthData; -import io.appform.conductor.server.internalmodels.auth.UserAuthDataVisitor; -import io.appform.conductor.server.internalmodels.auth.UserTokenAuthData; -import io.appform.conductor.server.usermanagement.*; +import io.appform.conductor.user.internalmodels.auth.PasswordAuthData; +import io.appform.conductor.user.internalmodels.auth.UserAuthData; +import io.appform.conductor.user.internalmodels.auth.UserAuthDataVisitor; +import io.appform.conductor.user.internalmodels.auth.UserTokenAuthData; +import io.appform.conductor.user.usermanagement.SessionStore; +import io.appform.conductor.user.usermanagement.UserPasswordAuthStore; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -51,7 +55,7 @@ import java.util.Optional; import java.util.function.BiFunction; -import static io.appform.conductor.server.utils.ConductorServerUtils.errorMessage; +import static io.appform.conductor.core.utils.ConductorServerUtils.errorMessage; /** * Handles authentication requests diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/impl/CachingRoleStore.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/impl/CachingRoleStore.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/impl/CachingRoleStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/impl/CachingRoleStore.java index 02c778f..599644c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/impl/CachingRoleStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/impl/CachingRoleStore.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.appform.conductor.server.auth.impl; +package io.appform.conductor.user.auth.impl; +import io.appform.conductor.core.auth.RoleStore; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.auth.Permission; import io.appform.conductor.model.auth.Role; import io.appform.conductor.model.error.Throws; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.auth.RoleStore; -import io.appform.conductor.server.hazelcast.HazelcastClient; import io.appform.functionmetrics.MonitoredFunction; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -50,7 +50,7 @@ public class CachingRoleStore implements RoleStore { @Inject public CachingRoleStore( - @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) final RoleStore root, + @Named(Constants.ROOT_IMPLEMENTATION_NAME) final RoleStore root, HazelcastClient hazelcastClient) { this.root = root; this.rolesCacheProvider = hazelcastClient.loadingCache( diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/impl/CachingUserRoleMappingStore.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/impl/CachingUserRoleMappingStore.java similarity index 90% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/impl/CachingUserRoleMappingStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/impl/CachingUserRoleMappingStore.java index fa14858..0e51471 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/impl/CachingUserRoleMappingStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/impl/CachingUserRoleMappingStore.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.auth.impl; +package io.appform.conductor.user.auth.impl; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.auth.UserRoleMappingStore; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.utils.Pair; +import io.appform.conductor.core.auth.UserRoleMappingStore; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.Pair; import io.appform.functionmetrics.MonitoredFunction; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -47,7 +47,7 @@ public class CachingUserRoleMappingStore implements UserRoleMappingStore { @Inject public CachingUserRoleMappingStore( - @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) final UserRoleMappingStore root, + @Named(Constants.ROOT_IMPLEMENTATION_NAME) final UserRoleMappingStore root, final HazelcastClient hazelcastClient) { this.root = root; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/impl/DBRoleStore.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/impl/DBRoleStore.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/impl/DBRoleStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/impl/DBRoleStore.java index 95093e3..ae29227 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/impl/DBRoleStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/impl/DBRoleStore.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.auth.impl; +package io.appform.conductor.user.auth.impl; +import io.appform.conductor.core.auth.RoleStore; import io.appform.conductor.model.auth.Permission; import io.appform.conductor.model.auth.Role; import io.appform.conductor.model.error.Throws; -import io.appform.conductor.server.auth.RoleStore; -import io.appform.conductor.server.auth.impl.models.StoredRole; +import io.appform.conductor.user.auth.impl.models.StoredRole; import io.appform.dropwizard.sharding.dao.LookupDao; import io.appform.functionmetrics.MonitoredFunction; import lombok.RequiredArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/impl/DBUserRoleMappingStore.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/impl/DBUserRoleMappingStore.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/impl/DBUserRoleMappingStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/impl/DBUserRoleMappingStore.java index 02acd13..7251371 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/impl/DBUserRoleMappingStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/impl/DBUserRoleMappingStore.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.auth.impl; +package io.appform.conductor.user.auth.impl; +import io.appform.conductor.core.auth.UserRoleMappingStore; import io.appform.conductor.model.error.Throws; -import io.appform.conductor.server.auth.UserRoleMappingStore; -import io.appform.conductor.server.auth.impl.models.StoredUserRoleMapping; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.user.auth.impl.models.StoredUserRoleMapping; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.dropwizard.sharding.dao.RelationalDao; import io.appform.functionmetrics.MonitoredFunction; import lombok.RequiredArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/impl/models/StoredRole.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/impl/models/StoredRole.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/impl/models/StoredRole.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/impl/models/StoredRole.java index 8fd58a5..543410a 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/impl/models/StoredRole.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/impl/models/StoredRole.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.auth.impl.models; +package io.appform.conductor.user.auth.impl.models; import io.appform.conductor.model.auth.Permission; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.utils.persistence.PermissionsConverter; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.persistence.PermissionsConverter; import io.appform.dropwizard.sharding.sharding.LookupKey; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/auth/impl/models/StoredUserRoleMapping.java b/conductor-user/src/main/java/io/appform/conductor/user/auth/impl/models/StoredUserRoleMapping.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/auth/impl/models/StoredUserRoleMapping.java rename to conductor-user/src/main/java/io/appform/conductor/user/auth/impl/models/StoredUserRoleMapping.java index ea6ea83..35a9358 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/auth/impl/models/StoredUserRoleMapping.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/auth/impl/models/StoredUserRoleMapping.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.appform.conductor.server.auth.impl.models; +package io.appform.conductor.user.auth.impl.models; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/PasswordAuthData.java b/conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/PasswordAuthData.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/PasswordAuthData.java rename to conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/PasswordAuthData.java index 0522da9..5f9f4d3 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/PasswordAuthData.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/PasswordAuthData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.internalmodels.auth; +package io.appform.conductor.user.internalmodels.auth; import io.appform.conductor.model.usermgmt.UserAuthType; import lombok.EqualsAndHashCode; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/UserAuthData.java b/conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/UserAuthData.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/UserAuthData.java rename to conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/UserAuthData.java index 9c8381a..db30e15 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/UserAuthData.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/UserAuthData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.internalmodels.auth; +package io.appform.conductor.user.internalmodels.auth; import io.appform.conductor.model.usermgmt.UserAuthType; import lombok.AccessLevel; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/UserAuthDataVisitor.java b/conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/UserAuthDataVisitor.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/UserAuthDataVisitor.java rename to conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/UserAuthDataVisitor.java index 9880656..f6a4782 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/UserAuthDataVisitor.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/UserAuthDataVisitor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.internalmodels.auth; +package io.appform.conductor.user.internalmodels.auth; /** * diff --git a/conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/UserPasswordAuthDetails.java b/conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/UserPasswordAuthDetails.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/UserPasswordAuthDetails.java rename to conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/UserPasswordAuthDetails.java index b96576e..e2a9d61 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/UserPasswordAuthDetails.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/UserPasswordAuthDetails.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.internalmodels.auth; +package io.appform.conductor.user.internalmodels.auth; import lombok.AllArgsConstructor; import lombok.Value; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/UserTokenAuthData.java b/conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/UserTokenAuthData.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/UserTokenAuthData.java rename to conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/UserTokenAuthData.java index f5181bb..eb3169a 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/internalmodels/auth/UserTokenAuthData.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/internalmodels/auth/UserTokenAuthData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.internalmodels.auth; +package io.appform.conductor.user.internalmodels.auth; import io.appform.conductor.model.usermgmt.UserAuthType; import lombok.EqualsAndHashCode; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/EventGeneratingSkillStore.java b/conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/EventGeneratingSkillStore.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/EventGeneratingSkillStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/EventGeneratingSkillStore.java index 3dc7e29..b40072a 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/EventGeneratingSkillStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/EventGeneratingSkillStore.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.skillmanagement; +package io.appform.conductor.user.skillmanagement; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.skills.SkillDefinition; import io.appform.conductor.model.skills.SkillValue; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; +import static io.appform.conductor.core.utils.Constants.ROOT_IMPLEMENTATION_NAME; +import io.appform.conductor.core.eventmanagement.EventBus; import io.appform.conductor.model.events.impl.skill.*; import io.appform.conductor.model.events.impl.user.UserSkillAssociatedEvent; import io.appform.conductor.model.events.impl.user.UserSkillDisasocciatedEvent; @@ -40,7 +41,7 @@ public class EventGeneratingSkillStore implements SkillStore { private final SkillStore skillStore; @Inject - public EventGeneratingSkillStore(EventBus eventBus, @Named(ConductorModule.CACHED_IMPLEMENTATION_NAME) SkillStore skillStore) { + public EventGeneratingSkillStore(EventBus eventBus, @Named(Constants.CACHED_IMPLEMENTATION_NAME) SkillStore skillStore) { this.eventBus = eventBus; this.skillStore = skillStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/SkillStore.java b/conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/SkillStore.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/SkillStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/SkillStore.java index edc62ad..c6a1c77 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/SkillStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/SkillStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.skillmanagement; +package io.appform.conductor.user.skillmanagement; import io.appform.conductor.model.skills.SkillDefinition; import io.appform.conductor.model.skills.SkillValue; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/CachingSkillStore.java b/conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/CachingSkillStore.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/CachingSkillStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/CachingSkillStore.java index f72b78f..da4ae51 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/CachingSkillStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/CachingSkillStore.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.appform.conductor.server.skillmanagement.impl; +package io.appform.conductor.user.skillmanagement.impl; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.skills.SkillDefinition; import io.appform.conductor.model.skills.SkillValue; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.skillmanagement.SkillStore; -import io.appform.conductor.server.utils.Pair; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.user.skillmanagement.SkillStore; +import io.appform.conductor.core.utils.Pair; import io.appform.functionmetrics.MonitoredFunction; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -51,7 +51,7 @@ public class CachingSkillStore implements SkillStore { @Inject public CachingSkillStore( - @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) final SkillStore root, + @Named(Constants.ROOT_IMPLEMENTATION_NAME) final SkillStore root, final HazelcastClient hazelcastClient) { this.root = root; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/DBSkillStore.java b/conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/DBSkillStore.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/DBSkillStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/DBSkillStore.java index 58a3aeb..d54f89c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/DBSkillStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/DBSkillStore.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package io.appform.conductor.server.skillmanagement.impl; +package io.appform.conductor.user.skillmanagement.impl; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.Throws; import io.appform.conductor.model.skills.SkillDefinition; import io.appform.conductor.model.skills.SkillValue; -import io.appform.conductor.server.skillmanagement.SkillStore; -import io.appform.conductor.server.skillmanagement.impl.models.StoredSkillDefinition; -import io.appform.conductor.server.skillmanagement.impl.models.StoredSkillValue; -import io.appform.conductor.server.skillmanagement.impl.models.StoredUserSkillAssociation; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.user.skillmanagement.SkillStore; +import io.appform.conductor.user.skillmanagement.impl.models.StoredSkillDefinition; +import io.appform.conductor.user.skillmanagement.impl.models.StoredSkillValue; +import io.appform.conductor.user.skillmanagement.impl.models.StoredUserSkillAssociation; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.dropwizard.sharding.dao.LookupDao; import io.appform.dropwizard.sharding.dao.RelationalDao; import io.appform.functionmetrics.MonitoredFunction; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/models/StoredSkillDefinition.java b/conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/models/StoredSkillDefinition.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/models/StoredSkillDefinition.java rename to conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/models/StoredSkillDefinition.java index bdd15ac..9086572 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/models/StoredSkillDefinition.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/models/StoredSkillDefinition.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.appform.conductor.server.skillmanagement.impl.models; +package io.appform.conductor.user.skillmanagement.impl.models; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import io.appform.dropwizard.sharding.sharding.LookupKey; import lombok.*; import lombok.experimental.FieldNameConstants; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/models/StoredSkillValue.java b/conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/models/StoredSkillValue.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/models/StoredSkillValue.java rename to conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/models/StoredSkillValue.java index 7615da6..7ce49e5 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/models/StoredSkillValue.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/models/StoredSkillValue.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.appform.conductor.server.skillmanagement.impl.models; +package io.appform.conductor.user.skillmanagement.impl.models; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import lombok.*; import lombok.experimental.FieldNameConstants; import org.hibernate.annotations.CreationTimestamp; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/models/StoredUserSkillAssociation.java b/conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/models/StoredUserSkillAssociation.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/models/StoredUserSkillAssociation.java rename to conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/models/StoredUserSkillAssociation.java index 341c3fd..ee23229 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/skillmanagement/impl/models/StoredUserSkillAssociation.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/skillmanagement/impl/models/StoredUserSkillAssociation.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.appform.conductor.server.skillmanagement.impl.models; +package io.appform.conductor.user.skillmanagement.impl.models; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import lombok.*; import lombok.experimental.FieldNameConstants; import org.hibernate.annotations.CreationTimestamp; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingGroupStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingGroupStore.java similarity index 91% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingGroupStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingGroupStore.java index 89fd9b4..19a47a3 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingGroupStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingGroupStore.java @@ -1,5 +1,7 @@ -package io.appform.conductor.server.usermanagement; +package io.appform.conductor.user.usermanagement; +import io.appform.conductor.core.interfaces.GroupStore; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.events.impl.group.GroupCreatedEvent; import io.appform.conductor.model.events.impl.group.GroupDeletedEvent; import io.appform.conductor.model.events.impl.group.GroupUpdatedEvent; @@ -7,8 +9,7 @@ import io.appform.conductor.model.events.impl.user.UserGroupUnassignedEvent; import io.appform.conductor.model.usermgmt.Group; import io.appform.conductor.model.usermgmt.GroupType; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; +import io.appform.conductor.core.eventmanagement.EventBus; import lombok.val; import javax.inject.Inject; @@ -25,7 +26,7 @@ public class EventGeneratingGroupStore implements GroupStore { private final GroupStore groupStore; @Inject - public EventGeneratingGroupStore(EventBus eventBus, @Named(ConductorModule.CACHED_IMPLEMENTATION_NAME) GroupStore groupStore) { + public EventGeneratingGroupStore(EventBus eventBus, @Named(Constants.CACHED_IMPLEMENTATION_NAME) GroupStore groupStore) { this.eventBus = eventBus; this.groupStore = groupStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingSessionStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingSessionStore.java similarity index 87% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingSessionStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingSessionStore.java index 0045f35..7a67d8c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingSessionStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingSessionStore.java @@ -1,12 +1,13 @@ -package io.appform.conductor.server.usermanagement; +package io.appform.conductor.user.usermanagement; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.events.impl.user.UserSessionCreatedEvent; import io.appform.conductor.model.events.impl.user.UserSessionUpdatedEvent; import io.appform.conductor.model.usermgmt.SessionState; import io.appform.conductor.model.usermgmt.SessionType; import io.appform.conductor.model.usermgmt.UserSessionDetails; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; +import static io.appform.conductor.core.utils.Constants.ROOT_IMPLEMENTATION_NAME; +import io.appform.conductor.core.eventmanagement.EventBus; import lombok.val; import javax.inject.Inject; @@ -25,7 +26,7 @@ public class EventGeneratingSessionStore implements SessionStore { private final SessionStore sessionStore; @Inject - public EventGeneratingSessionStore(EventBus eventBus, @Named(ConductorModule.CACHED_IMPLEMENTATION_NAME) SessionStore sessionStore) { + public EventGeneratingSessionStore(EventBus eventBus, @Named(Constants.CACHED_IMPLEMENTATION_NAME) SessionStore sessionStore) { this.eventBus = eventBus; this.sessionStore = sessionStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingUserActivationTokenStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingUserActivationTokenStore.java similarity index 87% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingUserActivationTokenStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingUserActivationTokenStore.java index 843b195..7bf097e 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingUserActivationTokenStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingUserActivationTokenStore.java @@ -1,10 +1,11 @@ -package io.appform.conductor.server.usermanagement; +package io.appform.conductor.user.usermanagement; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.events.impl.user.UserActivationTokenStateUpdatedEvent; import io.appform.conductor.model.usermgmt.UserActivationToken; import io.appform.conductor.model.usermgmt.UserActivationTokenState; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; +import static io.appform.conductor.core.utils.Constants.ROOT_IMPLEMENTATION_NAME; +import io.appform.conductor.core.eventmanagement.EventBus; import io.appform.conductor.model.events.impl.user.UserActivationTokenGeneratedEvent; import lombok.val; @@ -22,7 +23,7 @@ public class EventGeneratingUserActivationTokenStore implements UserActivationTo private UserActivationTokenStore userActivationTokenStore; @Inject - public EventGeneratingUserActivationTokenStore(EventBus eventBus, @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) UserActivationTokenStore userActivationTokenStore) { + public EventGeneratingUserActivationTokenStore(EventBus eventBus, @Named(Constants.ROOT_IMPLEMENTATION_NAME) UserActivationTokenStore userActivationTokenStore) { this.eventBus = eventBus; this.userActivationTokenStore = userActivationTokenStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingUserPasswordAuthStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingUserPasswordAuthStore.java similarity index 84% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingUserPasswordAuthStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingUserPasswordAuthStore.java index 219aec4..1ec070c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingUserPasswordAuthStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingUserPasswordAuthStore.java @@ -1,10 +1,10 @@ -package io.appform.conductor.server.usermanagement; +package io.appform.conductor.user.usermanagement; import io.appform.conductor.model.events.impl.user.UserPasswordFailedAttemptUpdatedEvent; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; +import static io.appform.conductor.core.utils.Constants.ROOT_IMPLEMENTATION_NAME; +import io.appform.conductor.core.eventmanagement.EventBus; import io.appform.conductor.model.events.impl.user.UserPasswordSetEvent; -import io.appform.conductor.server.internalmodels.auth.UserPasswordAuthDetails; +import io.appform.conductor.user.internalmodels.auth.UserPasswordAuthDetails; import lombok.val; import javax.inject.Inject; @@ -20,7 +20,7 @@ public class EventGeneratingUserPasswordAuthStore implements UserPasswordAuthSto private final UserPasswordAuthStore userPasswordAuthStore; @Inject - public EventGeneratingUserPasswordAuthStore(EventBus eventBus, @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) UserPasswordAuthStore userPasswordAuthStore) { + public EventGeneratingUserPasswordAuthStore(EventBus eventBus, @Named(ROOT_IMPLEMENTATION_NAME) UserPasswordAuthStore userPasswordAuthStore) { this.eventBus = eventBus; this.userPasswordAuthStore = userPasswordAuthStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingUserStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingUserStore.java similarity index 88% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingUserStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingUserStore.java index 3a634b0..71573e1 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/EventGeneratingUserStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/EventGeneratingUserStore.java @@ -1,10 +1,11 @@ -package io.appform.conductor.server.usermanagement; +package io.appform.conductor.user.usermanagement; +import io.appform.conductor.core.interfaces.UserStore; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.usermgmt.UserState; import io.appform.conductor.model.usermgmt.UserSummary; import io.appform.conductor.model.usermgmt.UserType; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.eventmanagement.EventBus; +import io.appform.conductor.core.eventmanagement.EventBus; import io.appform.conductor.model.events.impl.user.UserCreatedEvent; import io.appform.conductor.model.events.impl.user.UserStateChangeEvent; import io.appform.conductor.model.events.impl.user.UserUpdatedEvent; @@ -23,7 +24,7 @@ public class EventGeneratingUserStore implements UserStore { private final UserStore userStore; @Inject - public EventGeneratingUserStore(EventBus eventBus, @Named(ConductorModule.CACHED_IMPLEMENTATION_NAME) UserStore userStore) { + public EventGeneratingUserStore(EventBus eventBus, @Named(Constants.CACHED_IMPLEMENTATION_NAME) UserStore userStore) { this.eventBus = eventBus; this.userStore = userStore; } diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/SessionStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/SessionStore.java similarity index 97% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/SessionStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/SessionStore.java index 99a8225..f83f725 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/SessionStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/SessionStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement; +package io.appform.conductor.user.usermanagement; import io.appform.conductor.model.usermgmt.SessionState; import io.appform.conductor.model.usermgmt.SessionType; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/UserActivationTokenStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/UserActivationTokenStore.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/UserActivationTokenStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/UserActivationTokenStore.java index 10cd52c..8e7a3bf 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/UserActivationTokenStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/UserActivationTokenStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement; +package io.appform.conductor.user.usermanagement; import io.appform.conductor.model.usermgmt.UserActivationToken; import io.appform.conductor.model.usermgmt.UserActivationTokenState; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/UserLifecycleManager.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/UserLifecycleManagerImpl.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/UserLifecycleManager.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/UserLifecycleManagerImpl.java index 6b479be..fabbd36 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/UserLifecycleManager.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/UserLifecycleManagerImpl.java @@ -14,24 +14,27 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement; +package io.appform.conductor.user.usermanagement; import at.favre.lib.crypto.bcrypt.BCrypt; import com.google.common.base.Strings; +import io.appform.conductor.core.auth.RoleStore; +import io.appform.conductor.core.auth.UserRoleMappingStore; +import io.appform.conductor.core.comms.MailSender; +import io.appform.conductor.core.id.IdUtils; +import io.appform.conductor.core.interfaces.GroupStore; +import io.appform.conductor.core.interfaces.UserLifecycleManager; +import io.appform.conductor.core.interfaces.UserStore; import io.appform.conductor.model.attributes.AttributeScopeType; import io.appform.conductor.model.auth.Role; import io.appform.conductor.model.skills.SkillDefinition; import io.appform.conductor.model.skills.SkillValue; import io.appform.conductor.model.usermgmt.*; -import io.appform.conductor.server.attributes.values.AttributeManager; -import io.appform.conductor.server.auth.RoleStore; -import io.appform.conductor.server.auth.UserAuthValidator; -import io.appform.conductor.server.auth.UserRoleMappingStore; -import io.appform.conductor.server.comms.MailSender; -import io.appform.conductor.server.id.IdUtils; -import io.appform.conductor.server.internalmodels.auth.PasswordAuthData; -import io.appform.conductor.server.internalmodels.auth.UserTokenAuthData; -import io.appform.conductor.server.skillmanagement.SkillStore; +import io.appform.conductor.core.attributes.values.AttributeManager; +import io.appform.conductor.user.auth.UserAuthValidator; +import io.appform.conductor.user.internalmodels.auth.PasswordAuthData; +import io.appform.conductor.user.internalmodels.auth.UserTokenAuthData; +import io.appform.conductor.user.skillmanagement.SkillStore; import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -48,7 +51,7 @@ @Slf4j @RequiredArgsConstructor(onConstructor_ = {@Inject}) -public class UserLifecycleManager { +public class UserLifecycleManagerImpl implements UserLifecycleManager { /** * Default validity for {@link UserActivationToken} */ diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/UserPasswordAuthStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/UserPasswordAuthStore.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/UserPasswordAuthStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/UserPasswordAuthStore.java index 1a5bf89..94aa769 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/UserPasswordAuthStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/UserPasswordAuthStore.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement; +package io.appform.conductor.user.usermanagement; -import io.appform.conductor.server.internalmodels.auth.UserPasswordAuthDetails; +import io.appform.conductor.user.internalmodels.auth.UserPasswordAuthDetails; import java.util.Optional; import java.util.function.ToIntFunction; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/CachingGroupStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/CachingGroupStore.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/CachingGroupStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/CachingGroupStore.java index dda2f8a..d4311dc 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/CachingGroupStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/CachingGroupStore.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.impl; +package io.appform.conductor.user.usermanagement.impl; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.usermgmt.Group; import io.appform.conductor.model.usermgmt.GroupType; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.usermanagement.GroupStore; +import io.appform.conductor.core.interfaces.GroupStore; import io.appform.functionmetrics.MonitoredFunction; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -51,7 +51,7 @@ public class CachingGroupStore implements GroupStore { @Inject public CachingGroupStore( - @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) final GroupStore root, + @Named(Constants.ROOT_IMPLEMENTATION_NAME) final GroupStore root, final HazelcastClient hazelcastClient) { this.root = root; this.groupCacheProvider = hazelcastClient.loadingCache( diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/CachingSessionStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/CachingSessionStore.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/CachingSessionStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/CachingSessionStore.java index f3aa9f6..3cd3c6e 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/CachingSessionStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/CachingSessionStore.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.impl; +package io.appform.conductor.user.usermanagement.impl; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.usermgmt.SessionState; import io.appform.conductor.model.usermgmt.SessionType; import io.appform.conductor.model.usermgmt.UserSessionDetails; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.usermanagement.SessionStore; +import static io.appform.conductor.core.utils.Constants.ROOT_IMPLEMENTATION_NAME; +import io.appform.conductor.core.hazelcast.HazelcastClient; +import io.appform.conductor.user.usermanagement.SessionStore; import io.appform.functionmetrics.MonitoredFunction; import lombok.Value; import lombok.extern.slf4j.Slf4j; @@ -58,7 +59,7 @@ private static class SessionKey { @Inject public CachingSessionStore( - @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) final SessionStore root, + @Named(Constants.ROOT_IMPLEMENTATION_NAME) final SessionStore root, final HazelcastClient hazelcastClient) { this.root = root; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/CachingUserStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/CachingUserStore.java similarity index 92% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/CachingUserStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/CachingUserStore.java index e9b69a2..bafd730 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/CachingUserStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/CachingUserStore.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.impl; +package io.appform.conductor.user.usermanagement.impl; +import io.appform.conductor.core.interfaces.UserStore; +import io.appform.conductor.core.utils.Constants; import io.appform.conductor.model.usermgmt.UserSummary; import io.appform.conductor.model.usermgmt.UserType; -import io.appform.conductor.server.ConductorModule; -import io.appform.conductor.server.hazelcast.HazelcastClient; -import io.appform.conductor.server.usermanagement.UserStore; +import io.appform.conductor.core.hazelcast.HazelcastClient; import io.appform.functionmetrics.MonitoredFunction; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -53,7 +53,7 @@ public class CachingUserStore implements UserStore { @Inject public CachingUserStore( - @Named(ConductorModule.ROOT_IMPLEMENTATION_NAME) final UserStore root, + @Named(Constants.ROOT_IMPLEMENTATION_NAME) final UserStore root, final HazelcastClient hazelcastClient) { this.root = root; val cacheName = getClass().getSimpleName(); diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBGroupStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBGroupStore.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBGroupStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBGroupStore.java index 72a2256..f7d391f 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBGroupStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBGroupStore.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.impl; +package io.appform.conductor.user.usermanagement.impl; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.Throws; import io.appform.conductor.model.usermgmt.Group; import io.appform.conductor.model.usermgmt.GroupType; -import io.appform.conductor.server.usermanagement.GroupStore; -import io.appform.conductor.server.usermanagement.impl.models.StoredGroup; -import io.appform.conductor.server.usermanagement.impl.models.StoredGroupUserMapping; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.core.interfaces.GroupStore; +import io.appform.conductor.user.usermanagement.impl.models.StoredGroup; +import io.appform.conductor.user.usermanagement.impl.models.StoredGroupUserMapping; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.dropwizard.sharding.dao.LookupDao; import io.appform.dropwizard.sharding.dao.RelationalDao; import io.appform.functionmetrics.MonitoredFunction; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBSessionStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBSessionStore.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBSessionStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBSessionStore.java index a353b3f..b6a3a83 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBSessionStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBSessionStore.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.impl; +package io.appform.conductor.user.usermanagement.impl; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.Throws; import io.appform.conductor.model.usermgmt.SessionState; import io.appform.conductor.model.usermgmt.SessionType; import io.appform.conductor.model.usermgmt.UserSessionDetails; -import io.appform.conductor.server.usermanagement.SessionStore; -import io.appform.conductor.server.usermanagement.impl.models.StoredUserSessionDetails; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.user.usermanagement.SessionStore; +import io.appform.conductor.user.usermanagement.impl.models.StoredUserSessionDetails; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.dropwizard.sharding.dao.RelationalDao; import io.appform.functionmetrics.MonitoredFunction; import lombok.SneakyThrows; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBUserActivationTokenStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBUserActivationTokenStore.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBUserActivationTokenStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBUserActivationTokenStore.java index 561c837..58aaf4c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBUserActivationTokenStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBUserActivationTokenStore.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.impl; +package io.appform.conductor.user.usermanagement.impl; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.Throws; import io.appform.conductor.model.usermgmt.UserActivationToken; import io.appform.conductor.model.usermgmt.UserActivationTokenState; -import io.appform.conductor.server.usermanagement.UserActivationTokenStore; -import io.appform.conductor.server.usermanagement.impl.models.StoredUserActivationToken; -import io.appform.conductor.server.utils.ConductorServerUtils; +import io.appform.conductor.user.usermanagement.UserActivationTokenStore; +import io.appform.conductor.user.usermanagement.impl.models.StoredUserActivationToken; +import io.appform.conductor.core.utils.ConductorServerUtils; import io.appform.dropwizard.sharding.dao.LookupDao; import io.appform.functionmetrics.MonitoredFunction; import lombok.RequiredArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBUserPasswordAuthStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBUserPasswordAuthStore.java similarity index 93% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBUserPasswordAuthStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBUserPasswordAuthStore.java index 2b1c5e6..a4e6aca 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBUserPasswordAuthStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBUserPasswordAuthStore.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.impl; +package io.appform.conductor.user.usermanagement.impl; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.Throws; -import io.appform.conductor.server.internalmodels.auth.UserPasswordAuthDetails; -import io.appform.conductor.server.usermanagement.UserPasswordAuthStore; -import io.appform.conductor.server.usermanagement.impl.models.StoredUserPassword; +import io.appform.conductor.user.internalmodels.auth.UserPasswordAuthDetails; +import io.appform.conductor.user.usermanagement.UserPasswordAuthStore; +import io.appform.conductor.user.usermanagement.impl.models.StoredUserPassword; import io.appform.dropwizard.sharding.dao.RelationalDao; import io.appform.functionmetrics.MonitoredFunction; import lombok.RequiredArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBUserStore.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBUserStore.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBUserStore.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBUserStore.java index 1f0a7a1..69c9fe8 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/DBUserStore.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/DBUserStore.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.impl; +package io.appform.conductor.user.usermanagement.impl; import com.google.common.base.Strings; +import io.appform.conductor.core.interfaces.UserStore; import io.appform.conductor.model.error.ConductorErrorCode; import io.appform.conductor.model.error.Throws; import io.appform.conductor.model.usermgmt.UserState; import io.appform.conductor.model.usermgmt.UserSummary; import io.appform.conductor.model.usermgmt.UserType; -import io.appform.conductor.server.usermanagement.UserStore; -import io.appform.conductor.server.usermanagement.impl.models.StoredUser; +import io.appform.conductor.user.usermanagement.impl.models.StoredUser; import io.appform.dropwizard.sharding.dao.LookupDao; import io.appform.functionmetrics.MonitoredFunction; import lombok.SneakyThrows; @@ -37,7 +37,7 @@ import java.util.Optional; import java.util.function.UnaryOperator; -import static io.appform.conductor.server.usermanagement.impl.models.StoredUser.USER_TABLE_NAME; +import static io.appform.conductor.user.usermanagement.impl.models.StoredUser.USER_TABLE_NAME; /** * RDBMS backend for {@link UserStore} diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredGroup.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredGroup.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredGroup.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredGroup.java index 4f05cea..8e590e6 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredGroup.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredGroup.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.impl.models; +package io.appform.conductor.user.usermanagement.impl.models; import io.appform.conductor.model.usermgmt.GroupType; -import io.appform.conductor.server.utils.Constants; -import io.appform.conductor.server.utils.persistence.StringSetConverter; +import io.appform.conductor.core.utils.Constants; +import io.appform.conductor.core.utils.persistence.StringSetConverter; import io.appform.dropwizard.sharding.sharding.LookupKey; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredGroupUserMapping.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredGroupUserMapping.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredGroupUserMapping.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredGroupUserMapping.java index 8c7ada6..234851c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredGroupUserMapping.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredGroupUserMapping.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.impl.models; +package io.appform.conductor.user.usermanagement.impl.models; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import lombok.*; import lombok.experimental.FieldNameConstants; import org.hibernate.annotations.CreationTimestamp; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredUser.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredUser.java similarity index 96% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredUser.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredUser.java index 01db2c5..0527a1c 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredUser.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredUser.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.impl.models; +package io.appform.conductor.user.usermanagement.impl.models; import io.appform.conductor.model.usermgmt.UserState; import io.appform.conductor.model.usermgmt.UserSummary; import io.appform.conductor.model.usermgmt.UserType; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import io.appform.dropwizard.sharding.sharding.LookupKey; import lombok.*; import lombok.experimental.FieldNameConstants; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredUserActivationToken.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredUserActivationToken.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredUserActivationToken.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredUserActivationToken.java index 5e18c32..7db1182 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredUserActivationToken.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredUserActivationToken.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.impl.models; +package io.appform.conductor.user.usermanagement.impl.models; import io.appform.conductor.model.usermgmt.UserActivationToken; import io.appform.conductor.model.usermgmt.UserActivationTokenState; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.Constants; import io.appform.dropwizard.sharding.sharding.LookupKey; import lombok.*; import lombok.experimental.FieldNameConstants; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredUserPassword.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredUserPassword.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredUserPassword.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredUserPassword.java index 1c776d7..88a2082 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredUserPassword.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredUserPassword.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.impl.models; +package io.appform.conductor.user.usermanagement.impl.models; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.Constants; import io.appform.dropwizard.sharding.sharding.LookupKey; import lombok.*; import lombok.experimental.FieldNameConstants; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredUserSessionDetails.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredUserSessionDetails.java similarity index 94% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredUserSessionDetails.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredUserSessionDetails.java index fc68400..5660bac 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/impl/models/StoredUserSessionDetails.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/impl/models/StoredUserSessionDetails.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.impl.models; +package io.appform.conductor.user.usermanagement.impl.models; import io.appform.conductor.model.usermgmt.SessionState; import io.appform.conductor.model.usermgmt.SessionType; -import io.appform.conductor.server.utils.ConductorServerUtils; -import io.appform.conductor.server.utils.Constants; +import io.appform.conductor.core.utils.ConductorServerUtils; +import io.appform.conductor.core.utils.Constants; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.FieldNameConstants; diff --git a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/support/AutomaticGroupAssignmentManager.java b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/support/AutomaticGroupAssignmentManager.java similarity index 95% rename from conductor-server/src/main/java/io/appform/conductor/server/usermanagement/support/AutomaticGroupAssignmentManager.java rename to conductor-user/src/main/java/io/appform/conductor/user/usermanagement/support/AutomaticGroupAssignmentManager.java index d02832c..0e3c551 100644 --- a/conductor-server/src/main/java/io/appform/conductor/server/usermanagement/support/AutomaticGroupAssignmentManager.java +++ b/conductor-user/src/main/java/io/appform/conductor/user/usermanagement/support/AutomaticGroupAssignmentManager.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package io.appform.conductor.server.usermanagement.support; +package io.appform.conductor.user.usermanagement.support; +import io.appform.conductor.core.interfaces.UserLifecycleManager; import io.appform.conductor.model.events.Event; import io.appform.conductor.model.events.EventType; import io.appform.conductor.model.skills.SkillValue; import io.appform.conductor.model.usermgmt.Group; import io.appform.conductor.model.usermgmt.GroupType; -import io.appform.conductor.server.eventmanagement.*; +import io.appform.conductor.core.eventmanagement.*; import io.appform.conductor.model.events.impl.user.UserSkillAssociatedEvent; import io.appform.conductor.model.events.impl.user.UserSkillDisasocciatedEvent; -import io.appform.conductor.server.usermanagement.UserLifecycleManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import lombok.val;