You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/04 23:52:47 UTC

[isis] 01/02: ISIS-2213: reorgs classes in keycloak module

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit ca25e0fd41569002b0e8a9407134013e7ef3b599
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 23:45:21 2019 +0000

    ISIS-2213: reorgs classes in keycloak module
---
 .../isis/security/keycloak/IsisBootSecurityKeycloak.java       |  1 +
 .../isis/security/keycloak/{ => webmodule}/KeycloakFilter.java |  2 +-
 .../security/keycloak/{ => webmodule}/WebModuleKeycloak.java   | 10 ++--------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisBootSecurityKeycloak.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisBootSecurityKeycloak.java
index e6d5fbd..e4268b2 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisBootSecurityKeycloak.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisBootSecurityKeycloak.java
@@ -23,6 +23,7 @@ import javax.inject.Singleton;
 import org.apache.isis.runtime.services.auth.AuthorizationManagerStandard;
 import org.apache.isis.security.keycloak.authentication.KeycloakAuthenticator;
 import org.apache.isis.security.keycloak.authorization.KeycloakAuthorizor;
+import org.apache.isis.security.keycloak.webmodule.WebModuleKeycloak;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/KeycloakFilter.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
similarity index 98%
rename from core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/KeycloakFilter.java
rename to core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
index 9adf530..dc41664 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/KeycloakFilter.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
@@ -1,4 +1,4 @@
-package org.apache.isis.security.keycloak;
+package org.apache.isis.security.keycloak.webmodule;
 
 import lombok.val;
 
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/WebModuleKeycloak.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
similarity index 93%
rename from core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/WebModuleKeycloak.java
rename to core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
index dbd272b..705fd51 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/WebModuleKeycloak.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.security.keycloak;
+package org.apache.isis.security.keycloak.webmodule;
 
 import lombok.val;
 
@@ -42,16 +42,10 @@ import static org.apache.isis.commons.internal.exceptions._Exceptions.unexpected
 @Order(Ordered.HIGHEST_PRECEDENCE + 100)
 public final class WebModuleKeycloak implements WebModule  {
 
-    private final static String KEYCLOAK_FILTER_CLASS_NAME =
-            KeycloakFilter.class.getName();
+    private final static String KEYCLOAK_FILTER_CLASS_NAME = KeycloakFilter.class.getName();
 
     private final static String KEYCLOAK_FILTER_NAME = "KeycloakFilter";
 
-    // -- CONFIGURATION
-
-
-    // -- 
-
     @Override
     public String getName() {
         return "Keycloak";