Merge pull request quarkusio#4725 from stuartwdouglas/jdbc-elytron

Fixes quarkusio#4718
geoand · Oct 22, 2019 · ab5874d · ab5874d
2 parents d703584 + 496a1e1
commit ab5874d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/...c/main/java/io/quarkus/elytron/security/jdbc/deployment/ElytronSecurityJdbcProcessor.java b/...c/main/java/io/quarkus/elytron/security/jdbc/deployment/ElytronSecurityJdbcProcessor.java
@@ -5,6 +5,7 @@
 import org.wildfly.security.auth.server.SecurityRealm;
 
 import io.quarkus.agroal.deployment.DataSourceInitializedBuildItem;
+import io.quarkus.arc.deployment.BeanContainerBuildItem;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
@@ -40,6 +41,7 @@ FeatureBuildItem feature() {
     @Record(ExecutionTime.STATIC_INIT)
     void configureJdbcRealmAuthConfig(JdbcRecorder recorder,
             BuildProducer<SecurityRealmBuildItem> securityRealm,
+            BeanContainerBuildItem beanContainerBuildItem, //we need this to make sure ArC is initialized
             Optional<DataSourceInitializedBuildItem> dataSourceInitialized) throws Exception {
         if (jdbc.enabled) {
             RuntimeValue<SecurityRealm> realm = recorder.createRealm(jdbc);

diff --git a/...on-security-jdbc/runtime/src/main/java/io/quarkus/elytron/security/jdbc/JdbcRecorder.java b/...on-security-jdbc/runtime/src/main/java/io/quarkus/elytron/security/jdbc/JdbcRecorder.java
@@ -41,9 +41,6 @@ public Provider[] get() {
     }
 
     private void registerPrincipalQuery(PrincipalQueryConfig principalQuery, JdbcSecurityRealmBuilder builder) {
-        if (Arc.container() == null) {
-            Arc.initialize();
-        }
         DataSource dataSource = (DataSource) principalQuery.datasource
                 .map(name -> Arc.container().instance(name).get())
                 .orElse(Arc.container().instance(DataSource.class).get());

diff --git a/...ment/src/main/java/io/quarkus/elytron/security/deployment/ElytronDeploymentProcessor.java b/...ment/src/main/java/io/quarkus/elytron/security/deployment/ElytronDeploymentProcessor.java
@@ -51,6 +51,15 @@ void services(BuildProducer<ReflectiveClassBuildItem> classes) {
         classes.produce(new ReflectiveClassBuildItem(true, false, allClasses));
     }
 
+    @BuildStep
+    void addBeans(BuildProducer<AdditionalBeanBuildItem> beans) {
+
+        beans.produce(AdditionalBeanBuildItem.unremovableOf(ElytronSecurityDomainManager.class));
+        beans.produce(AdditionalBeanBuildItem.unremovableOf(ElytronTokenIdentityProvider.class));
+        beans.produce(AdditionalBeanBuildItem.unremovableOf(ElytronPasswordIdentityProvider.class));
+        beans.produce(AdditionalBeanBuildItem.unremovableOf(DefaultRoleDecoder.class));
+    }
+
     /**
      * Create the deployment SecurityDomain using the SecurityRealm build items that have been created.
      *
@@ -61,16 +70,9 @@ void services(BuildProducer<ReflectiveClassBuildItem> classes) {
      */
     @BuildStep
     @Record(ExecutionTime.STATIC_INIT)
-    SecurityDomainBuildItem build(ElytronRecorder recorder, List<SecurityRealmBuildItem> realms,
-            BuildProducer<AdditionalBeanBuildItem> beans)
+    SecurityDomainBuildItem build(ElytronRecorder recorder, List<SecurityRealmBuildItem> realms)
             throws Exception {
         if (realms.size() > 0) {
-
-            beans.produce(AdditionalBeanBuildItem.unremovableOf(ElytronSecurityDomainManager.class));
-            beans.produce(AdditionalBeanBuildItem.unremovableOf(ElytronTokenIdentityProvider.class));
-            beans.produce(AdditionalBeanBuildItem.unremovableOf(ElytronPasswordIdentityProvider.class));
-            beans.produce(AdditionalBeanBuildItem.unremovableOf(DefaultRoleDecoder.class));
-
             // Configure the SecurityDomain.Builder from the main realm
             SecurityRealmBuildItem realmBuildItem = realms.get(0);
             RuntimeValue<SecurityDomain.Builder> securityDomainBuilder = recorder

diff --git a/...m/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java b/...m/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
@@ -54,7 +54,6 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
-import io.quarkus.deployment.builditem.ApplicationIndexBuildItem;
 import io.quarkus.deployment.builditem.ArchiveRootBuildItem;
 import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
@@ -126,7 +125,6 @@ public void build(RecorderContext recorderContext, HibernateOrmRecorder recorder
             List<NonJpaModelBuildItem> nonJpaModelBuildItems,
             List<IgnorableNonIndexedClasses> ignorableNonIndexedClassesBuildItems,
             CombinedIndexBuildItem index,
-            ApplicationIndexBuildItem applicationIndex,
             ArchiveRootBuildItem archiveRoot,
             ApplicationArchivesBuildItem applicationArchivesBuildItem,
             Optional<DataSourceDriverBuildItem> driverBuildItem,