This is an automated email from the ASF dual-hosted git repository.
aicam 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 e6c9d7db32 fix(access-control-service): fix service file formats
(#3840)
e6c9d7db32 is described below
commit e6c9d7db328d05303c7050deb8213f79018ddb5a
Author: ali risheh <[email protected]>
AuthorDate: Tue Oct 7 21:05:29 2025 -0700
fix(access-control-service): fix service file formats (#3840)
## Update
This PR fixes formatting issues that introduce redundant file changes in
the core [PR](https://github.com/apache/texera/pull/3598).
---
.../ics/texera/service/AccessControlService.scala | 6 ++--
.../uci/ics/texera/AccessControlResourceSpec.scala | 40 +++++++++++++++-------
2 files changed, 32 insertions(+), 14 deletions(-)
diff --git
a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/AccessControlService.scala
b/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/AccessControlService.scala
index 02278fd97a..f56f29e812 100644
---
a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/AccessControlService.scala
+++
b/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/AccessControlService.scala
@@ -30,7 +30,6 @@ import io.dropwizard.auth.AuthDynamicFeature
import org.eclipse.jetty.server.session.SessionHandler
import org.jooq.impl.DSL
-
class AccessControlService extends
Application[AccessControlServiceConfiguration] with LazyLogging {
override def initialize(bootstrap:
Bootstrap[AccessControlServiceConfiguration]): Unit = {
// Register Scala module to Dropwizard default object mapper
@@ -43,7 +42,10 @@ class AccessControlService extends
Application[AccessControlServiceConfiguration
)
}
- override def run(configuration: AccessControlServiceConfiguration,
environment: Environment): Unit = {
+ override def run(
+ configuration: AccessControlServiceConfiguration,
+ environment: Environment
+ ): Unit = {
// Serve backend at /api
environment.jersey.setUrlPattern("/api/*")
diff --git
a/core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala
b/core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala
index 349ec334aa..3aa71b48aa 100644
---
a/core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala
+++
b/core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala
@@ -20,9 +20,21 @@ package edu.uci.ics.texera
import edu.uci.ics.texera.auth.JwtAuth
import edu.uci.ics.texera.auth.util.HeaderField
import edu.uci.ics.texera.dao.MockTexeraDB
-import edu.uci.ics.texera.dao.jooq.generated.enums.{PrivilegeEnum,
UserRoleEnum, WorkflowComputingUnitTypeEnum}
-import
edu.uci.ics.texera.dao.jooq.generated.tables.daos.{ComputingUnitUserAccessDao,
UserDao, WorkflowComputingUnitDao}
-import
edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{ComputingUnitUserAccess,
User, WorkflowComputingUnit}
+import edu.uci.ics.texera.dao.jooq.generated.enums.{
+ PrivilegeEnum,
+ UserRoleEnum,
+ WorkflowComputingUnitTypeEnum
+}
+import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{
+ ComputingUnitUserAccessDao,
+ UserDao,
+ WorkflowComputingUnitDao
+}
+import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{
+ ComputingUnitUserAccess,
+ User,
+ WorkflowComputingUnit
+}
import edu.uci.ics.texera.service.resource.AccessControlResource
import jakarta.ws.rs.core.{HttpHeaders, MultivaluedHashMap, Response, UriInfo}
import org.mockito.Mockito._
@@ -33,11 +45,12 @@ import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
import java.net.URI
import java.util
-class AccessControlResourceSpec extends AnyFlatSpec
- with Matchers
- with BeforeAndAfterAll
- with BeforeAndAfterEach
- with MockTexeraDB {
+class AccessControlResourceSpec
+ extends AnyFlatSpec
+ with Matchers
+ with BeforeAndAfterAll
+ with BeforeAndAfterEach
+ with MockTexeraDB {
private val testURI: String = "http://localhost:8080/";
private val testPath: String = "/api/executions/1/stats/1"
@@ -129,7 +142,8 @@ class AccessControlResourceSpec extends AnyFlatSpec
when(mockUriInfo.getRequestUri).thenReturn(new URI(testURI))
when(mockUriInfo.getPath).thenReturn(testPath)
when(mockHttpHeaders.getRequestHeaders).thenReturn(requestHeaders)
-
when(mockHttpHeaders.getRequestHeader("Authorization")).thenReturn(util.Arrays.asList("Bearer
dummy-token"))
+ when(mockHttpHeaders.getRequestHeader("Authorization"))
+ .thenReturn(util.Arrays.asList("Bearer dummy-token"))
val accessControlResource = new AccessControlResource()
val response = accessControlResource.authorizeGet(mockUriInfo,
mockHttpHeaders)
@@ -174,7 +188,8 @@ class AccessControlResourceSpec extends AnyFlatSpec
when(mockUriInfo.getRequestUri).thenReturn(new URI(testURI))
when(mockUriInfo.getPath).thenReturn(testPath)
when(mockHttpHeaders.getRequestHeaders).thenReturn(requestHeaders)
-
when(mockHttpHeaders.getRequestHeader("Authorization")).thenReturn(util.Arrays.asList("Bearer
" + token))
+ when(mockHttpHeaders.getRequestHeader("Authorization"))
+ .thenReturn(util.Arrays.asList("Bearer " + token))
// Instantiate the resource and call the method under test
val accessControlResource = new AccessControlResource()
@@ -202,7 +217,8 @@ class AccessControlResourceSpec extends AnyFlatSpec
when(mockUriInfo.getRequestUri).thenReturn(new URI(testURI))
when(mockUriInfo.getPath).thenReturn(testPath)
when(mockHttpHeaders.getRequestHeaders).thenReturn(requestHeaders)
-
when(mockHttpHeaders.getRequestHeader("Authorization")).thenReturn(util.Arrays.asList("Bearer
" + token))
+ when(mockHttpHeaders.getRequestHeader("Authorization"))
+ .thenReturn(util.Arrays.asList("Bearer " + token))
// Instantiate the resource and call the method under test
val accessControlResource = new AccessControlResource()
@@ -217,4 +233,4 @@ class AccessControlResourceSpec extends AnyFlatSpec
response.getHeaderString(HeaderField.UserName) shouldBe testUser1.getName
response.getHeaderString(HeaderField.UserEmail) shouldBe testUser1.getEmail
}
-}
\ No newline at end of file
+}
