Support new types mock server

osvaldjr · Jul 17, 2020 · 2f0bf92 · 2f0bf92
1 parent 2680c59
commit 2f0bf92
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 22 deletions.
diff --git a/easy-cucumber-core/pom.xml b/easy-cucumber-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.osvaldjr</groupId>
         <artifactId>easy-cucumber-parent</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
     </parent>
     <artifactId>easy-cucumber-core</artifactId>
     <packaging>jar</packaging>

diff --git a/easy-cucumber-datasource/pom.xml b/easy-cucumber-datasource/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.osvaldjr</groupId>
         <artifactId>easy-cucumber-parent</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
     </parent>
     <artifactId>easy-cucumber-datasource</artifactId>
     <packaging>jar</packaging>

diff --git a/easy-cucumber-jms/pom.xml b/easy-cucumber-jms/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.osvaldjr</groupId>
         <artifactId>easy-cucumber-parent</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
     </parent>
     <artifactId>easy-cucumber-jms</artifactId>
     <packaging>jar</packaging>

diff --git a/easy-cucumber-mock/pom.xml b/easy-cucumber-mock/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.osvaldjr</groupId>
         <artifactId>easy-cucumber-parent</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
     </parent>
     <artifactId>easy-cucumber-mock</artifactId>
     <packaging>jar</packaging>

