feat: Replace boundary connector with one that connects to case-connector instead, working around JSii issue

Author: TimothyJones

build.gradle

@@ -1,29 +1,123 @@
 plugins {
     id 'java-library'
-}
+    id 'java-library-distribution'
+    id 'maven-publish'
+    id "com.google.protobuf" version "0.9.4"
 
-group 'io.contracttesting.contractcase'
+}
+group 'io.contract-testing.contractcase'
 version "0.0.1" // x-release-please-version
 
 repositories {
-    mavenLocal()
     mavenCentral()
+    mavenLocal()
 }
 
-def caseCoreVersion = "0.12.2"
+def caseCoreVersion = "0.13.0"
+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 'com.diogonunes:JColor:5.5.1'
-    implementation 'io.contract-testing.contractcase:case_boundary:0.6.2'
+    implementation 'com.google.protobuf:protobuf-java:3.25.1'
+    implementation 'com.google.protobuf:protobuf-java-util:3.25.1'
+    implementation 'com.google.protobuf:protoc:3.25.1'
+    implementation "io.grpc:protoc-gen-grpc-java:${grpcVersion}"
+    implementation "io.grpc:grpc-core:${grpcVersion}"
+    implementation "io.grpc:grpc-stub:${grpcVersion}"
+    implementation "io.grpc:grpc-netty-shaded:${grpcVersion}"
+    implementation "io.grpc:grpc-protobuf:${grpcVersion}"
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.16.1'
     implementation 'org.jetbrains:annotations:23.0.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
