|
...
|
...
|
@@ -16,14 +16,17 @@ |
|
16
|
16
|
package org.thingsboard.server.dao.cassandra;
|
|
17
|
17
|
|
|
18
|
18
|
|
|
19
|
|
-import com.datastax.driver.core.*;
|
|
|
19
|
+import com.datastax.driver.core.Cluster;
|
|
|
20
|
+import com.datastax.driver.core.ConsistencyLevel;
|
|
|
21
|
+import com.datastax.driver.core.HostDistance;
|
|
|
22
|
+import com.datastax.driver.core.PoolingOptions;
|
|
20
|
23
|
import com.datastax.driver.core.ProtocolOptions.Compression;
|
|
|
24
|
+import com.datastax.driver.core.Session;
|
|
21
|
25
|
import com.datastax.driver.mapping.DefaultPropertyMapper;
|
|
22
|
26
|
import com.datastax.driver.mapping.Mapper;
|
|
23
|
27
|
import com.datastax.driver.mapping.MappingConfiguration;
|
|
24
|
28
|
import com.datastax.driver.mapping.MappingManager;
|
|
25
|
29
|
import com.datastax.driver.mapping.PropertyAccessStrategy;
|
|
26
|
|
-import com.datastax.driver.mapping.PropertyMapper;
|
|
27
|
30
|
import lombok.extern.slf4j.Slf4j;
|
|
28
|
31
|
import org.apache.commons.lang3.StringUtils;
|
|
29
|
32
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
...
|
...
|
@@ -149,10 +152,13 @@ public abstract class AbstractCassandraCluster { |
|
149
|
152
|
} else {
|
|
150
|
153
|
session = cluster.connect();
|
|
151
|
154
|
}
|
|
|
155
|
+// For Cassandra Driver version 3.5.0
|
|
152
|
156
|
DefaultPropertyMapper propertyMapper = new DefaultPropertyMapper();
|
|
153
|
157
|
propertyMapper.setPropertyAccessStrategy(PropertyAccessStrategy.FIELDS);
|
|
154
|
158
|
MappingConfiguration configuration = MappingConfiguration.builder().withPropertyMapper(propertyMapper).build();
|
|
155
|
159
|
mappingManager = new MappingManager(session, configuration);
|
|
|
160
|
+// For Cassandra Driver version 3.0.0
|
|
|
161
|
+// mappingManager = new MappingManager(session);
|
|
156
|
162
|
break;
|
|
157
|
163
|
} catch (Exception e) {
|
|
158
|
164
|
log.warn("Failed to initialize cassandra cluster due to {}. Will retry in {} ms", e.getMessage(), initRetryInterval);
|
...
|
...
|
|
