summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-common-lib/src/main
diff options
context:
space:
mode:
authorTomasz Golabek <tomasz.golabek@nokia.com>2019-06-11 13:41:48 +0200
committerOren Kleks <orenkle@amdocs.com>2019-06-16 08:40:58 +0000
commitb836d3492984e8c751f00b200d24eb07da792c75 (patch)
tree5633e0863101d032dd5398530abdcf85c29dcc88 /openecomp-be/lib/openecomp-common-lib/src/main
parentd6bd31bf81c1eb8e4f3a6b349d021f5533f03b03 (diff)
BeanUtils upgrade to 1.9.x
Transitive dependency to beanutils 1.8.3 removed. Refactor of existing usage of beanutils proposed. Change-Id: I6614a5794979225376338c778b25f71911ae9c50 Issue-ID: SDC-2269 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-common-lib/src/main')
-rw-r--r--openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java37
1 files changed, 5 insertions, 32 deletions
diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java
index 7d37a55388..fcb668f393 100644
--- a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java
+++ b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java
@@ -12,14 +12,15 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+ * ============LICENSE_END=========================================================
+ * Modifications copyright (c) 2019 Nokia
+ * ================================================================================
*/
package org.openecomp.sdc.common.utils;
-import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Multimap;
-import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -176,27 +177,7 @@ public class CommonUtil {
public static <T> Optional<T> createObjectUsingSetters(Object objectCandidate,
Class<T> classToCreate)
throws Exception {
- if (Objects.isNull(objectCandidate)) {
- return Optional.empty();
- }
-
- Map<String, Object> objectAsMap = getObjectAsMap(objectCandidate);
- T result = classToCreate.newInstance();
-
- Field[] declaredFields = classToCreate.getDeclaredFields();
- for( Field field : declaredFields){
- if(isComplexClass(field)){
- Optional<?> objectUsingSetters =
- createObjectUsingSetters(objectAsMap.get(field.getName()), field.getType());
- if( objectUsingSetters.isPresent()){
- objectAsMap.remove(field.getName());
- objectAsMap.put(field.getName(), objectUsingSetters.get());
- }
- }
- }
- BeanUtils.populate(result, objectAsMap);
-
- return Optional.of(result);
+ return org.onap.sdc.tosca.services.CommonUtil.createObjectUsingSetters(objectCandidate, classToCreate);
}
private static boolean isComplexClass(Field field) {
@@ -211,15 +192,7 @@ public class CommonUtil {
}
public static Map<String, Object> getObjectAsMap(Object obj) {
- Map<String, Object> objectAsMap = obj instanceof Map ? (Map<String, Object>) obj
- : new ObjectMapper().convertValue(obj, Map.class);
-
- if (objectAsMap.containsKey(DEFAULT)) {
- Object defaultValue = objectAsMap.get(DEFAULT);
- objectAsMap.remove(DEFAULT);
- objectAsMap.put(_DEFAULT, defaultValue);
- }
- return objectAsMap;
+ return org.onap.sdc.tosca.services.CommonUtil.getObjectAsMap(obj);
}
public static <K, V> boolean isMultimapEmpty(Multimap<K, V> obj) {