Merge "Improve Rest Service API"

1 files changed, 9 insertions, 1 deletions

diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt
index 7ac79e2f1..7b5f181da 100644
--- a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
+ * Modifications Copyright © 2018-2019 IBM.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ import kotlinx.coroutines.withContext
 import org.apache.commons.io.IOUtils
 import org.onap.ccsdk.cds.controllerblueprints.core.*
 import java.io.File
+import java.io.InputStream
 import java.nio.charset.Charset
 
 /**
@@ -42,10 +43,17 @@ class JacksonUtils {
         inline fun <reified T : Any> readValue(content: String): T =
                 objectMapper.readValue(content, T::class.java)
 
+        inline fun <reified T : Any> readValue(stream: InputStream): T =
+                objectMapper.readValue(stream, T::class.java)
+
         fun <T> readValue(content: String, valueType: Class<T>): T? {
             return objectMapper.readValue(content, valueType)
         }
 
+        fun <T> readValue(stream: InputStream, valueType: Class<T>): T? {
+            return objectMapper.readValue(stream, valueType)
+        }
+
         fun <T> readValue(node: JsonNode, valueType: Class<T>): T? {
             return objectMapper.treeToValue(node, valueType)
         }