From 9eba753aed9d5575fa24ab8806e4d614668c75cb Mon Sep 17 00:00:00 2001 From: Ram Krishna Verma Date: Wed, 7 Jul 2021 14:21:34 -0400 Subject: 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 --- .../parameters/PolicyForwarderParameters.java | 17 ++------- .../forwarding/PolicyDecodingExceptionTest.java | 43 ---------------------- .../distribution/forwarding/TestExceptions.java | 32 ++++++++++++++++ 3 files changed, 35 insertions(+), 57 deletions(-) delete mode 100644 forwarding/src/test/java/org/onap/policy/distribution/forwarding/PolicyDecodingExceptionTest.java create mode 100644 forwarding/src/test/java/org/onap/policy/distribution/forwarding/TestExceptions.java (limited to 'forwarding/src') 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,26 +39,13 @@ import org.onap.policy.common.parameters.annotations.NotNull; */ @Getter @NotBlank +@AllArgsConstructor public class PolicyForwarderParameters implements ParameterGroup { private @NotNull String forwarderType; private @NotNull @ClassName String forwarderClassName; 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}. */ diff --git a/forwarding/src/test/java/org/onap/policy/distribution/forwarding/PolicyDecodingExceptionTest.java b/forwarding/src/test/java/org/onap/policy/distribution/forwarding/PolicyDecodingExceptionTest.java deleted file mode 100644 index af820883..00000000 --- a/forwarding/src/test/java/org/onap/policy/distribution/forwarding/PolicyDecodingExceptionTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2018 Ericsson. 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.distribution.forwarding; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class PolicyDecodingExceptionTest { - - @Test - public void testPolicyDecodingExceptionString() { - final PolicyForwardingException policyDecodingException = new PolicyForwardingException("error message"); - assertEquals("error message", policyDecodingException.getMessage()); - } - - @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()); - } - -} diff --git a/forwarding/src/test/java/org/onap/policy/distribution/forwarding/TestExceptions.java b/forwarding/src/test/java/org/onap/policy/distribution/forwarding/TestExceptions.java new file mode 100644 index 00000000..66e16651 --- /dev/null +++ b/forwarding/src/test/java/org/onap/policy/distribution/forwarding/TestExceptions.java @@ -0,0 +1,32 @@ +/*- + * ============LICENSE_START======================================================= + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.distribution.forwarding; + +import org.junit.Test; +import org.onap.policy.common.utils.test.ExceptionsTester; + +public class TestExceptions { + + @Test + public void test() { + new ExceptionsTester().test(PolicyForwardingException.class); + } +} -- cgit 1.2.3-korg