Moving oauth-config-keys

cuioss · Sep 29, 2023 · 70a724d · 70a724d
1 parent d2b1f99
commit 70a724d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 18 deletions.
diff --git a/...portal/configuration/OAuthConfigKeys.java → ...authentication/oauth/OAuthConfigKeys.java b/...portal/configuration/OAuthConfigKeys.java → ...authentication/oauth/OAuthConfigKeys.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.cuioss.portal.configuration;
+package de.cuioss.portal.authentication.oauth;
 
 import lombok.experimental.UtilityClass;
 

diff --git a/...java/de/cuioss/portal/authentication/oauth/impl/Oauth2DiscoveryConfigurationProducer.java b/...java/de/cuioss/portal/authentication/oauth/impl/Oauth2DiscoveryConfigurationProducer.java
@@ -15,10 +15,10 @@
  */
 package de.cuioss.portal.authentication.oauth.impl;
 
-import static de.cuioss.portal.configuration.OAuthConfigKeys.AUTHENTICATION_BASE;
-import static de.cuioss.portal.configuration.OAuthConfigKeys.OPEN_ID_DISCOVER_PATH;
-import static de.cuioss.portal.configuration.OAuthConfigKeys.OPEN_ID_ROLE_MAPPER_CLAIM;
-import static de.cuioss.portal.configuration.OAuthConfigKeys.OPEN_ID_SERVER_BASE_URL;
+import static de.cuioss.portal.authentication.oauth.OAuthConfigKeys.AUTHENTICATION_BASE;
+import static de.cuioss.portal.authentication.oauth.OAuthConfigKeys.OPEN_ID_DISCOVER_PATH;
+import static de.cuioss.portal.authentication.oauth.OAuthConfigKeys.OPEN_ID_ROLE_MAPPER_CLAIM;
+import static de.cuioss.portal.authentication.oauth.OAuthConfigKeys.OPEN_ID_SERVER_BASE_URL;
 import static de.cuioss.tools.net.UrlHelper.addTrailingSlashToUrl;
 import static de.cuioss.tools.string.MoreStrings.isBlank;
 
@@ -38,8 +38,8 @@
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
+import de.cuioss.portal.authentication.oauth.OAuthConfigKeys;
 import de.cuioss.portal.authentication.oauth.Oauth2Configuration;
-import de.cuioss.portal.configuration.OAuthConfigKeys;
 import de.cuioss.portal.configuration.PortalConfigurationChangeEvent;
 import de.cuioss.portal.configuration.PortalConfigurationChangeInterceptor;
 import de.cuioss.portal.restclient.CuiRestClientBuilder;

diff --git a/...tication-oauth/src/test/java/de/cuioss/portal/authentication/oauth/DefaultConfigTest.java b/...tication-oauth/src/test/java/de/cuioss/portal/authentication/oauth/DefaultConfigTest.java
@@ -15,20 +15,19 @@
  */
 package de.cuioss.portal.authentication.oauth;
 
