refactor: converted PactDslJsonArray to Kotlin

consumer/src/main/java/au/com/dius/pact/consumer/dsl/PactDslJsonBody.java

@@ -29,6 +29,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.FastDateFormat;
+import org.jetbrains.annotations.NotNull;
 
 import java.math.BigDecimal;
 import java.time.Instant;
@@ -49,7 +50,7 @@
 public class PactDslJsonBody extends DslPart {
 
   private static final String EXAMPLE = "Example \"";
-  private final JsonValue.Object body;
+  private JsonValue.Object body;
 
   /**
    * Constructs a new body as a root
@@ -120,12 +121,17 @@ public void putArrayPrivate(DslPart object) {
     }
   }
 
-    @Override
-    public JsonValue getBody() {
-        return body;
-    }
+  @Override
+  public JsonValue getBody() {
+      return body;
+  }
 
-    /**
+  @Override
+  public void setBody(JsonValue body) {
+    this.body = (JsonValue.Object) body;
+  }
+
+  /**
      * Attribute that must be the specified value
      * @param name attribute name
      * @param value string value
@@ -1032,7 +1038,7 @@ public PactDslJsonBody hexValue(String name) {
      * @param hexValue example value to use for generated bodies
      */
     public PactDslJsonBody hexValue(String name, String hexValue) {
-      if (!hexValue.matches(HEXADECIMAL)) {
+      if (!hexValue.matches(DslPart.Companion.getHEXADECIMAL().getPattern())) {
         throw new InvalidMatcherException(EXAMPLE + hexValue + "\" is not a hexadecimal value");
       }
       body.add(name, new JsonValue.StringValue(hexValue.toCharArray()));
@@ -1064,11 +1070,11 @@ public PactDslJsonBody uuid(String name, UUID uuid) {
      * @param uuid example UUID to use for generated bodies
      */
     public PactDslJsonBody uuid(String name, String uuid) {
-      if (!uuid.matches(UUID_REGEX)) {
+      if (!uuid.matches(DslPart.Companion.getUUID_REGEX().getPattern())) {
         throw new InvalidMatcherException(EXAMPLE + uuid + "\" is not an UUID");
       }
       body.add(name, new JsonValue.StringValue(uuid.toCharArray()));
-      getMatchers().addRule(matcherKey(name, getRootPath()), regexp(UUID_REGEX));
+      getMatchers().addRule(matcherKey(name, getRootPath()), regexp(DslPart.Companion.getUUID_REGEX().getPattern()));
       return this;
     }
 

consumer/src/main/java/au/com/dius/pact/consumer/dsl/PactDslJsonRootValue.java

@@ -60,6 +60,11 @@ public JsonValue getBody() {
     return Json.toJson(value);
   }
 
+  @Override
+  public void setBody(JsonValue body) {
+    value = body;
+  }
+
   /**
    * @deprecated Use PactDslJsonArray for arrays
    */
@@ -612,7 +617,7 @@ public static PactDslJsonRootValue hexValue() {
    * @param hexValue example value to use for generated bodies
    */
   public static PactDslJsonRootValue hexValue(String hexValue) {
-    if (!hexValue.matches(HEXADECIMAL)) {
+    if (!hexValue.matches(DslPart.Companion.getHEXADECIMAL().getPattern())) {
       throw new InvalidMatcherException(EXAMPLE + hexValue + "\" is not a hexadecimal value");
     }
     PactDslJsonRootValue value = new PactDslJsonRootValue();
@@ -628,7 +633,7 @@ public static PactDslJsonRootValue uuid() {
     PactDslJsonRootValue value = new PactDslJsonRootValue();
     value.getGenerators().addGenerator(Category.BODY, "", UuidGenerator.INSTANCE);
     value.setValue("e2490de5-5bd3-43d5-b7c4-526e33f71304");
-    value.setMatcher(value.regexp(UUID_REGEX));
+    value.setMatcher(value.regexp(DslPart.Companion.getUUID_REGEX().getPattern()));
     return value;
   }
 
@@ -645,13 +650,13 @@ public static PactDslJsonRootValue uuid(UUID uuid) {
    * @param uuid example UUID to use for generated bodies
    */
   public static PactDslJsonRootValue uuid(String uuid) {
-    if (!uuid.matches(UUID_REGEX)) {
+    if (!uuid.matches(DslPart.Companion.getUUID_REGEX().getPattern())) {
       throw new InvalidMatcherException(EXAMPLE + uuid + "\" is not an UUID");
     }
 
     PactDslJsonRootValue value = new PactDslJsonRootValue();
     value.setValue(uuid);
-    value.setMatcher(value.regexp(UUID_REGEX));
+    value.setMatcher(value.regexp(DslPart.Companion.getUUID_REGEX().getPattern()));
     return value;
   }
 

consumer/src/main/java/au/com/dius/pact/consumer/dsl/PactDslRootValue.java

@@ -59,6 +59,11 @@ public JsonValue getBody() {
     return value;
   }
 
+  @Override
+  public void setBody(JsonValue body) {
+    value = body;
+  }
+
   /**
    * @deprecated Use PactDslJsonArray for arrays
    */
@@ -567,7 +572,7 @@ public static PactDslRootValue hexValue() {
    * @param hexValue example value to use for generated bodies
    */
   public static PactDslRootValue hexValue(String hexValue) {
-    if (!hexValue.matches(HEXADECIMAL)) {
+    if (!hexValue.matches(DslPart.Companion.getHEXADECIMAL().getPattern())) {
       throw new InvalidMatcherException(EXAMPLE + hexValue + "\" is not a hexadecimal value");
     }
     PactDslRootValue value = new PactDslRootValue();
@@ -583,7 +588,7 @@ public static PactDslRootValue uuid() {
     PactDslRootValue value = new PactDslRootValue();
     value.getGenerators().addGenerator(Category.BODY, "", UuidGenerator.INSTANCE);
     value.setValue("e2490de5-5bd3-43d5-b7c4-526e33f71304");
-    value.setMatcher(value.regexp(UUID_REGEX));
+    value.setMatcher(value.regexp(DslPart.Companion.getUUID_REGEX().getPattern()));
     return value;
   }
 
@@ -600,13 +605,13 @@ public static PactDslRootValue uuid(UUID uuid) {
    * @param uuid example UUID to use for generated bodies
    */
   public static PactDslRootValue uuid(String uuid) {
-    if (!uuid.matches(UUID_REGEX)) {
+    if (!uuid.matches(DslPart.Companion.getUUID_REGEX().getPattern())) {
       throw new InvalidMatcherException(EXAMPLE + uuid + "\" is not an UUID");
     }
 
     PactDslRootValue value = new PactDslRootValue();
     value.setValue(uuid);
-    value.setMatcher(value.regexp(UUID_REGEX));
+    value.setMatcher(value.regexp(DslPart.Companion.getUUID_REGEX().getPattern()));
     return value;
   }
 

consumer/src/main/kotlin/au/com/dius/pact/consumer/dsl/DslPart.kt

@@ -42,7 +42,7 @@ abstract class DslPart {
 
   abstract fun putObjectPrivate(obj: DslPart)
   abstract fun putArrayPrivate(obj: DslPart)
-  abstract val body: JsonValue
+  abstract var body: JsonValue
 
   /**
    * Field which is an array
@@ -58,7 +58,7 @@ abstract class DslPart {
   /**
    * Close of the previous array element
    */
-  abstract fun closeArray(): DslPart
+  abstract fun closeArray(): DslPart?
 
   /**
    * Array field where each element must match the following object
@@ -431,9 +431,9 @@ abstract class DslPart {
   abstract fun matchUrl2(vararg pathFragments: Any): DslPart
 
   companion object {
-    const val HEXADECIMAL = "[0-9a-fA-F]+"
-    const val IP_ADDRESS = "(\\d{1,3}\\.)+\\d{1,3}"
-    const val UUID_REGEX = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
+    val HEXADECIMAL = Regex("[0-9a-fA-F]+")
+    val IP_ADDRESS = Regex("(\\d{1,3}\\.)+\\d{1,3}")
+    val UUID_REGEX = Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}")
     const val DATE_2000 = 949323600000L
 
     /**

consumer/src/main/kotlin/au/com/dius/pact/consumer/dsl/FormPostBuilder.kt

@@ -1,6 +1,7 @@
 package au.com.dius.pact.consumer.dsl
 
 import au.com.dius.pact.consumer.InvalidMatcherException
+import au.com.dius.pact.consumer.dsl.DslPart.Companion.HEXADECIMAL
 import au.com.dius.pact.core.model.ContentType
 import au.com.dius.pact.core.model.generators.DateGenerator
 import au.com.dius.pact.core.model.generators.DateTimeGenerator
@@ -286,7 +287,7 @@ class FormPostBuilder(
    * @param hexValue example value to use for generated bodies
    */
   fun hexValue(name: String, hexValue: String): FormPostBuilder {
-    if (!hexValue.matches(HEXADECIMAL_REGEX)) {
+    if (!hexValue.matches(HEXADECIMAL)) {
       throw InvalidMatcherException("Example \"$hexValue\" is not a hexadecimal value")
     }
     body[name] = listOf(hexValue)
@@ -318,11 +319,11 @@ class FormPostBuilder(
    * @param uuid example UUID to use for generated bodies
    */
   fun uuid(name: String, uuid: String): FormPostBuilder {
-    if (!uuid.matches(UUID_REGEX)) {
+    if (!uuid.matches(DslPart.UUID_REGEX)) {
       throw InvalidMatcherException("Example \"$uuid\" is not an UUID")
     }
     body[name] = listOf(uuid)
-    matchers.addRule(ROOT + name, PM.stringMatcher(DslPart.UUID_REGEX))
+    matchers.addRule(ROOT + name, PM.stringMatcher(DslPart.UUID_REGEX.pattern))
     return this
   }
 
@@ -434,8 +435,6 @@ class FormPostBuilder(
 
   companion object {
     val BODY = au.com.dius.pact.core.model.generators.Category.BODY
-    val HEXADECIMAL_REGEX = Regex(DslPart.HEXADECIMAL)
-    val UUID_REGEX = Regex(DslPart.UUID_REGEX)
     val APPLICATION_FORM_URLENCODED = org.apache.http.entity.ContentType.APPLICATION_FORM_URLENCODED.toString()
     const val ROOT = "$."
   }

consumer/src/main/kotlin/au/com/dius/pact/consumer/dsl/MetadataBuilder.kt

@@ -328,7 +328,7 @@ open class MetadataBuilder(
    * @param hexValue example value to use for generated bodies
    */
   fun hexValue(name: String, hexValue: String): MetadataBuilder {
-    if (!hexValue.matches(Regex(DslPart.HEXADECIMAL))) {
+    if (!hexValue.matches(DslPart.HEXADECIMAL)) {
       throw InvalidMatcherException("Example \"$hexValue\" is not a valid hexadecimal value")
     }
     values[name] = hexValue
@@ -360,11 +360,11 @@ open class MetadataBuilder(
    * @param uuid example UUID to use for generated bodies
    */
   fun uuid(name: String, uuid: String): MetadataBuilder {
-    if (!uuid.matches(Regex(DslPart.UUID_REGEX))) {
+    if (!uuid.matches(DslPart.UUID_REGEX)) {
       throw InvalidMatcherException("Example \"$uuid\" is not a valid UUID")
     }
     values[name] = uuid
-    matchers.addRule(name, RegexMatcher(DslPart.UUID_REGEX))
+    matchers.addRule(name, RegexMatcher(DslPart.UUID_REGEX.pattern))
     return this
   }