This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-sidecar.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1e3b4bfb CASSSIDECAR-89: Update Google Guice to 7.0.0
1e3b4bfb is described below
commit 1e3b4bfb8658d9419ad85ba2f363d3b10c8b85f1
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Wed Dec 20 15:25:47 2023 +0100
CASSSIDECAR-89: Update Google Guice to 7.0.0
patch by Stefan Miklosovic; reviewed by Francisco Guerrero for
CASSSIDECAR-89
---
CHANGES.txt | 1 +
gradle.properties | 2 +-
server/build.gradle | 2 +-
.../cassandra/sidecar/cluster/locator/CachedLocalTokenRanges.java | 4 +++-
.../cassandra/sidecar/handlers/ListOperationalJobsHandler.java | 2 +-
.../apache/cassandra/sidecar/handlers/OperationalJobHandler.java | 2 +-
.../livemigration/LiveMigrationListInstanceFilesHandler.java | 2 +-
.../cassandra/sidecar/handlers/restore/CreateRestoreJobHandler.java | 4 ++--
.../sidecar/handlers/restore/CreateRestoreSliceHandler.java | 2 +-
.../sidecar/handlers/restore/RestoreJobSummaryHandler.java | 4 ++--
.../org/apache/cassandra/sidecar/job/OperationalJobManager.java | 2 +-
.../main/java/org/apache/cassandra/sidecar/utils/TimeSkewInfo.java | 2 +-
.../test/java/org/apache/cassandra/sidecar/server/ServerTest.java | 6 ++----
13 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index cc07c00b..028726c1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
0.2.0
-----
+ * Update Google Guice to 7.0.0 (CASSSIDECAR-89)
* Fix rpm broken symlink (CASSSIDECAR-327)
* Fix system_views client table access and make
CreateRestoreJobRequestPayload serialization backward compatible
(CASSSIDECAR-326)
* CdcRawDirectorySpaceCleaner always uses fallback after the first time it is
queried from system_views.settings (CASSSIDECAR-325)
diff --git a/gradle.properties b/gradle.properties
index eb0b38f2..3dbb77a2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ junitVersion=5.9.2
vertxVersion=4.5.13
nettyVersion=4.1.118.Final
guavaVersion=27.0.1-jre
-guiceVersion=4.2.3
+guiceVersion=7.0.0
slf4jVersion=1.7.36
jacksonVersion=2.14.3
dtestApiVersion=0.0.17
diff --git a/server/build.gradle b/server/build.gradle
index 36dbca90..73c403ed 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -133,7 +133,7 @@ dependencies {
testImplementation "org.quicktheories:quicktheories:0.26"
testRuntimeOnly
"org.junit.jupiter:junit-jupiter-engine:${project.junitVersion}"
- testImplementation('com.google.guava:guava-testlib:31.1-jre') {
+ testImplementation('com.google.guava:guava-testlib:32.0.0-jre') {
exclude group: 'junit', module: 'junit'
}
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/cluster/locator/CachedLocalTokenRanges.java
b/server/src/main/java/org/apache/cassandra/sidecar/cluster/locator/CachedLocalTokenRanges.java
index d1562e57..c70a6908 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/cluster/locator/CachedLocalTokenRanges.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/cluster/locator/CachedLocalTokenRanges.java
@@ -205,7 +205,9 @@ public class CachedLocalTokenRanges implements
LocalTokenRangesProvider
if (isClusterTheSame && localTokenRangesCache != null &&
localTokenRangesCache.containsKey(ks.getName()))
{
// we don't need to rebuild if already cached
- perKeyspaceBuilder.put(ks.getName(),
localTokenRangesCache.get(ks.getName()));
+ Map<Integer, Set<TokenRange>> value =
localTokenRangesCache.get(ks.getName());
+ if (value != null)
+ perKeyspaceBuilder.put(ks.getName(), value);
}
else
{
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/ListOperationalJobsHandler.java
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/ListOperationalJobsHandler.java
index 4337560e..484039e5 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/ListOperationalJobsHandler.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/ListOperationalJobsHandler.java
@@ -20,7 +20,7 @@ package org.apache.cassandra.sidecar.handlers;
import java.util.Collections;
import java.util.Set;
-import javax.inject.Inject;
+import com.google.inject.Inject;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.net.SocketAddress;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/OperationalJobHandler.java
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/OperationalJobHandler.java
index 45f131ff..ac483974 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/OperationalJobHandler.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/OperationalJobHandler.java
@@ -21,7 +21,7 @@ package org.apache.cassandra.sidecar.handlers;
import java.util.Collections;
import java.util.Set;
import java.util.UUID;
-import javax.inject.Inject;
+import com.google.inject.Inject;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.vertx.core.http.HttpServerRequest;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/livemigration/LiveMigrationListInstanceFilesHandler.java
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/livemigration/LiveMigrationListInstanceFilesHandler.java
index 24f8f5e2..3e775a88 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/livemigration/LiveMigrationListInstanceFilesHandler.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/livemigration/LiveMigrationListInstanceFilesHandler.java
@@ -20,11 +20,11 @@ package org.apache.cassandra.sidecar.handlers.livemigration;
import java.io.IOException;
import java.util.Set;
-import javax.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.inject.Inject;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.net.SocketAddress;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/CreateRestoreJobHandler.java
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/CreateRestoreJobHandler.java
index 9479a956..f58d685e 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/CreateRestoreJobHandler.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/CreateRestoreJobHandler.java
@@ -21,8 +21,8 @@ package org.apache.cassandra.sidecar.handlers.restore;
import java.util.Collections;
import java.util.Set;
import java.util.UUID;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.vertx.core.Future;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/CreateRestoreSliceHandler.java
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/CreateRestoreSliceHandler.java
index dad11eb3..22460e48 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/CreateRestoreSliceHandler.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/CreateRestoreSliceHandler.java
@@ -21,7 +21,7 @@ package org.apache.cassandra.sidecar.handlers.restore;
import java.nio.file.Paths;
import java.util.Collections;
import java.util.Set;
-import javax.inject.Inject;
+import com.google.inject.Inject;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.vertx.core.Future;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/RestoreJobSummaryHandler.java
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/RestoreJobSummaryHandler.java
index fa48fe99..3f980aa5 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/RestoreJobSummaryHandler.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/handlers/restore/RestoreJobSummaryHandler.java
@@ -20,8 +20,8 @@ package org.apache.cassandra.sidecar.handlers.restore;
import java.util.Collections;
import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.vertx.core.Future;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/job/OperationalJobManager.java
b/server/src/main/java/org/apache/cassandra/sidecar/job/OperationalJobManager.java
index dd5d199e..3c37ddaa 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/job/OperationalJobManager.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/job/OperationalJobManager.java
@@ -21,7 +21,7 @@ package org.apache.cassandra.sidecar.job;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
-import javax.inject.Inject;
+import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.apache.cassandra.sidecar.concurrent.ExecutorPools;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/utils/TimeSkewInfo.java
b/server/src/main/java/org/apache/cassandra/sidecar/utils/TimeSkewInfo.java
index 6e421e71..48f4811c 100644
--- a/server/src/main/java/org/apache/cassandra/sidecar/utils/TimeSkewInfo.java
+++ b/server/src/main/java/org/apache/cassandra/sidecar/utils/TimeSkewInfo.java
@@ -19,7 +19,7 @@
package org.apache.cassandra.sidecar.utils;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import com.google.inject.Inject;
import org.apache.cassandra.sidecar.common.response.TimeSkewResponse;
import org.apache.cassandra.sidecar.config.ServiceConfiguration;
diff --git
a/server/src/test/java/org/apache/cassandra/sidecar/server/ServerTest.java
b/server/src/test/java/org/apache/cassandra/sidecar/server/ServerTest.java
index 6b20b4eb..559ee3bf 100644
--- a/server/src/test/java/org/apache/cassandra/sidecar/server/ServerTest.java
+++ b/server/src/test/java/org/apache/cassandra/sidecar/server/ServerTest.java
@@ -301,8 +301,7 @@ class ServerTest
{
assertThatThrownBy(() ->
configureServer("config/sidecar_unrecognized_authenticator.yaml"))
.hasCauseInstanceOf(RuntimeException.class)
- .hasMessageContaining("Implementation for class
org.apache.cassandra.sidecar.acl.authentication." +
- "UnrecognizedAuthenticationHandler has not been
registered");
+ .hasMessageContaining("Implementation for class
UnrecognizedAuthenticationHandler has not been registered");
}
@Test
@@ -311,8 +310,7 @@ class ServerTest
{
assertThatThrownBy(() ->
configureServer("config/sidecar_unrecognized_authorizer.yaml"))
.hasCauseInstanceOf(ConfigurationException.class)
- .hasMessageContaining("Unrecognized authorization provider
org.apache.cassandra.sidecar.acl." +
- "authorization.UnrecognizedAuthorizationProvider
set");
+ .hasMessageContaining("Unrecognized authorization provider
UnrecognizedAuthorizationProvider set");
}
Future<String> validateHealthEndpoint(String deploymentId)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
