chore: Upgrade contract-case core dependencies

Author: TimothyJones

build.gradle

@@ -13,13 +13,14 @@ repositories {
     mavenLocal()
 }
 
-def caseCoreVersion = "0.15.2"
+def caseCoreVersion = "0.15.4"
+def caseBoundaryVersion = "0.10.2"
 def grpcVersion = "1.60.1"
 
 dependencies {
     api "io.contract-testing.contractcase:case_example_mock_types:${caseCoreVersion}"
     api "io.contract-testing.contractcase:test-equivalence-matchers:${caseCoreVersion}"
-    implementation 'io.contract-testing.contractcase:case_boundary:0.6.3'
+    implementation "io.contract-testing.contractcase:case_boundary:${caseBoundaryVersion}"
     implementation 'com.diogonunes:JColor:5.5.1'
     implementation 'com.google.protobuf:protobuf-java:3.25.1'
     implementation 'com.google.protobuf:protobuf-java-util:3.25.1'

src/main/java/io/contract_testing/contractcase/BoundaryStateHandlerMapper.java

@@ -2,7 +2,6 @@
 
 import io.contract_testing.contractcase.case_boundary.BoundaryResult;
 import io.contract_testing.contractcase.case_boundary.BoundaryStateHandler;
-import io.contract_testing.contractcase.case_boundary.BoundaryStateHandlerWithTeardown;
 import io.contract_testing.contractcase.case_boundary.BoundarySuccess;
 import io.contract_testing.contractcase.case_boundary.BoundarySuccessWithMap;
 import java.util.HashMap;
@@ -11,7 +10,7 @@
 
 class BoundaryStateHandlerMapper {
 
-  public static Map<String, ? extends BoundaryStateHandler> map(
+  public static Map<String, BoundaryStateHandler> map(
       Map<String, StateHandler> stateHandlers) {
     var ret = new HashMap<String, BoundaryStateHandler>();
 
@@ -20,9 +19,9 @@ class BoundaryStateHandlerMapper {
     return ret;
   }
 
-  private static BoundaryStateHandlerWithTeardown map(StateHandler handler) {
+  private static BoundaryStateHandler map(StateHandler handler) {
 
-    return new BoundaryStateHandlerWithTeardown() {
+    return new BoundaryStateHandler() {
 
       @Override
       public @NotNull BoundaryResult setup() {

src/main/java/io/contract_testing/contractcase/ContractDefiner.java

@@ -1,6 +1,6 @@
 package io.contract_testing.contractcase;
 
-import io.contract_testing.contractcase.case_example_mock_types.base.AnyMockDescriptor;
+import io.contract_testing.contractcase.case_example_mock_types.mocks.base.AnyMockDescriptor;
 import io.contract_testing.contractcase.client.InternalDefinerClient;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/io/contract_testing/contractcase/ExampleDefinition.java

@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.contract_testing.contractcase.case_example_mock_types.base.AnyMockDescriptor;
+import io.contract_testing.contractcase.case_example_mock_types.mocks.base.AnyMockDescriptor;
 import java.util.List;
 import java.util.function.Function;
 

src/main/java/io/contract_testing/contractcase/client/InternalDefinerClient.java

@@ -312,7 +312,16 @@ public void onNext(DefinitionResponse note) {
       @Override
       public void onError(Throwable t) {
         Status status = Status.fromThrowable(t);
-        System.err.println("ContractCase failed: " + status);
+        if (Status.Code.UNAVAILABLE.equals(status.getCode())) {
+          System.err.println(
+              "ContractCase was unable to contact its internal server."
+                  + " This is either a conflict while starting the server,"
+                  + " or a bug in ContractCase. Please see the rest of the "
+                  + "log output. If it is a bug, please open an issue on "
+                  + "https://github.com/case-contract-testing/contract-case");
+        } else {
+          System.err.println("ContractCase failed: " + status);
+        }
         errorStatus = status;
       }