Merge pull request #16 from kyle-winkelman/JvmStatic

Add @JvmStatic to companion object methods for ease of use with other JVM languages.
wiremock · Dec 12, 2023 · 44f3bcf · 44f3bcf
2 parents 1bab403 + 8132329
commit 44f3bcf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/examples/testcontainers-java/pom.xml b/examples/testcontainers-java/pom.xml
@@ -15,7 +15,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <wiremock.testcontainers.version>1.0-alpha-13</wiremock.testcontainers.version>
         <testcontainers.version>1.19.0</testcontainers.version>
-        <extension.version>0.7.0</extension.version>
+        <extension.version>0.8.0</extension.version>
         <wiremock.version>3.3.1</wiremock.version>
         <junit.version>5.10.1</junit.version>
     </properties>

diff --git a/examples/testcontainers-java/src/test/java/TestSample.java b/examples/testcontainers-java/src/test/java/TestSample.java
@@ -46,7 +46,7 @@ public void testGraphql() throws IOException, InterruptedException {
                 WireMock.post(WireMock.urlEqualTo("/graphql"))
                         .andMatching(
                                 GraphqlBodyMatcher.extensionName,
-                                GraphqlBodyMatcher.Companion.withRequest(
+                                GraphqlBodyMatcher.withRequest(
                                         "{ \"query\": \"{ query { name id }}\" }"
                                 )
                         )

diff --git a/wiremock-graphql-extension/src/main/kotlin/io/github/nilwurtz/GraphqlBodyMatcher.kt b/wiremock-graphql-extension/src/main/kotlin/io/github/nilwurtz/GraphqlBodyMatcher.kt
@@ -32,6 +32,8 @@ class GraphqlBodyMatcher() : RequestMatcherExtension() {
          * @throws InvalidQueryException if the given query is invalid.
          */
         @Deprecated("This method will be deleted in a future release. Use withRequestJson instead.")
+        @JvmStatic
+        @JvmOverloads
         fun withRequestQueryAndVariables(expectedQuery: String, expectedVariables: String? = null): GraphqlBodyMatcher {
             // Avoid to parse json here. It will be parsed in initExpectedRequestJson
             return GraphqlBodyMatcher().apply {
@@ -52,6 +54,7 @@ class GraphqlBodyMatcher() : RequestMatcherExtension() {
          * @throws InvalidJsonException if the given JSON is malformed.
          * @throws InvalidQueryException if the given query is invalid.
          */
+        @JvmStatic
         fun withRequestJson(expectedJson: String): GraphqlBodyMatcher {
             return GraphqlBodyMatcher().apply {
                 initExpectedRequestJson(expectedJson)
@@ -68,6 +71,7 @@ class GraphqlBodyMatcher() : RequestMatcherExtension() {
          * @throws InvalidJsonException if the given JSON is malformed.
          * @throws InvalidQueryException if the given query is invalid.
          */
+        @JvmStatic
         fun withRequest(expectedJson: String): Parameters {
             // check if the json and query is valid
             expectedJson.toJSONObject().graphqlQueryDocument()