Cleanup

cuioss · Jul 25, 2023 · fd2233c · fd2233c
1 parent 6c7f277
commit fd2233c
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 329 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -99,13 +99,6 @@
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
-            <!-- Deltaspike modules-->
-            <dependency>
-                <groupId>de.cuioss.portal.core</groupId>
-                <artifactId>portal-deltaspike</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <!-- Test-->
             <dependency>
                 <groupId>de.cuioss.portal.test</groupId>

diff --git a/...rtal/authentication/oauth/Redirector.java → ...authentication/oauth/OauthRedirector.java b/...rtal/authentication/oauth/Redirector.java → ...authentication/oauth/OauthRedirector.java
@@ -5,7 +5,7 @@
  * modules.
  *
  */
-public interface Redirector {
+public interface OauthRedirector {
 
     /**
      * Redirect to another url. The url is expected to be complete and independent

diff --git a/.../main/java/de/cuioss/portal/authentication/oauth/impl/Oauth2AuthenticationFacadeImpl.java b/.../main/java/de/cuioss/portal/authentication/oauth/impl/Oauth2AuthenticationFacadeImpl.java
@@ -37,7 +37,7 @@
 import de.cuioss.portal.authentication.oauth.Oauth2Service;
 import de.cuioss.portal.authentication.oauth.OauthAuthenticationException;
 import de.cuioss.portal.authentication.oauth.OidcRpInitiatedLogoutParams;
-import de.cuioss.portal.authentication.oauth.Redirector;
+import de.cuioss.portal.authentication.oauth.OauthRedirector;
 import de.cuioss.portal.authentication.oauth.Token;
 import de.cuioss.tools.collect.CollectionBuilder;
 import de.cuioss.tools.logging.CuiLogger;
@@ -93,7 +93,7 @@ public class Oauth2AuthenticationFacadeImpl extends BaseAuthenticationFacade
     private Provider<String> loginUrl;
 
     @Inject
-    private Provider<Redirector> redirector;
+    private Provider<OauthRedirector> oauthRedirector;
 
     @Inject
     private Provider<HttpServletRequest> servletRequestProvider;
@@ -143,7 +143,7 @@ private void sendRedirect(final String scopes, final String idToken) {
         try {
             var retrieveUrl = retrieveOauth2RedirectUrl(scopes, idToken);
             LOGGER.debug("Calling redirect to %s", retrieveUrl);
-            redirector.get().sendRedirect(retrieveUrl);
+            oauthRedirector.get().sendRedirect(retrieveUrl);
         } catch (final IllegalStateException e) {
             LOGGER.warn("Portal-146: Oauth2 sendRedirect failed", e);
         }

diff --git a/...cation-oauth/src/test/java/de/cuioss/portal/authentication/oauth/impl/RedirectorMock.java b/...cation-oauth/src/test/java/de/cuioss/portal/authentication/oauth/impl/RedirectorMock.java
@@ -2,12 +2,12 @@
 
 import javax.enterprise.context.ApplicationScoped;
 
-import de.cuioss.portal.authentication.oauth.Redirector;
+import de.cuioss.portal.authentication.oauth.OauthRedirector;
 import lombok.Getter;
 
 @SuppressWarnings("javadoc")
 @ApplicationScoped
-public class RedirectorMock implements Redirector {
+public class RedirectorMock implements OauthRedirector {
 
     @Getter
     private String redirectUrl;

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -65,6 +65,5 @@
         <module>core</module>
         <module>micro-profile</module>
         <module>test</module>
-        <module>portal-deltaspike</module>
     </modules>
 </project>
diff --git a/modules/portal-deltaspike/README.adoc b/modules/portal-deltaspike/README.adoc
diff --git a/modules/portal-deltaspike/pom.xml b/modules/portal-deltaspike/pom.xml
diff --git a/...s/portal-deltaspike/src/main/java/org/apache/deltaspike/core/api/lifecycle/Destroyed.java b/...s/portal-deltaspike/src/main/java/org/apache/deltaspike/core/api/lifecycle/Destroyed.java
diff --git a/...l-deltaspike/src/main/java/org/apache/deltaspike/core/api/lifecycle/DestroyedLiteral.java b/...l-deltaspike/src/main/java/org/apache/deltaspike/core/api/lifecycle/DestroyedLiteral.java
diff --git a/...portal-deltaspike/src/main/java/org/apache/deltaspike/core/api/lifecycle/Initialized.java b/...portal-deltaspike/src/main/java/org/apache/deltaspike/core/api/lifecycle/Initialized.java
diff --git a/...deltaspike/src/main/java/org/apache/deltaspike/core/api/lifecycle/InitializedLiteral.java b/...deltaspike/src/main/java/org/apache/deltaspike/core/api/lifecycle/InitializedLiteral.java
diff --git a/...ke/src/main/java/org/apache/deltaspike/servlet/impl/event/RequestResponseEventFilter.java b/...ke/src/main/java/org/apache/deltaspike/servlet/impl/event/RequestResponseEventFilter.java
diff --git a/modules/portal-deltaspike/src/main/resources/META-INF/beans.xml b/modules/portal-deltaspike/src/main/resources/META-INF/beans.xml
diff --git a/modules/portal-deltaspike/src/main/resources/META-INF/web-fragment.xml b/modules/portal-deltaspike/src/main/resources/META-INF/web-fragment.xml
diff --git a/...rc/test/java/org/apache/deltaspike/servlet/impl/event/RequestResponseEventFilterTest.java b/...rc/test/java/org/apache/deltaspike/servlet/impl/event/RequestResponseEventFilterTest.java