refactoring - rename AccessControlProvider

ing-bank · Oct 31, 2023 · a412591 · a412591
1 parent 80dd388
commit a412591
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/it/scala/com/ing/wbaa/rokku/proxy/RokkuS3ProxyItTest.scala b/src/it/scala/com/ing/wbaa/rokku/proxy/RokkuS3ProxyItTest.scala
@@ -78,7 +78,7 @@ class RokkuS3ProxyItTest extends AsyncWordSpec with Diagrams
   def withSdkToMockProxy(testCode: (AWSSecurityTokenService, Authority) => Future[Assertion]): Future[Assertion] = {
     val proxy: RokkuS3Proxy = new RokkuS3Proxy with RequestHandlerS3
       with FilterRecursiveListBucketHandler with AuthenticationProviderSTS
-      with AccessControlProviderClassForName with SignatureProviderAws
+      with AccessControlProvider with SignatureProviderAws
       with MessageProviderKafka with AuditLogProvider with MemoryUserRequestQueue with RequestParser {
       override implicit lazy val system: ActorSystem = testSystem
       override def materializer: Materializer = Materializer(system)

diff --git a/src/it/scala/com/ing/wbaa/rokku/proxy/provider/AccessControlProviderRangerItTest.scala b/src/it/scala/com/ing/wbaa/rokku/proxy/provider/AccessControlProviderRangerItTest.scala
@@ -59,8 +59,8 @@ class AccessControlProviderRangerItTest extends AsyncWordSpec with Diagrams {
     */
   def withAuthorizationProviderRanger(rangerTestSettings: AccessControlProviderSettings =
                                       AccessControlProviderSettings(testSystem))
-                                     (testCode: AccessControlProviderClassForName => Future[Assertion]): Future[Assertion] = {
-    testCode(new AccessControlProviderClassForName {
+                                     (testCode: AccessControlProvider => Future[Assertion]): Future[Assertion] = {
+    testCode(new AccessControlProvider {
       override def accessControlProviderSettings: AccessControlProviderSettings = rangerTestSettings
     })
   }

diff --git a/src/main/scala/com/ing/wbaa/rokku/proxy/Server.scala b/src/main/scala/com/ing/wbaa/rokku/proxy/Server.scala
@@ -11,7 +11,7 @@ import com.ing.wbaa.rokku.proxy.queue.MemoryUserRequestQueue
 
 object Server extends App {
 
-  new RokkuS3Proxy with AccessControlProviderClassForName with RequestHandlerS3WithNamespaces with AuthenticationCachedProviderSTS with SignatureProviderAws with KerberosLoginProvider with FilterRecursiveListBucketHandler with MessageProviderKafka with AuditLogProvider with MemoryUserRequestQueue with RequestParser {
+  new RokkuS3Proxy with AccessControlProvider with RequestHandlerS3WithNamespaces with AuthenticationCachedProviderSTS with SignatureProviderAws with KerberosLoginProvider with FilterRecursiveListBucketHandler with MessageProviderKafka with AuditLogProvider with MemoryUserRequestQueue with RequestParser {
 
     override implicit lazy val system: ActorSystem = ActorSystem.create("rokku")
     override implicit def materializer: Materializer = Materializer(system)

diff --git a/...r/AccessControlProviderClassForName.scala → ...roxy/provider/AccessControlProvider.scala b/...r/AccessControlProviderClassForName.scala → ...roxy/provider/AccessControlProvider.scala
@@ -9,7 +9,7 @@ import com.ing.wbaa.rokku.proxy.security.{ AccessControl, AccessControlRequest }
 
 import scala.jdk.CollectionConverters._
 
-trait AccessControlProviderClassForName extends AccessControl {
+trait AccessControlProvider extends AccessControl {
 
   private val logger = new LoggerHandlerWithId
 

diff --git a/src/test/scala/com/ing/wbaa/rokku/proxy/provider/RangerAccessControlProviderSpec.scala b/src/test/scala/com/ing/wbaa/rokku/proxy/provider/RangerAccessControlProviderSpec.scala
@@ -6,7 +6,7 @@ import com.ing.wbaa.rokku.proxy.provider.AccessControlProviderRanger.RangerExcep
 import org.scalatest.diagrams.Diagrams
 import org.scalatest.wordspec.AnyWordSpec
 
-class RangerAccessControlProviderSpec extends AnyWordSpec with Diagrams with AccessControlProviderClassForName {
+class RangerAccessControlProviderSpec extends AnyWordSpec with Diagrams with AccessControlProvider {
 
   private[this] final implicit val testSystem: ActorSystem = ActorSystem.create("test-system")