Kotlin implementation

ExpediaGroup · Jun 11, 2019 · 04189e5 · 04189e5
1 parent 0dfd928
commit 04189e5
Show file tree

Hide file tree

Showing 8 changed files with 185 additions and 199 deletions.
diff --git a/components/proxy/pom.xml b/components/proxy/pom.xml
@@ -92,6 +92,11 @@
       <artifactId>jackson-dataformat-yaml</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-kotlin</artifactId>
+    </dependency>
+
     <dependency>
       <artifactId>logback-classic</artifactId>
       <groupId>ch.qos.logback</groupId>

diff --git a/...proxy/src/main/java/com/hotels/styx/infrastructure/configuration/yaml/JsonNodeConfig.java b/...proxy/src/main/java/com/hotels/styx/infrastructure/configuration/yaml/JsonNodeConfig.java
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.fasterxml.jackson.module.kotlin.KotlinModule;
 import com.hotels.styx.api.configuration.ConversionException;
 import com.hotels.styx.api.configuration.Configuration;
 
@@ -38,7 +39,9 @@
  * jackson API and Styx API.
  */
 public class JsonNodeConfig implements Configuration {
-    static final ObjectMapper YAML_MAPPER = addStyxMixins(new ObjectMapper(new YAMLFactory()))
+    static final ObjectMapper YAML_MAPPER = addStyxMixins(
+            new ObjectMapper(new YAMLFactory())
+                    .registerModule(new KotlinModule()))
             .configure(FAIL_ON_UNKNOWN_PROPERTIES, false)
             .configure(AUTO_CLOSE_SOURCE, true);
 
@@ -58,7 +61,7 @@ public JsonNodeConfig(JsonNode rootNode) {
      * Construct an instance from a JSON node.
      *
      * @param rootNode a JSON node
-     * @param mapper mapper to convert JSON into objects
+     * @param mapper   mapper to convert JSON into objects
      */
     protected JsonNodeConfig(JsonNode rootNode, ObjectMapper mapper) {
         this.rootNode = requireNonNull(rootNode);

diff --git a/components/proxy/src/main/java/com/hotels/styx/routing/config/RoutingObjectFactory.java b/components/proxy/src/main/java/com/hotels/styx/routing/config/RoutingObjectFactory.java
@@ -82,7 +82,7 @@ public class RoutingObjectFactory {
                 .put(PROXY_TO_BACKEND, ProxyToBackend.SCHEMA)
                 .put(PATH_PREFIX_ROUTER, PathPrefixRouter.SCHEMA)
                 .put(HOST_PROXY, HostProxy.SCHEMA)
-                .put(LOAD_BALANCING_GROUP, LoadBalancingGroup.SCHEMA)
+                .put(LOAD_BALANCING_GROUP,  LoadBalancingGroup.Companion.getSCHEMA())
                 .build();
     }
 

diff --git a/components/proxy/src/main/java/com/hotels/styx/routing/handlers/LoadBalancingGroup.java b/components/proxy/src/main/java/com/hotels/styx/routing/handlers/LoadBalancingGroup.java