From 834851e6c460ef8a28f356a64fe7b85d8bbf9a55 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 21 Mar 2019 12:36:35 -0400 Subject: [PATCH] Add copy constructors for models-pap Also added a method to PfUtils to simplify cloning lists. Change-Id: Iae667be02cced57b0b9578e0a96c5cda38111b97 Issue-ID: POLICY-1542 Signed-off-by: Jim Hahn --- .../java/org/onap/policy/models/base/PfUtils.java | 23 ++++++- .../org/onap/policy/models/base/PfUtilsTest.java | 20 +++++- models-pap/pom.xml | 11 ++++ .../onap/policy/models/pap/concepts/PdpGroup.java | 30 +++++++-- .../models/pap/concepts/PdpInstanceDetails.java | 24 ++++++- .../policy/models/pap/concepts/PdpSubGroup.java | 34 ++++++++-- .../onap/policy/models/pap/concepts/Policy.java | 24 ++++++- .../policy/models/pap/concepts/TestPdpGroup.java | 66 +++++++++++++++++++ .../pap/concepts/TestPdpInstanceDetails.java | 51 +++++++++++++++ .../models/pap/concepts/TestPdpSubGroup.java | 75 ++++++++++++++++++++++ .../policy/models/pap/concepts/TestPolicy.java | 49 ++++++++++++++ 11 files changed, 393 insertions(+), 14 deletions(-) create mode 100644 models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpGroup.java create mode 100644 models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpInstanceDetails.java create mode 100644 models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpSubGroup.java create mode 100644 models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPolicy.java 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 a18315ceb..8e77d3fcf 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,7 @@ -/*- +/* * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019 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. @@ -20,6 +21,10 @@ package org.onap.policy.models.base; +import java.util.List; +import java.util.function.Function; +import java.util.stream.Collectors; + /** * Utility class for Policy Framework concept utilities. * @@ -56,4 +61,20 @@ public final class PfUtils { return 0; } + + /** + * 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 + */ + public static List mapList(List source, Function mapFunc) { + if (source == null) { + return null; + } + + return source.stream().map(mapFunc).collect(Collectors.toList()); + } } 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 2b495a1e7..bdbab5c36 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,7 @@ -/*- +/* * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019 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. @@ -22,7 +23,10 @@ package org.onap.policy.models.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import java.util.Arrays; +import java.util.List; import org.junit.Test; /** @@ -33,11 +37,23 @@ import org.junit.Test; public class PfUtilsTest { @Test - public void testPfUtils() { + public void testCompareObjects() { assertEquals(0, PfUtils.compareObjects(null, null)); assertEquals(-1, PfUtils.compareObjects("hello", null)); assertEquals(1, PfUtils.compareObjects(null, "hello")); assertFalse(PfUtils.compareObjects("hello", "goodbye") == 0); assertEquals(0, PfUtils.compareObjects("hello", "hello")); } + + @Test + public void testMapList() { + assertNull(PfUtils.mapList(null, item -> { + throw new RuntimeException("should not be invoked"); + })); + + List origList = Arrays.asList("abc", "def"); + List newList = PfUtils.mapList(origList, text -> text + "X"); + + assertEquals(Arrays.asList("abcX", "defX"), newList); + } } diff --git a/models-pap/pom.xml b/models-pap/pom.xml index 1cc5603cb..a437d545b 100644 --- a/models-pap/pom.xml +++ b/models-pap/pom.xml @@ -1,6 +1,7 @@