-import static de.cuioss.portal.configuration.OAuthConfigKeys.EXTERNAL_HOSTNAME;
-import static de.cuioss.portal.configuration.OAuthConfigKeys.OPEN_ID_CLIENT_ID;
-import static de.cuioss.portal.configuration.OAuthConfigKeys.OPEN_ID_CLIENT_LOGOUT_REDIRECT_PARAMETER;
-import static de.cuioss.portal.configuration.OAuthConfigKeys.OPEN_ID_CLIENT_POST_LOGOUT_REDIRECT_URI;
-import static de.cuioss.portal.configuration.OAuthConfigKeys.OPEN_ID_CLIENT_SECRET;
-import static de.cuioss.portal.configuration.OAuthConfigKeys.OPEN_ID_SERVER_BASE_URL;
-import static de.cuioss.portal.configuration.OAuthConfigKeys.OPEN_ID_SERVER_TOKEN_URL;
-import static de.cuioss.portal.configuration.OAuthConfigKeys.OPEN_ID_SERVER_USER_INFO_URL;
+import static de.cuioss.portal.authentication.oauth.OAuthConfigKeys.EXTERNAL_HOSTNAME;
+import static de.cuioss.portal.authentication.oauth.OAuthConfigKeys.OPEN_ID_CLIENT_ID;
+import static de.cuioss.portal.authentication.oauth.OAuthConfigKeys.OPEN_ID_CLIENT_LOGOUT_REDIRECT_PARAMETER;
+import static de.cuioss.portal.authentication.oauth.OAuthConfigKeys.OPEN_ID_CLIENT_POST_LOGOUT_REDIRECT_URI;
+import static de.cuioss.portal.authentication.oauth.OAuthConfigKeys.OPEN_ID_CLIENT_SECRET;
+import static de.cuioss.portal.authentication.oauth.OAuthConfigKeys.OPEN_ID_SERVER_BASE_URL;
+import static de.cuioss.portal.authentication.oauth.OAuthConfigKeys.OPEN_ID_SERVER_TOKEN_URL;
+import static de.cuioss.portal.authentication.oauth.OAuthConfigKeys.OPEN_ID_SERVER_USER_INFO_URL;
 import static de.cuioss.tools.collect.CollectionLiterals.immutableList;
 
 import java.util.List;
 
 import de.cuioss.portal.configuration.FileConfigurationSource;
-import de.cuioss.portal.configuration.OAuthConfigKeys;
 import de.cuioss.portal.core.test.tests.configuration.AbstractConfigurationKeyVerifierTest;
 import de.cuioss.portal.core.test.tests.configuration.PropertiesDefaultConfigSource;
 import lombok.Getter;

diff --git a/...uth/src/test/java/de/cuioss/portal/authentication/oauth/impl/OIDCWellKnownDispatcher.java b/...uth/src/test/java/de/cuioss/portal/authentication/oauth/impl/OIDCWellKnownDispatcher.java
@@ -26,7 +26,7 @@
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 
-import de.cuioss.portal.configuration.OAuthConfigKeys;
+import de.cuioss.portal.authentication.oauth.OAuthConfigKeys;
 import de.cuioss.portal.core.test.mocks.configuration.PortalTestConfiguration;
 import de.cuioss.tools.collect.CollectionBuilder;
 import de.cuioss.tools.io.FileLoader;

diff --git a/.../de/cuioss/portal/authentication/oauth/impl/Oauth2DiscoveryConfigurationProducerTest.java b/.../de/cuioss/portal/authentication/oauth/impl/Oauth2DiscoveryConfigurationProducerTest.java
@@ -26,7 +26,7 @@
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
 import org.junit.jupiter.api.Test;
 
-import de.cuioss.portal.configuration.OAuthConfigKeys;
+import de.cuioss.portal.authentication.oauth.OAuthConfigKeys;
 import de.cuioss.portal.configuration.PortalConfigurationSource;
 import de.cuioss.portal.core.test.junit5.EnablePortalConfiguration;
 import de.cuioss.portal.core.test.junit5.mockwebserver.EnableMockWebServer;

diff --git a/...oauth/src/test/java/de/cuioss/portal/authentication/oauth/impl/Oauth2ServiceImplTest.java b/...oauth/src/test/java/de/cuioss/portal/authentication/oauth/impl/Oauth2ServiceImplTest.java
@@ -38,8 +38,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import de.cuioss.portal.authentication.oauth.OAuthConfigKeys;
 import de.cuioss.portal.authentication.oauth.Oauth2AuthenticationFacade;
-import de.cuioss.portal.configuration.OAuthConfigKeys;
 import de.cuioss.portal.configuration.PortalConfigurationSource;
 import de.cuioss.portal.core.test.junit5.EnablePortalConfiguration;
 import de.cuioss.portal.core.test.junit5.mockwebserver.EnableMockWebServer;

diff --git a/modules/micro-profile/portal-metrics-api/pom.xml b/modules/micro-profile/portal-metrics-api/pom.xml
@@ -26,5 +26,9 @@
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
     </dependencies>
 </project>