Skip to content

conductor-core package files moved #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ashu82492 wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

conductor-core package files moved #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f16676e
conductor-core package files moved
Feb 12, 2026
8ca4ee1
conductor-user and conductor-console package files moved
Feb 12, 2026
4c99485
conductor-core package files moved fixes
Feb 12, 2026
a28de25
package name and import path changes
Feb 16, 2026
00eb0b8
import package name changes and location fixes
Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 5 additions & 5 deletions ...tor/server/dashboards/DashboardStore.java → ...or/console/dashboards/DashboardStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions ...ver/dashboards/impl/DBDashboardStore.java → ...ole/dashboards/impl/DBDashboardStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...ashboards/impl/model/StoredDashboard.java → ...ashboards/impl/model/StoredDashboard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...or/server/dashboards/model/Dashboard.java → ...r/console/dashboards/model/Dashboard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...server/dashboards/model/DashboardRow.java → ...onsole/dashboards/model/DashboardRow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...erver/dashboards/model/DashboardSpec.java → ...nsole/dashboards/model/DashboardSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ver/dashboards/model/DashboardWidget.java → ...ole/dashboards/model/DashboardWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion .../server/dashboards/model/SpecVersion.java → ...console/dashboards/model/SpecVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.appform.conductor.server.dashboards.model;
package io.appform.conductor.console.dashboards.model;

/**
*
Expand Down
2 changes: 1 addition & 1 deletion ...dashboards/model/WidgetQueryResponse.java → ...dashboards/model/WidgetQueryResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.appform.conductor.server.dashboards.model;
package io.appform.conductor.console.dashboards.model;

import lombok.*;

Expand Down
8 changes: 4 additions & 4 deletions ...reporting/EventGeneratingReportStore.java → ...reporting/EventGeneratingReportStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion ...uctor/server/reporting/ReportContext.java → ...ctor/console/reporting/ReportContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.appform.conductor.server.reporting;
package io.appform.conductor.console.reporting;

import lombok.Value;

Expand Down
20 changes: 10 additions & 10 deletions ...uctor/server/reporting/ReportManager.java → ...ctor/console/reporting/ReportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;

/**
*
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...nductor/server/reporting/ReportStore.java → ...ductor/console/reporting/ReportStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions .../server/reporting/impl/DBReportStore.java → ...console/reporting/impl/DBReportStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;

/**
*
Expand Down
6 changes: 3 additions & 3 deletions ...r/reporting/impl/models/StoredReport.java → ...e/reporting/impl/models/StoredReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ting/impl/models/StoredReportContext.java → ...ting/impl/models/StoredReportContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...eporting/impl/models/StoredReportRun.java → ...eporting/impl/models/StoredReportRun.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...tor/server/ui/HandlebarsHelperBundle.java → ...or/console/ui/HandlebarsHelperBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...tor/server/ui/HandlebarsViewRenderer.java → ...or/console/ui/HandlebarsViewRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...uctor/server/ui/views/ActivationView.java → ...ctor/console/ui/views/ActivationView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...tor/server/ui/views/BaseLoggedInView.java → ...or/console/ui/views/BaseLoggedInView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...m/conductor/server/ui/views/HomeView.java → .../conductor/console/ui/views/HomeView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...rver/ui/views/actions/ActionListView.java → ...sole/ui/views/actions/ActionListView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ns/fragments/AddTicketActionFragment.java → ...ns/fragments/AddTicketActionFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...agments/ChangePriorityActionFragment.java → ...agments/ChangePriorityActionFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...fragments/RouteToGroupActionFragment.java → ...fragments/RouteToGroupActionFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ons/fragments/SetFieldActionFragment.java → ...ons/fragments/SetFieldActionFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading