aboutsummaryrefslogtreecommitdiffstats
path: root/testsuites/integration/integration-context-test/src/test
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-08-02 16:36:26 -0400
committerJim Hahn <jrh3@att.com>2021-08-06 14:56:04 -0400
commit9344ec1396b7151262e9b4ac48c72020e2b03e7e (patch)
tree532be4e8f8f5d3ec009dc20f198c1ae1db5399d0 /testsuites/integration/integration-context-test/src/test
parentd7d3b5bd8f1c69fdaddffb3c200468feee424564 (diff)
Use lombok in apex-pdp #5
Updated examples thru integration-executor-test. Issue-ID: POLICY-3391 Change-Id: Idc707146a646d05720675a787761c199484048e9 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'testsuites/integration/integration-context-test/src/test')
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ArtifactKeyTestEntity.java101
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ReferenceKeyTestEntity.java101
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/TestContextAlbumFactory.java11
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProviderImpl.java70
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java13
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/NetworkUtils.java13
6 files changed, 44 insertions, 265 deletions
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ArtifactKeyTestEntity.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ArtifactKeyTestEntity.java
index 19c3d33c5..3b8394dbb 100644
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ArtifactKeyTestEntity.java
+++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ArtifactKeyTestEntity.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.
@@ -27,6 +28,11 @@ import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlElement;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
@@ -37,6 +43,11 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
*/
@Entity
@Table(name = "ArtifactKeyTestEntity")
+@Getter
+@Setter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
public class ArtifactKeyTestEntity extends AxConcept {
private static final long serialVersionUID = -2962570563281067896L;
@@ -65,25 +76,6 @@ public class ArtifactKeyTestEntity extends AxConcept {
}
/**
- * Instantiates a new artifact key test entity.
- *
- * @param key the key
- * @param doubleValue the double value
- */
- public ArtifactKeyTestEntity(final AxArtifactKey key, final Double doubleValue) {
- this.key = key;
- this.doubleValue = doubleValue;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public AxArtifactKey getKey() {
- return key;
- }
-
- /**
* {@inheritDoc}.
*/
@Override
@@ -92,15 +84,6 @@ public class ArtifactKeyTestEntity extends AxConcept {
}
/**
- * Sets the key.
- *
- * @param key the new key
- */
- public void setKey(final AxArtifactKey key) {
- this.key = key;
- }
-
- /**
* Check set key.
*
* @return true, if successful
@@ -110,24 +93,6 @@ public class ArtifactKeyTestEntity extends AxConcept {
}
/**
- * Gets the double value.
- *
- * @return the double value
- */
- public double getDoubleValue() {
- return doubleValue;
- }
-
- /**
- * Sets the double value.
- *
- * @param doubleValue the new double value
- */
- public void setDoubleValue(final double doubleValue) {
- this.doubleValue = doubleValue;
- }
-
- /**
* {@inheritDoc}.
*/
@Override
@@ -147,14 +112,6 @@ public class ArtifactKeyTestEntity extends AxConcept {
* {@inheritDoc}.
*/
@Override
- public String toString() {
- return "ArtifactKeyTestEntity [key=" + key + ", doubleValue=" + doubleValue + "]";
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
public AxConcept copyTo(final AxConcept target) {
final Object copyObject = ((target == null) ? new ArtifactKeyTestEntity() : target);
if (copyObject instanceof ArtifactKeyTestEntity) {
@@ -175,42 +132,6 @@ public class ArtifactKeyTestEntity extends AxConcept {
* {@inheritDoc}.
*/
@Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((key == null) ? 0 : key.hashCode());
- return result;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public boolean equals(final Object obj) {
- if (obj == null) {
- return false;
- }
- if (this == obj) {
- return true;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final ArtifactKeyTestEntity other = (ArtifactKeyTestEntity) obj;
- if (key == null) {
- if (other.key != null) {
- return false;
- }
- } else if (!key.equals(other.key)) {
- return false;
- }
- return (Double.compare(doubleValue, other.doubleValue) == 0);
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
public int compareTo(final AxConcept otherObj) {
if (otherObj == null) {
return -1;
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ReferenceKeyTestEntity.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ReferenceKeyTestEntity.java
index b3256484b..da478f0dd 100644
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ReferenceKeyTestEntity.java
+++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ReferenceKeyTestEntity.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.
@@ -28,6 +29,11 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
@@ -39,6 +45,11 @@ import org.onap.policy.apex.model.basicmodel.xml.AxReferenceKeyAdapter;
*/
@Entity
@Table(name = "ReferenceKeyTestEntity")
+@Getter
+@Setter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
public class ReferenceKeyTestEntity extends AxConcept {
private static final long serialVersionUID = -2962570563281067895L;
@@ -68,25 +79,6 @@ public class ReferenceKeyTestEntity extends AxConcept {
}
/**
- * Instantiates a new reference key test entity.
- *
- * @param key the key
- * @param doubleValue the double value
- */
- public ReferenceKeyTestEntity(final AxReferenceKey key, final Double doubleValue) {
- this.key = key;
- this.doubleValue = doubleValue;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public AxReferenceKey getKey() {
- return key;
- }
-
- /**
* {@inheritDoc}.
*/
@Override
@@ -95,15 +87,6 @@ public class ReferenceKeyTestEntity extends AxConcept {
}
/**
- * Sets the key.
- *
- * @param key the new key
- */
- public void setKey(final AxReferenceKey key) {
- this.key = key;
- }
-
- /**
* Check set key.
*
* @return true, if successful
@@ -113,24 +96,6 @@ public class ReferenceKeyTestEntity extends AxConcept {
}
/**
- * Gets the double value.
- *
- * @return the double value
- */
- public double getDoubleValue() {
- return doubleValue;
- }
-
- /**
- * Sets the double value.
- *
- * @param doubleValue the new double value
- */
- public void setDoubleValue(final double doubleValue) {
- this.doubleValue = doubleValue;
- }
-
- /**
* {@inheritDoc}.
*/
@Override
@@ -150,14 +115,6 @@ public class ReferenceKeyTestEntity extends AxConcept {
* {@inheritDoc}.
*/
@Override
- public String toString() {
- return "ReferenceKeyTestEntity [key=" + key + ", doubleValue=" + doubleValue + "]";
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
public AxConcept copyTo(final AxConcept target) {
final Object copyObject = ((target == null) ? new ReferenceKeyTestEntity() : target);
if (copyObject instanceof ReferenceKeyTestEntity) {
@@ -178,42 +135,6 @@ public class ReferenceKeyTestEntity extends AxConcept {
* {@inheritDoc}.
*/
@Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((key == null) ? 0 : key.hashCode());
- return result;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public boolean equals(final Object obj) {
- if (obj == null) {
- return false;
- }
- if (this == obj) {
- return true;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final ReferenceKeyTestEntity other = (ReferenceKeyTestEntity) obj;
- if (key == null) {
- if (other.key != null) {
- return false;
- }
- } else if (!key.equals(other.key)) {
- return false;
- }
- return (Double.compare(doubleValue, other.doubleValue) == 0);
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
public int compareTo(final AxConcept otherObj) {
if (otherObj == null) {
return -1;
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/TestContextAlbumFactory.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/TestContextAlbumFactory.java
index 4abbc2051..be4a379aa 100644
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/TestContextAlbumFactory.java
+++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/TestContextAlbumFactory.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.
@@ -29,6 +30,8 @@ import static org.onap.policy.apex.testsuites.integration.context.utils.Constant
import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.POLICY_CONTEXT_ALBUM;
import static org.onap.policy.apex.testsuites.integration.context.utils.Constants.VERSION;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.onap.policy.apex.context.test.concepts.TestContextDateLocaleItem;
import org.onap.policy.apex.context.test.concepts.TestContextLongItem;
import org.onap.policy.apex.context.test.concepts.TestContextTreeMapItem;
@@ -48,6 +51,7 @@ import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchemas;
*
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class TestContextAlbumFactory {
// Recurring string constants.
private static final String CONTEXT = "context";
@@ -58,13 +62,6 @@ public final class TestContextAlbumFactory {
private static final String JAVA_FLAVOUR = "Java";
/**
- * Default constructor to prevent sub-classing.
- */
- private TestContextAlbumFactory() {
- // Private constructor to block subclassing
- }
-
- /**
* Creates the policy context model.
*
* @return the ax context model
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProviderImpl.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProviderImpl.java
index 608a7fc68..0b3ac82c2 100644
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProviderImpl.java
+++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProviderImpl.java
@@ -2,6 +2,7 @@
* ============LICENSE_START=======================================================
* Copyright (C) 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.
@@ -25,6 +26,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import lombok.Getter;
+import lombok.ToString;
import org.onap.policy.apex.context.ContextAlbum;
import org.onap.policy.apex.context.ContextException;
import org.onap.policy.apex.context.ContextRuntimeException;
@@ -41,9 +44,11 @@ import org.onap.policy.common.utils.validation.Assertions;
/**
* The Class ConfigrationProviderImpl provides configuration information for a context test back to the caller.
*/
+@Getter
+@ToString
public class ConfigrationProviderImpl implements ConfigrationProvider {
- private final String testType;
+ private final String testName;
private final int jvmCount;
private final int threadCount;
private final int loopSize;
@@ -62,7 +67,7 @@ public class ConfigrationProviderImpl implements ConfigrationProvider {
*/
public ConfigrationProviderImpl(final String testType, final int jvmCount, final int threadCount,
final int loopSize, final int albumSize, final int lockType) {
- this.testType = testType;
+ this.testName = testType;
this.jvmCount = jvmCount;
this.threadCount = threadCount;
this.loopSize = loopSize;
@@ -74,48 +79,8 @@ public class ConfigrationProviderImpl implements ConfigrationProvider {
* {@inheritDoc}.
*/
@Override
- public String getTestName() {
- return testType;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public int getLoopSize() {
- return loopSize;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public int getThreadCount() {
- return threadCount;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public int getJvmCount() {
- return jvmCount;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public int getAlbumSize() {
- return albumSize;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
public ExecutorService getExecutorService() {
- final String name = getThreadFactoryName(jvmCount, testType);
+ final String name = getThreadFactoryName(jvmCount, testName);
final IntegrationThreadFactory threadFactory = new IntegrationThreadFactory(name);
return Executors.newFixedThreadPool(threadCount, threadFactory);
}
@@ -198,14 +163,6 @@ public class ConfigrationProviderImpl implements ConfigrationProvider {
}
/**
- * {@inheritDoc}.
- */
- @Override
- public LockType getLockType() {
- return lockType;
- }
-
- /**
* Gets the thread factory name.
*
* @param jvmCount the jvm count
@@ -216,15 +173,4 @@ public class ConfigrationProviderImpl implements ConfigrationProvider {
return jvmCount == 1 ? testType + ":TestConcurrentContextThread_0_"
: testType + ":TestConcurrentContextJVMThread_";
}
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public String toString() {
- return "ConfigrationProviderImpl [testType=" + testType + ", jvmCount=" + jvmCount + ", threadCount="
- + threadCount + ", loopSize=" + loopSize + ", albumSize=" + albumSize + ", lockType=" + lockType
- + "]";
- }
-
}
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java
index e1d8d1a9e..a5eabd753 100644
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java
+++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java
@@ -2,6 +2,7 @@
* ============LICENSE_START=======================================================
* Copyright (C) 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.
@@ -22,13 +23,16 @@
package org.onap.policy.apex.testsuites.integration.context.utils;
import java.util.TimeZone;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.onap.policy.apex.context.test.concepts.TestPolicyContextItem;
import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
/**
* The Class Constants provides constants for context tests.
*/
-public class Constants {
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class Constants {
public static final String MAP_CONTEXT_ALBUM = "MapContextAlbum";
public static final String LONG_CONTEXT_ALBUM = "LongContextAlbum";
public static final String DATE_CONTEXT_ALBUM = "DateContextAlbum";
@@ -65,13 +69,6 @@ public class Constants {
private static final AxArtifactKey[] USED_ARTIFACT_STACK_ARRAY = new AxArtifactKey[] {KEY, KEY2, KEY3};
/**
- * Instantiates a new constants.
- */
- private Constants() {
- // Private constructor to block subclassing
- }
-
- /**
* Gets the ax artifact key array.
*
* @return the ax artifact key array
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/NetworkUtils.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/NetworkUtils.java
index 30bc8d823..a4a110659 100644
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/NetworkUtils.java
+++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/NetworkUtils.java
@@ -2,6 +2,7 @@
* ============LICENSE_START=======================================================
* Copyright (C) 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.
@@ -28,18 +29,14 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.SortedSet;
import java.util.TreeSet;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
/**
* The Class NetworkUtils contains some utility functions for getting network information for context tests.
*/
-public class NetworkUtils {
-
- /**
- * Instantiates a new network utils.
- */
- private NetworkUtils() {
- // Private constructor to block subclassing
- }
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class NetworkUtils {
/**
* The JGroups IP address must be set to a real (not loopback) IP address for Infinispan to work. In order to ensure