chore: refactoring

Author: tomasbjerre

build.gradle

@@ -10,57 +10,47 @@ buildscript {
  }
 }
 
-project.ext.buildConfig = [
-  repoType: "DEFAULT",
-  sourceCompatibility: 17,
-  targetCompatibility: 17,
-]
-apply from: project.buildscript.classLoader.getResource('main.gradle').toURI()
-
 allprojects {
   apply plugin: 'java-library'
-}
 
-project('wiremock-pact-lib', {
   project.ext.buildConfig = [
     repoType: "DEFAULT",
     sourceCompatibility: 17,
     targetCompatibility: 17,
+    staticCodeAnalysis: [
+	  maxViolations: 0
+    ]
   ]
   apply from: project.buildscript.classLoader.getResource('main.gradle').toURI()
 
+  test {
+	  useJUnitPlatform()
+  }
+
+  dependencies {
+	testImplementation 'org.assertj:assertj-core:3.25.3'
+	testImplementation platform('org.junit:junit-bom:5.10.2')
+	testImplementation 'org.junit.jupiter:junit-jupiter'
+	testImplementation 'org.junit.platform:junit-platform-launcher'
+  }
+}
+
+project('wiremock-pact-lib', {
   dependencies {
     implementation 'au.com.dius.pact.core:model:4.6.9'
     compileOnly 'org.wiremock:wiremock:3.5.4'
   }
 })
 
 project('wiremock-pact-test', {
-  project.ext.buildConfig = [
-    repoType: "DEFAULT",
-    sourceCompatibility: 17,
-    targetCompatibility: 17,
-  ]
-  apply from: project.buildscript.classLoader.getResource('main.gradle').toURI()
-
   dependencies {
     testImplementation(project(":wiremock-pact-lib")) {
 		exclude group: "org.apache.groovy", module: "groovy-xml"
 	}
     testImplementation 'org.wiremock:wiremock:3.5.4'
-	implementation 'org.assertj:assertj-core:3.25.3'
-	testImplementation platform('org.junit:junit-bom:5.10.2')
-	testImplementation 'org.junit.jupiter:junit-jupiter'
-	testImplementation 'org.junit.platform:junit-platform-launcher'
 	testImplementation("io.rest-assured:rest-assured:5.4.0") {
 		exclude group: "org.apache.groovy", module: "groovy-xml"
 	}
 	testImplementation "org.apache.groovy:groovy-xml:4.0.18"
-	
   }
-  
-  test {
-	  useJUnitPlatform()
-  }
-
 })

wiremock-pact-lib/src/main/java/se/bjurr/wiremockpact/wiremockpactlib/api/WiremockPactApi.java

@@ -13,7 +13,6 @@
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
 import java.util.List;
-import java.util.Objects;
 
 public final class WiremockPactApi {
   private String consumerName = "consumer-name";
@@ -44,7 +43,6 @@ public void toPact(final String pactDir) {
 
   /** Record all given Wiremock requests to PACT. */
   public void toPact(final List<LoggedRequest> wiremockRequests, final String pactDir) {
-    Objects.requireNonNull(wiremockRequests);
     final Consumer consumer = new Consumer(this.consumerName);
     final Provider provider = new Provider(this.providerName);
     final V4Pact v4 = new V4Pact(consumer, provider);

wiremock-pact-test/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/ExampleUsageTest.java

@@ -0,0 +1,77 @@
+package se.bjurr.wiremockpact.wiremockpact.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.github.tomakehurst.wiremock.client.WireMock;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import org.junit.jupiter.api.Test;
+import se.bjurr.wiremockpact.wiremockpact.testutils.BaseTest;
+import se.bjurr.wiremockpact.wiremockpactlib.api.WiremockPactApi;
+
+public class ExampleUsageTest extends BaseTest {
+
+  @Test
+  public void testThatGetRequestCanGeneratePact() throws Exception {
+    // Setup Wiremock
+    WireMock.stubFor(WireMock.get("/getrequest").willReturn(WireMock.ok()));
+
+    // Invoke your code and let it invoke Wiremock
+    RestAssured.given()
+        .log()
+        .all()
+        .accept(ContentType.JSON)
+        .when()
+        .get("/getrequest")
+        .then()
+        .statusCode(200);
+
+    // Use this library to create PACT json
+    WiremockPactApi.builder() //
+        .consumerName(this.me) //
+        .providerName(this.you) //
+        .toPact(this.tmpdir.toString());
+
+    final String pactContent = this.readPactFileContent(this.tmpdir, this.you, this.me);
+
+    // And the content of that pact file will be
+    assertThat(pactContent)
+        .isEqualToIgnoringWhitespace(
+            """
+{
+  "consumer": {
+    "name": "this-is-me"
+  },
+  "interactions": [
+    {
+      "description": "generated from Wiremock",
+      "key": "2b57c74e",
+      "pending": false,
+      "request": {
+        "body": {
+          "content": ""
+        },
+        "method": "GET",
+        "path": "/getrequest"
+      },
+      "response": {
+        "status": 200
+      },
+      "type": "Synchronous/HTTP"
+    }
+  ],
+  "metadata": {
+    "pact-jvm": {
+      "version": "4.6.9"
+    },
+    "pactSpecification": {
+      "version": "4.0"
+    }
+  },
+  "provider": {
+    "name": "this-is-you"
+  }
+}
+""");
+  }
+}

wiremock-pact-test/src/test/java/se/bjurr/wiremockpact/wiremockpact/testutils/BaseTest.java

@@ -14,24 +14,43 @@
 @WireMockTest
 public class BaseTest {
 
+  protected Path tmpdir;
+  protected String you;
+  protected String me;
+
   @BeforeEach
   public void before(final WireMockRuntimeInfo wmRuntimeInfo) {
     RestAssured.baseURI = "http://localhost:" + wmRuntimeInfo.getHttpPort();
+    this.tmpdir = this.getTempDir();
+    this.you = "this-is-you";
+    this.me = "this-is-me";
+  }
+
+  public Path getTempDir() {
+    try {
+      return Files.createTempDirectory(this.getClass().getName() + "-tempfile");
+    } catch (final IOException e) {
+      throw new RuntimeException(e.getMessage(), e);
+    }
+  }
+
+  public String readPactFileContent(final Path tmpdir, final String you, final String me)
+      throws IOException {
+    final Path pactFile = tmpdir.resolve(me + "-" + you + ".json");
+    final String pactContent = Files.readString(pactFile);
+    return pactContent;
   }
 
   public void assertPactEquals(final String expected) {
-    Path tmpdir = null;
-    Path pactFile = null;
     try {
-      tmpdir = Files.createTempDirectory(this.getClass().getName() + "-tempfile");
+      final Path tmpdir = this.getTempDir();
       final String you = "this-is-you";
       final String me = "this-is-me";
       WiremockPactApi.builder().consumerName(me).providerName(you).toPact(tmpdir.toString());
-      pactFile = tmpdir.resolve(me + "-" + you + ".json");
-      final String pactContent = Files.readString(pactFile);
+      final String pactContent = this.readPactFileContent(tmpdir, you, me);
       assertThat(pactContent).isEqualToIgnoringWhitespace(expected);
     } catch (final IOException e) {
-      throw new RuntimeException(pactFile.toString(), e);
+      throw new RuntimeException(e.getMessage(), e);
     }
   }
 }