From 9fd8d7c3d16ab0e6b9bda48e30f23d5957bceb77 Mon Sep 17 00:00:00 2001 From: Matthew Ball Date: Wed, 10 Jun 2026 20:53:32 -0700 Subject: [PATCH 1/5] added a notification for when users don't follow the appropriate template in issues or prs --- .github/template-compliance-warning.txt | 9 + .../workflows/template-compliance-warning.yml | 195 ++++++++++++++++++ 2 files changed, 204 insertions(+) create mode 100644 .github/template-compliance-warning.txt create mode 100644 .github/workflows/template-compliance-warning.yml diff --git a/.github/template-compliance-warning.txt b/.github/template-compliance-warning.txt new file mode 100644 index 00000000000..b0f9272b63e --- /dev/null +++ b/.github/template-compliance-warning.txt @@ -0,0 +1,9 @@ +👋 Thanks for opening this {{kind}}, @{{author}}! + +It looks like the {{kind}} description doesn't quite follow our template yet: + +{{details}} + +Filling out the template helps reviewers understand and triage your contribution faster. Please edit the description to complete it. This message will disappear automatically once the template is followed. + +You can find the template prompts by editing the description, or see [CONTRIBUTING.md](https://github.com/{{owner}}/{{repo}}/blob/main/CONTRIBUTING.md) for the full contribution flow. diff --git a/.github/workflows/template-compliance-warning.yml b/.github/workflows/template-compliance-warning.yml new file mode 100644 index 00000000000..6ca71616b66 --- /dev/null +++ b/.github/workflows/template-compliance-warning.yml @@ -0,0 +1,195 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Post a non-blocking warning when a pull request (or issue) is opened +# without following our template, and clear it automatically once the +# author fixes the description. +# +# Designed to be cheap on CI: +# * Single `github-script` job, no build, no full checkout (only a +# sparse-checkout of the one message .txt file), so a run is a few +# seconds of an ubuntu-latest runner. +# * Triggers only on `opened` / `edited`, never on `synchronize`, so +# it does NOT run on every push to a PR branch. +# * Skips drafts and bots, so WIP and automation don't get nagged. +# * Posts a single sticky comment (idempotency marker) that is +# UPDATED in place while the template is incomplete and DELETED once +# it is followed, so it never piles up duplicate comments. +# +# Issue templates here are GitHub form (`.yaml`) templates whose +# required fields are already enforced at submission time, so for issues +# this only catches a fully blank body (e.g. a blank issue). PR +# templates cannot be enforced by GitHub, which is the main case this +# covers. +# +# Uses `pull_request_target` so PRs from forks are still checked. +# A `pull_request` run from a fork gets a read-only token and could not +# comment. +name: Template compliance warning +on: + issues: + types: [opened, edited] + pull_request_target: + types: [opened, edited] + +permissions: + issues: write + pull-requests: write + +jobs: + check-template: + if: github.event.sender.type != 'Bot' + runs-on: ubuntu-latest + steps: + # Check out only the warning message template. `pull_request_target` + # and `issues` both resolve to the trusted base branch (never the + # fork head), so reading this file is safe. Keeping the wording in a + # .txt file means editing the message does not touch workflow logic. + - uses: actions/checkout@v5 + with: + persist-credentials: false + sparse-checkout: .github/template-compliance-warning.txt + sparse-checkout-cone-mode: false + - uses: actions/github-script@v8 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const isPR = context.eventName === 'pull_request_target'; + const subject = isPR + ? context.payload.pull_request + : context.payload.issue; + + // Drafts are work-in-progress; don't nag until they're ready. + if (isPR && subject.draft) { + core.info(`#${subject.number} is a draft; skipping.`); + return; + } + + const author = subject.user.login; + const issue_number = subject.number; + const kind = isPR ? 'pull request' : 'issue'; + const { owner, repo } = context.repo; + const body = subject.body || ''; + + // Strip HTML comments (the template's guidance) + // before judging whether a section actually has content. + const stripped = body.replace(//g, ''); + + // Build the list of problems with the description. Each entry + // is a user-facing bullet. An empty list means "compliant". + const problems = []; + + if (stripped.trim().length === 0) { + problems.push( + `The description is empty. Please open the ${kind} using ` + + `the provided template and fill it out.`, + ); + } else if (isPR) { + // PR template required sections (headings copied verbatim + // from .github/PULL_REQUEST_TEMPLATE). For each, capture the + // text from its heading to the next "### " heading (or end) + // and treat whitespace-only as not filled in. + const REQUIRED_SECTIONS = [ + 'What changes were proposed in this PR?', + 'How was this PR tested?', + 'Was this PR authored or co-authored using generative AI tooling?', + ]; + for (const heading of REQUIRED_SECTIONS) { + // Escape regex metacharacters in the heading text. + const esc = heading.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); + // The trailing `(?![\s\S])` is the end-of-string case (JS + // regex has no `\Z`); with the `m` flag a bare `$` would + // match every line end, not just the end of the body. + const re = new RegExp( + `^#{1,6}\\s*${esc}\\s*$([\\s\\S]*?)(?=^#{1,6}\\s|(?![\\s\\S]))`, + 'm', + ); + const m = stripped.match(re); + if (!m) { + problems.push( + `The **${heading}** section is missing; please keep ` + + `the template's headings.`, + ); + } else if (m[1].trim().length === 0) { + problems.push( + `The **${heading}** section is empty; please fill it in.`, + ); + } + } + } + + const MARKER = ''; + + // Find a previous warning comment from this workflow. + let existing = null; + try { + const comments = await github.paginate( + github.rest.issues.listComments, + { owner, repo, issue_number, per_page: 100 }, + ); + existing = comments.find((c) => (c.body || '').includes(MARKER)); + } catch (e) { + core.warning(`listComments on #${issue_number} failed: ${e.message}`); + // Without the comment list we can't safely de-dupe; bail to + // avoid posting a duplicate warning. + return; + } + + // Compliant now: remove any stale warning and stop. + if (problems.length === 0) { + core.info(`#${issue_number} follows the template.`); + if (existing) { + try { + await github.rest.issues.deleteComment({ + owner, repo, comment_id: existing.id, + }); + core.info(`Cleared resolved warning on #${issue_number}.`); + } catch (e) { + core.warning(`Failed to delete warning: ${e.message}`); + } + } + return; + } + + // Not compliant: render the message and post/update the sticky + // comment. + const fs = require('fs'); + const template = fs.readFileSync( + '.github/template-compliance-warning.txt', 'utf8', + ); + const details = problems.map((p) => `- ${p}`).join('\n'); + const message = MARKER + '\n' + template + .replaceAll('{{author}}', author) + .replaceAll('{{owner}}', owner) + .replaceAll('{{repo}}', repo) + .replaceAll('{{kind}}', kind) + .replaceAll('{{details}}', details); + + try { + if (existing) { + await github.rest.issues.updateComment({ + owner, repo, comment_id: existing.id, body: message, + }); + core.info(`Updated template warning on #${issue_number}.`); + } else { + await github.rest.issues.createComment({ + owner, repo, issue_number, body: message, + }); + core.info(`Posted template warning on #${issue_number}.`); + } + } catch (e) { + core.warning(`Failed to post warning on #${issue_number}: ${e.message}`); + } From 8f2cfbd2137f7c0a5def943acd6d46d421e80b43 Mon Sep 17 00:00:00 2001 From: Matthew Ball Date: Thu, 11 Jun 2026 02:15:52 -0700 Subject: [PATCH 2/5] changed issues to cover more templates --- .../workflows/template-compliance-warning.yml | 74 +++++++++++++------ 1 file changed, 53 insertions(+), 21 deletions(-) diff --git a/.github/workflows/template-compliance-warning.yml b/.github/workflows/template-compliance-warning.yml index 6ca71616b66..82b8e87cf26 100644 --- a/.github/workflows/template-compliance-warning.yml +++ b/.github/workflows/template-compliance-warning.yml @@ -29,11 +29,11 @@ # UPDATED in place while the template is incomplete and DELETED once # it is followed, so it never piles up duplicate comments. # -# Issue templates here are GitHub form (`.yaml`) templates whose -# required fields are already enforced at submission time, so for issues -# this only catches a fully blank body (e.g. a blank issue). PR -# templates cannot be enforced by GitHub, which is the main case this -# covers. +# Issues are matched to their template by GitHub issue type +# (Bug/Feature/Task) and checked against that template's `required: true` +# fields. Because every template sets a type, an issue with no recognized +# type is flagged outright as not using a template. PR templates cannot +# be enforced by GitHub, which is the main case this covers. # # Uses `pull_request_target` so PRs from forks are still checked. # A `pull_request` run from a fork gets a read-only token and could not @@ -88,26 +88,55 @@ jobs: // before judging whether a section actually has content. const stripped = body.replace(//g, ''); + // Pick the required sections for whichever template applies. + // PRs use the single PR template. Issues are matched by their + // GitHub issue type (set by the form template the author + // chose), so each issue is checked against the right + // template's fields. Only fields marked `required: true` in + // the templates are listed here. + const PR_SECTIONS = [ + 'What changes were proposed in this PR?', + 'How was this PR tested?', + 'Was this PR authored or co-authored using generative AI tooling?', + ]; + const ISSUE_SECTIONS = { + Bug: ['What happened?', 'How to reproduce?', 'Version/Branch'], + Feature: ['Feature Summary', 'Proposed Solution or Design'], + Task: ['Task Summary'], + }; + let requiredSections = null; + if (isPR) { + requiredSections = PR_SECTIONS; + } else { + const typeName = subject.type && subject.type.name; + requiredSections = ISSUE_SECTIONS[typeName] || null; + } + // Build the list of problems with the description. Each entry // is a user-facing bullet. An empty list means "compliant". const problems = []; - if (stripped.trim().length === 0) { + if (!isPR && !requiredSections) { + // All our issue templates set an issue type, so a missing or + // unrecognized type means no template was used (e.g. a blank + // issue). Flag it outright. + problems.push( + `This ${kind} doesn't appear to use one of our templates ` + + `(Bug, Feature, or Task). Please open it using a template ` + + `so the required details are captured.`, + ); + } else if (stripped.trim().length === 0) { problems.push( `The description is empty. Please open the ${kind} using ` + `the provided template and fill it out.`, ); - } else if (isPR) { - // PR template required sections (headings copied verbatim - // from .github/PULL_REQUEST_TEMPLATE). For each, capture the - // text from its heading to the next "### " heading (or end) - // and treat whitespace-only as not filled in. - const REQUIRED_SECTIONS = [ - 'What changes were proposed in this PR?', - 'How was this PR tested?', - 'Was this PR authored or co-authored using generative AI tooling?', - ]; - for (const heading of REQUIRED_SECTIONS) { + } else { + // PR, or an issue with a recognized type: check each required + // section. Capture the text from its heading to the next + // heading (or end of body), treating a blank value or + // GitHub's "_No response_" placeholder (shown for an empty + // field) as not filled in. + for (const heading of requiredSections) { // Escape regex metacharacters in the heading text. const esc = heading.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // The trailing `(?![\s\S])` is the end-of-string case (JS @@ -123,10 +152,13 @@ jobs: `The **${heading}** section is missing; please keep ` + `the template's headings.`, ); - } else if (m[1].trim().length === 0) { - problems.push( - `The **${heading}** section is empty; please fill it in.`, - ); + } else { + const content = m[1].trim(); + if (content.length === 0 || content === '_No response_') { + problems.push( + `The **${heading}** section is empty; please fill it in.`, + ); + } } } } From 6e5f0be763182ea9d488bc40f235871e5254ff34 Mon Sep 17 00:00:00 2001 From: Matthew Ball Date: Fri, 12 Jun 2026 19:39:33 -0700 Subject: [PATCH 3/5] renamed amber config packages --- .../org/apache/texera/service/AccessControlService.scala | 2 +- .../apache/texera/amber/clustering/ClusterListener.scala | 2 +- .../architecture/common/PekkoMessageTransferService.scala | 2 +- .../amber/engine/architecture/controller/Controller.scala | 2 +- .../promisehandlers/QueryWorkerStatisticsHandler.scala | 2 +- .../architecture/logreplay/AsyncReplayLogWriter.scala | 2 +- .../engine/architecture/messaginglayer/FlowControl.scala | 2 +- .../architecture/messaginglayer/WorkerTimerService.scala | 2 +- .../architecture/pythonworker/PythonWorkflowWorker.scala | 2 +- .../scheduling/CostBasedScheduleGenerator.scala | 2 +- .../architecture/scheduling/ScheduleGenerator.scala | 2 +- .../architecture/scheduling/config/WorkerConfig.scala | 2 +- .../sendsemantics/partitioners/Partitioner.scala | 2 +- .../managers/InputPortMaterializationReaderThread.scala | 2 +- .../apache/texera/amber/engine/common/AmberRuntime.scala | 2 +- .../scala/org/apache/texera/web/ComputingUnitMaster.scala | 2 +- .../org/apache/texera/web/TexeraWebApplication.scala | 2 +- .../texera/web/resource/SyncExecutionResource.scala | 2 +- .../web/resource/aiassistant/AiAssistantManager.scala | 2 +- .../resource/pythonvirtualenvironment/PveManager.scala | 2 +- .../texera/web/service/ExecutionConsoleService.scala | 2 +- .../texera/web/service/ExecutionResultService.scala | 2 +- .../apache/texera/web/service/ResultExportService.scala | 2 +- .../org/apache/texera/web/service/WorkflowService.scala | 2 +- .../iceberg/IcebergRestCatalogIntegrationSpec.scala | 2 +- .../architecture/messaginglayer/FlowControlSpec.scala | 2 +- .../scheduling/config/SchedulingConfigsSpec.scala | 2 +- .../resourcePolicies/ResourcePoliciesSpec.scala | 2 +- .../partitioners/NetworkOutputBufferSpec.scala | 2 +- .../org/apache/texera/amber/engine/e2e/TestUtils.scala | 2 +- .../texera/{amber => }/config/ApplicationConfig.scala | 2 +- .../texera/{amber => }/config/EnvironmentalVariable.scala | 2 +- .../apache/texera/{amber => }/config/PekkoConfig.scala | 2 +- .../apache/texera/{amber => }/config/PythonUtils.scala | 2 +- .../apache/texera/{amber => }/config/StorageConfig.scala | 2 +- .../org/apache/texera/{amber => }/config/UdfConfig.scala | 2 +- .../texera/amber/core/storage/DocumentFactory.scala | 2 +- .../amber/core/storage/IcebergCatalogInstance.scala | 2 +- .../amber/core/storage/model/DatasetFileDocument.scala | 2 +- .../core/storage/result/iceberg/IcebergTableWriter.scala | 2 +- .../amber/core/storage/util/LakeFSStorageClient.scala | 2 +- .../scala/org/apache/texera/amber/util/IcebergUtil.scala | 2 +- .../apache/texera/service/util/LargeBinaryManager.scala | 2 +- .../org/apache/texera/service/util/S3StorageClient.scala | 2 +- .../storage/result/iceberg/IcebergDocumentSpec.scala | 2 +- .../apache/texera/service/util/S3StorageTestBase.scala | 2 +- .../texera/service/ComputingUnitManagingService.scala | 2 +- .../service/resource/ComputingUnitManagingResource.scala | 8 ++++++-- .../scala/org/apache/texera/service/ConfigService.scala | 3 +-- .../scala/org/apache/texera/service/FileService.scala | 2 +- .../apache/texera/service/resource/DatasetResource.scala | 2 +- .../test/scala/org/apache/texera/service/MockLakeFS.scala | 2 +- .../apache/texera/service/WorkflowCompilingService.scala | 2 +- 53 files changed, 58 insertions(+), 55 deletions(-) rename common/config/src/main/scala/org/apache/texera/{amber => }/config/ApplicationConfig.scala (99%) rename common/config/src/main/scala/org/apache/texera/{amber => }/config/EnvironmentalVariable.scala (99%) rename common/config/src/main/scala/org/apache/texera/{amber => }/config/PekkoConfig.scala (96%) rename common/config/src/main/scala/org/apache/texera/{amber => }/config/PythonUtils.scala (96%) rename common/config/src/main/scala/org/apache/texera/{amber => }/config/StorageConfig.scala (99%) rename common/config/src/main/scala/org/apache/texera/{amber => }/config/UdfConfig.scala (97%) 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 e262b80900d..2648ec28097 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.config.StorageConfig import org.apache.texera.auth.{ JwtAuthFilter, RequestLoggingFilter, 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 e3e9afab3fb..f594764b9f5 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.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 cba9b0b2ee4..8a613351c73 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.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 512a3342ce4..3eee657b42a 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.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 6551579f719..a27727e2558 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.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 39969340d39..0ccd204628e 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.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 d4b24dad1d8..db84af5975a 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.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 006c9614fd7..9167379de78 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.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 c7ed3b63242..c09eded9746 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.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 43e8d281ce3..1e42c28a90d 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.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 fc42499fa6e..55fd6729394 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.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 8166dee6dd1..70f38aac16e 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.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 eac77bce365..867a871c0d9 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.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 428d9fb48cb..8ed02781c2b 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.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 03234a277e4..80c7e4105e3 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.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 41d8d3b5830..f558fd4881a 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.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 5438eea4d0f..794e6c7bc9f 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.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/SyncExecutionResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/SyncExecutionResource.scala index d3047db5802..8a6f70d9823 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.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 374525ff3ff..580581aff28 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.config.ApplicationConfig import java.net.{HttpURLConnection, URL} 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 2256798030b..1bc0aeb9732 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.config.PythonUtils /** * PveManager is responsible for managing Python Virtual Environments (PVEs) 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 1678494e937..ac2c2173bee 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.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 20446bb998a..46047149091 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.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 e4fdc92da94..12a5e3267bf 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.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 c18b8b50e83..c3525f30db2 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.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 9f2133b608f..a51051a26f1 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.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 3cccd8f7cb0..98723cd6d5b 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.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 31ab5c8e1a0..e05562b0bfb 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.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 63a08e899fb..288c5e3dfcd 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.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 765dd386b89..c4b121d14c4 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.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 bcc43b396b1..d43fd901b21 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.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/config/src/main/scala/org/apache/texera/amber/config/ApplicationConfig.scala b/common/config/src/main/scala/org/apache/texera/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/config/ApplicationConfig.scala index 927b102ebc3..66901136a02 100644 --- a/common/config/src/main/scala/org/apache/texera/amber/config/ApplicationConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/config/ApplicationConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.amber.config +package org.apache.texera.config import com.typesafe.config.{Config, ConfigFactory} diff --git a/common/config/src/main/scala/org/apache/texera/amber/config/EnvironmentalVariable.scala b/common/config/src/main/scala/org/apache/texera/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/config/EnvironmentalVariable.scala index 123c56505ee..952a099833c 100644 --- a/common/config/src/main/scala/org/apache/texera/amber/config/EnvironmentalVariable.scala +++ b/common/config/src/main/scala/org/apache/texera/config/EnvironmentalVariable.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.amber.config +package org.apache.texera.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/amber/config/PekkoConfig.scala b/common/config/src/main/scala/org/apache/texera/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/config/PekkoConfig.scala index 33ba24d2476..bb2d5101d4c 100644 --- a/common/config/src/main/scala/org/apache/texera/amber/config/PekkoConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/config/PekkoConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.amber.config +package org.apache.texera.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/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/config/PythonUtils.scala index 353945f04e0..f5e2386adee 100644 --- a/common/config/src/main/scala/org/apache/texera/amber/config/PythonUtils.scala +++ b/common/config/src/main/scala/org/apache/texera/config/PythonUtils.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.amber.config +package org.apache.texera.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/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/config/StorageConfig.scala index c88541cf1b4..6c4f90cc83c 100644 --- a/common/config/src/main/scala/org/apache/texera/amber/config/StorageConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/config/StorageConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.amber.config +package org.apache.texera.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/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/config/UdfConfig.scala index 2c4035d2224..7ef33c308ee 100644 --- a/common/config/src/main/scala/org/apache/texera/amber/config/UdfConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/config/UdfConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.texera.amber.config +package org.apache.texera.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 cc67ab84ce6..166e2d8f0a0 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.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 bb9f2d8bf2d..b8e1dc9f632 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.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 b62b6583658..830addf1b0c 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.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 06d04e407f5..aa47467f13d 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.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 613255173e5..559df813976 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.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/util/IcebergUtil.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/IcebergUtil.scala index 0b45b9eec32..4a13ba3bfb5 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.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 2fa4acb5302..1e49227d421 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.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 148205a6812..7d65b1a5dba 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.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 0e9b2ae68a3..87b17381d7f 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.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 1d3b77dbb16..6c8fcc15127 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.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 31a68e9c5db..e70bc7ed10c 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.config.StorageConfig import org.apache.texera.auth.{ JwtAuthFilter, RequestLoggingFilter, 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 d013d71e6b8..31d38d568b5 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,7 +25,6 @@ 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} @@ -35,7 +34,12 @@ import org.apache.texera.config.KubernetesConfig.{ maxNumOfRunningComputingUnitsPerUser, memoryLimitOptions } -import org.apache.texera.config.{ComputingUnitConfig, KubernetesConfig} +import org.apache.texera.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/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala b/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala index 112ea3e2e42..57395d77a3b 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.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/file-service/src/main/scala/org/apache/texera/service/FileService.scala b/file-service/src/main/scala/org/apache/texera/service/FileService.scala index 88f76503780..43e1644ef00 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.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 6da19a924fa..95f369e2208 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.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 10c68bd0858..9dd322047ae 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.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 d21fa0a225a..839971213b2 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.config.StorageConfig import org.apache.texera.amber.util.ObjectMapperUtils import org.apache.texera.auth.{JwtAuthFilter, SessionUser, UnauthorizedExceptionMapper} import org.apache.texera.dao.SqlServer From 2bd53f5b858bcadb5f41424dcd100d6a7d29cbcc Mon Sep 17 00:00:00 2001 From: Matthew Ball Date: Sat, 13 Jun 2026 17:07:33 -0700 Subject: [PATCH 4/5] refactor(config): move common config to org.apache.texera.common.config --- .../org/apache/texera/service/AccessControlService.scala | 2 +- .../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 +- .../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 +- .../managers/InputPortMaterializationReaderThread.scala | 2 +- .../org/apache/texera/amber/engine/common/AmberRuntime.scala | 2 +- .../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 +- .../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 +- .../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 +- .../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 +- .../apache/texera/{ => common}/config/ApplicationConfig.scala | 2 +- .../org/apache/texera/{ => common}/config/AuthConfig.scala | 2 +- .../texera/{ => common}/config/ComputingUnitConfig.scala | 2 +- .../apache/texera/{ => common}/config/DefaultsConfig.scala | 2 +- .../texera/{ => 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 +- .../org/apache/texera/{ => common}/config/PekkoConfig.scala | 2 +- .../org/apache/texera/{ => common}/config/PythonUtils.scala | 2 +- .../org/apache/texera/{ => common}/config/StorageConfig.scala | 2 +- .../org/apache/texera/{ => common}/config/UdfConfig.scala | 2 +- .../apache/texera/{ => common}/config/UserSystemConfig.scala | 2 +- .../apache/texera/amber/core/storage/DocumentFactory.scala | 2 +- .../texera/amber/core/storage/IcebergCatalogInstance.scala | 2 +- .../texera/amber/core/storage/model/DatasetFileDocument.scala | 2 +- .../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 +- .../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 | 4 ++-- .../org/apache/texera/service/util/KubernetesClient.scala | 2 +- .../main/scala/org/apache/texera/service/ConfigService.scala | 2 +- .../org/apache/texera/service/resource/ConfigResource.scala | 2 +- .../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, 75 insertions(+), 75 deletions(-) rename common/config/src/main/scala/org/apache/texera/{ => common}/config/ApplicationConfig.scala (99%) rename common/config/src/main/scala/org/apache/texera/{ => common}/config/AuthConfig.scala (97%) rename common/config/src/main/scala/org/apache/texera/{ => common}/config/ComputingUnitConfig.scala (96%) rename common/config/src/main/scala/org/apache/texera/{ => common}/config/DefaultsConfig.scala (97%) rename common/config/src/main/scala/org/apache/texera/{ => common}/config/EnvironmentalVariable.scala (99%) rename common/config/src/main/scala/org/apache/texera/{ => common}/config/GuiConfig.scala (99%) rename common/config/src/main/scala/org/apache/texera/{ => common}/config/KubernetesConfig.scala (98%) rename common/config/src/main/scala/org/apache/texera/{ => common}/config/LLMConfig.scala (96%) rename common/config/src/main/scala/org/apache/texera/{ => common}/config/PekkoConfig.scala (96%) rename common/config/src/main/scala/org/apache/texera/{ => common}/config/PythonUtils.scala (96%) rename common/config/src/main/scala/org/apache/texera/{ => common}/config/StorageConfig.scala (99%) rename common/config/src/main/scala/org/apache/texera/{ => common}/config/UdfConfig.scala (97%) rename common/config/src/main/scala/org/apache/texera/{ => common}/config/UserSystemConfig.scala (98%) 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 2648ec28097..f01d06f9417 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.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 0c90a6ce31f..94df8d8b98c 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, 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 f594764b9f5..263b14858a7 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.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 8a613351c73..16c9e394ca5 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.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 3eee657b42a..4e365dba2de 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.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 a27727e2558..1f22fa5b368 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.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 0ccd204628e..668d5345d32 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.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 db84af5975a..992b3c06d3e 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.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 9167379de78..81b7c7b0bd4 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.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 c09eded9746..bd9f052b063 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.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 1e42c28a90d..44958718b2c 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.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 55fd6729394..bde2cb6f010 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.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 70f38aac16e..dd81537d5cb 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.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 867a871c0d9..39065ca6936 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.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 8ed02781c2b..2f4386c1d87 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.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 80c7e4105e3..1993e510736 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.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 f558fd4881a..d4a061781c9 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.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 794e6c7bc9f..c93f75fe75b 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.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 d43ca1e5079..17084b6c101 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 ab91c9ad437..348dad6ff7e 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 8a6f70d9823..b70bafb4b0b 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.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 580581aff28..62ff3e9f0d1 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.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 0f99da681d5..7739c4baa0a 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 2f99b9c1bd3..a088e5e56dd 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 d98ede5610e..a1880f3c3ca 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 7be74ae5b00..e0664b7c1d4 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 1bc0aeb9732..c3a823a423f 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.config.PythonUtils +import org.apache.texera.common.config.PythonUtils /** * PveManager is responsible for managing Python Virtual Environments (PVEs) 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 ac07616d509..b52430c30ec 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 @@ -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.ws.rs._ import javax.ws.rs.core.MediaType 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 efaa266caac..d539b8c31b3 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 ac2c2173bee..3811bfaeb42 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.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 46047149091..37c803951ec 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.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 12a5e3267bf..605e6a9e582 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.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 c3525f30db2..a241121da20 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.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 a51051a26f1..807591dde59 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.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 98723cd6d5b..418a02426cf 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.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 e05562b0bfb..f41f55b3656 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.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 288c5e3dfcd..9500ed47303 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.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 c4b121d14c4..33f89a33488 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.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 d43fd901b21..9021765fc8c 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.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 6e099a1f36b..a97e36a50e4 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/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/config/ApplicationConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/ApplicationConfig.scala index 66901136a02..dea1e169d6a 100644 --- a/common/config/src/main/scala/org/apache/texera/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.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 748db036c98..43e1409ecdd 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 5d4e3ae7500..377fb0ef986 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 7e3b94a79b3..965dcb8c0c5 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/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/config/EnvironmentalVariable.scala rename to common/config/src/main/scala/org/apache/texera/common/config/EnvironmentalVariable.scala index 952a099833c..a335ddeff6c 100644 --- a/common/config/src/main/scala/org/apache/texera/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.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 3064f0584c2..3b378de1275 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 7f9a730fe8d..f6294767365 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 a85b734bad6..ec961584956 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/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/config/PekkoConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/PekkoConfig.scala index bb2d5101d4c..449df5ef9d4 100644 --- a/common/config/src/main/scala/org/apache/texera/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.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/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/config/PythonUtils.scala rename to common/config/src/main/scala/org/apache/texera/common/config/PythonUtils.scala index f5e2386adee..27f650eeb3b 100644 --- a/common/config/src/main/scala/org/apache/texera/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.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/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/config/StorageConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/StorageConfig.scala index 6c4f90cc83c..2a31e4e116f 100644 --- a/common/config/src/main/scala/org/apache/texera/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.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/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/config/UdfConfig.scala rename to common/config/src/main/scala/org/apache/texera/common/config/UdfConfig.scala index 7ef33c308ee..e8f48d92c04 100644 --- a/common/config/src/main/scala/org/apache/texera/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.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 b78eed02024..ae41a75c2d2 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 166e2d8f0a0..d3fcae868f6 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.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 b8e1dc9f632..cd4b3c8796f 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.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 830addf1b0c..6d8f917c7f4 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.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 aa47467f13d..e6d7395d64e 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.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 559df813976..cb66ea3e4f3 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.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 c4a86d35382..d5a766855c3 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 4a13ba3bfb5..b8e46e5cc5b 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.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 1e49227d421..3e051597dcf 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.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 7d65b1a5dba..8d0c0bcfa3f 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.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 87b17381d7f..d21644f6e64 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.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 6c8fcc15127..a6e5f9a5c8c 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.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 e70bc7ed10c..0650990264d 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.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 9538ca41687..4045de42c01 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 31d38d568b5..aa02f73387e 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 @@ -28,13 +28,13 @@ import jakarta.ws.rs.core.{MediaType, Response} 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.{ +import org.apache.texera.common.config.{ ComputingUnitConfig, EnvironmentalVariable, KubernetesConfig, 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 cfc01b83b64..5177ebaf471 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 57395d77a3b..e4736cf2511 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 @@ -31,7 +31,7 @@ import org.apache.texera.auth.{ SessionUser, UnauthorizedExceptionMapper } -import org.apache.texera.config.{DefaultsConfig, StorageConfig} +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 805ca3cbb5e..af29b6c070e 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,7 @@ 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 43e1644ef00..76d78dfef86 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.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 95f369e2208..2f0764a8ac0 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.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 9dd322047ae..785c6a508bc 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.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 839971213b2..c278b21b4d3 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.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 From aa5c0825ca2a84ac09f3262ef71835f5fb1f784c Mon Sep 17 00:00:00 2001 From: Matthew Ball Date: Sat, 13 Jun 2026 18:47:25 -0700 Subject: [PATCH 5/5] lint --- .../apache/texera/service/resource/ConfigResource.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 af29b6c070e..55dc386a3ea 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.common.config.{AuthConfig, ComputingUnitConfig, GuiConfig, UserSystemConfig} +import org.apache.texera.common.config.{ + AuthConfig, + ComputingUnitConfig, + GuiConfig, + UserSystemConfig +} @Path("/config") @Produces(Array(MediaType.APPLICATION_JSON))