diff options
Diffstat (limited to 'testsuites/integration/integration-common/src/main')
13 files changed, 60 insertions, 185 deletions
diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextBooleanItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextBooleanItem.java index bcb850350..450fffa43 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextBooleanItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextBooleanItem.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2021 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,30 +23,18 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * The Class TestContextBooleanItem. */ @Data +@NoArgsConstructor +@AllArgsConstructor public class TestContextBooleanItem implements Serializable { private static final long serialVersionUID = 7241008665286367796L; private boolean flag = false; - - /** - * The Constructor. - */ - public TestContextBooleanItem() { - // Default constructor - } - - /** - * The Constructor. - * - * @param flag the flag - */ - public TestContextBooleanItem(final Boolean flag) { - this.flag = flag; - } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextByteItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextByteItem.java index e8e4c6219..3865de181 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextByteItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextByteItem.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2021 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,33 +23,21 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * The Class TestContextByteItem. */ @Data +@NoArgsConstructor +@AllArgsConstructor public class TestContextByteItem implements Serializable { private static final long serialVersionUID = 1361938145823720386L; private byte byteValue = 0; - /** - * The Constructor. - */ - public TestContextByteItem() { - // Default constructor - } - - /** - * The Constructor. - * - * @param byteValue the byte value - */ - public TestContextByteItem(final Byte byteValue) { - this.byteValue = byteValue; - } - public Byte getIncrementedByteValue() { return (byte) (byteValue + 1); } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateLocaleItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateLocaleItem.java index 87c5b23ea..a550809fa 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateLocaleItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateLocaleItem.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2021 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. @@ -25,11 +26,13 @@ import java.io.Serializable; import java.util.Locale; import java.util.TimeZone; import lombok.Data; +import lombok.NoArgsConstructor; /** * The Class TestContextDateLocaleItem. */ @Data +@NoArgsConstructor public class TestContextDateLocaleItem implements Serializable { private static final long serialVersionUID = -6579903685538233754L; @@ -41,12 +44,6 @@ public class TestContextDateLocaleItem implements Serializable { /** * The Constructor. - */ - public TestContextDateLocaleItem() { - } - - /** - * The Constructor. * * @param dateValue the date value * @param tzValue the tz value diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateTzItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateTzItem.java index e53f23179..91db2cec8 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateTzItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateTzItem.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2021 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. @@ -23,12 +24,14 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; import java.util.TimeZone; +import lombok.AllArgsConstructor; import lombok.Data; /** * The Class TestContextDateTzItem. */ @Data +@AllArgsConstructor public class TestContextDateTzItem implements Serializable { private static final long serialVersionUID = 5604426823170331706L; @@ -46,19 +49,6 @@ public class TestContextDateTzItem implements Serializable { /** * The Constructor. * - * @param dateValue the date value - * @param tzValue the tz value - * @param dst the dst - */ - public TestContextDateTzItem(final TestContextDateItem dateValue, final String tzValue, final boolean dst) { - this.dateValue = dateValue; - this.tzValue = TimeZone.getTimeZone(tzValue).getDisplayName(); - this.dst = dst; - } - - /** - * The Constructor. - * * @param original the original */ public TestContextDateTzItem(final TestContextDateTzItem original) { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDoubleItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDoubleItem.java index 0a93af562..b385894cb 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDoubleItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDoubleItem.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2021 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,33 +23,21 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * The Class TestContextDoubleItem. */ @Data +@NoArgsConstructor +@AllArgsConstructor public class TestContextDoubleItem implements Serializable { private static final long serialVersionUID = -2958758261076734821L; private double doubleValue = 0; - /** - * The Constructor. - */ - public TestContextDoubleItem() { - // Default constructor - } - - /** - * The Constructor. - * - * @param doubleValue the double value - */ - public TestContextDoubleItem(final Double doubleValue) { - this.doubleValue = doubleValue; - } - public Double getIncrementedDoubleValue() { return doubleValue + 1; } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextFloatItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextFloatItem.java index 097f412a7..48c960a2a 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextFloatItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextFloatItem.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2021 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,33 +23,21 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * The Class TestContextFloatItem. */ @Data +@NoArgsConstructor +@AllArgsConstructor public class TestContextFloatItem implements Serializable { private static final long serialVersionUID = -3359180576903272400L; private float floatValue = 0; - /** - * The Constructor. - */ - public TestContextFloatItem() { - // Default constructor - } - - /** - * The Constructor. - * - * @param floatValue the float value - */ - public TestContextFloatItem(final Float floatValue) { - this.floatValue = floatValue; - } - public Float getIncrementedFloatValue() { return floatValue + 1; } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextIntItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextIntItem.java index 1907fcde5..1db8e4a44 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextIntItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextIntItem.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2021 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,12 +23,16 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * The Class TestContextIntItem. */ @Data +@NoArgsConstructor +@AllArgsConstructor public class TestContextIntItem implements Serializable { private static final long serialVersionUID = -8978435658277900984L; @@ -35,22 +40,6 @@ public class TestContextIntItem implements Serializable { /** * The Constructor. - */ - public TestContextIntItem() { - // Default constructor - } - - /** - * The Constructor. - * - * @param intValue the int value - */ - public TestContextIntItem(final Integer intValue) { - this.intValue = intValue; - } - - /** - * The Constructor. * * @param original the original */ diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongItem.java index db1f63def..5fdcd98ff 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongItem.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2021 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,33 +23,21 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * The Class TestContextLongItem. */ @Data +@NoArgsConstructor +@AllArgsConstructor public class TestContextLongItem implements Serializable { private static final long serialVersionUID = 3599267534512489386L; private long longValue = 0; - /** - * The Constructor. - */ - public TestContextLongItem() { - // Default constructor - } - - /** - * The Constructor. - * - * @param longValue the long value - */ - public TestContextLongItem(final Long longValue) { - this.longValue = longValue; - } - public Long getIncrementedLongValue() { return longValue + 1; } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongObjectItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongObjectItem.java index d9bb7edbd..4956501ce 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongObjectItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongObjectItem.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2021 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,33 +23,21 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * The Class TestContextLongObjectItem. */ @Data +@NoArgsConstructor +@AllArgsConstructor public class TestContextLongObjectItem implements Serializable { private static final long serialVersionUID = -1029406737866392421L; private Long longValue = 0L; - /** - * The Constructor. - */ - public TestContextLongObjectItem() { - // Default constructor - } - - /** - * The Constructor. - * - * @param longValue the long value - */ - public TestContextLongObjectItem(final Long longValue) { - this.longValue = longValue; - } - public Long getIncrementedLongValue() { return longValue + 1; } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextStringItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextStringItem.java index bb8707ca7..02eb948b1 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextStringItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextStringItem.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2021 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,30 +23,18 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * The Class TestContextStringItem. */ @Data +@NoArgsConstructor +@AllArgsConstructor public class TestContextStringItem implements Serializable { private static final long serialVersionUID = -1074772190611125121L; private String stringValue = ""; - - /** - * The Constructor. - */ - public TestContextStringItem() { - // Default constructor - } - - /** - * The Constructor. - * - * @param stringValue the string value - */ - public TestContextStringItem(final String stringValue) { - this.stringValue = stringValue; - } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeMapItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeMapItem.java index 602254ae3..4652fa710 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeMapItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeMapItem.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2021 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. @@ -24,30 +25,18 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; import java.util.Map; import java.util.TreeMap; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * The Class TestContextTreeMapItem. */ @Data +@NoArgsConstructor +@AllArgsConstructor public class TestContextTreeMapItem implements Serializable { private static final long serialVersionUID = -7497746259264651884L; private Map<String, String> mapValue = new TreeMap<>(); - - /** - * The Constructor. - */ - public TestContextTreeMapItem() { - // Default constructor - } - - /** - * The Constructor. - * - * @param mapValue the map value - */ - public TestContextTreeMapItem(final Map<String, String> mapValue) { - this.mapValue = mapValue; - } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeSetItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeSetItem.java index a0c2539a6..f1d045fc0 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeSetItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeSetItem.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2021 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. @@ -25,12 +26,16 @@ import java.io.Serializable; import java.util.Arrays; import java.util.SortedSet; import java.util.TreeSet; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * The Class TestContextTreeSetItem. */ @Data +@NoArgsConstructor +@AllArgsConstructor public class TestContextTreeSetItem implements Serializable { private static final long serialVersionUID = 1254589722957250388L; @@ -38,26 +43,10 @@ public class TestContextTreeSetItem implements Serializable { /** * The Constructor. - */ - public TestContextTreeSetItem() { - // Default constructor - } - - /** - * The Constructor. * * @param setArray the set array */ public TestContextTreeSetItem(final String[] setArray) { this.setValue = new TreeSet<>(Arrays.asList(setArray)); } - - /** - * The Constructor. - * - * @param setValue the set value - */ - public TestContextTreeSetItem(final SortedSet<String> setValue) { - this.setValue = setValue; - } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/SampleDomainModelSaver.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/SampleDomainModelSaver.java index d7aba2d3c..362ccf923 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/SampleDomainModelSaver.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/SampleDomainModelSaver.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2021 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. @@ -21,6 +22,8 @@ package org.onap.policy.apex.testsuites.integration.common.model; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; import org.onap.policy.apex.model.basicmodel.handling.ApexModelSaver; import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; @@ -32,17 +35,12 @@ import org.slf4j.ext.XLoggerFactory; * * @author Liam Fallon (liam.fallon@ericsson.com) */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class SampleDomainModelSaver { // Logger for this class private static final XLogger LOGGER = XLoggerFactory.getXLogger(SampleDomainModelSaver.class); /** - * Private default constructor to prevent subclassing. - */ - private SampleDomainModelSaver() { - } - - /** * Write the sample Models to args[0]. * * @param args Not used |