+    testImplementation 'com.google.protobuf:protobuf-gradle-plugin:0.8.0'
     // api("org.junit.jupiter:junit-jupiter-api")
     // compileOnly("org.junit.jupiter:junit-jupiter")
 }
 
 test {
     useJUnitPlatform()
+}
+
+jar {
+    duplicatesStrategy(DuplicatesStrategy.WARN)
+}
+
+sourceSets {
+    main {
+        java {
+     //       srcDirs 'build/generated/source/proto/main/grpcjava', 'build/generated/source/proto/main/java'
+        }
+    }
+}
+
+protobuf {
+    plugins {
+        // Locate a plugin with name 'grpc'. This step is optional.
+        // If you leave it empty, it uses the current directory.
+        // If you don't specify it, protoc will try to use "protoc-gen-grpc" from
+        // system search path.
+        'grpc' {
+            artifact = 'io.grpc:protoc-gen-grpc-java:1.60.1'
+        }
+    }
+    protoc {
+        // Download from repositories
+        artifact = 'com.google.protobuf:protoc:3.25.1'
+    }
+    generateProtoTasks {
+        all().configureEach { task ->
+            task.builtins {
+                java {}
+            }
+            task.plugins {
+                grpc {
+                    outputSubDir = 'grpcjava'
+                }
+            }
+        }
+
+    }
+
+}
+
+
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
+
+publishing {
+    publications {
+        contractcase(MavenPublication) {
+            from components.java
+            versionMapping {
+                usage('java-api') {
+                    fromResolutionOf('runtimeClasspath')
+                }
+                usage('java-runtime') {
+                    fromResolutionResult()
+                }
+            }
+        }
+        /*
+        contractcase(MavenPublication) {
+            from components.java
+            versionMapping {
+                usage('java-api') {
+                    fromResolutionOf('runtimeClasspath')
+                }
+                usage('java-runtime') {
+                    fromResolutionResult()
+                }
+            }
+        }*/
+    }
+    repositories {
+        mavenLocal()
+    }
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,20 +1,20 @@
 package io.contract_testing.contractcase;
 
-import io.contract_testing.contractcase.case_boundary.BoundaryContractDefiner;
-import io.contract_testing.contractcase.case_example_mock_types.AnyMockDescriptor;
+import io.contract_testing.contractcase.case_example_mock_types.base.AnyMockDescriptor;
+import io.contract_testing.contractcase.client.InternalDefinerClient;
 import org.jetbrains.annotations.NotNull;
 
 public class ContractDefiner {
 
   private static final String TEST_RUN_ID = "JAVA";
-  private final BoundaryContractDefiner definer;
+  private final InternalDefinerClient definer;
 
 
   public ContractDefiner(final @NotNull ContractCaseConfig config) {
     LogPrinter logPrinter = new LogPrinter();
-    BoundaryContractDefiner definer = null;
+    InternalDefinerClient definer = null;
     try {
-      definer = new BoundaryContractDefiner(BoundaryConfigMapper.map(config, TEST_RUN_ID),
+      definer = new InternalDefinerClient(BoundaryConfigMapper.map(config, TEST_RUN_ID),
           logPrinter,
           logPrinter,
           new BoundaryVersionGenerator().getVersions());
@@ -27,14 +27,14 @@ public ContractDefiner(final @NotNull ContractCaseConfig config) {
   public <T, M extends AnyMockDescriptor> void runExample(ExampleDefinition<M> definition,
       final @NotNull IndividualSuccessTestConfig<T> additionalConfig) {
     try {
-      BoundaryResultMapper.map(definer.runExample(BoundaryDefinitionMapper.map(definition),
+      BoundaryResultMapper.map(definer.runExample(definition.toJSON(),
           BoundaryConfigMapper.mapSuccessExample(additionalConfig, TEST_RUN_ID)));
     } catch (Throwable e) {
       BoundaryCrashReporter.handleAndRethrow(e);
     }
   }
 
-  public <T, M extends AnyMockDescriptor> void runExample(ExampleDefinition<M> definition) {
+  public <M extends AnyMockDescriptor> void runExample(ExampleDefinition<M> definition) {
     this.runExample(
         definition,
         IndividualSuccessTestConfig
@@ -53,7 +53,7 @@ public <T, M extends AnyMockDescriptor> void runThrowingExample(ExampleDefinitio
     }
   }
 
-  public <T, M extends AnyMockDescriptor> void runThrowingExample(ExampleDefinition<M> definition) {
+  public <M extends AnyMockDescriptor> void runThrowingExample(ExampleDefinition<M> definition) {
     this.runThrowingExample(
         definition,
         IndividualFailedTestConfig

gradlew

@@ -1,7 +1,12 @@
 package io.contract_testing.contractcase;
 
-import io.contract_testing.contractcase.case_example_mock_types.AnyMockDescriptor;
+import com.fasterxml.jackson.core.TreeNode;
+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 java.util.List;
+import java.util.function.Function;
 
 public class ExampleDefinition<M extends AnyMockDescriptor> {
 
@@ -20,4 +25,20 @@ Object getDefinition() {
   public List<? extends Object> getStates() {
     return states;
   }
+
+  public JsonNode toJSON() {
+    var mapper = new ObjectMapper();
+    ObjectNode node = mapper.createObjectNode();
+    node.set("definition", mapper.valueToTree(definition.toJSON()));
+    node.set("states",
+        mapper.createArrayNode()
+            .addAll(this.states.stream()
+                .map((Function<Object, JsonNode>) mapper::valueToTree)
+                .toList()));
+
+    return node;
+
+  }
+
+
 }

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

@@ -0,0 +1,42 @@
+package io.contract_testing.contractcase.client;
+
+import io.contract_testing.contractcase.ContractCaseConfigurationError;
+import io.contract_testing.contractcase.ContractCaseCoreError;
+import io.contract_testing.contractcase.ContractCaseExpectationsNotMet;
+import io.contract_testing.contractcase.case_boundary.BoundaryFailure;
+import io.contract_testing.contractcase.case_boundary.BoundaryFailureKindConstants;
+import io.contract_testing.contractcase.case_boundary.BoundaryResult;
+import io.contract_testing.contractcase.case_boundary.BoundaryResultTypeConstants;
+
+class BoundaryResultMapper {
+
+  public static void map(BoundaryResult result) {
+    final var resultType = result.getResultType();
+
+    if (resultType.equals(BoundaryResultTypeConstants.RESULT_SUCCESS)) {
+      return;
+    }
+    if (resultType.equals(BoundaryResultTypeConstants.RESULT_FAILURE)) {
+      mapFailure((BoundaryFailure) result);
+    }
+  }
+
+  private static void mapFailure(BoundaryFailure result) {
+    String kind = result.getKind();
+
+    if (kind.equals(BoundaryFailureKindConstants.CASE_BROKER_ERROR)
+        || kind.equals(BoundaryFailureKindConstants.CASE_CONFIGURATION_ERROR)
+        || kind.equals(BoundaryFailureKindConstants.CASE_TRIGGER_ERROR)) {
+      throw new ContractCaseConfigurationError(result.getMessage(), result.getLocation());
+    } else if (kind.equals(BoundaryFailureKindConstants.CASE_CORE_ERROR)) {
+      throw new ContractCaseCoreError(result.getMessage(), result.getLocation());
+    } else if (kind.equals(BoundaryFailureKindConstants.CASE_FAILED_ASSERTION_ERROR)
+        || kind.equals(BoundaryFailureKindConstants.CASE_VERIFY_RETURN_ERROR)) {
+      throw new ContractCaseExpectationsNotMet(result.getMessage(), result.getLocation());
+    }
+
+    throw new ContractCaseCoreError(
+        "Unhandled error kind (" + kind + "): " + result.getMessage(),
+        result.getLocation());
+  }
+}