简柏林 / thingskit · Commits

Commit ada50b5d73f9271f3b532ec350bfe626e061be54

Authored by Andrew Shvayka
1 parent 2a58bd31

Fixed Dependency HELL

Inline Side-by-side
Showing 3 changed files with 12 additions and 4 deletions
@@ -16,14 +16,17 @@ @@ -16,14 +16,17 @@
16 package org.thingsboard.server.dao.cassandra; 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 import com.datastax.driver.core.ProtocolOptions.Compression; 23 import com.datastax.driver.core.ProtocolOptions.Compression;
  24 +import com.datastax.driver.core.Session;
21 import com.datastax.driver.mapping.DefaultPropertyMapper; 25 import com.datastax.driver.mapping.DefaultPropertyMapper;
22 import com.datastax.driver.mapping.Mapper; 26 import com.datastax.driver.mapping.Mapper;
23 import com.datastax.driver.mapping.MappingConfiguration; 27 import com.datastax.driver.mapping.MappingConfiguration;
24 import com.datastax.driver.mapping.MappingManager; 28 import com.datastax.driver.mapping.MappingManager;
25 import com.datastax.driver.mapping.PropertyAccessStrategy; 29 import com.datastax.driver.mapping.PropertyAccessStrategy;
26 -import com.datastax.driver.mapping.PropertyMapper;  
27 import lombok.extern.slf4j.Slf4j; 30 import lombok.extern.slf4j.Slf4j;
28 import org.apache.commons.lang3.StringUtils; 31 import org.apache.commons.lang3.StringUtils;
29 import org.springframework.beans.factory.annotation.Autowired; 32 import org.springframework.beans.factory.annotation.Autowired;
@@ -149,10 +152,13 @@ public abstract class AbstractCassandraCluster { @@ -149,10 +152,13 @@ public abstract class AbstractCassandraCluster {
149 } else { 152 } else {
150 session = cluster.connect(); 153 session = cluster.connect();
151 } 154 }
  155 +// For Cassandra Driver version 3.5.0
152 DefaultPropertyMapper propertyMapper = new DefaultPropertyMapper(); 156 DefaultPropertyMapper propertyMapper = new DefaultPropertyMapper();
153 propertyMapper.setPropertyAccessStrategy(PropertyAccessStrategy.FIELDS); 157 propertyMapper.setPropertyAccessStrategy(PropertyAccessStrategy.FIELDS);
154 MappingConfiguration configuration = MappingConfiguration.builder().withPropertyMapper(propertyMapper).build(); 158 MappingConfiguration configuration = MappingConfiguration.builder().withPropertyMapper(propertyMapper).build();
155 mappingManager = new MappingManager(session, configuration); 159 mappingManager = new MappingManager(session, configuration);
  160 +// For Cassandra Driver version 3.0.0
  161 +// mappingManager = new MappingManager(session);
156 break; 162 break;
157 } catch (Exception e) { 163 } catch (Exception e) {
158 log.warn("Failed to initialize cassandra cluster due to {}. Will retry in {} ms", e.getMessage(), initRetryInterval); 164 log.warn("Failed to initialize cassandra cluster due to {}. Will retry in {} ms", e.getMessage(), initRetryInterval);
@@ -103,6 +103,8 @@ commitlog_directory: target/embeddedCassandra/commitlog @@ -103,6 +103,8 @@ commitlog_directory: target/embeddedCassandra/commitlog
103 103
104 hints_directory: target/embeddedCassandra/hints 104 hints_directory: target/embeddedCassandra/hints
105 105
  106 +cdc_raw_directory: target/embeddedCassandra/cdc
  107 +
106 # policy for data disk failures: 108 # policy for data disk failures:
107 # stop: shut down gossip and Thrift, leaving the node effectively dead, but 109 # stop: shut down gossip and Thrift, leaving the node effectively dead, but
108 # can still be inspected via JMX. 110 # can still be inspected via JMX.
@@ -42,9 +42,9 @@ @@ -42,9 +42,9 @@
42 <mockito.version>1.9.5</mockito.version> 42 <mockito.version>1.9.5</mockito.version>
43 <rat.version>0.10</rat.version> 43 <rat.version>0.10</rat.version>
44 <cassandra.version>3.5.0</cassandra.version> 44 <cassandra.version>3.5.0</cassandra.version>
45 - <cassandra-unit.version>3.0.0.1</cassandra-unit.version> 45 + <cassandra-unit.version>3.3.0.2</cassandra-unit.version>
46 <takari-cpsuite.version>1.2.7</takari-cpsuite.version> 46 <takari-cpsuite.version>1.2.7</takari-cpsuite.version>
47 - <guava.version>20.0</guava.version> 47 + <guava.version>21.0</guava.version>
48 <caffeine.version>2.6.1</caffeine.version> 48 <caffeine.version>2.6.1</caffeine.version>
49 <commons-lang3.version>3.4</commons-lang3.version> 49 <commons-lang3.version>3.4</commons-lang3.version>
50 <commons-validator.version>1.5.0</commons-validator.version> 50 <commons-validator.version>1.5.0</commons-validator.version>