Fixes for secret-store initialization

secret-store-api/pom.xml

@@ -71,6 +71,22 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-processor</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

secret-store/src/main/java/org/hawkular/accounts/secretstore/control/MsgLogger.java → secret-store-api/src/main/java/org/hawkular/accounts/secretstore/api/internal/MsgLogger.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.accounts.secretstore.control;
+package org.hawkular.accounts.secretstore.api.internal;
 
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.Cause;

secret-store/src/main/java/org/hawkular/accounts/secretstore/control/SecretStoreSchemaInitializer.java → secret-store-api/src/main/java/org/hawkular/accounts/secretstore/api/internal/SecretStoreSchemaInitializer.java

@@ -14,11 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.accounts.secretstore.control;
+package org.hawkular.accounts.secretstore.api.internal;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
@@ -28,8 +30,11 @@
 import javax.ejb.Startup;
 import javax.enterprise.concurrent.ManagedExecutorService;
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 
+import org.hawkular.accounts.common.internal.CassandraSessionCallable;
+
 import com.datastax.driver.core.Session;
 
 /**
@@ -40,17 +45,25 @@
 @ApplicationScoped
 @PermitAll
 public class SecretStoreSchemaInitializer {
+    private Future<Session> sessionFuture;
+
+    @Inject
+    CassandraSessionCallable cassandraSessionCallable;
+
     MsgLogger logger = MsgLogger.LOGGER;
 
     @Resource
     private ManagedExecutorService executor;
 
-    @Inject
-    Session session;
-
     @PostConstruct
     public void init() {
-        executor.submit(() -> {
+        sessionFuture = executor.submit(cassandraSessionCallable);
+    }
+
+    @Produces @ApplicationScoped
+    public Session getSession() {
+        try {
+            Session session = sessionFuture.get();
             InputStream input = getClass().getResourceAsStream("/secret-store.cql");
             try (BufferedReader buffer = new BufferedReader(new InputStreamReader(input))) {
                 String content = buffer.lines().collect(Collectors.joining("\n"));
@@ -62,7 +75,9 @@ public void init() {
             } catch (Exception e) {
                 logger.failedToInitializeSchema(e);
             }
-        });
-
+            return session;
+        } catch (InterruptedException | ExecutionException e) {
+            throw new IllegalStateException("Could not get the initialized session.");
+        }
     }
-}
+}