aboutsummaryrefslogtreecommitdiffstats
path: root/forwarding
diff options
context:
space:
mode:
authorRam Krishna Verma <ram_krishna.verma@bell.ca>2021-07-07 14:21:34 -0400
committerRam Krishna Verma <ram_krishna.verma@bell.ca>2021-07-07 14:57:57 -0400
commit9eba753aed9d5575fa24ab8806e4d614668c75cb (patch)
tree181eb2b234fc01a14629e882d4356cf351405f38 /forwarding
parent49d86a99c3ed1920e3d999d85b7ae95a61b8d23a (diff)
Use lombok in policy/distribution
Use lombok for getter, setter, constructor & builder functions. Remove unused classes. Remove duplicate classes for testing exceptions. Issue-ID: POLICY-3393 Change-Id: I8a565bc6a5699b8716982f84e03b6a11d08ce65b Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Diffstat (limited to 'forwarding')
-rw-r--r--forwarding/pom.xml5
-rw-r--r--forwarding/src/main/java/org/onap/policy/distribution/forwarding/parameters/PolicyForwarderParameters.java17
-rw-r--r--forwarding/src/test/java/org/onap/policy/distribution/forwarding/TestExceptions.java (renamed from forwarding/src/test/java/org/onap/policy/distribution/forwarding/PolicyDecodingExceptionTest.java)21
3 files changed, 13 insertions, 30 deletions
diff --git a/forwarding/pom.xml b/forwarding/pom.xml
index 8fed5855..62b473fe 100644
--- a/forwarding/pom.xml
+++ b/forwarding/pom.xml
@@ -42,6 +42,11 @@
<version>${policy.common.version}</version>
</dependency>
<dependency>
+ <groupId>org.onap.policy.common</groupId>
+ <artifactId>utils-test</artifactId>
+ <version>${policy.common.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.onap.policy.models</groupId>
<artifactId>policy-models-tosca</artifactId>
<version>${policy.models.version}</version>
diff --git a/forwarding/src/main/java/org/onap/policy/distribution/forwarding/parameters/PolicyForwarderParameters.java b/forwarding/src/main/java/org/onap/policy/distribution/forwarding/parameters/PolicyForwarderParameters.java
index bc8041a4..7e7718a1 100644
--- a/forwarding/src/main/java/org/onap/policy/distribution/forwarding/parameters/PolicyForwarderParameters.java
+++ b/forwarding/src/main/java/org/onap/policy/distribution/forwarding/parameters/PolicyForwarderParameters.java
@@ -3,6 +3,7 @@
* Copyright (C) 2018 Ericsson. All rights reserved.
* Copyright (C) 2019 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2021 Bell Canada. 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,6 +23,7 @@
package org.onap.policy.distribution.forwarding.parameters;
+import lombok.AllArgsConstructor;
import lombok.Getter;
import org.onap.policy.common.parameters.BeanValidationResult;
import org.onap.policy.common.parameters.BeanValidator;
@@ -37,6 +39,7 @@ import org.onap.policy.common.parameters.annotations.NotNull;
*/
@Getter
@NotBlank
+@AllArgsConstructor
public class PolicyForwarderParameters implements ParameterGroup {
private @NotNull String forwarderType;
@@ -44,20 +47,6 @@ public class PolicyForwarderParameters implements ParameterGroup {
private String forwarderConfigurationName;
/**
- * Constructor for instantiating PolicyForwarderParameters.
- *
- * @param forwarderType the policy forwarder type
- * @param forwarderClassName the policy forwarder class name
- * @param forwarderConfigurationName the name of the configuration for the policy forwarder
- */
- public PolicyForwarderParameters(final String forwarderType, final String forwarderClassName,
- final String forwarderConfigurationName) {
- this.forwarderType = forwarderType;
- this.forwarderClassName = forwarderClassName;
- this.forwarderConfigurationName = forwarderConfigurationName;
- }
-
- /**
* {@inheritDoc}.
*/
@Override
diff --git a/forwarding/src/test/java/org/onap/policy/distribution/forwarding/PolicyDecodingExceptionTest.java b/forwarding/src/test/java/org/onap/policy/distribution/forwarding/TestExceptions.java
index af820883..66e16651 100644
--- a/forwarding/src/test/java/org/onap/policy/distribution/forwarding/PolicyDecodingExceptionTest.java
+++ b/forwarding/src/test/java/org/onap/policy/distribution/forwarding/TestExceptions.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. All rights reserved.
+ * Copyright (C) 2021 Bell Canada. 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,24 +20,13 @@
package org.onap.policy.distribution.forwarding;
-import static org.junit.Assert.assertEquals;
-
import org.junit.Test;
+import org.onap.policy.common.utils.test.ExceptionsTester;
-public class PolicyDecodingExceptionTest {
+public class TestExceptions {
@Test
- public void testPolicyDecodingExceptionString() {
- final PolicyForwardingException policyDecodingException = new PolicyForwardingException("error message");
- assertEquals("error message", policyDecodingException.getMessage());
+ public void test() {
+ new ExceptionsTester().test(PolicyForwardingException.class);
}
-
- @Test
- public void testPolicyDecodingExceptionStringThrowable() {
- final Exception cause = new IllegalArgumentException();
- final PolicyForwardingException policyDecodingException = new PolicyForwardingException("error message", cause);
- assertEquals("error message", policyDecodingException.getMessage());
- assertEquals(cause, policyDecodingException.getCause());
- }
-
}