Merge branch 'master' into feature/zalandogh-78-line-numbers

nandhiniG · Nov 14, 2018 · 62e7a86 · 62e7a86
2 parents c736438 + ad7ffc4
commit 62e7a86
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 23 deletions.
diff --git a/server/build.gradle b/server/build.gradle
@@ -92,7 +92,7 @@ dependencies {
     compile("org.zalando:problem-spring-web:0.23.0")
     compile("org.zalando:twintip-spring-web:1.1.0")
     compile("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
-    compile("io.github.config4k:config4k:0.4.0")
+    compile("io.github.config4k:config4k:0.4.1")
 
     compile("de.mpg.mpi-inf:javatools:1.1")
 

diff --git a/server/src/main/java/de/zalando/zally/configuration/RegexCustomType.kt b/server/src/main/java/de/zalando/zally/configuration/RegexCustomType.kt
diff --git a/server/src/main/java/de/zalando/zally/configuration/RulesConfigConfiguration.kt b/server/src/main/java/de/zalando/zally/configuration/RulesConfigConfiguration.kt
@@ -2,7 +2,6 @@ package de.zalando.zally.configuration
 
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
-import io.github.config4k.registerCustomType
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -15,7 +14,6 @@ open class RulesConfigConfiguration {
 
     @Bean
     open fun createRulesConfig(): Config {
-        registerCustomType(RegexCustomType)
         return ConfigFactory.load(rulesConfigPath!!)
     }
 }
diff --git a/server/src/test/java/de/zalando/zally/TestUtil.kt b/server/src/test/java/de/zalando/zally/TestUtil.kt
@@ -3,12 +3,10 @@ package de.zalando.zally
 import com.fasterxml.jackson.databind.JsonNode
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
-import de.zalando.zally.configuration.RegexCustomType
 import de.zalando.zally.rule.ContentParseResult
 import de.zalando.zally.rule.DefaultContext
 import de.zalando.zally.rule.ObjectTreeReader
 import de.zalando.zally.rule.api.Context
-import io.github.config4k.registerCustomType
 import io.swagger.models.Path
 import io.swagger.models.Swagger
 import io.swagger.models.parameters.HeaderParameter
@@ -22,7 +20,6 @@ import io.swagger.v3.oas.models.responses.ApiResponses
 import java.io.StringReader
 
 val testConfig: Config by lazy {
-    registerCustomType(RegexCustomType)
     ConfigFactory.load("rules-config.conf")
 }