ninja fix to changelog and build
diff --git a/CHANGES.txt b/CHANGES.txt
index 114940e..4d0bb18 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,9 @@
1.0.0
-----
+ * Call the start method of CassandraAdaptorDelegate to start periodic health check (CASSANDRASC-32)
+ * Avoid having sidecar's health response code depend on Cassandra's health information (CASSANDRASC-29)
+ * Add Stream SSTable API to Sidecar to stream SSTable components through zero copy streaming (CASSANDRASC-28)
+ * Fix broken sidecar gradle configuration due to Cassandra 40 version (CASSANDRASC-31)
* Support multiple Cassandra versions with integration tests using Kubernetes (CASSANDRA-23)
* RESTEasy integration with dynamically generated Swagger OpenAPI, Swagger UI and JAX-RS (CASSANDRASC-22)
* Set up asciidoc based documentation (CASSANDRASC-15)
diff --git a/common/build.gradle b/common/build.gradle
index 8e6760a..653f9d2 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -28,6 +28,7 @@
compile 'com.datastax.cassandra:cassandra-driver-core:3.9.0+'
compile group: 'com.google.inject', name: 'guice', version: '4.2.2'
compile group: 'org.apache.commons', name: 'commons-configuration2', version: '2.7'
+ compile group: 'org.jetbrains', name: 'annotations', version: '20.1.0'
implementation 'org.apache.commons:commons-lang3:3.10'
@@ -35,4 +36,4 @@
testCompile "org.junit.jupiter:junit-jupiter-params:${project.junitVersion}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junitVersion}"
testImplementation("org.assertj:assertj-core:3.16.0")
-}
\ No newline at end of file
+}
diff --git a/common/src/main/java/org/apache/cassandra/sidecar/common/CassandraAdapterDelegate.java b/common/src/main/java/org/apache/cassandra/sidecar/common/CassandraAdapterDelegate.java
index 3ed9c04..28751da 100644
--- a/common/src/main/java/org/apache/cassandra/sidecar/common/CassandraAdapterDelegate.java
+++ b/common/src/main/java/org/apache/cassandra/sidecar/common/CassandraAdapterDelegate.java
@@ -24,8 +24,6 @@
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-import com.google.common.base.Preconditions;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,7 +31,7 @@
import com.datastax.driver.core.Host;
import com.datastax.driver.core.Session;
import com.datastax.driver.core.exceptions.NoHostAvailableException;
-import com.sun.istack.internal.NotNull;
+import org.jetbrains.annotations.NotNull;
/**
@@ -54,7 +52,7 @@
private Session session;
private SimpleCassandraVersion currentVersion;
private ICassandraAdapter adapter;
- private Boolean isUp = false;
+ private volatile boolean isUp = false;
private final int refreshRate;
private static final Logger logger = LoggerFactory.getLogger(CassandraAdapterDelegate.class);
