Initial Mutiny migration at data access layer

.github/workflows/maven-build.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 18
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 18
       - name: Build with Maven
         run: mvn -s $GITHUB_WORKSPACE/.github/workflows/maven-settings.xml -P github_actions -B package --file pom.xml
         env:

.github/workflows/maven-publish.yml

@@ -15,10 +15,10 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 18
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '18'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
 

dal/cockroachdb-dal/cockroachdb-cache/pom.xml

@@ -12,6 +12,10 @@
 
     <name>Extensions :: Data Access :: CockroachDB :: Cache</name>
 
+    <properties>
+        <skipTests>true</skipTests>
+    </properties>
+
     <artifactId>cockroachdb-cache</artifactId>
 
     <dependencies>

dal/cockroachdb-dal/cockroachdb-cache/src/test/java/com/nexblocks/authguard/dal/cockroachdb/cache/CockroachDBAccountTokensRepositoryTest.java

@@ -6,10 +6,10 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CockroachDBAccountTokensRepositoryTest extends HibernateAccountTokensRepositoryTest {
-    @BeforeAll
-    @Override
-    public void setup() {
-        CockroachTestContainer.start();
-        initialize(CockroachTestContainer.getSessionProvider());
-    }
+//    @BeforeAll
+//    @Override
+//    public void setup() {
+//        CockroachTestContainer.start();
+//        initialize(CockroachTestContainer.getSessionProvider());
+//    }
 }

dal/cockroachdb-dal/cockroachdb-cache/src/test/java/com/nexblocks/authguard/dal/cockroachdb/cache/CockroachDBSessionsRepositoryTest.java

@@ -6,10 +6,10 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class CockroachDBSessionsRepositoryTest extends HibernateSessionsRepositoryTest {
-    @BeforeAll
-    @Override
-    public void setup() {
-        CockroachTestContainer.start();
-        initialize(CockroachTestContainer.getSessionProvider());
-    }
+//    @BeforeAll
+//    @Override
+//    public void setup() {
+//        CockroachTestContainer.start();
+//        initialize(CockroachTestContainer.getSessionProvider());
+//    }
 }

dal/cockroachdb-dal/cockroachdb-persistence/pom.xml

@@ -12,6 +12,10 @@
 
     <name>Extensions :: Data Access :: CockroachDB :: Persistence</name>
 
+    <properties>
+        <skipTests>true</skipTests>
+    </properties>
+
     <artifactId>cockroachdb-persistence</artifactId>
 
     <dependencies>

dal/cockroachdb-dal/cockroachdb-persistence/src/test/java/com/nexblocks/authguard/dal/couchdb/persistence/CockroachDBAccountRepositoryTest.java

@@ -6,10 +6,10 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CockroachDBAccountRepositoryTest extends HibernateAccountsRepositoryTest {
-    @BeforeAll
-    @Override
-    public void setup() {
-        CockroachTestContainer.start();
-        initialize(CockroachTestContainer.getSessionProvider());
-    }
+//    @BeforeAll
+//    @Override
+//    public void setup() {
+//        CockroachTestContainer.start();
+//        initialize(CockroachTestContainer.getSessionProvider());
+//    }
 }

dal/cockroachdb-dal/cockroachdb-persistence/src/test/java/com/nexblocks/authguard/dal/couchdb/persistence/CockroachDBApiKeysRepositoryTest.java

@@ -6,10 +6,10 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CockroachDBApiKeysRepositoryTest extends HibernateApiKeysRepositoryTest {
-    @BeforeAll
-    @Override
-    public void setup() {
-        CockroachTestContainer.start();
-        initialize(CockroachTestContainer.getSessionProvider());
-    }
+//    @BeforeAll
+//    @Override
+//    public void setup() {
+//        CockroachTestContainer.start();
+//        initialize(CockroachTestContainer.getSessionProvider());
+//    }
 }

dal/cockroachdb-dal/cockroachdb-persistence/src/test/java/com/nexblocks/authguard/dal/couchdb/persistence/CockroachDBAppsRepositoryTest.java