diff --git a/easy-cucumber-mock/src/main/java/io/github/osvaldjr/mock/objects/StubbyRequest.java b/easy-cucumber-mock/src/main/java/io/github/osvaldjr/mock/objects/StubbyRequest.java
@@ -23,8 +23,14 @@ public class StubbyRequest implements Serializable {
   private ResponseBody response;
 
   public enum BodyType {
+    RAW,
     JSON,
-    RAW
+    JSON_STRICT,
+    JSON_ONLY_MATCHING_FIELDS,
+    EXACT,
+    REGEX,
+    JSON_SCHEMA,
+    XPATH
   }
 
   @Getter

diff --git a/...java/io/github/osvaldjr/mock/utils/mockserver/assemblers/ExpectationRequestAssembler.java b/...java/io/github/osvaldjr/mock/utils/mockserver/assemblers/ExpectationRequestAssembler.java
@@ -7,11 +7,17 @@
 import java.util.List;
 import java.util.Map;
 
+import org.mockserver.matchers.MatchType;
 import org.mockserver.mock.Expectation;
 import org.mockserver.model.Header;
 import org.mockserver.model.HttpRequest;
 import org.mockserver.model.HttpResponse;
+import org.mockserver.model.JsonBody;
+import org.mockserver.model.JsonSchemaBody;
 import org.mockserver.model.Parameter;
+import org.mockserver.model.RegexBody;
+import org.mockserver.model.StringBody;
+import org.mockserver.model.XPathBody;
 import org.springframework.stereotype.Component;
 
 import gherkin.deps.com.google.gson.Gson;
@@ -47,15 +53,27 @@ private HttpRequest getHttpRequest(StubbyRequest.RequestBody request) {
         .withMethod(request.getMethod())
         .withPath("/" + request.getUrl())
         .withHeaders(getHeaders(request.getHeaders()))
-        .withQueryStringParameters(getQueryParameters(request.getQueryParams()))
-        .withBody(getRequestBody(request));
-    return httpRequest;
-  }
+        .withQueryStringParameters(getQueryParameters(request.getQueryParams()));
 
-  private String getRequestBody(StubbyRequest.RequestBody request) {
-    return request.getBodyType() == StubbyRequest.BodyType.RAW
-        ? request.getBody().toString()
-        : gson.toJson(request.getBody());
+    if (request.getBodyType() == StubbyRequest.BodyType.RAW) {
+      httpRequest.withBody(request.getBody().toString());
+    } else if (request.getBodyType() == StubbyRequest.BodyType.JSON_STRICT) {
+      httpRequest.withBody(JsonBody.json(request.getBody(), MatchType.STRICT));
+    } else if (request.getBodyType() == StubbyRequest.BodyType.JSON_ONLY_MATCHING_FIELDS) {
+      httpRequest.withBody(JsonBody.json(request.getBody(), MatchType.ONLY_MATCHING_FIELDS));
+    } else if (request.getBodyType() == StubbyRequest.BodyType.EXACT) {
+      httpRequest.withBody(StringBody.exact(request.getBody().toString()));
+    } else if (request.getBodyType() == StubbyRequest.BodyType.REGEX) {
+      httpRequest.withBody(RegexBody.regex(request.getBody().toString()));
+    } else if (request.getBodyType() == StubbyRequest.BodyType.JSON_SCHEMA) {
+      httpRequest.withBody(JsonSchemaBody.jsonSchema(request.getBody().toString()));
+    } else if (request.getBodyType() == StubbyRequest.BodyType.XPATH) {
+      httpRequest.withBody(XPathBody.xpath(request.getBody().toString()));
+    } else {
+      httpRequest.withBody(gson.toJson(request.getBody()));
+    }
+
+    return httpRequest;
   }
 
   private List<Parameter> getQueryParameters(Map<String, String> queryParams) {

diff --git a/easy-cucumber-owasp-zap/pom.xml b/easy-cucumber-owasp-zap/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.osvaldjr</groupId>
         <artifactId>easy-cucumber-parent</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
     </parent>
     <artifactId>easy-cucumber-owasp-zap</artifactId>
     <packaging>jar</packaging>

diff --git a/examples/complete-springboot/pom.xml b/examples/complete-springboot/pom.xml
@@ -17,7 +17,7 @@
     <properties>
         <java.version>1.8</java.version>
         <spring.cloud.version>Greenwich.SR2</spring.cloud.version>
-        <easy-cucumber.version>1.0.2</easy-cucumber.version>
+        <easy-cucumber.version>1.0.3</easy-cucumber.version>
     </properties>
 
     <dependencies>

diff --git a/examples/simple-springboot-activemq/pom.xml b/examples/simple-springboot-activemq/pom.xml
@@ -17,7 +17,7 @@
     <properties>
         <java.version>1.8</java.version>
         <spring.cloud.version>Greenwich.SR2</spring.cloud.version>
-        <easy-cucumber.version>1.0.2</easy-cucumber.version>
+        <easy-cucumber.version>1.0.3</easy-cucumber.version>
     </properties>
 
     <dependencies>

diff --git a/examples/simple-springboot-core/pom.xml b/examples/simple-springboot-core/pom.xml
@@ -17,7 +17,7 @@
     <properties>
         <java.version>1.8</java.version>
         <spring.cloud.version>Greenwich.SR2</spring.cloud.version>
-        <easy-cucumber.version>1.0.2</easy-cucumber.version>
+        <easy-cucumber.version>1.0.3</easy-cucumber.version>
     </properties>
 
     <dependencies>

diff --git a/examples/simple-springboot-datasource/pom.xml b/examples/simple-springboot-datasource/pom.xml
@@ -17,7 +17,7 @@
     <properties>
         <java.version>1.8</java.version>
         <spring.cloud.version>Greenwich.SR2</spring.cloud.version>
-        <easy-cucumber.version>1.0.2</easy-cucumber.version>
+        <easy-cucumber.version>1.0.3</easy-cucumber.version>
     </properties>
 
     <dependencies>

diff --git a/examples/simple-springboot-mockserver/pom.xml b/examples/simple-springboot-mockserver/pom.xml
@@ -17,7 +17,7 @@
     <properties>
         <java.version>1.8</java.version>
         <spring.cloud.version>Greenwich.SR2</spring.cloud.version>
-        <easy-cucumber.version>1.0.2</easy-cucumber.version>
+        <easy-cucumber.version>1.0.3</easy-cucumber.version>
     </properties>
 
     <dependencies>

diff --git a/examples/simple-springboot-owaspzap/pom.xml b/examples/simple-springboot-owaspzap/pom.xml
@@ -17,7 +17,7 @@
     <properties>
         <java.version>1.8</java.version>
         <spring.cloud.version>Greenwich.SR2</spring.cloud.version>
-        <easy-cucumber.version>1.0.2</easy-cucumber.version>
+        <easy-cucumber.version>1.0.3</easy-cucumber.version>
     </properties>
 
     <dependencies>

diff --git a/examples/simple-springboot-stubby/pom.xml b/examples/simple-springboot-stubby/pom.xml
@@ -17,7 +17,7 @@
     <properties>
         <java.version>1.8</java.version>
         <spring.cloud.version>Greenwich.SR2</spring.cloud.version>
-        <easy-cucumber.version>1.0.2</easy-cucumber.version>
+        <easy-cucumber.version>1.0.3</easy-cucumber.version>
     </properties>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     </parent>
     <groupId>io.github.osvaldjr</groupId>
     <artifactId>easy-cucumber-parent</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <packaging>pom</packaging>
     <name>io.github.osvaldjr:easy-cucumber</name>
     <description>Easy Cucumber JVM Testing</description>