Reorganize packages to avoid exposing internal classes as API

quarkusio · Oct 23, 2019 · 15f0be5 · 15f0be5
1 parent 923d13f
commit 15f0be5
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/...ak/deployment/VertxKeycloakBuildStep.java → ...uarkus/oidc/deployment/OidcProcessor.java b/...ak/deployment/VertxKeycloakBuildStep.java → ...uarkus/oidc/deployment/OidcProcessor.java
@@ -1,19 +1,19 @@
-package io.quarkus.vertx.keycloak.deployment;
+package io.quarkus.oidc.deployment;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.BeanContainerBuildItem;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.EnableAllSecurityServicesBuildItem;
-import io.quarkus.oidc.OidcConfig;
-import io.quarkus.oidc.VertxJwtPrincipalProducer;
-import io.quarkus.oidc.VertxKeycloakRecorder;
-import io.quarkus.oidc.VertxOAuth2AuthenticationMechanism;
-import io.quarkus.oidc.VertxOAuth2IdentityProvider;
+import io.quarkus.oidc.runtime.OidcConfig;
+import io.quarkus.oidc.runtime.OidcRecorder;
+import io.quarkus.oidc.runtime.VertxJwtPrincipalProducer;
+import io.quarkus.oidc.runtime.VertxOAuth2AuthenticationMechanism;
+import io.quarkus.oidc.runtime.VertxOAuth2IdentityProvider;
 import io.quarkus.vertx.deployment.VertxBuildItem;
 
-public class VertxKeycloakBuildStep {
+public class OidcProcessor {
 
     @BuildStep
     public AdditionalBeanBuildItem beans() {
@@ -30,7 +30,7 @@ EnableAllSecurityServicesBuildItem security() {
 
     @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep
-    public void setup(OidcConfig config, VertxKeycloakRecorder recorder, VertxBuildItem vertxBuildItem,
+    public void setup(OidcConfig config, OidcRecorder recorder, VertxBuildItem vertxBuildItem,
             BeanContainerBuildItem bc) {
         recorder.setup(config, vertxBuildItem.getVertx(), bc.getValue());
     }

diff --git a/...main/java/io/quarkus/oidc/OidcConfig.java → ...a/io/quarkus/oidc/runtime/OidcConfig.java b/...main/java/io/quarkus/oidc/OidcConfig.java → ...a/io/quarkus/oidc/runtime/OidcConfig.java
@@ -1,4 +1,4 @@
-package io.quarkus.oidc;
+package io.quarkus.oidc.runtime;
 
 import java.util.Optional;
 

diff --git a/...o/quarkus/oidc/VertxKeycloakRecorder.java → ...io/quarkus/oidc/runtime/OidcRecorder.java b/...o/quarkus/oidc/VertxKeycloakRecorder.java → ...io/quarkus/oidc/runtime/OidcRecorder.java
@@ -1,4 +1,4 @@
-package io.quarkus.oidc;
+package io.quarkus.oidc.runtime;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -14,7 +14,7 @@
 import io.vertx.ext.auth.oauth2.providers.KeycloakAuth;
 
 @Recorder
-public class VertxKeycloakRecorder {
+public class OidcRecorder {
 
     public void setup(OidcConfig config, RuntimeValue<Vertx> vertx, BeanContainer beanContainer) {
         OAuth2ClientOptions options = new OAuth2ClientOptions();

diff --git a/...arkus/oidc/VertxJwtPrincipalProducer.java → ...dc/runtime/VertxJwtPrincipalProducer.java b/...arkus/oidc/VertxJwtPrincipalProducer.java → ...dc/runtime/VertxJwtPrincipalProducer.java
@@ -1,4 +1,4 @@
-package io.quarkus.oidc;
+package io.quarkus.oidc.runtime;
 
 import java.util.Set;
 

diff --git a/...c/VertxOAuth2AuthenticationMechanism.java → ...e/VertxOAuth2AuthenticationMechanism.java b/...c/VertxOAuth2AuthenticationMechanism.java → ...e/VertxOAuth2AuthenticationMechanism.java
@@ -1,4 +1,4 @@
-package io.quarkus.oidc;
+package io.quarkus.oidc.runtime;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;

diff --git a/...kus/oidc/VertxOAuth2IdentityProvider.java → .../runtime/VertxOAuth2IdentityProvider.java b/...kus/oidc/VertxOAuth2IdentityProvider.java → .../runtime/VertxOAuth2IdentityProvider.java
@@ -1,4 +1,4 @@
-package io.quarkus.oidc;
+package io.quarkus.oidc.runtime;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
@@ -8,6 +8,7 @@
 import org.jose4j.jwt.JwtClaims;
 import org.jose4j.jwt.consumer.InvalidJwtException;
 
+import io.quarkus.oidc.VertxJwtCallerPrincipal;
 import io.quarkus.security.identity.AuthenticationRequestContext;
 import io.quarkus.security.identity.IdentityProvider;
 import io.quarkus.security.identity.SecurityIdentity;