@@ -6,10 +6,10 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CockroachDBAppsRepositoryTest extends HibernateAppsRepositoryTest {
-    @BeforeAll
-    @Override
-    public void setup() {
-        CockroachTestContainer.start();
-        initialize(CockroachTestContainer.getSessionProvider());
-    }
+//    @BeforeAll
+//    @Override
+//    public void setup() {
+//        CockroachTestContainer.start();
+//        initialize(CockroachTestContainer.getSessionProvider());
+//    }
 }

dal/cockroachdb-dal/cockroachdb-persistence/src/test/java/com/nexblocks/authguard/dal/couchdb/persistence/CockroachDBClientsRepositoryTest.java

@@ -6,10 +6,10 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CockroachDBClientsRepositoryTest extends HibernateClientsRepositoryTest {
-    @BeforeAll
-    @Override
-    public void setup() {
-        CockroachTestContainer.start();
-        initialize(CockroachTestContainer.getSessionProvider());
-    }
+//    @BeforeAll
+//    @Override
+//    public void setup() {
+//        CockroachTestContainer.start();
+//        initialize(CockroachTestContainer.getSessionProvider());
+//    }
 }

dal/cockroachdb-dal/cockroachdb-persistence/src/test/java/com/nexblocks/authguard/dal/couchdb/persistence/CockroachDBCredentialsRepositoryTest.java

@@ -6,10 +6,10 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CockroachDBCredentialsRepositoryTest extends HibernateCredentialsRepositoryTest {
-    @BeforeAll
-    @Override
-    public void setup() {
-        CockroachTestContainer.start();
-        initialize(CockroachTestContainer.getSessionProvider());
-    }
+//    @BeforeAll
+//    @Override
+//    public void setup() {
+//        CockroachTestContainer.start();
+//        initialize(CockroachTestContainer.getSessionProvider());
+//    }
 }

dal/cockroachdb-dal/cockroachdb-persistence/src/test/java/com/nexblocks/authguard/dal/couchdb/persistence/CockroachDBExchangeAttemptsRepositoryTest.java

@@ -6,10 +6,10 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CockroachDBExchangeAttemptsRepositoryTest extends HibernateExchangeAttemptsRepositoryTest {
-    @BeforeAll
-    @Override
-    public void setup() {
-        CockroachTestContainer.start();
-        initialize(CockroachTestContainer.getSessionProvider());
-    }
+//    @BeforeAll
+//    @Override
+//    public void setup() {
+//        CockroachTestContainer.start();
+//        initialize(CockroachTestContainer.getSessionProvider());
+//    }
 }

dal/cockroachdb-dal/cockroachdb-persistence/src/test/java/com/nexblocks/authguard/dal/couchdb/persistence/CockroachDBIdempotencyRecordsRepositoryTest.java

@@ -6,10 +6,10 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CockroachDBIdempotencyRecordsRepositoryTest extends HibernateIdempotencyRecordRepositoryTest {
-    @BeforeAll
-    @Override
-    public void setup() {
-        CockroachTestContainer.start();
-        initialize(CockroachTestContainer.getSessionProvider());
-    }
+//    @BeforeAll
+//    @Override
+//    public void setup() {
+//        CockroachTestContainer.start();
+//        initialize(CockroachTestContainer.getSessionProvider());
+//    }
 }

dal/cockroachdb-dal/cockroachdb-persistence/src/test/java/com/nexblocks/authguard/dal/couchdb/persistence/CockroachDBPermissionsRepositoryTest.java

@@ -6,10 +6,10 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CockroachDBPermissionsRepositoryTest extends HibernatePermissionsRepositoryTest {
-    @BeforeAll
-    @Override
-    public void setup() {
-        CockroachTestContainer.start();
-        initialize(CockroachTestContainer.getSessionProvider());
-    }
+//    @BeforeAll
+//    @Override
+//    public void setup() {
+//        CockroachTestContainer.start();
+//        initialize(CockroachTestContainer.getSessionProvider());
+//    }
 }

