This is an automated email from the ASF dual-hosted git repository. github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/main/pr-5672-aca41f3cb79b3330f4a744504b349b479a645fa2 in repository https://gitbox.apache.org/repos/asf/texera.git
commit b21540d1f3433419d0badc19c3de1e6de01ee883 Author: Matthew B. <[email protected]> AuthorDate: Sat Jun 13 22:16:32 2026 -0700 refactor(config): drop amber prefix from common config package (#5672) ### What changes were proposed in this PR? - Unified all config objects in `common/config` under one package, `org.apache.texera.common.config`. This merges the two former packages (`org.apache.texera.config` and `org.apache.texera.amber.config`) so the namespace reflects that they live in `common` and are shared by both web and engine, rather than implying they belong to `amber`. - Moved the module directory to `.../org/apache/texera/common/config/` and rewrote all references across the repo (74 files) to the new package. - Pure rename and import rewrite, no behavior change. ### Any related issues, documentation, discussions? Closes: #5668 ### How was this PR tested? - `sbt "Config/compile" "ConfigService/compile" "ComputingUnitManagingService/compile" "WorkflowCompilingService/compile" "WorkflowCore/compile"` all report `[success]`. - No behavior changed, so existing test suites should pass unchanged. ### Was this PR authored or co-authored using generative AI tooling? Co-authored with Claude Opus 4.8 in compliance with ASF --- .../scala/org/apache/texera/service/AccessControlService.scala | 2 +- .../apache/texera/service/resource/AccessControlResource.scala | 2 +- .../org/apache/texera/amber/clustering/ClusterListener.scala | 2 +- .../architecture/common/PekkoMessageTransferService.scala | 2 +- .../amber/engine/architecture/controller/Controller.scala | 2 +- .../promisehandlers/QueryWorkerStatisticsHandler.scala | 2 +- .../engine/architecture/logreplay/AsyncReplayLogWriter.scala | 2 +- .../amber/engine/architecture/messaginglayer/FlowControl.scala | 2 +- .../architecture/messaginglayer/WorkerTimerService.scala | 2 +- .../architecture/pythonworker/PythonWorkflowWorker.scala | 2 +- .../architecture/scheduling/CostBasedScheduleGenerator.scala | 2 +- .../engine/architecture/scheduling/ScheduleGenerator.scala | 2 +- .../engine/architecture/scheduling/config/WorkerConfig.scala | 2 +- .../architecture/sendsemantics/partitioners/Partitioner.scala | 2 +- .../worker/managers/InputPortMaterializationReaderThread.scala | 2 +- .../org/apache/texera/amber/engine/common/AmberRuntime.scala | 2 +- .../main/scala/org/apache/texera/web/ComputingUnitMaster.scala | 2 +- .../scala/org/apache/texera/web/TexeraWebApplication.scala | 2 +- .../scala/org/apache/texera/web/resource/EmailTemplate.scala | 2 +- .../scala/org/apache/texera/web/resource/GmailResource.scala | 2 +- .../org/apache/texera/web/resource/SyncExecutionResource.scala | 2 +- .../texera/web/resource/aiassistant/AiAssistantManager.scala | 2 +- .../org/apache/texera/web/resource/auth/AuthResource.scala | 2 +- .../apache/texera/web/resource/auth/GoogleAuthResource.scala | 2 +- .../dashboard/admin/settings/AdminSettingsResource.scala | 2 +- .../dashboard/user/workflow/WorkflowVersionResource.scala | 2 +- .../web/resource/pythonvirtualenvironment/PveManager.scala | 2 +- .../web/resource/pythonvirtualenvironment/PveResource.scala | 2 +- .../pythonvirtualenvironment/PveWebsocketResource.scala | 2 +- .../apache/texera/web/service/ExecutionConsoleService.scala | 2 +- .../org/apache/texera/web/service/ExecutionResultService.scala | 2 +- .../org/apache/texera/web/service/ResultExportService.scala | 2 +- .../scala/org/apache/texera/web/service/WorkflowService.scala | 2 +- .../storage/iceberg/IcebergRestCatalogIntegrationSpec.scala | 2 +- .../engine/architecture/messaginglayer/FlowControlSpec.scala | 2 +- .../architecture/scheduling/config/SchedulingConfigsSpec.scala | 2 +- .../scheduling/resourcePolicies/ResourcePoliciesSpec.scala | 2 +- .../sendsemantics/partitioners/NetworkOutputBufferSpec.scala | 2 +- .../scala/org/apache/texera/amber/engine/e2e/TestUtils.scala | 2 +- .../auth/src/main/scala/org/apache/texera/auth/JwtAuth.scala | 2 +- .../texera/{amber => common}/config/ApplicationConfig.scala | 2 +- .../org/apache/texera/{ => common}/config/AuthConfig.scala | 2 +- .../texera/{ => common}/config/ComputingUnitConfig.scala | 2 +- .../org/apache/texera/{ => common}/config/DefaultsConfig.scala | 2 +- .../{amber => common}/config/EnvironmentalVariable.scala | 2 +- .../org/apache/texera/{ => common}/config/GuiConfig.scala | 2 +- .../apache/texera/{ => common}/config/KubernetesConfig.scala | 2 +- .../org/apache/texera/{ => common}/config/LLMConfig.scala | 2 +- .../apache/texera/{amber => common}/config/PekkoConfig.scala | 2 +- .../apache/texera/{amber => common}/config/PythonUtils.scala | 2 +- .../apache/texera/{amber => common}/config/StorageConfig.scala | 2 +- .../org/apache/texera/{amber => common}/config/UdfConfig.scala | 2 +- .../apache/texera/{ => common}/config/UserSystemConfig.scala | 2 +- .../org/apache/texera/amber/core/storage/DocumentFactory.scala | 2 +- .../texera/amber/core/storage/IcebergCatalogInstance.scala | 2 +- .../texera/amber/core/storage/model/DatasetFileDocument.scala | 2 +- .../amber/core/storage/result/iceberg/IcebergTableWriter.scala | 2 +- .../texera/amber/core/storage/util/LakeFSStorageClient.scala | 2 +- .../apache/texera/amber/core/workflow/WorkflowSettings.scala | 2 +- .../main/scala/org/apache/texera/amber/util/IcebergUtil.scala | 2 +- .../org/apache/texera/service/util/LargeBinaryManager.scala | 2 +- .../scala/org/apache/texera/service/util/S3StorageClient.scala | 2 +- .../amber/storage/result/iceberg/IcebergDocumentSpec.scala | 2 +- .../org/apache/texera/service/util/S3StorageTestBase.scala | 2 +- .../apache/texera/service/ComputingUnitManagingService.scala | 2 +- .../texera/service/resource/ComputingUnitAccessResource.scala | 2 +- .../service/resource/ComputingUnitManagingResource.scala | 10 +++++++--- .../org/apache/texera/service/util/KubernetesClient.scala | 2 +- .../main/scala/org/apache/texera/service/ConfigService.scala | 3 +-- .../org/apache/texera/service/resource/ConfigResource.scala | 7 ++++++- .../src/main/scala/org/apache/texera/service/FileService.scala | 2 +- .../org/apache/texera/service/resource/DatasetResource.scala | 2 +- .../src/test/scala/org/apache/texera/service/MockLakeFS.scala | 2 +- .../org/apache/texera/service/WorkflowCompilingService.scala | 2 +- 74 files changed, 85 insertions(+), 77 deletions(-) diff --git a/access-control-service/src/main/scala/org/apache/texera/service/AccessControlService.scala b/access-control-service/src/main/scala/org/apache/texera/service/AccessControlService.scala index e262b80900..f01d06f941 100644 --- a/access-control-service/src/main/scala/org/apache/texera/service/AccessControlService.scala +++ b/access-control-service/src/main/scala/org/apache/texera/service/AccessControlService.scala @@ -23,7 +23,7 @@ import io.dropwizard.auth.AuthDynamicFeature import io.dropwizard.configuration.{EnvironmentVariableSubstitutor, SubstitutingSourceProvider} import io.dropwizard.core.Application import io.dropwizard.core.setup.{Bootstrap, Environment} -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.apache.texera.auth.{ JwtAuthFilter, RequestLoggingFilter, diff --git a/access-control-service/src/main/scala/org/apache/texera/service/resource/AccessControlResource.scala b/access-control-service/src/main/scala/org/apache/texera/service/resource/AccessControlResource.scala index 96b2d52624..4f1691287f 100644 --- a/access-control-service/src/main/scala/org/apache/texera/service/resource/AccessControlResource.scala +++ b/access-control-service/src/main/scala/org/apache/texera/service/resource/AccessControlResource.scala @@ -27,7 +27,7 @@ import jakarta.ws.rs.{Consumes, DELETE, GET, POST, PUT, Path, Produces} import org.apache.texera.auth.JwtParser.parseToken import org.apache.texera.auth.SessionUser import org.apache.texera.auth.util.{ComputingUnitAccess, HeaderField} -import org.apache.texera.config.{GuiConfig, KubernetesConfig, LLMConfig} +import org.apache.texera.common.config.{GuiConfig, KubernetesConfig, LLMConfig} import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum import java.net.URLDecoder diff --git a/amber/src/main/scala/org/apache/texera/amber/clustering/ClusterListener.scala b/amber/src/main/scala/org/apache/texera/amber/clustering/ClusterListener.scala index e3e9afab3f..263b14858a 100644 --- a/amber/src/main/scala/org/apache/texera/amber/clustering/ClusterListener.scala +++ b/amber/src/main/scala/org/apache/texera/amber/clustering/ClusterListener.scala @@ -25,7 +25,7 @@ import org.apache.pekko.cluster.ClusterEvent._ import com.google.protobuf.timestamp.Timestamp import com.twitter.util.{Await, Future} import org.apache.texera.amber.clustering.ClusterListener.numWorkerNodesInCluster -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity import org.apache.texera.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/PekkoMessageTransferService.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/PekkoMessageTransferService.scala index cba9b0b2ee..16c9e394ca 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/PekkoMessageTransferService.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/PekkoMessageTransferService.scala @@ -20,7 +20,7 @@ package org.apache.texera.amber.engine.architecture.common import org.apache.pekko.actor.Cancellable -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkMessage import org.apache.texera.amber.engine.architecture.messaginglayer.{CongestionControl, FlowControl} diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Controller.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Controller.scala index 512a3342ce..4e365dba2d 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Controller.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Controller.scala @@ -22,7 +22,7 @@ package org.apache.texera.amber.engine.architecture.controller import org.apache.pekko.actor.SupervisorStrategy.Stop import org.apache.pekko.actor.{AllForOneStrategy, Props, SupervisorStrategy} import org.apache.texera.web.model.websocket.response.RegionUpdateEvent -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.virtualidentity.ChannelIdentity import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext} import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkAck diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala index 6551579f71..1f22fa5b36 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala @@ -20,7 +20,7 @@ package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity import org.apache.texera.amber.engine.architecture.controller.{ ControllerAsyncRPCHandlerInitializer, diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala index 39969340d3..668d5345d3 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala @@ -20,7 +20,7 @@ package org.apache.texera.amber.engine.architecture.logreplay import com.google.common.collect.Queues -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordWriter diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/FlowControl.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/FlowControl.scala index d4b24dad1d..992b3c06d3 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/FlowControl.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/FlowControl.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.engine.architecture.messaginglayer -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkMessage import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerTimerService.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerTimerService.scala index 006c9614fd..81b7c7b0bd 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerTimerService.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerTimerService.scala @@ -20,7 +20,7 @@ package org.apache.texera.amber.engine.architecture.messaginglayer import org.apache.pekko.actor.Cancellable -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.engine.architecture.common.PekkoActorService import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala index c7ed3b6324..bd9f052b06 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala @@ -21,7 +21,7 @@ package org.apache.texera.amber.engine.architecture.pythonworker import org.apache.pekko.actor.Props import com.twitter.util.Promise -import org.apache.texera.amber.config.{PythonUtils, StorageConfig, UdfConfig} +import org.apache.texera.common.config.{PythonUtils, StorageConfig, UdfConfig} import org.apache.texera.amber.core.virtualidentity.ChannelIdentity import org.apache.texera.amber.engine.architecture.common.WorkflowActor import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkAck diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala index 43e8d281ce..44958718b2 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.engine.architecture.scheduling -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.storage.VFSURIFactory.createPortBaseURI import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, PhysicalOpIdentity} import org.apache.texera.amber.core.workflow._ diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ScheduleGenerator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ScheduleGenerator.scala index fc42499fa6..bde2cb6f01 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ScheduleGenerator.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ScheduleGenerator.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.engine.architecture.scheduling -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.workflow._ import org.apache.texera.amber.engine.architecture.scheduling.resourcePolicies.{ DefaultResourceAllocator, diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/WorkerConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/WorkerConfig.scala index 8166dee6dd..dd81537d5c 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/WorkerConfig.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/WorkerConfig.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.engine.architecture.scheduling.config -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity import org.apache.texera.amber.core.workflow.PhysicalOp import org.apache.texera.amber.util.VirtualIdentityUtils diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala index eac77bce36..39065ca693 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.state.State import org.apache.texera.amber.core.tuple.Tuple import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala index 428d9fb48c..2f4386c1d8 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala @@ -20,7 +20,7 @@ package org.apache.texera.amber.engine.architecture.worker.managers import io.grpc.MethodDescriptor -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.state.State import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory} import org.apache.texera.amber.core.storage.model.VirtualDocument diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberRuntime.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberRuntime.scala index 03234a277e..1993e51073 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberRuntime.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberRuntime.scala @@ -23,7 +23,7 @@ import org.apache.pekko.actor.{ActorSystem, Address, Cancellable, DeadLetter, Pr import org.apache.pekko.serialization.{Serialization, SerializationExtension} import com.typesafe.config.{Config, ConfigFactory} import org.apache.texera.amber.clustering.ClusterListener -import org.apache.texera.amber.config.PekkoConfig +import org.apache.texera.common.config.PekkoConfig import org.apache.texera.amber.engine.architecture.messaginglayer.DeadLetterMonitorActor import java.io.{BufferedReader, InputStreamReader} diff --git a/amber/src/main/scala/org/apache/texera/web/ComputingUnitMaster.scala b/amber/src/main/scala/org/apache/texera/web/ComputingUnitMaster.scala index 41d8d3b583..d4a061781c 100644 --- a/amber/src/main/scala/org/apache/texera/web/ComputingUnitMaster.scala +++ b/amber/src/main/scala/org/apache/texera/web/ComputingUnitMaster.scala @@ -25,7 +25,7 @@ import io.dropwizard.Configuration import io.dropwizard.configuration.{EnvironmentVariableSubstitutor, SubstitutingSourceProvider} import io.dropwizard.setup.{Bootstrap, Environment} import io.dropwizard.websockets.WebsocketBundle -import org.apache.texera.amber.config.{ApplicationConfig, StorageConfig} +import org.apache.texera.common.config.{ApplicationConfig, StorageConfig} import org.apache.texera.amber.core.storage.DocumentFactory import org.apache.texera.amber.core.virtualidentity.ExecutionIdentity import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext} diff --git a/amber/src/main/scala/org/apache/texera/web/TexeraWebApplication.scala b/amber/src/main/scala/org/apache/texera/web/TexeraWebApplication.scala index 5438eea4d0..c93f75fe75 100644 --- a/amber/src/main/scala/org/apache/texera/web/TexeraWebApplication.scala +++ b/amber/src/main/scala/org/apache/texera/web/TexeraWebApplication.scala @@ -26,7 +26,7 @@ import io.dropwizard.auth.AuthValueFactoryProvider import io.dropwizard.configuration.{EnvironmentVariableSubstitutor, SubstitutingSourceProvider} import io.dropwizard.setup.{Bootstrap, Environment} import io.dropwizard.websockets.WebsocketBundle -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.apache.texera.amber.engine.common.Utils import org.apache.texera.amber.util.ObjectMapperUtils import org.apache.texera.auth.SessionUser diff --git a/amber/src/main/scala/org/apache/texera/web/resource/EmailTemplate.scala b/amber/src/main/scala/org/apache/texera/web/resource/EmailTemplate.scala index d43ca1e507..17084b6c10 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/EmailTemplate.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/EmailTemplate.scala @@ -19,7 +19,7 @@ package org.apache.texera.web.resource -import org.apache.texera.config.UserSystemConfig +import org.apache.texera.common.config.UserSystemConfig import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum /** diff --git a/amber/src/main/scala/org/apache/texera/web/resource/GmailResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/GmailResource.scala index ab91c9ad43..348dad6ff7 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/GmailResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/GmailResource.scala @@ -21,7 +21,7 @@ package org.apache.texera.web.resource import io.dropwizard.auth.Auth import org.apache.texera.auth.SessionUser -import org.apache.texera.config.UserSystemConfig +import org.apache.texera.common.config.UserSystemConfig import org.apache.texera.dao.SqlServer import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum import org.apache.texera.dao.jooq.generated.tables.daos.UserDao diff --git a/amber/src/main/scala/org/apache/texera/web/resource/SyncExecutionResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/SyncExecutionResource.scala index d3047db580..b70bafb4b0 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/SyncExecutionResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/SyncExecutionResource.scala @@ -22,7 +22,7 @@ package org.apache.texera.web.resource import com.fasterxml.jackson.databind.node.ObjectNode import com.typesafe.scalalogging.LazyLogging import io.dropwizard.auth.Auth -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.storage.DocumentFactory import org.apache.texera.amber.operator.LogicalOp import org.apache.texera.amber.core.storage.model.VirtualDocument diff --git a/amber/src/main/scala/org/apache/texera/web/resource/aiassistant/AiAssistantManager.scala b/amber/src/main/scala/org/apache/texera/web/resource/aiassistant/AiAssistantManager.scala index 374525ff3f..62ff3e9f0d 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/aiassistant/AiAssistantManager.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/aiassistant/AiAssistantManager.scala @@ -20,7 +20,7 @@ package org.apache.texera.web.resource.aiassistant import com.typesafe.config.Config -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import java.net.{HttpURLConnection, URL} diff --git a/amber/src/main/scala/org/apache/texera/web/resource/auth/AuthResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/auth/AuthResource.scala index 0f99da681d..7739c4baa0 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/auth/AuthResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/auth/AuthResource.scala @@ -20,7 +20,7 @@ package org.apache.texera.web.resource.auth import org.apache.texera.auth.JwtAuth.{TOKEN_EXPIRE_TIME_IN_MINUTES, jwtClaims, jwtToken} -import org.apache.texera.config.UserSystemConfig +import org.apache.texera.common.config.UserSystemConfig import org.apache.texera.dao.SqlServer import org.apache.texera.dao.jooq.generated.Tables.USER import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum diff --git a/amber/src/main/scala/org/apache/texera/web/resource/auth/GoogleAuthResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/auth/GoogleAuthResource.scala index 2f99b9c1bd..a088e5e56d 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/auth/GoogleAuthResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/auth/GoogleAuthResource.scala @@ -23,7 +23,7 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier import com.google.api.client.http.javanet.NetHttpTransport import com.google.api.client.json.gson.GsonFactory import org.apache.texera.auth.JwtAuth.{TOKEN_EXPIRE_TIME_IN_MINUTES, jwtClaims, jwtToken} -import org.apache.texera.config.UserSystemConfig +import org.apache.texera.common.config.UserSystemConfig import org.apache.texera.dao.SqlServer import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum import org.apache.texera.dao.jooq.generated.tables.daos.UserDao diff --git a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/settings/AdminSettingsResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/settings/AdminSettingsResource.scala index d98ede5610..a1880f3c3c 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/settings/AdminSettingsResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/settings/AdminSettingsResource.scala @@ -22,7 +22,7 @@ package org.apache.texera.web.resource.dashboard.admin.settings import com.fasterxml.jackson.annotation.JsonProperty import io.dropwizard.auth.Auth import org.apache.texera.auth.SessionUser -import org.apache.texera.config.DefaultsConfig +import org.apache.texera.common.config.DefaultsConfig import org.apache.texera.dao.SqlServer import org.jooq.impl.DSL diff --git a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala index 7be74ae5b0..e0664b7c1d 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala @@ -23,7 +23,7 @@ import com.flipkart.zjsonpatch.{JsonDiff, JsonPatch} import io.dropwizard.auth.Auth import org.apache.texera.amber.util.JSONUtils.objectMapper import org.apache.texera.auth.SessionUser -import org.apache.texera.config.UserSystemConfig +import org.apache.texera.common.config.UserSystemConfig import org.apache.texera.dao.SqlServer import org.apache.texera.dao.jooq.generated.Tables.WORKFLOW_VERSION import org.apache.texera.dao.jooq.generated.tables.daos.{WorkflowDao, WorkflowVersionDao} diff --git a/amber/src/main/scala/org/apache/texera/web/resource/pythonvirtualenvironment/PveManager.scala b/amber/src/main/scala/org/apache/texera/web/resource/pythonvirtualenvironment/PveManager.scala index c82d252e43..260811a700 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/pythonvirtualenvironment/PveManager.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/pythonvirtualenvironment/PveManager.scala @@ -25,7 +25,7 @@ import scala.collection.mutable.Map import scala.jdk.CollectionConverters._ import scala.sys.process._ import java.util.Comparator -import org.apache.texera.amber.config.PythonUtils +import org.apache.texera.common.config.PythonUtils import org.apache.texera.dao.SqlServer import org.apache.texera.dao.jooq.generated.tables.daos.VirtualEnvironmentsDao import org.apache.texera.dao.jooq.generated.tables.pojos.VirtualEnvironments diff --git a/amber/src/main/scala/org/apache/texera/web/resource/pythonvirtualenvironment/PveResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/pythonvirtualenvironment/PveResource.scala index f404416731..4525bd9600 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/pythonvirtualenvironment/PveResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/pythonvirtualenvironment/PveResource.scala @@ -25,7 +25,7 @@ import com.fasterxml.jackson.module.scala.DefaultScalaModule import com.typesafe.scalalogging.LazyLogging import io.dropwizard.auth.Auth import org.apache.texera.auth.SessionUser -import org.apache.texera.config.KubernetesConfig +import org.apache.texera.common.config.KubernetesConfig import org.jooq.exception.DataAccessException import javax.ws.rs._ diff --git a/amber/src/main/scala/org/apache/texera/web/resource/pythonvirtualenvironment/PveWebsocketResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/pythonvirtualenvironment/PveWebsocketResource.scala index efaa266caa..d539b8c31b 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/pythonvirtualenvironment/PveWebsocketResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/pythonvirtualenvironment/PveWebsocketResource.scala @@ -19,7 +19,7 @@ package org.apache.texera.web.resource.pythonvirtualenvironment -import org.apache.texera.config.KubernetesConfig +import org.apache.texera.common.config.KubernetesConfig import javax.websocket._ import javax.websocket.server.ServerEndpoint diff --git a/amber/src/main/scala/org/apache/texera/web/service/ExecutionConsoleService.scala b/amber/src/main/scala/org/apache/texera/web/service/ExecutionConsoleService.scala index 1678494e93..3811bfaeb4 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/ExecutionConsoleService.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/ExecutionConsoleService.scala @@ -22,7 +22,7 @@ package org.apache.texera.web.service import com.google.protobuf.timestamp.Timestamp import com.twitter.util.{Await, Duration} import com.typesafe.scalalogging.LazyLogging -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.storage.model.BufferedItemWriter import org.apache.texera.amber.core.storage.result.ResultSchema import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory} diff --git a/amber/src/main/scala/org/apache/texera/web/service/ExecutionResultService.scala b/amber/src/main/scala/org/apache/texera/web/service/ExecutionResultService.scala index 20446bb998..37c803951e 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/ExecutionResultService.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/ExecutionResultService.scala @@ -23,7 +23,7 @@ import org.apache.pekko.actor.Cancellable import com.fasterxml.jackson.annotation.{JsonTypeInfo, JsonTypeName} import com.fasterxml.jackson.databind.node.ObjectNode import com.typesafe.scalalogging.LazyLogging -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.storage.model.VirtualDocument import org.apache.texera.amber.core.storage.result._ import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory} diff --git a/amber/src/main/scala/org/apache/texera/web/service/ResultExportService.scala b/amber/src/main/scala/org/apache/texera/web/service/ResultExportService.scala index e4fdc92da9..605e6a9e58 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/ResultExportService.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/ResultExportService.scala @@ -23,7 +23,7 @@ import com.fasterxml.jackson.core.`type`.TypeReference import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.scala.DefaultScalaModule import com.github.tototoshi.csv.CSVWriter -import org.apache.texera.amber.config.EnvironmentalVariable +import org.apache.texera.common.config.EnvironmentalVariable import org.apache.texera.amber.core.storage.DocumentFactory import org.apache.texera.amber.core.storage.model.VirtualDocument import org.apache.texera.amber.core.tuple.Tuple diff --git a/amber/src/main/scala/org/apache/texera/web/service/WorkflowService.scala b/amber/src/main/scala/org/apache/texera/web/service/WorkflowService.scala index c18b8b50e8..a241121da2 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/WorkflowService.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/WorkflowService.scala @@ -23,7 +23,7 @@ import com.google.protobuf.timestamp.Timestamp import com.typesafe.scalalogging.LazyLogging import io.reactivex.rxjava3.disposables.{CompositeDisposable, Disposable} import io.reactivex.rxjava3.subjects.BehaviorSubject -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.WorkflowRuntimeException import org.apache.texera.amber.core.storage.DocumentFactory import org.apache.texera.amber.core.storage.result.iceberg.OnIceberg diff --git a/amber/src/test/integration/org/apache/texera/amber/storage/iceberg/IcebergRestCatalogIntegrationSpec.scala b/amber/src/test/integration/org/apache/texera/amber/storage/iceberg/IcebergRestCatalogIntegrationSpec.scala index 9f2133b608..807591dde5 100644 --- a/amber/src/test/integration/org/apache/texera/amber/storage/iceberg/IcebergRestCatalogIntegrationSpec.scala +++ b/amber/src/test/integration/org/apache/texera/amber/storage/iceberg/IcebergRestCatalogIntegrationSpec.scala @@ -22,7 +22,7 @@ package org.apache.texera.amber.storage.iceberg import org.apache.iceberg.catalog.TableIdentifier import org.apache.iceberg.exceptions.NoSuchTableException import org.apache.iceberg.rest.RESTCatalog -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema} import org.apache.texera.amber.tags.IntegrationTest import org.apache.texera.amber.util.IcebergUtil diff --git a/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/FlowControlSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/FlowControlSpec.scala index 3cccd8f7cb..418a02426c 100644 --- a/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/FlowControlSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/FlowControlSpec.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.engine.architecture.messaginglayer -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkMessage import org.apache.texera.amber.engine.common.ambermessage.{ diff --git a/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/config/SchedulingConfigsSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/config/SchedulingConfigsSpec.scala index 31ab5c8e1a..f41f55b365 100644 --- a/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/config/SchedulingConfigsSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/config/SchedulingConfigsSpec.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.engine.architecture.scheduling.config -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.executor.OpExecInitInfo import org.apache.texera.amber.core.virtualidentity.{ ActorVirtualIdentity, diff --git a/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ResourcePoliciesSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ResourcePoliciesSpec.scala index 63a08e899f..9500ed4730 100644 --- a/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ResourcePoliciesSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ResourcePoliciesSpec.scala @@ -105,7 +105,7 @@ class ResourcePoliciesSpec extends AnyFlatSpec { if (!op.parallelizable) 1 else op.suggestedWorkerNum.getOrElse( - org.apache.texera.amber.config.ApplicationConfig.numWorkerPerOperatorByDefault + org.apache.texera.common.config.ApplicationConfig.numWorkerPerOperatorByDefault ) assert(workers == expected, s"unexpected worker count for ${op.id}") } diff --git a/amber/src/test/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/NetworkOutputBufferSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/NetworkOutputBufferSpec.scala index 765dd386b8..33f89a3348 100644 --- a/amber/src/test/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/NetworkOutputBufferSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/NetworkOutputBufferSpec.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners -import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.common.config.ApplicationConfig import org.apache.texera.amber.core.state.State import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity diff --git a/amber/src/test/scala/org/apache/texera/amber/engine/e2e/TestUtils.scala b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/TestUtils.scala index bcc43b396b..9021765fc8 100644 --- a/amber/src/test/scala/org/apache/texera/amber/engine/e2e/TestUtils.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/TestUtils.scala @@ -21,7 +21,7 @@ package org.apache.texera.amber.engine.e2e import com.twitter.util.{Await, Duration, Promise, Return} import org.apache.pekko.actor.ActorSystem -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.apache.texera.amber.core.executor.OpExecInitInfo import org.apache.texera.amber.core.storage.DocumentFactory import org.apache.texera.amber.core.storage.model.VirtualDocument diff --git a/common/auth/src/main/scala/org/apache/texera/auth/JwtAuth.scala b/common/auth/src/main/scala/org/apache/texera/auth/JwtAuth.scala index 6e099a1f36..a97e36a50e 100644 --- a/common/auth/src/main/scala/org/apache/texera/auth/JwtAuth.scala +++ b/common/auth/src/main/scala/org/apache/texera/auth/JwtAuth.scala @@ -19,7 +19,7 @@ package org.apache.texera.auth -import org.apache.texera.config.AuthConfig +import org.apache.texera.common.config.AuthConfig import org.apache.texera.dao.jooq.generated.tables.pojos.User import org.jose4j.jws.AlgorithmIdentifiers.HMAC_SHA256 import org.jose4j.jws.JsonWebSignature diff --git a/common/config/src/main/scala/org/apache/texera/amber/config/ApplicationConfig.scala b/common/config/src/main/scala/org/apache/texera/common/config/ApplicationConfig.scala similarity index 99% rename from common/config/src/main/scala/org/apache/texera/amber/config/ApplicationConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/ApplicationConfig.scala index 927b102ebc..dea1e169d6 100644 --- a/common/config/src/main/scala/org/apache/texera/amber/config/ApplicationConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/common/config/ApplicationConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.amber.config +package org.apache.texera.common.config import com.typesafe.config.{Config, ConfigFactory} diff --git a/common/config/src/main/scala/org/apache/texera/config/AuthConfig.scala b/common/config/src/main/scala/org/apache/texera/common/config/AuthConfig.scala similarity index 97% rename from common/config/src/main/scala/org/apache/texera/config/AuthConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/AuthConfig.scala index 748db036c9..43e1409ecd 100644 --- a/common/config/src/main/scala/org/apache/texera/config/AuthConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/common/config/AuthConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.config +package org.apache.texera.common.config import com.typesafe.config.{Config, ConfigFactory} import java.security.SecureRandom diff --git a/common/config/src/main/scala/org/apache/texera/config/ComputingUnitConfig.scala b/common/config/src/main/scala/org/apache/texera/common/config/ComputingUnitConfig.scala similarity index 96% rename from common/config/src/main/scala/org/apache/texera/config/ComputingUnitConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/ComputingUnitConfig.scala index 5d4e3ae750..377fb0ef98 100644 --- a/common/config/src/main/scala/org/apache/texera/config/ComputingUnitConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/common/config/ComputingUnitConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.config +package org.apache.texera.common.config import com.typesafe.config.{Config, ConfigFactory} diff --git a/common/config/src/main/scala/org/apache/texera/config/DefaultsConfig.scala b/common/config/src/main/scala/org/apache/texera/common/config/DefaultsConfig.scala similarity index 97% rename from common/config/src/main/scala/org/apache/texera/config/DefaultsConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/DefaultsConfig.scala index 7e3b94a79b..965dcb8c0c 100644 --- a/common/config/src/main/scala/org/apache/texera/config/DefaultsConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/common/config/DefaultsConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.config +package org.apache.texera.common.config import com.typesafe.config.{ConfigFactory, ConfigRenderOptions, ConfigValueType} diff --git a/common/config/src/main/scala/org/apache/texera/amber/config/EnvironmentalVariable.scala b/common/config/src/main/scala/org/apache/texera/common/config/EnvironmentalVariable.scala similarity index 99% rename from common/config/src/main/scala/org/apache/texera/amber/config/EnvironmentalVariable.scala rename to common/config/src/main/scala/org/apache/texera/common/config/EnvironmentalVariable.scala index 123c56505e..a335ddeff6 100644 --- a/common/config/src/main/scala/org/apache/texera/amber/config/EnvironmentalVariable.scala +++ b/common/config/src/main/scala/org/apache/texera/common/config/EnvironmentalVariable.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.amber.config +package org.apache.texera.common.config // Environment variable names for all the *.conf files // TODO: currently these values are hard-coded, it would be good to have a way to dynamically load these names to avoid 2-copy diff --git a/common/config/src/main/scala/org/apache/texera/config/GuiConfig.scala b/common/config/src/main/scala/org/apache/texera/common/config/GuiConfig.scala similarity index 99% rename from common/config/src/main/scala/org/apache/texera/config/GuiConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/GuiConfig.scala index 3064f0584c..3b378de127 100644 --- a/common/config/src/main/scala/org/apache/texera/config/GuiConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/common/config/GuiConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.config +package org.apache.texera.common.config import com.typesafe.config.{Config, ConfigFactory} diff --git a/common/config/src/main/scala/org/apache/texera/config/KubernetesConfig.scala b/common/config/src/main/scala/org/apache/texera/common/config/KubernetesConfig.scala similarity index 98% rename from common/config/src/main/scala/org/apache/texera/config/KubernetesConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/KubernetesConfig.scala index 7f9a730fe8..f629476736 100644 --- a/common/config/src/main/scala/org/apache/texera/config/KubernetesConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/common/config/KubernetesConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.config +package org.apache.texera.common.config import com.typesafe.config.{Config, ConfigFactory} diff --git a/common/config/src/main/scala/org/apache/texera/config/LLMConfig.scala b/common/config/src/main/scala/org/apache/texera/common/config/LLMConfig.scala similarity index 96% rename from common/config/src/main/scala/org/apache/texera/config/LLMConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/LLMConfig.scala index a85b734bad..ec96158495 100644 --- a/common/config/src/main/scala/org/apache/texera/config/LLMConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/common/config/LLMConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.config +package org.apache.texera.common.config import com.typesafe.config.{Config, ConfigFactory} diff --git a/common/config/src/main/scala/org/apache/texera/amber/config/PekkoConfig.scala b/common/config/src/main/scala/org/apache/texera/common/config/PekkoConfig.scala similarity index 96% rename from common/config/src/main/scala/org/apache/texera/amber/config/PekkoConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/PekkoConfig.scala index 33ba24d247..449df5ef9d 100644 --- a/common/config/src/main/scala/org/apache/texera/amber/config/PekkoConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/common/config/PekkoConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.amber.config +package org.apache.texera.common.config import com.typesafe.config.{Config, ConfigFactory} diff --git a/common/config/src/main/scala/org/apache/texera/amber/config/PythonUtils.scala b/common/config/src/main/scala/org/apache/texera/common/config/PythonUtils.scala similarity index 96% rename from common/config/src/main/scala/org/apache/texera/amber/config/PythonUtils.scala rename to common/config/src/main/scala/org/apache/texera/common/config/PythonUtils.scala index 353945f04e..27f650eeb3 100644 --- a/common/config/src/main/scala/org/apache/texera/amber/config/PythonUtils.scala +++ b/common/config/src/main/scala/org/apache/texera/common/config/PythonUtils.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.amber.config +package org.apache.texera.common.config // Util function used by PveManager and PythonWorkflowWorker object PythonUtils { diff --git a/common/config/src/main/scala/org/apache/texera/amber/config/StorageConfig.scala b/common/config/src/main/scala/org/apache/texera/common/config/StorageConfig.scala similarity index 99% rename from common/config/src/main/scala/org/apache/texera/amber/config/StorageConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/StorageConfig.scala index c88541cf1b..2a31e4e116 100644 --- a/common/config/src/main/scala/org/apache/texera/amber/config/StorageConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/common/config/StorageConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.amber.config +package org.apache.texera.common.config import com.typesafe.config.{Config, ConfigFactory} import org.apache.texera.amber.util.ConfigParserUtil.parseSizeStringToBytes diff --git a/common/config/src/main/scala/org/apache/texera/amber/config/UdfConfig.scala b/common/config/src/main/scala/org/apache/texera/common/config/UdfConfig.scala similarity index 97% rename from common/config/src/main/scala/org/apache/texera/amber/config/UdfConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/UdfConfig.scala index 2c4035d222..e8f48d92c0 100644 --- a/common/config/src/main/scala/org/apache/texera/amber/config/UdfConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/common/config/UdfConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.amber.config +package org.apache.texera.common.config import com.typesafe.config.{Config, ConfigFactory} diff --git a/common/config/src/main/scala/org/apache/texera/config/UserSystemConfig.scala b/common/config/src/main/scala/org/apache/texera/common/config/UserSystemConfig.scala similarity index 98% rename from common/config/src/main/scala/org/apache/texera/config/UserSystemConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/UserSystemConfig.scala index b78eed0202..ae41a75c2d 100644 --- a/common/config/src/main/scala/org/apache/texera/config/UserSystemConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/common/config/UserSystemConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.config +package org.apache.texera.common.config import com.typesafe.config.{Config, ConfigFactory} diff --git a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/DocumentFactory.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/DocumentFactory.scala index cc67ab84ce..d3fcae868f 100644 --- a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/DocumentFactory.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/DocumentFactory.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.core.storage -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.apache.texera.amber.core.storage.FileResolver.DATASET_FILE_URI_SCHEME import org.apache.texera.amber.core.storage.VFSResourceType._ import org.apache.texera.amber.core.storage.VFSURIFactory.{VFS_FILE_URI_SCHEME, decodeURI} diff --git a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/IcebergCatalogInstance.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/IcebergCatalogInstance.scala index bb9f2d8bf2..cd4b3c8796 100644 --- a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/IcebergCatalogInstance.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/IcebergCatalogInstance.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.core.storage -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.apache.texera.amber.util.IcebergUtil import org.apache.iceberg.catalog.Catalog diff --git a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/DatasetFileDocument.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/DatasetFileDocument.scala index b62b658365..6d8f917c7f 100644 --- a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/DatasetFileDocument.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/DatasetFileDocument.scala @@ -20,7 +20,7 @@ package org.apache.texera.amber.core.storage.model import com.typesafe.scalalogging.LazyLogging -import org.apache.texera.amber.config.EnvironmentalVariable +import org.apache.texera.common.config.EnvironmentalVariable import org.apache.texera.amber.core.storage.model.DatasetFileDocument.{ fileServiceGetPresignURLEndpoint, userJwtToken diff --git a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergTableWriter.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergTableWriter.scala index 06d04e407f..e6d7395d64 100644 --- a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergTableWriter.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergTableWriter.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.core.storage.result.iceberg -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.apache.texera.amber.core.storage.model.BufferedItemWriter import org.apache.texera.amber.util.IcebergUtil import org.apache.iceberg.catalog.Catalog diff --git a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/LakeFSStorageClient.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/LakeFSStorageClient.scala index 613255173e..cb66ea3e4f 100644 --- a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/LakeFSStorageClient.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/LakeFSStorageClient.scala @@ -22,7 +22,7 @@ package org.apache.texera.amber.core.storage.util import io.lakefs.clients.sdk._ import io.lakefs.clients.sdk.model.ResetCreation.TypeEnum import io.lakefs.clients.sdk.model._ -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import java.io.{File, FileOutputStream, InputStream} import java.net.URI diff --git a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala index c4a86d3538..d5a766855c 100644 --- a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.core.workflow -import org.apache.texera.config.GuiConfig +import org.apache.texera.common.config.GuiConfig case class WorkflowSettings( dataTransferBatchSize: Int = 400, diff --git a/common/workflow-core/src/main/scala/org/apache/texera/amber/util/IcebergUtil.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/IcebergUtil.scala index 0b45b9eec3..b8e46e5cc5 100644 --- a/common/workflow-core/src/main/scala/org/apache/texera/amber/util/IcebergUtil.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/IcebergUtil.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.util -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, LargeBinary, Schema, Tuple} import org.apache.hadoop.conf.Configuration import org.apache.iceberg.catalog.{Catalog, SupportsNamespaces, TableIdentifier} diff --git a/common/workflow-core/src/main/scala/org/apache/texera/service/util/LargeBinaryManager.scala b/common/workflow-core/src/main/scala/org/apache/texera/service/util/LargeBinaryManager.scala index df61981252..3ccd281db8 100644 --- a/common/workflow-core/src/main/scala/org/apache/texera/service/util/LargeBinaryManager.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/service/util/LargeBinaryManager.scala @@ -20,7 +20,7 @@ package org.apache.texera.service.util import com.typesafe.scalalogging.LazyLogging -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import java.util.UUID diff --git a/common/workflow-core/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala b/common/workflow-core/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala index 956de75520..8be8c7c701 100644 --- a/common/workflow-core/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala @@ -19,7 +19,7 @@ package org.apache.texera.service.util -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import software.amazon.awssdk.auth.credentials.{AwsBasicCredentials, StaticCredentialsProvider} import software.amazon.awssdk.regions.Region import software.amazon.awssdk.services.s3.model._ diff --git a/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentSpec.scala index 0e9b2ae68a..d21644f6e6 100644 --- a/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentSpec.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentSpec.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.storage.result.iceberg -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.apache.texera.amber.core.state.State import org.apache.texera.amber.core.storage.model.{VirtualDocument, VirtualDocumentSpec} import org.apache.texera.amber.core.storage.{DocumentFactory, IcebergCatalogInstance, VFSURIFactory} diff --git a/common/workflow-core/src/test/scala/org/apache/texera/service/util/S3StorageTestBase.scala b/common/workflow-core/src/test/scala/org/apache/texera/service/util/S3StorageTestBase.scala index 1d3b77dbb1..a6e5f9a5c8 100644 --- a/common/workflow-core/src/test/scala/org/apache/texera/service/util/S3StorageTestBase.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/service/util/S3StorageTestBase.scala @@ -20,7 +20,7 @@ package org.apache.texera.service.util import com.dimafeng.testcontainers.MinIOContainer -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.scalatest.{BeforeAndAfterAll, Suite} import org.testcontainers.utility.DockerImageName diff --git a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala index 31a68e9c5d..0650990264 100644 --- a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala +++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala @@ -24,7 +24,7 @@ import io.dropwizard.auth.AuthDynamicFeature import io.dropwizard.configuration.{EnvironmentVariableSubstitutor, SubstitutingSourceProvider} import io.dropwizard.core.Application import io.dropwizard.core.setup.{Bootstrap, Environment} -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.apache.texera.auth.{ JwtAuthFilter, RequestLoggingFilter, diff --git a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitAccessResource.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitAccessResource.scala index 9538ca4168..4045de42c0 100644 --- a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitAccessResource.scala +++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitAccessResource.scala @@ -23,7 +23,7 @@ import jakarta.annotation.security.RolesAllowed import jakarta.ws.rs.core.MediaType import jakarta.ws.rs._ import org.apache.texera.auth.SessionUser -import org.apache.texera.config.ComputingUnitConfig +import org.apache.texera.common.config.ComputingUnitConfig import org.apache.texera.dao.SqlServer import org.apache.texera.dao.SqlServer.withTransaction import org.apache.texera.dao.jooq.generated.Tables.COMPUTING_UNIT_USER_ACCESS diff --git a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala index d013d71e6b..aa02f73387 100644 --- a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala +++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala @@ -25,17 +25,21 @@ import io.fabric8.kubernetes.client.KubernetesClientException import jakarta.annotation.security.RolesAllowed import jakarta.ws.rs._ import jakarta.ws.rs.core.{MediaType, Response} -import org.apache.texera.amber.config.{EnvironmentalVariable, StorageConfig} import org.apache.commons.lang3.StringUtils import org.apache.texera.auth.JwtAuth.{TOKEN_EXPIRE_TIME_IN_MINUTES, jwtClaims} import org.apache.texera.auth.{JwtAuth, SessionUser} -import org.apache.texera.config.KubernetesConfig.{ +import org.apache.texera.common.config.KubernetesConfig.{ cpuLimitOptions, gpuLimitOptions, maxNumOfRunningComputingUnitsPerUser, memoryLimitOptions } -import org.apache.texera.config.{ComputingUnitConfig, KubernetesConfig} +import org.apache.texera.common.config.{ + ComputingUnitConfig, + EnvironmentalVariable, + KubernetesConfig, + StorageConfig +} import org.apache.texera.dao.SqlServer import org.apache.texera.dao.SqlServer.withTransaction import org.apache.texera.dao.jooq.generated.enums.{PrivilegeEnum, WorkflowComputingUnitTypeEnum} diff --git a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/util/KubernetesClient.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/util/KubernetesClient.scala index cfc01b83b6..5177ebaf47 100644 --- a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/util/KubernetesClient.scala +++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/util/KubernetesClient.scala @@ -22,7 +22,7 @@ package org.apache.texera.service.util import io.fabric8.kubernetes.api.model._ import io.fabric8.kubernetes.api.model.metrics.v1beta1.PodMetricsList import io.fabric8.kubernetes.client.KubernetesClientBuilder -import org.apache.texera.config.KubernetesConfig +import org.apache.texera.common.config.KubernetesConfig import scala.jdk.CollectionConverters._ diff --git a/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala b/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala index 112ea3e2e4..e4736cf251 100644 --- a/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala +++ b/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala @@ -25,14 +25,13 @@ import io.dropwizard.auth.AuthDynamicFeature import io.dropwizard.configuration.{EnvironmentVariableSubstitutor, SubstitutingSourceProvider} import io.dropwizard.core.Application import io.dropwizard.core.setup.{Bootstrap, Environment} -import org.apache.texera.amber.config.StorageConfig import org.apache.texera.auth.{ JwtAuthFilter, RequestLoggingFilter, SessionUser, UnauthorizedExceptionMapper } -import org.apache.texera.config.DefaultsConfig +import org.apache.texera.common.config.{DefaultsConfig, StorageConfig} import org.apache.texera.dao.SqlServer import org.apache.texera.service.resource.{ConfigResource, HealthCheckResource} import org.eclipse.jetty.server.session.SessionHandler diff --git a/config-service/src/main/scala/org/apache/texera/service/resource/ConfigResource.scala b/config-service/src/main/scala/org/apache/texera/service/resource/ConfigResource.scala index 805ca3cbb5..55dc386a3e 100644 --- a/config-service/src/main/scala/org/apache/texera/service/resource/ConfigResource.scala +++ b/config-service/src/main/scala/org/apache/texera/service/resource/ConfigResource.scala @@ -22,7 +22,12 @@ package org.apache.texera.service.resource import jakarta.annotation.security.{PermitAll, RolesAllowed} import jakarta.ws.rs.core.MediaType import jakarta.ws.rs.{GET, Path, Produces} -import org.apache.texera.config.{AuthConfig, ComputingUnitConfig, GuiConfig, UserSystemConfig} +import org.apache.texera.common.config.{ + AuthConfig, + ComputingUnitConfig, + GuiConfig, + UserSystemConfig +} @Path("/config") @Produces(Array(MediaType.APPLICATION_JSON)) diff --git a/file-service/src/main/scala/org/apache/texera/service/FileService.scala b/file-service/src/main/scala/org/apache/texera/service/FileService.scala index 88f7650378..76d78dfef8 100644 --- a/file-service/src/main/scala/org/apache/texera/service/FileService.scala +++ b/file-service/src/main/scala/org/apache/texera/service/FileService.scala @@ -26,7 +26,7 @@ import io.dropwizard.auth.AuthDynamicFeature import io.dropwizard.configuration.{EnvironmentVariableSubstitutor, SubstitutingSourceProvider} import io.dropwizard.core.Application import io.dropwizard.core.setup.{Bootstrap, Environment} -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.apache.texera.amber.core.storage.util.LakeFSStorageClient import org.apache.texera.auth.{ JwtAuthFilter, diff --git a/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala index 1f8f28a85c..efed479653 100644 --- a/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala +++ b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala @@ -24,7 +24,7 @@ import io.dropwizard.auth.Auth import jakarta.annotation.security.{PermitAll, RolesAllowed} import jakarta.ws.rs._ import jakarta.ws.rs.core._ -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.apache.texera.amber.core.storage.model.OnDataset import org.apache.texera.amber.core.storage.util.LakeFSStorageClient import org.apache.texera.amber.core.storage.{DocumentFactory, FileResolver} diff --git a/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala b/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala index 62e60bd267..3f5ae772ec 100644 --- a/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala +++ b/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala @@ -21,7 +21,7 @@ package org.apache.texera.service import com.dimafeng.testcontainers._ import io.lakefs.clients.sdk.{ApiClient, RepositoriesApi} -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.apache.texera.service.util.S3StorageClient import org.scalatest.{BeforeAndAfterAll, Suite} import org.testcontainers.containers.Network diff --git a/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala index d21fa0a225..c278b21b4d 100644 --- a/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala +++ b/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala @@ -24,7 +24,7 @@ import io.dropwizard.auth.AuthDynamicFeature import io.dropwizard.configuration.{EnvironmentVariableSubstitutor, SubstitutingSourceProvider} import io.dropwizard.core.Application import io.dropwizard.core.setup.{Bootstrap, Environment} -import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.common.config.StorageConfig import org.apache.texera.amber.util.ObjectMapperUtils import org.apache.texera.auth.{JwtAuthFilter, SessionUser, UnauthorizedExceptionMapper} import org.apache.texera.dao.SqlServer
