Skip to content

Commit 35c2e14

Browse files
committed
CASSANDRA-20884 - Use shared JMX classes which were moved to the in-jvm-dtest API
1 parent 5d3af44 commit 35c2e14

File tree

12 files changed

+11
-523
lines changed

12 files changed

+11
-523
lines changed

.build/parent-maven-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@
524524
<dependency>
525525
<groupId>org.apache.cassandra</groupId>
526526
<artifactId>dtest-api</artifactId>
527-
<version>0.0.17</version>
527+
<version>0.0.18</version>
528528
<scope>test</scope>
529529
</dependency>
530530
<dependency>

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ Merged from 4.1:
317317
* Enforce CQL message size limit on multiframe messages (CASSANDRA-20052)
318318
* Fix race condition in DecayingEstimatedHistogramReservoir during rescale (CASSANDRA-19365)
319319
Merged from 4.0:
320+
* Updated dtest-api to 0.0.18 and removed JMX-related classes that now live in the dtest-api (CASSANDRA-20884)
320321
* Fixed incorrect error message constant for keyspace name length validation (CASSANDRA-20915)
321322
* Prevent too long table names not fitting file names (CASSANDRA-20389)
322323
* Update Jackson to 2.19.2 (CASSANDRA-20848)

ide/nbproject/project.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/java/org/apache/cassandra/utils/RMIClientSocketFactoryImpl.java

Lines changed: 0 additions & 83 deletions
This file was deleted.

src/java/org/apache/cassandra/utils/RMICloseableClientSocketFactory.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/java/org/apache/cassandra/utils/RMICloseableServerSocketFactory.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,6 @@ public AbstractBuilder(Factory<I, C, B> factory)
228228
withSharedClasses(SHARED_PREDICATE);
229229
}
230230

231-
@SuppressWarnings("unchecked")
232-
private B self()
233-
{
234-
return (B) this;
235-
}
236-
237231
public B withNodeProvisionStrategy(INodeProvisionStrategy.Factory nodeProvisionStrategy)
238232
{
239233
this.nodeProvisionStrategy = nodeProvisionStrategy;
@@ -618,7 +612,7 @@ public InstanceConfig newInstanceConfig()
618612
}
619613

620614
@VisibleForTesting
621-
InstanceConfig createInstanceConfig(int nodeNum)
615+
public InstanceConfig createInstanceConfig(int nodeNum)
622616
{
623617
INodeProvisionStrategy provisionStrategy = nodeProvisionStrategy.create(subnet, portMap);
624618
Collection<String> tokens = tokenSupplier.tokens(nodeNum);

test/distributed/org/apache/cassandra/distributed/impl/CollectingRMIServerSocketFactoryImpl.java

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)