dal/cockroachdb-dal/cockroachdb-persistence/src/test/java/com/nexblocks/authguard/dal/couchdb/persistence/CockroachDBRolesRepositoryTest.java

@@ -6,10 +6,10 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CockroachDBRolesRepositoryTest extends HibernateRolesRepositoryTest {
-    @BeforeAll
-    @Override
-    public void setup() {
-        CockroachTestContainer.start();
-        initialize(CockroachTestContainer.getSessionProvider());
-    }
+//    @BeforeAll
+//    @Override
+//    public void setup() {
+//        CockroachTestContainer.start();
+//        initialize(CockroachTestContainer.getSessionProvider());
+//    }
 }

dal/hibernate-dal/hibernate-cache/pom.xml

@@ -10,16 +10,15 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <properties>
+        <skipTests>true</skipTests>
+    </properties>
+
     <name>Extensions :: Data Access :: Hibernate :: Cache</name>
 
     <artifactId>hibernate-cache</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.nexblocks.authguard</groupId>
             <artifactId>hibernate-common</artifactId>

dal/hibernate-dal/hibernate-cache/src/main/java/com/nexblocks/authguard/dal/hibernate/cache/HibernateAccountLocksRepository.java

@@ -4,6 +4,7 @@
 import com.nexblocks.authguard.dal.cache.AccountLocksRepository;
 import com.nexblocks.authguard.dal.hibernate.common.AbstractHibernateRepository;
 import com.nexblocks.authguard.dal.hibernate.common.QueryExecutor;
+import com.nexblocks.authguard.dal.hibernate.common.ReactiveQueryExecutor;
 import com.nexblocks.authguard.dal.model.AccountLockDO;
 
 import java.util.Collection;
@@ -18,7 +19,7 @@ public class HibernateAccountLocksRepository extends AbstractHibernateRepository
     private static final String ACCOUNT_ID_FIELD = "accountId";
 
     @Inject
-    public HibernateAccountLocksRepository(final QueryExecutor queryExecutor) {
+    public HibernateAccountLocksRepository(final ReactiveQueryExecutor queryExecutor) {
         super(AccountLockDO.class, queryExecutor);
     }
 
@@ -27,6 +28,7 @@ public CompletableFuture<Collection<AccountLockDO>> findByAccountId(final long a
         return queryExecutor
                 .getAList(session -> session.createNamedQuery(GET_BY_ACCOUNT_ID, AccountLockDO.class)
                         .setParameter(ACCOUNT_ID_FIELD, accountId))
+                .subscribeAsCompletionStage()
                 .thenApply(Function.identity());
     }
 }

dal/hibernate-dal/hibernate-cache/src/main/java/com/nexblocks/authguard/dal/hibernate/cache/HibernateAccountTokensRepository.java

@@ -4,6 +4,7 @@
 import com.nexblocks.authguard.dal.cache.AccountTokensRepository;
 import com.nexblocks.authguard.dal.hibernate.common.AbstractHibernateRepository;
 import com.nexblocks.authguard.dal.hibernate.common.QueryExecutor;
+import com.nexblocks.authguard.dal.hibernate.common.ReactiveQueryExecutor;
 import com.nexblocks.authguard.dal.model.AccountTokenDO;
 
 import java.util.Optional;
@@ -16,22 +17,23 @@ public class HibernateAccountTokensRepository extends AbstractHibernateRepositor
     private static final String TOKEN_FIELD = "token";
 
     @Inject
