diff options
author | Jim Hahn <jrh3@att.com> | 2021-04-13 15:31:48 +0000 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2021-04-13 15:31:48 +0000 |
commit | 1155833a3d4e271f495e0ca40ea591919aa11b78 (patch) | |
tree | ad31fe3f008904e20e72536bfb7432040ede19cc /utils/src/main/java | |
parent | 04623fef95f2b164d79ad48de2ef3708d02eda80 (diff) |
Revert "Modify StandardCoder to handle empty source"
This reverts commit 04623fef95f2b164d79ad48de2ef3708d02eda80.
Reason for revert: prefer consistency with gson
Issue-ID: POLICY-3172
Change-Id: Ic2501abcc68ec1186142a7e520e7985c43fd3315
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'utils/src/main/java')
-rw-r--r-- | utils/src/main/java/org/onap/policy/common/utils/coder/StandardCoder.java | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/utils/src/main/java/org/onap/policy/common/utils/coder/StandardCoder.java b/utils/src/main/java/org/onap/policy/common/utils/coder/StandardCoder.java index 3b4f3c23..7f5e3b85 100644 --- a/utils/src/main/java/org/onap/policy/common/utils/coder/StandardCoder.java +++ b/utils/src/main/java/org/onap/policy/common/utils/coder/StandardCoder.java @@ -1,8 +1,8 @@ -/*- +/* * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +40,6 @@ import java.io.Writer; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; -import org.apache.commons.lang3.StringUtils; import org.onap.policy.common.gson.DoubleConverter; import org.onap.policy.common.gson.GsonMessageBodyHandler; @@ -342,17 +341,8 @@ public class StandardCoder implements Coder { * @param json json string to be decoded * @param clazz class of object to be decoded * @return the object represented by the given json string - * @throws CoderException if the source is empty */ - protected <T> T fromJson(String json, Class<T> clazz) throws CoderException { - if (json == null) { - return null; - } - - if (StringUtils.isBlank(json)) { - throw new CoderException("source string is empty"); - } - + protected <T> T fromJson(String json, Class<T> clazz) { return convertFromDouble(clazz, gson.fromJson(json, clazz)); } @@ -362,16 +352,9 @@ public class StandardCoder implements Coder { * @param source source from which to read the json string to be decoded * @param clazz class of object to be decoded * @return the object represented by the given json string - * @throws CoderException if the source is empty */ - protected <T> T fromJson(Reader source, Class<T> clazz) throws CoderException { - T object = gson.fromJson(source, clazz); - - if (object == null) { - throw new CoderException("source is empty"); - } - - return convertFromDouble(clazz, object); + protected <T> T fromJson(Reader source, Class<T> clazz) { + return convertFromDouble(clazz, gson.fromJson(source, clazz)); } /** |