chore(cassandra): datastacks-driver version bump

Signed-off-by: opdt <IT-Systemhaus.SEP5-Online-Team-OPDT@arbeitsagentur.de>
opdt · Oct 2, 2024 · 5d754b2 · 5d754b2
1 parent 1decc1b
commit 5d754b2
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 25 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -70,15 +70,15 @@
 
         <!-- Datastax Cassandra -->
         <dependency>
-            <groupId>com.datastax.oss</groupId>
+            <groupId>org.apache.cassandra</groupId>
             <artifactId>java-driver-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.datastax.oss</groupId>
+            <groupId>org.apache.cassandra</groupId>
             <artifactId>java-driver-mapper-runtime</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.datastax.oss</groupId>
+            <groupId>org.apache.cassandra</groupId>
             <artifactId>java-driver-query-builder</artifactId>
         </dependency>
 
@@ -110,7 +110,7 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>com.datastax.oss:*</include>
+                                    <include>org.apache.cassandra:*</include>
                                     <include>com.typesafe:*</include>
                                     <include>org.cognitor.cassandra:cassandra-migration</include>
                                 </includes>

diff --git a/core/src/main/java/de/arbeitsagentur/opdt/keycloak/cassandra/user/CassandraUserProvider.java b/core/src/main/java/de/arbeitsagentur/opdt/keycloak/cassandra/user/CassandraUserProvider.java
@@ -521,21 +521,27 @@ public Stream<UserModel> searchForUserStream(
                           : makeAttributeComparator;
 
                   return switch (entry.getKey()) {
-                    case UserModel.SEARCH -> makeUsernameComparator
-                        .apply(UserModel.USERNAME, entry.getValue())
-                        .or(makeAttributeComparator.apply(UserModel.EMAIL, entry.getValue()))
-                        .or(makeAttributeComparator.apply(UserModel.FIRST_NAME, entry.getValue()))
-                        .or(makeAttributeComparator.apply(UserModel.LAST_NAME, entry.getValue()));
-                    case UserModel.USERNAME -> makeUsernameComparator.apply(
-                        UserModel.USERNAME, entry.getValue());
-                    case UserModel.IDP_ALIAS -> makeAttributeComparator.apply(
-                        UserModel.IDP_ALIAS, entry.getValue());
-                    case UserModel.IDP_USER_ID -> makeAttributeComparator.apply(
-                        UserModel.IDP_USER_ID, entry.getValue());
-                    case UserModel.INCLUDE_SERVICE_ACCOUNT -> (Predicate<UserModel>)
-                        (UserModel u) ->
-                            Boolean.parseBoolean(entry.getValue())
-                                || u.getServiceAccountClientLink() == null;
+                    case UserModel.SEARCH ->
+                        makeUsernameComparator
+                            .apply(UserModel.USERNAME, entry.getValue())
+                            .or(makeAttributeComparator.apply(UserModel.EMAIL, entry.getValue()))
+                            .or(
+                                makeAttributeComparator.apply(
+                                    UserModel.FIRST_NAME, entry.getValue()))
+                            .or(
+                                makeAttributeComparator.apply(
+                                    UserModel.LAST_NAME, entry.getValue()));
+                    case UserModel.USERNAME ->
+                        makeUsernameComparator.apply(UserModel.USERNAME, entry.getValue());
+                    case UserModel.IDP_ALIAS ->
+                        makeAttributeComparator.apply(UserModel.IDP_ALIAS, entry.getValue());
+                    case UserModel.IDP_USER_ID ->
+                        makeAttributeComparator.apply(UserModel.IDP_USER_ID, entry.getValue());
+                    case UserModel.INCLUDE_SERVICE_ACCOUNT ->
+                        (Predicate<UserModel>)
+                            (UserModel u) ->
+                                Boolean.parseBoolean(entry.getValue())
+                                    || u.getServiceAccountClientLink() == null;
                     default -> makeAttributeComparator.apply(entry.getKey(), entry.getValue());
                   };
                 })

diff --git a/metrics/pom.xml b/metrics/pom.xml
@@ -16,7 +16,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.datastax.oss</groupId>
+            <groupId>org.apache.cassandra</groupId>
             <artifactId>java-driver-metrics-micrometer</artifactId>
             <version>${cassandra-java-driver.version}</version>
         </dependency>

diff --git a/pom.xml b/pom.xml
@@ -58,7 +58,7 @@
         <auto-service.version>1.1.1</auto-service.version>
 
         <!-- cassandra -->
-        <cassandra-java-driver.version>4.17.0</cassandra-java-driver.version>
+        <cassandra-java-driver.version>4.18.1</cassandra-java-driver.version>
 
         <!-- SonarCloud -->
         <sonar.organization>opdt</sonar.organization>
@@ -121,17 +121,17 @@
 
             <!-- Datastax Cassandra -->
             <dependency>
-                <groupId>com.datastax.oss</groupId>
+                <groupId>org.apache.cassandra</groupId>
                 <artifactId>java-driver-core</artifactId>
                 <version>${cassandra-java-driver.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.datastax.oss</groupId>
+                <groupId>org.apache.cassandra</groupId>
                 <artifactId>java-driver-mapper-runtime</artifactId>
                 <version>${cassandra-java-driver.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.datastax.oss</groupId>
+                <groupId>org.apache.cassandra</groupId>
                 <artifactId>java-driver-query-builder</artifactId>
                 <version>${cassandra-java-driver.version}</version>
             </dependency>
@@ -179,7 +179,7 @@
                                 <version>${auto-service.version}</version>
                             </path>
                             <path>
-                                <groupId>com.datastax.oss</groupId>
+                                <groupId>org.apache.cassandra</groupId>
                                 <artifactId>java-driver-mapper-processor</artifactId>
                                 <version>${cassandra-java-driver.version}</version>
                             </path>