From ab145590ffdf99b9f4e132e5f20241099d6c5cbe Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 9 Dec 2020 11:30:40 +0000 Subject: [PATCH] Add functional method for mapping maps to PfUtils Add a functional interface to PfUtils for mapping maps so that more complex conversions can be handled. List mapping functional methods added as well. Issue-ID: POLICY-2900 Change-Id: I4189e09d6d8621638960b5d9f0d19792a7faceb8 Signed-off-by: liamfallon --- .../java/org/onap/policy/models/base/PfUtils.java | 42 ++++++++++------------ .../org/onap/policy/models/base/PfUtilsTest.java | 22 ++++++------ 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfUtils.java b/models-base/src/main/java/org/onap/policy/models/base/PfUtils.java index fa7d21f9d..d5b70d78a 100644 --- a/models-base/src/main/java/org/onap/policy/models/base/PfUtils.java +++ b/models-base/src/main/java/org/onap/policy/models/base/PfUtils.java @@ -1,6 +1,6 @@ -/* +/*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019-2020 Nordix Foundation. * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,7 +26,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.function.UnaryOperator; +import java.util.function.Function; import java.util.stream.Collectors; import javax.ws.rs.core.Response; @@ -68,15 +68,14 @@ public final class PfUtils { } /** - * Convenience method to apply a mapping function to all of the elements of a list, - * generating a new list. + * Convenience method to apply a mapping function to all of the elements of a list, generating a new list. * * @param source list whose elements are to be mapped, or {@code null} * @param mapFunc mapping function * @param defaultValue value to be returned if source is {@code null} * @return a new list, containing mappings of all of the items in the original list */ - public static List mapList(List source, UnaryOperator mapFunc, List defaultValue) { + public static List mapList(List source, Function mapFunc, List defaultValue) { if (source == null) { return defaultValue; } @@ -85,34 +84,32 @@ public final class PfUtils { } /** - * Convenience method to apply a mapping function to all of the elements of a list, - * generating a new list. + * Convenience method to apply a mapping function to all of the elements of a list, generating a new list. * * @param source list whose elements are to be mapped, or {@code null} * @param mapFunc mapping function - * @return a new list, containing mappings of all of the items in the original list, - * or {@code null} if the source is {@code null} + * @return a new list, containing mappings of all of the items in the original list, or {@code null} if the source + * is {@code null} */ - public static List mapList(List source, UnaryOperator mapFunc) { + public static List mapList(List source, Function mapFunc) { return mapList(source, mapFunc, null); } /** - * Convenience method to apply a mapping function to all of the values of a map, - * generating a new map. + * Convenience method to apply a mapping function to all of the values of a map, generating a new map. * * @param source map whose values are to be mapped, or {@code null} * @param mapFunc mapping function * @param defaultValue value to be returned if source is {@code null} * @return a new map, containing mappings of all of the items in the original map */ - public static Map mapMap(Map source, UnaryOperator mapFunc, - Map defaultValue) { + public static Map mapMap(Map source, Function mapFunc, + Map defaultValue) { if (source == null) { return defaultValue; } - Map map = new LinkedHashMap<>(); + Map map = new LinkedHashMap<>(); for (Entry ent : source.entrySet()) { map.put(ent.getKey(), mapFunc.apply(ent.getValue())); } @@ -121,15 +118,14 @@ public final class PfUtils { } /** - * Convenience method to apply a mapping function to all of the values of a map, - * generating a new map. + * Convenience method to apply a mapping function to all of the values of a map, generating a new map. * * @param source map whose values are to be mapped, or {@code null} * @param mapFunc mapping function - * @return a new map, containing mappings of all of the items in the original map, - * or {@code null} if the source is {@code null} + * @return a new map, containing mappings of all of the items in the original map, or {@code null} if the source is + * {@code null} */ - public static Map mapMap(Map source, UnaryOperator mapFunc) { + public static Map mapMap(Map source, Function mapFunc) { return mapMap(source, mapFunc, null); } @@ -152,9 +148,9 @@ public final class PfUtils { return clazz.getConstructor(clazz).newInstance(source); } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException - | RuntimeException e) { + | RuntimeException e) { throw new PfModelRuntimeException(Response.Status.INTERNAL_SERVER_ERROR, - "error copying concept key class: " + source.getClass().getName(), e); + "error copying concept key class: " + source.getClass().getName(), e); } } } diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfUtilsTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfUtilsTest.java index 19f8ee988..d96d2243f 100644 --- a/models-base/src/test/java/org/onap/policy/models/base/PfUtilsTest.java +++ b/models-base/src/test/java/org/onap/policy/models/base/PfUtilsTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019-2020 Nordix Foundation. * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -59,14 +59,14 @@ public class PfUtilsTest { }); assertNull(resultList); - List origList = Arrays.asList("abc", "def"); - List newList = PfUtils.mapList(origList, text -> text + "X"); + List origList = Arrays.asList("123", "456"); + List newList = PfUtils.mapList(origList, item -> Integer.valueOf(item) + 5); - assertEquals(Arrays.asList("abcX", "defX"), newList); + assertEquals(Arrays.asList(128, 461), newList); // verify that we can modify the list without throwing an exception - newList.remove("abcX"); - newList.add("something else"); + newList.remove(1); + newList.add(789); } @Test @@ -77,15 +77,15 @@ public class PfUtilsTest { assertNull(resultMap); Map origMap = new TreeMap<>(); - origMap.put("key2A", "xyz2"); - origMap.put("key2B", "pdq2"); - Map newMap = PfUtils.mapMap(origMap, text -> text + "X"); + origMap.put("key2A", "123"); + origMap.put("key2B", "456"); + Map newMap = PfUtils.mapMap(origMap, item -> Integer.valueOf(item) + 10); - assertEquals("{key2A=xyz2X, key2B=pdq2X}", newMap.toString()); + assertEquals("{key2A=133, key2B=466}", newMap.toString()); // verify that we can modify the map without throwing an exception newMap.remove("abcX"); - newMap.put("something", "else"); + newMap.put("something", 789); } @Test -- 2.16.6