Support compilation in IntelliJ

The IntelliJ compiler complained about double defined EmbeddedCassandra types even though one was defined in it and one in multi-jvm. To silent IntelliJ the EmbeddedCassandra in multi-jvm is renamed to MultiNodeEmbeddedCassandra.
RBMHTechnology · Jun 30, 2017 · 18192fa · 18192fa
1 parent e58f87b
commit 18192fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...hnology/eventuate/EmbeddedCassandra.scala → ...ventuate/MultiNodeEmbeddedCassandra.scala b/...hnology/eventuate/EmbeddedCassandra.scala → ...ventuate/MultiNodeEmbeddedCassandra.scala
@@ -18,7 +18,7 @@ package com.rbmhtechnology.eventuate
 
 import org.cassandraunit.utils.EmbeddedCassandraServerHelper
 
-object EmbeddedCassandra {
+object MultiNodeEmbeddedCassandra {
   val DefaultCassandraDir =
     "target/embedded-cassandra"
 

diff --git a/...assandra/src/multi-jvm/scala/com/rbmhtechnology/eventuate/MultiNodeSupportCassandra.scala b/...assandra/src/multi-jvm/scala/com/rbmhtechnology/eventuate/MultiNodeSupportCassandra.scala
@@ -31,14 +31,14 @@ trait MultiNodeSupportCassandra extends BeforeAndAfterAll { this: MultiNodeSpec
   val coordinator = RoleName("nodeA")
 
   def cassandraDir: String =
-    EmbeddedCassandra.DefaultCassandraDir
+    MultiNodeEmbeddedCassandra.DefaultCassandraDir
 
   def logProps(logId: String): Props =
     CassandraEventLog.props(logId)
 
   override def atStartup(): Unit = {
     if (isNode(coordinator)) {
-      EmbeddedCassandra.start(cassandraDir)
+      MultiNodeEmbeddedCassandra.start(cassandraDir)
       Cassandra(system)
     }
     enterBarrier("startup")
@@ -54,7 +54,7 @@ trait MultiNodeSupportCassandra extends BeforeAndAfterAll { this: MultiNodeSpec
     // clean database and delete snapshot files
     if (isNode(coordinator)) {
       FileUtils.deleteDirectory(snapshotRootDir)
-      EmbeddedCassandra.clean()
+      MultiNodeEmbeddedCassandra.clean()
     }
   }
 }