Skip to content

Commit 4488828

Browse files
committed
CASSANDRA-20884 - Use shared JMX classes which were moved to the in-jvm-dtest API
1 parent 0e9f0fa commit 4488828

10 files changed

+9
-522
lines changed

.build/parent-maven-pom.xml

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

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)