This is an automated email from the ASF dual-hosted git repository.
yiconghuang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to refs/heads/main by this push:
new 7720eb468a chore: relocate file-service (#3873)
7720eb468a is described below
commit 7720eb468a3e2708cf32d2db5de995ba58aa426c
Author: Yicong Huang <[email protected]>
AuthorDate: Sun Oct 12 10:08:22 2025 -0700
chore: relocate file-service (#3873)
According to the reorganization plan #3846, this PR moves
`core/file-service` out to the root folder.
resolves #3858.
---------
Signed-off-by: Yicong Huang <[email protected]>
---
build.sbt | 2 +-
core/config/src/main/scala/org/apache/amber/util/PathUtils.scala | 2 --
{core/file-service => file-service}/build.sbt | 0
.../src/main/resources/docker-compose.yml | 0
.../src/main/resources/file-service-web-config.yaml | 0
.../src/main/resources/minio-config.yml | 0
.../src/main/scala/org/apache/texera/service/FileService.scala | 7 +++++--
.../scala/org/apache/texera/service/FileServiceConfiguration.scala | 0
.../org/apache/texera/service/resource/DatasetAccessResource.scala | 0
.../scala/org/apache/texera/service/resource/DatasetResource.scala | 0
.../org/apache/texera/service/resource/HealthCheckResource.scala | 0
.../org/apache/texera/service/type/dataset/DatasetFileNode.scala | 0
.../texera/service/type/serde/DatasetFileNodeSerializer.java | 0
.../scala/org/apache/texera/service/util/S3StorageClient.scala | 0
.../src/test/scala/org/apache/texera/service/MockLakeFS.scala | 0
.../org/apache/texera/service/resource/DatasetResourceSpec.scala | 0
16 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/build.sbt b/build.sbt
index 38dafbf168..ba83094dc8 100644
--- a/build.sbt
+++ b/build.sbt
@@ -49,7 +49,7 @@ lazy val ComputingUnitManagingService = (project in
file("computing-unit-managin
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.17.0"
)
)
-lazy val FileService = (project in file("core/file-service"))
+lazy val FileService = (project in file("file-service"))
.dependsOn(WorkflowCore, Auth, Config)
.configs(Test)
.dependsOn(DAO % "test->test") // test scope dependency
diff --git a/core/config/src/main/scala/org/apache/amber/util/PathUtils.scala
b/core/config/src/main/scala/org/apache/amber/util/PathUtils.scala
index 0cbf40ec3b..3b71848961 100644
--- a/core/config/src/main/scala/org/apache/amber/util/PathUtils.scala
+++ b/core/config/src/main/scala/org/apache/amber/util/PathUtils.scala
@@ -54,8 +54,6 @@ object PathUtils {
}
}
- lazy val fileServicePath: Path = corePath.resolve("file-service")
-
lazy val configServicePath: Path = corePath.resolve("config-service")
lazy val accessControlServicePath: Path =
corePath.resolve("access-control-service")
diff --git a/core/file-service/build.sbt b/file-service/build.sbt
similarity index 100%
rename from core/file-service/build.sbt
rename to file-service/build.sbt
diff --git a/core/file-service/src/main/resources/docker-compose.yml
b/file-service/src/main/resources/docker-compose.yml
similarity index 100%
rename from core/file-service/src/main/resources/docker-compose.yml
rename to file-service/src/main/resources/docker-compose.yml
diff --git a/core/file-service/src/main/resources/file-service-web-config.yaml
b/file-service/src/main/resources/file-service-web-config.yaml
similarity index 100%
rename from core/file-service/src/main/resources/file-service-web-config.yaml
rename to file-service/src/main/resources/file-service-web-config.yaml
diff --git a/core/file-service/src/main/resources/minio-config.yml
b/file-service/src/main/resources/minio-config.yml
similarity index 100%
rename from core/file-service/src/main/resources/minio-config.yml
rename to file-service/src/main/resources/minio-config.yml
diff --git
a/core/file-service/src/main/scala/org/apache/texera/service/FileService.scala
b/file-service/src/main/scala/org/apache/texera/service/FileService.scala
similarity index 96%
rename from
core/file-service/src/main/scala/org/apache/texera/service/FileService.scala
rename to
file-service/src/main/scala/org/apache/texera/service/FileService.scala
index ab6a5c2386..9eab6fc1a4 100644
---
a/core/file-service/src/main/scala/org/apache/texera/service/FileService.scala
+++ b/file-service/src/main/scala/org/apache/texera/service/FileService.scala
@@ -27,7 +27,6 @@ import io.dropwizard.core.Application
import io.dropwizard.core.setup.{Bootstrap, Environment}
import org.apache.amber.config.StorageConfig
import org.apache.amber.core.storage.util.LakeFSStorageClient
-import org.apache.amber.util.PathUtils.fileServicePath
import org.apache.texera.auth.{JwtAuthFilter, SessionUser}
import org.apache.texera.dao.SqlServer
import org.apache.texera.service.`type`.DatasetFileNode
@@ -40,6 +39,8 @@ import org.apache.texera.service.resource.{
import org.apache.texera.service.util.S3StorageClient
import org.eclipse.jetty.server.session.SessionHandler
+import java.nio.file.Path
+
class FileService extends Application[FileServiceConfiguration] with
LazyLogging {
override def initialize(bootstrap: Bootstrap[FileServiceConfiguration]):
Unit = {
// Register Scala module to Dropwizard default object mapper
@@ -86,7 +87,9 @@ class FileService extends
Application[FileServiceConfiguration] with LazyLogging
object FileService {
def main(args: Array[String]): Unit = {
// Set the configuration file's path
- val configFilePath = fileServicePath
+ val configFilePath = Path
+ .of(sys.env.getOrElse("TEXERA_HOME", "."))
+ .resolve("file-service")
.resolve("src")
.resolve("main")
.resolve("resources")
diff --git
a/core/file-service/src/main/scala/org/apache/texera/service/FileServiceConfiguration.scala
b/file-service/src/main/scala/org/apache/texera/service/FileServiceConfiguration.scala
similarity index 100%
rename from
core/file-service/src/main/scala/org/apache/texera/service/FileServiceConfiguration.scala
rename to
file-service/src/main/scala/org/apache/texera/service/FileServiceConfiguration.scala
diff --git
a/core/file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala
b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala
similarity index 100%
rename from
core/file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala
rename to
file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala
diff --git
a/core/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
similarity index 100%
rename from
core/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala
rename to
file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala
diff --git
a/core/file-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
b/file-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
similarity index 100%
rename from
core/file-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
rename to
file-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
diff --git
a/core/file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala
b/file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala
similarity index 100%
rename from
core/file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala
rename to
file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala
diff --git
a/core/file-service/src/main/scala/org/apache/texera/service/type/serde/DatasetFileNodeSerializer.java
b/file-service/src/main/scala/org/apache/texera/service/type/serde/DatasetFileNodeSerializer.java
similarity index 100%
rename from
core/file-service/src/main/scala/org/apache/texera/service/type/serde/DatasetFileNodeSerializer.java
rename to
file-service/src/main/scala/org/apache/texera/service/type/serde/DatasetFileNodeSerializer.java
diff --git
a/core/file-service/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala
b/file-service/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala
similarity index 100%
rename from
core/file-service/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala
rename to
file-service/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala
diff --git
a/core/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala
b/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala
similarity index 100%
rename from
core/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala
rename to file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala
diff --git
a/core/file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala
b/file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala
similarity index 100%
rename from
core/file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala
rename to
file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala
