update dependency graph based on testing

Terracotta-OSS · Jan 17, 2025 · 24b1b5b · 24b1b5b
1 parent 3a7e05e
commit 24b1b5b
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 30 deletions.
diff --git a/default-configuration/build.gradle b/default-configuration/build.gradle
@@ -38,10 +38,7 @@ dependencies {
     implementation "org.terracotta:tcconfig-schema:10.7.5"
     implementation "commons-cli:commons-cli:1.3.1"
 
-    compileOnly project(":common-spi")
-    compileOnly project(":configuration-provider")
-    compileOnly project(":server-bootstrap")
-    compileOnly "org.terracotta:standard-cluster-services:1.9.1"
+    compileOnly project(":server-api")
     compileOnly "org.slf4j:slf4j-api:$slf4jVersion"
 
     testImplementation project(":common-spi")

diff --git a/examples/extended-server/build.gradle b/examples/extended-server/build.gradle
@@ -23,6 +23,5 @@ description = 'terracotta-core examples exended server'
 
 
 dependencies {
-    compileOnly project(':tc-server')
     compileOnly project(':common-spi')
 }
diff --git a/galvan-support/build.gradle b/galvan-support/build.gradle
@@ -35,8 +35,9 @@ configurations {
 }
 
 dependencies {
+    api project(":galvan")
+
     implementation "junit:junit:$junitVersion"
-    implementation project(":galvan")
     implementation project(":test-interfaces")
     implementation "org.terracotta:terracotta-utilities-port-chooser:0.0.19"
     compileOnly project(':common')

diff --git a/passthrough-server/build.gradle b/passthrough-server/build.gradle
@@ -31,17 +31,19 @@ jar {
 }
 
 dependencies {
-    implementation "junit:junit:$junitVersion"
-
     compileOnly "com.google.code.findbugs:annotations:3.0.1"
 
-    implementation project(':test-interfaces')
-    implementation "org.terracotta:entity-client-api:$terracottaApisVersion"
-    implementation "org.terracotta:entity-common-api:$terracottaApisVersion"
-    implementation "org.terracotta:entity-server-api:$terracottaApisVersion"
-    implementation "org.terracotta:standard-cluster-services:$terracottaApisVersion"
-    implementation "org.terracotta:monitoring-support:$terracottaApisVersion"
-    runtimeOnly project(':tripwire:plugin')
+    api project(':test-interfaces')
+    api "org.terracotta:connection-api:$terracottaApisVersion"
+
+    api "org.terracotta:entity-client-api:$terracottaApisVersion"
+    api "org.terracotta:entity-common-api:$terracottaApisVersion"
+    api "org.terracotta:entity-server-api:$terracottaApisVersion"
+    api "org.terracotta:standard-cluster-services:$terracottaApisVersion"
+    api "org.terracotta:monitoring-support:$terracottaApisVersion"
+    api project(':tripwire:plugin')
+    api project(':server-spi')
+
     testImplementation "junit:junit:$junitVersion"
     testImplementation "org.mockito:mockito-core:$mockitoVersion"
     testImplementation "org.hamcrest:hamcrest-all:$hamcrestVersion"

diff --git a/passthrough-server/src/main/java/org/terracotta/passthrough/PassthroughServer.java b/passthrough-server/src/main/java/org/terracotta/passthrough/PassthroughServer.java
@@ -31,8 +31,8 @@
 import java.util.Set;
 import java.util.Vector;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
 
-import org.junit.Assert;
 import org.terracotta.entity.EntityClientService;
 import org.terracotta.entity.EntityServerService;
 import org.terracotta.entity.ServiceProvider;
@@ -85,9 +85,15 @@ public PassthroughServer() {
 
   public void registerAsynchronousServerCrasher(IAsynchronousServerCrasher crasher) {
     // This should only be set once.
-    Assert.assertNull(this.crasher);
+    assertFalse(()->(this.crasher != null));
     this.crasher = crasher;
   }
+
+  public void assertFalse(Supplier<Boolean> p) {
+    if (p.get()) {
+      throw new RuntimeException("not false");
+    }
+  }
 
   public void setServerName(String serverName) {
     this.serverName = serverName;
@@ -102,12 +108,12 @@ public void setGroupPort(int groupPort) {
   }
 
   public void registerServerEntityService(EntityServerService<?, ?> service) {
-    Assert.assertFalse(this.hasStarted);
+    assertFalse(()->this.hasStarted);
     this.savedServerEntityServices.add(service);
   }
 
   public void registerClientEntityService(EntityClientService<?, ?, ? extends EntityMessage, ? extends EntityResponse, ?> service) {
-    Assert.assertFalse(this.hasStarted);
+    assertFalse(()->this.hasStarted);
     this.entityClientServices.add(service);
   }
 

diff --git a/server-api/build.gradle b/server-api/build.gradle
@@ -39,6 +39,7 @@ dependencies {
   compileOnlyApi project(':server-spi')
   compileOnlyApi project(':common-api')
   compileOnlyApi project(':configuration-provider')
+  compileOnlyApi project(':server-bootstrap')
 }
 
 publishing {

diff --git a/server-runtime/build.gradle b/server-runtime/build.gradle
@@ -28,16 +28,7 @@ base {
 }
 
 dependencies {
-  compileOnlyApi "org.terracotta:entity-common-api:$terracottaApisVersion"
-  compileOnlyApi "org.terracotta:entity-server-api:$terracottaApisVersion"
-  compileOnlyApi "org.terracotta:monitoring-support:$terracottaApisVersion"
-  compileOnlyApi "org.terracotta:packaging-support:$terracottaApisVersion"
-  compileOnlyApi "org.terracotta:standard-cluster-services:$terracottaApisVersion"
-
-  compileOnlyApi project(":tripwire:plugin")
-  compileOnlyApi project(':server-spi')
-  compileOnlyApi project(':configuration-provider')
-  compileOnlyApi project(':common-spi')
+  compileOnlyApi project(':server-api')
 
   implementation project(':tc-server')
   implementation project(':terracotta')

diff --git a/server-spi/build.gradle b/server-spi/build.gradle
@@ -30,6 +30,6 @@ jar {
 }
 
 dependencies {
-  compileOnlyApi project(':common-spi')
+  api project(':common-spi')
 }