-    public HibernateAccountTokensRepository(final QueryExecutor queryExecutor) {
+    public HibernateAccountTokensRepository(final ReactiveQueryExecutor queryExecutor) {
         super(AccountTokenDO.class, queryExecutor);
     }
 
     @Override
     public CompletableFuture<Optional<AccountTokenDO>> getByToken(final String token) {
         return queryExecutor.getSingleResult(session -> session.createNamedQuery(GET_BY_TOKEN, AccountTokenDO.class)
-                .setParameter(TOKEN_FIELD, token));
+                .setParameter(TOKEN_FIELD, token))
+                .subscribeAsCompletionStage();
     }
 
     @Override
     public CompletableFuture<Optional<AccountTokenDO>> deleteToken(final String token) {
         return getByToken(token)
                 .thenCompose(opt -> {
                     if (opt.isPresent()) {
-                        return delete(opt.get().getId());
+                        return delete(opt.get().getId()).subscribeAsCompletionStage();
                     }
 
                     return CompletableFuture.completedFuture(Optional.empty());

dal/hibernate-dal/hibernate-cache/src/main/java/com/nexblocks/authguard/dal/hibernate/cache/HibernateOtpRepository.java

@@ -4,13 +4,14 @@
 import com.nexblocks.authguard.dal.cache.OtpRepository;
 import com.nexblocks.authguard.dal.hibernate.common.AbstractHibernateRepository;
 import com.nexblocks.authguard.dal.hibernate.common.QueryExecutor;
+import com.nexblocks.authguard.dal.hibernate.common.ReactiveQueryExecutor;
 import com.nexblocks.authguard.dal.model.OneTimePasswordDO;
 
 public class HibernateOtpRepository extends AbstractHibernateRepository<OneTimePasswordDO>
         implements OtpRepository {
 
     @Inject
-    public HibernateOtpRepository(final QueryExecutor queryExecutor) {
+    public HibernateOtpRepository(final ReactiveQueryExecutor queryExecutor) {
         super(OneTimePasswordDO.class, queryExecutor);
     }
 }

dal/hibernate-dal/hibernate-cache/src/main/java/com/nexblocks/authguard/dal/hibernate/cache/HibernateSessionsRepository.java

@@ -4,7 +4,7 @@
 import com.nexblocks.authguard.dal.cache.SessionsRepository;
 import com.nexblocks.authguard.dal.hibernate.common.AbstractHibernateRepository;
 import com.nexblocks.authguard.dal.hibernate.common.CommonFields;
-import com.nexblocks.authguard.dal.hibernate.common.QueryExecutor;
+import com.nexblocks.authguard.dal.hibernate.common.ReactiveQueryExecutor;
 import com.nexblocks.authguard.dal.model.SessionDO;
 
 import java.util.List;
@@ -18,22 +18,23 @@ public class HibernateSessionsRepository extends AbstractHibernateRepository<Ses
     private static final String TOKEN_FIELD = "token";
 
     @Inject
-    public HibernateSessionsRepository(final QueryExecutor queryExecutor) {
+    public HibernateSessionsRepository(final ReactiveQueryExecutor queryExecutor) {
         super(SessionDO.class, queryExecutor);
     }
 
     @Override
     public CompletableFuture<Optional<SessionDO>> getByToken(final String token) {
         return queryExecutor.getSingleResult(session -> session.createNamedQuery(GET_BY_TOKEN, SessionDO.class)
-                .setParameter(TOKEN_FIELD, token));
+                .setParameter(TOKEN_FIELD, token))
+                .subscribeAsCompletionStage();
     }
 
     @Override
     public CompletableFuture<Optional<SessionDO>> deleteByToken(final String sessionToken) {
         return getByToken(sessionToken)
                 .thenCompose(opt -> {
                     if (opt.isPresent()) {
-                        return delete(opt.get().getId());
+                        return delete(opt.get().getId()).subscribeAsCompletionStage();
                     }
 
                     return CompletableFuture.completedFuture(Optional.empty());
@@ -44,7 +45,8 @@ public CompletableFuture<Optional<SessionDO>> deleteByToken(final String session
     public CompletableFuture<List<SessionDO>> findByAccountId(final long accountId, final String domain) {
         return queryExecutor.getAList(session -> session.createNamedQuery(GET_BY_ACCOUNT_ID, SessionDO.class)
                 .setParameter(CommonFields.DOMAIN, domain)
-                .setParameter(CommonFields.ACCOUNT_ID, accountId));
+                .setParameter(CommonFields.ACCOUNT_ID, accountId))
+                .subscribeAsCompletionStage();
 
     }
 }