From d7d3b5bd8f1c69fdaddffb3c200468feee424564 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 2 Aug 2021 15:56:00 -0400 Subject: Use lombok in apex-pdp #4 Updated model, testsuites, and tools. Issue-ID: POLICY-3391 Change-Id: I187d84380661f5d4222967c1c5f004c318d65982 Signed-off-by: Jim Hahn --- .../uservice/adapt/events/EventGenerator.java | 12 ++------ .../uservice/adapt/jms/JmsEventProducer.java | 12 ++------ .../uservice/adapt/jms/JmsEventSubscriber.java | 12 ++------ .../adapt/jms/TestInitialContextFactory.java | 12 ++------ .../uservice/adapt/kafka/KafkaEventProducer.java | 12 ++------ .../uservice/adapt/kafka/KafkaEventSubscriber.java | 12 ++------ .../uservice/adapt/sampletypes/Foo.java | 33 +++++++++------------- .../websocket/WebSocketEventProducerClient.java | 12 ++------ .../websocket/WebSocketEventProducerServer.java | 12 ++------ .../websocket/WebSocketEventSubscriberClient.java | 12 ++------ .../websocket/WebSocketEventSubscriberServer.java | 12 ++------ .../DummyApexEventConsumer.java | 11 ++------ .../DummyApexEventProducer.java | 11 ++------ .../uservice/executionproperties/RunTestEvent.java | 8 ++++-- 14 files changed, 55 insertions(+), 128 deletions(-) (limited to 'testsuites/integration/integration-uservice-test/src/test') diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/EventGenerator.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/EventGenerator.java index 98aeb5a76..0417b7331 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/EventGenerator.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/EventGenerator.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * 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,7 @@ package org.onap.policy.apex.testsuites.integration.uservice.adapt.events; import java.util.Random; +import lombok.Getter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,6 +34,7 @@ import org.slf4j.LoggerFactory; public class EventGenerator { private static final Logger LOGGER = LoggerFactory.getLogger(EventGenerator.class); + @Getter private static int nextEventNo = 0; /** @@ -602,13 +605,4 @@ public class EventGenerator { return; } } - - /** - * Gets the next event no. - * - * @return the next event no - */ - public static int getNextEventNo() { - return nextEventNo; - } } diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventProducer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventProducer.java index 516384dac..a626ff520 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventProducer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventProducer.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. @@ -28,6 +29,7 @@ import javax.jms.Message; import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.Topic; +import lombok.Getter; import org.apache.activemq.command.ActiveMQTopic; import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities; import org.onap.policy.apex.service.engine.event.ApexEventRuntimeException; @@ -48,6 +50,7 @@ public class JmsEventProducer implements Runnable { private final int eventCount; private final boolean sendObjects; private final long eventInterval; + @Getter private long eventsSentCount = 0; private final Thread producerThread; @@ -139,15 +142,6 @@ public class JmsEventProducer implements Runnable { LOGGER.debug("{} : completed, number of events sent", this.getClass().getName(), eventsSentCount); } - /** - * Gets the events sent count. - * - * @return the events sent count - */ - public long getEventsSentCount() { - return eventsSentCount; - } - /** * Shutdown. */ diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventSubscriber.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventSubscriber.java index 0cb4104e7..2bdacb66e 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventSubscriber.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventSubscriber.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. @@ -30,6 +31,7 @@ import javax.jms.ObjectMessage; import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; +import lombok.Getter; import org.apache.activemq.command.ActiveMQTopic; import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities; import org.onap.policy.apex.service.engine.event.ApexEventException; @@ -47,6 +49,7 @@ public class JmsEventSubscriber implements Runnable { private static final Logger LOGGER = LoggerFactory.getLogger(JmsEventSubscriber.class); private final String topic; + @Getter private long eventsReceivedCount = 0; private final Thread subscriberThread; @@ -112,15 +115,6 @@ public class JmsEventSubscriber implements Runnable { eventsReceivedCount); } - /** - * Gets the events received count. - * - * @return the events received count - */ - public long getEventsReceivedCount() { - return eventsReceivedCount; - } - /** * Shutdown. * diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestInitialContextFactory.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestInitialContextFactory.java index 77df46081..071c4269a 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestInitialContextFactory.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestInitialContextFactory.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * 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,25 +25,18 @@ import java.util.Hashtable; import javax.naming.Context; import javax.naming.NamingException; import javax.naming.spi.InitialContextFactory; +import lombok.NoArgsConstructor; /** * A factory for creating TestInitialContext objects. * * @author Liam Fallon (liam.fallon@ericsson.com) */ +@NoArgsConstructor public class TestInitialContextFactory implements InitialContextFactory { private final Context context = new TestContext(); - /** - * Instantiates a new test initial context factory. - * - * @throws NamingException the naming exception - */ - public TestInitialContextFactory() throws NamingException { - // Default constructor - } - /** * {@inheritDoc}. */ diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventProducer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventProducer.java index 2339368cd..2b9064280 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventProducer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventProducer.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,6 +24,7 @@ package org.onap.policy.apex.testsuites.integration.uservice.adapt.kafka; import com.salesforce.kafka.test.junit4.SharedKafkaTestResource; import java.time.Duration; +import lombok.Getter; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.serialization.StringSerializer; @@ -45,6 +47,7 @@ public class KafkaEventProducer implements Runnable { private final int eventCount; private final boolean xmlEvents; private final long eventInterval; + @Getter private long eventsSentCount = 0; private final Thread producerThread; @@ -127,15 +130,6 @@ public class KafkaEventProducer implements Runnable { LOGGER.debug("{}: completed", KafkaEventProducer.class.getName()); } - /** - * Gets the events sent count. - * - * @return the events sent count - */ - public long getEventsSentCount() { - return eventsSentCount; - } - /** * Shutdown. */ diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventSubscriber.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventSubscriber.java index 6da35d5b9..5a6696d80 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventSubscriber.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventSubscriber.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,6 +26,7 @@ import com.salesforce.kafka.test.junit4.SharedKafkaTestResource; import java.time.Duration; import java.util.Arrays; import java.util.Properties; +import lombok.Getter; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -46,6 +48,7 @@ public class KafkaEventSubscriber implements Runnable { private static final Duration POLL_DURATION = Duration.ofMillis(100); private final String topic; + @Getter private long eventsReceivedCount = 0; KafkaConsumer consumer; @@ -99,15 +102,6 @@ public class KafkaEventSubscriber implements Runnable { LOGGER.debug("{}: event reception completed", KafkaEventSubscriber.class.getName()); } - /** - * Gets the events received count. - * - * @return the events received count - */ - public long getEventsReceivedCount() { - return eventsReceivedCount; - } - /** * Shutdown. */ diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/sampletypes/Foo.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/sampletypes/Foo.java index 2d6ab4629..d911a9a00 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/sampletypes/Foo.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/sampletypes/Foo.java @@ -1,45 +1,38 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * 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. * 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.apex.testsuites.integration.uservice.adapt.sampletypes; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor public class Foo { private String bar; - public String getBar() { - return bar; - } - - public void setBar(final String bar) { - this.bar = bar; - } - - public Foo(final String bar) { - this(); - this.bar = bar; - } - - public Foo() { - super(); - } - @Override public String toString() { return "Foo [bar=(String)\"" + bar + "\"]"; diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerClient.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerClient.java index ffb8f1e1b..6ffdeeaf2 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerClient.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerClient.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,7 @@ package org.onap.policy.apex.testsuites.integration.uservice.adapt.websocket; +import lombok.Getter; import org.onap.policy.apex.core.infrastructure.messaging.MessagingException; import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageClient; import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageListener; @@ -40,6 +42,7 @@ public class WebSocketEventProducerClient implements WsStringMessageListener { private final int eventCount; private final boolean xmlEvents; private final long eventInterval; + @Getter private long eventsSentCount = 0; WsStringMessageClient client; @@ -95,15 +98,6 @@ public class WebSocketEventProducerClient implements WsStringMessageListener { LOGGER.debug("{}: completed", WebSocketEventProducerClient.class.getName()); } - /** - * Gets the events sent count. - * - * @return the events sent count - */ - public long getEventsSentCount() { - return eventsSentCount; - } - /** * Shutdown. */ diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerServer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerServer.java index ec3112c39..1bdb56ec3 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerServer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerServer.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,7 @@ package org.onap.policy.apex.testsuites.integration.uservice.adapt.websocket; +import lombok.Getter; import org.onap.policy.apex.core.infrastructure.messaging.MessagingException; import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageListener; import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageServer; @@ -39,6 +41,7 @@ public class WebSocketEventProducerServer implements WsStringMessageListener { private final int eventCount; private final boolean xmlEvents; private final long eventInterval; + @Getter private long eventsSentCount = 0; WsStringMessageServer server; @@ -92,15 +95,6 @@ public class WebSocketEventProducerServer implements WsStringMessageListener { LOGGER.debug("{}: event sending completed", WebSocketEventProducerServer.class.getName()); } - /** - * Gets the events sent count. - * - * @return the events sent count - */ - public long getEventsSentCount() { - return eventsSentCount; - } - /** * Shutdown. */ diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberClient.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberClient.java index 7fe2d4306..23d32e252 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberClient.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberClient.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,7 @@ package org.onap.policy.apex.testsuites.integration.uservice.adapt.websocket; +import lombok.Getter; import org.onap.policy.apex.core.infrastructure.messaging.MessagingException; import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageClient; import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageListener; @@ -34,6 +36,7 @@ public class WebSocketEventSubscriberClient implements WsStringMessageListener { private static final Logger LOGGER = LoggerFactory.getLogger(WebSocketEventSubscriberClient.class); private final int port; + @Getter private long eventsReceivedCount = 0; private final WsStringMessageClient client; @@ -62,15 +65,6 @@ public class WebSocketEventSubscriberClient implements WsStringMessageListener { eventsReceivedCount++; } - /** - * Gets the events received count. - * - * @return the events received count - */ - public long getEventsReceivedCount() { - return eventsReceivedCount; - } - /** * Shutdown. */ diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberServer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberServer.java index d36ce9638..41291a467 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberServer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberServer.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,7 @@ package org.onap.policy.apex.testsuites.integration.uservice.adapt.websocket; +import lombok.Getter; import org.onap.policy.apex.core.infrastructure.messaging.MessagingException; import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageListener; import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageServer; @@ -34,6 +36,7 @@ public class WebSocketEventSubscriberServer implements WsStringMessageListener { private static final Logger LOGGER = LoggerFactory.getLogger(WebSocketEventSubscriberServer.class); private final int port; + @Getter private long eventsReceivedCount = 0; private final WsStringMessageServer server; @@ -63,15 +66,6 @@ public class WebSocketEventSubscriberServer implements WsStringMessageListener { eventsReceivedCount++; } - /** - * Gets the events received count. - * - * @return the events received count - */ - public long getEventsReceivedCount() { - return eventsReceivedCount; - } - /** * Shutdown. */ diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyApexEventConsumer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyApexEventConsumer.java index 1dc6f13a2..226756b1c 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyApexEventConsumer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyApexEventConsumer.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. * Modifications Copyright (C) 2021 Bell Canada. All rights reserved. + * 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,7 @@ import java.io.IOException; import java.util.EnumMap; import java.util.Map; import java.util.Properties; +import lombok.Getter; import org.onap.policy.apex.service.engine.event.ApexEventConsumer; import org.onap.policy.apex.service.engine.event.ApexEventException; import org.onap.policy.apex.service.engine.event.ApexEventReceiver; @@ -50,6 +52,7 @@ public class DummyApexEventConsumer implements ApexEventConsumer { private ApexEventReceiver eventReceiver; // The name for this consumer + @Getter private String name = null; // The peer references for this event handler @@ -81,14 +84,6 @@ public class DummyApexEventConsumer implements ApexEventConsumer { new Thread(new RunTestEventSender()).start(); } - /** - * {@inheritDoc}. - */ - @Override - public String getName() { - return name; - } - /** * {@inheritDoc}. */ diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyApexEventProducer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyApexEventProducer.java index 5aebc22b4..b22b25883 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyApexEventProducer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/DummyApexEventProducer.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * 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. @@ -26,6 +27,7 @@ import java.io.IOException; import java.util.EnumMap; import java.util.Map; import java.util.Properties; +import lombok.Getter; import org.onap.policy.apex.service.engine.event.ApexEventException; import org.onap.policy.apex.service.engine.event.ApexEventProducer; import org.onap.policy.apex.service.engine.event.ApexEventRuntimeException; @@ -50,6 +52,7 @@ public class DummyApexEventProducer implements ApexEventProducer { private DummyCarrierTechnologyParameters dummyProducerProperties; // The name for this producer + @Getter private String name = null; // The peer references for this event handler @@ -72,14 +75,6 @@ public class DummyApexEventProducer implements ApexEventProducer { new File(dummyProducerProperties.getPropertyFileName()).delete(); } - /** - * {@inheritDoc}. - */ - @Override - public String getName() { - return name; - } - /** * {@inheritDoc}. */ diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/RunTestEvent.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/RunTestEvent.java index fc4e50876..e35bda62f 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/RunTestEvent.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/executionproperties/RunTestEvent.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * 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,7 @@ package org.onap.policy.apex.testsuites.integration.uservice.executionproperties; import lombok.Data; +import org.onap.policy.common.utils.coder.Coder; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; @@ -31,11 +33,13 @@ import org.onap.policy.common.utils.coder.StandardCoder; */ @Data public class RunTestEvent { + private static final Coder coder = new StandardCoder(); + private String testToRun; private String propertyFileName; public String toJson() throws CoderException { - return new StandardCoder().encode(this); + return coder.encode(this); } /** @@ -45,7 +49,7 @@ public class RunTestEvent { * @throws CoderException on JSON exceptions */ public void fromJson(final String jsonString) throws CoderException { - RunTestEvent jsonTestEvent = new StandardCoder().decode(jsonString, RunTestEvent.class); + RunTestEvent jsonTestEvent = coder.decode(jsonString, RunTestEvent.class); this.testToRun = jsonTestEvent.testToRun; this.propertyFileName = jsonTestEvent.propertyFileName; } -- cgit 1.2.3-korg