From dc101c2ad5e27d5a0afd4e2feeb8885f24728806 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Tue, 24 Aug 2021 13:20:26 -0400 Subject: Use CompareToBuilder Also added lombok to test classes. Issue-ID: POLICY-3391 Change-Id: I9ecf479f3861a2e5211b037e885029d1719b6a56 Signed-off-by: Jim Hahn --- .../service/engine/event/testpojos/DummyPojo.java | 49 +--- .../engine/event/testpojos/DummyPojoList.java | 18 +- .../engine/event/testpojos/DummySubPojo.java | 49 +--- .../engine/event/testpojos/DummySubSubPojo.java | 37 +-- .../dummyclasses/DummyStateFinalizerExecutor.java | 4 +- .../parameters/dummyclasses/DummyTaskExecutor.java | 4 +- .../dummyclasses/DummyTaskSelectExecutor.java | 3 +- .../SuperDooperCarrierTechnologyParameters.java | 301 +-------------------- .../SuperDooperDistributorParameters.java | 57 +--- .../dummyclasses/SuperDooperEventProducer.java | 15 +- .../dummyclasses/SuperDooperEventSubscriber.java | 11 +- 11 files changed, 53 insertions(+), 495 deletions(-) (limited to 'services/services-engine/src/test/java') diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummyPojo.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummyPojo.java index f87c72521..f6902f976 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummyPojo.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummyPojo.java @@ -1,69 +1,36 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 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.service.engine.event.testpojos; +import lombok.Getter; + /** * A test Pojo for pojo decoding and encoding in Apex. */ +@Getter public class DummyPojo { private int anInt; private Integer anInteger; private String someString; - - private DummySubPojo testSubPojo; - - /** - * Gets the an int. - * - * @return the an int - */ - public int getAnInt() { - return anInt; - } - - /** - * Gets the an integer. - * - * @return the an integer - */ - public Integer getAnInteger() { - return anInteger; - } - - /** - * Gets the a string. - * - * @return the a string - */ - public String getSomeString() { - return someString; - } - - /** - * Gets the test sub pojo. - * - * @return the test sub pojo - */ - public DummySubPojo getTestSubPojo() { - return testSubPojo; - } + private DummySubPojo testSubPojo; } diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummyPojoList.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummyPojoList.java index 13c0e9652..8a0d82d71 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummyPojoList.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummyPojoList.java @@ -1,19 +1,20 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 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========================================================= */ @@ -21,19 +22,12 @@ package org.onap.policy.apex.service.engine.event.testpojos; import java.util.List; +import lombok.Getter; /** * A test list of POJO for decoding and encoding. */ +@Getter public class DummyPojoList { private List testPojoList; - - /** - * Gets the test pojo list. - * - * @return the test pojo list - */ - public List getTestPojoList() { - return testPojoList; - } } diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummySubPojo.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummySubPojo.java index 121cc81a8..48614a6b9 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummySubPojo.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummySubPojo.java @@ -1,69 +1,36 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 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.service.engine.event.testpojos; +import lombok.Getter; + /** * A test Pojo for pojo decoding and encoding in Apex. */ +@Getter public class DummySubPojo { private int anInt; private Integer anInteger; private String someString; - - private DummySubSubPojo testSubSubPojo; - - /** - * Gets the an int. - * - * @return the an int - */ - public int getAnInt() { - return anInt; - } - - /** - * Gets the an integer. - * - * @return the an integer - */ - public Integer getAnInteger() { - return anInteger; - } - - /** - * Gets the a string. - * - * @return the a string - */ - public String getSomeString() { - return someString; - } - - /** - * Gets the test sub sub pojo. - * - * @return the test sub sub pojo - */ - public DummySubSubPojo getTestSubSubPojo() { - return testSubSubPojo; - } + private DummySubSubPojo testSubSubPojo; } diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummySubSubPojo.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummySubSubPojo.java index d2e55f462..f10e433c0 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummySubSubPojo.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummySubSubPojo.java @@ -1,57 +1,34 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 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.service.engine.event.testpojos; +import lombok.Getter; + /** * A test Pojo for pojo decoding and encoding in Apex. */ +@Getter public class DummySubSubPojo { private int anInt; private Integer anInteger; private String someString; - - /** - * Gets the an int. - * - * @return the an int - */ - public int getAnInt() { - return anInt; - } - - /** - * Gets the an integer. - * - * @return the an integer - */ - public Integer getAnInteger() { - return anInteger; - } - - /** - * Gets the a string. - * - * @return the a string - */ - public String getSomeString() { - return someString; - } } diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyStateFinalizerExecutor.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyStateFinalizerExecutor.java index ec06ce97f..c12db9692 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyStateFinalizerExecutor.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyStateFinalizerExecutor.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 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. @@ -30,9 +31,6 @@ import org.onap.policy.apex.core.engine.executor.exception.StateMachineException * Dummy state finalizer executor for testing. */ public class DummyStateFinalizerExecutor extends StateFinalizerExecutor { - public DummyStateFinalizerExecutor() { - // Default constructor - } @Override public String execute(final long executionId, final Properties executorProperties, diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyTaskExecutor.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyTaskExecutor.java index 56f0af5c6..d4b400279 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyTaskExecutor.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyTaskExecutor.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. All rights reserved. * 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. @@ -34,9 +35,6 @@ import org.onap.policy.apex.model.policymodel.concepts.AxTask; * Dummy task executor for testing. */ public class DummyTaskExecutor extends TaskExecutor { - public DummyTaskExecutor() { - // Default constructor - } @Override public void prepare() throws StateMachineException { diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyTaskSelectExecutor.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyTaskSelectExecutor.java index 22f6b4431..39374cdc9 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyTaskSelectExecutor.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/DummyTaskSelectExecutor.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 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. @@ -31,8 +32,6 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; * Dummy task selection executor for testing. */ public class DummyTaskSelectExecutor extends TaskSelectExecutor { - public DummyTaskSelectExecutor() { - } @Override public void prepare() throws StateMachineException { diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperCarrierTechnologyParameters.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperCarrierTechnologyParameters.java index d7a502c7f..b23acdd01 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperCarrierTechnologyParameters.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperCarrierTechnologyParameters.java @@ -24,6 +24,8 @@ package org.onap.policy.apex.service.engine.parameters.dummyclasses; import java.util.Arrays; import java.util.Collection; import java.util.Properties; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.onap.policy.apex.service.parameters.carriertechnology.CarrierTechnologyParameters; import org.onap.policy.common.parameters.BeanValidationResult; @@ -40,6 +42,8 @@ import org.onap.policy.models.base.Validated; */ @NotNull @NotBlank +@Getter +@Setter public class SuperDooperCarrierTechnologyParameters extends CarrierTechnologyParameters { // Default parameter values private static final String DEFAULT_ACKS = "all"; @@ -149,114 +153,6 @@ public class SuperDooperCarrierTechnologyParameters extends CarrierTechnologyPar return superDooperProperties; } - /** - * Gets the bootstrap servers. - * - * @return the bootstrap servers - */ - public String getBootstrapServers() { - return bootstrapServers; - } - - /** - * Gets the acks. - * - * @return the acks - */ - public String getAcks() { - return acks; - } - - /** - * Gets the retries. - * - * @return the retries - */ - public int getRetries() { - return retries; - } - - /** - * Gets the batch size. - * - * @return the batch size - */ - public int getBatchSize() { - return batchSize; - } - - /** - * Gets the linger time. - * - * @return the linger time - */ - public int getLingerTime() { - return lingerTime; - } - - /** - * Gets the buffer memory. - * - * @return the buffer memory - */ - public long getBufferMemory() { - return bufferMemory; - } - - /** - * Gets the group id. - * - * @return the group id - */ - public String getGroupId() { - return groupId; - } - - /** - * Checks if is enable auto commit. - * - * @return true, if checks if is enable auto commit - */ - public boolean isEnableAutoCommit() { - return enableAutoCommit; - } - - /** - * Gets the auto commit time. - * - * @return the auto commit time - */ - public int getAutoCommitTime() { - return autoCommitTime; - } - - /** - * Gets the session timeout. - * - * @return the session timeout - */ - public int getSessionTimeout() { - return sessionTimeout; - } - - /** - * Gets the producer topic. - * - * @return the producer topic - */ - public String getProducerTopic() { - return producerTopic; - } - - /** - * Gets the consumer poll time. - * - * @return the consumer poll time - */ - public long getConsumerPollTime() { - return consumerPollTime; - } - /** * Gets the consumer topic list. * @@ -266,195 +162,6 @@ public class SuperDooperCarrierTechnologyParameters extends CarrierTechnologyPar return Arrays.asList(consumerTopicList); } - /** - * Gets the key serializer. - * - * @return the key serializer - */ - public String getKeySerializer() { - return keySerializer; - } - - /** - * Gets the value serializer. - * - * @return the value serializer - */ - public String getValueSerializer() { - return valueSerializer; - } - - /** - * Gets the key deserializer. - * - * @return the key deserializer - */ - public String getKeyDeserializer() { - return keyDeserializer; - } - - /** - * Gets the value deserializer. - * - * @return the value deserializer - */ - public String getValueDeserializer() { - return valueDeserializer; - } - - /** - * Sets the bootstrap servers. - * - * @param bootstrapServers the new bootstrap servers - */ - public void setBootstrapServers(String bootstrapServers) { - this.bootstrapServers = bootstrapServers; - } - - /** - * Sets the acks. - * - * @param acks the new acks - */ - public void setAcks(String acks) { - this.acks = acks; - } - - /** - * Sets the retries. - * - * @param retries the new retries - */ - public void setRetries(int retries) { - this.retries = retries; - } - - /** - * Sets the batch size. - * - * @param batchSize the new batch size - */ - public void setBatchSize(int batchSize) { - this.batchSize = batchSize; - } - - /** - * Sets the linger time. - * - * @param lingerTime the new linger time - */ - public void setLingerTime(int lingerTime) { - this.lingerTime = lingerTime; - } - - /** - * Sets the buffer memory. - * - * @param bufferMemory the new buffer memory - */ - public void setBufferMemory(long bufferMemory) { - this.bufferMemory = bufferMemory; - } - - /** - * Sets the group id. - * - * @param groupId the new group id - */ - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - /** - * Sets the enable auto commit. - * - * @param enableAutoCommit the new enable auto commit - */ - public void setEnableAutoCommit(boolean enableAutoCommit) { - this.enableAutoCommit = enableAutoCommit; - } - - /** - * Sets the auto commit time. - * - * @param autoCommitTime the new auto commit time - */ - public void setAutoCommitTime(int autoCommitTime) { - this.autoCommitTime = autoCommitTime; - } - - /** - * Sets the session timeout. - * - * @param sessionTimeout the new session timeout - */ - public void setSessionTimeout(int sessionTimeout) { - this.sessionTimeout = sessionTimeout; - } - - /** - * Sets the producer topic. - * - * @param producerTopic the new producer topic - */ - public void setProducerTopic(String producerTopic) { - this.producerTopic = producerTopic; - } - - /** - * Sets the consumer poll time. - * - * @param consumerPollTime the new consumer poll time - */ - public void setConsumerPollTime(int consumerPollTime) { - this.consumerPollTime = consumerPollTime; - } - - /** - * Sets the consumer topic list. - * - * @param consumerTopicList the new consumer topic list - */ - public void setConsumerTopicList(String[] consumerTopicList) { - this.consumerTopicList = consumerTopicList; - } - - /** - * Sets the key serializer. - * - * @param keySerializer the new key serializer - */ - public void setKeySerializer(String keySerializer) { - this.keySerializer = keySerializer; - } - - /** - * Sets the value serializer. - * - * @param valueSerializer the new value serializer - */ - public void setValueSerializer(String valueSerializer) { - this.valueSerializer = valueSerializer; - } - - /** - * Sets the key deserializer. - * - * @param keyDeserializer the new key deserializer - */ - public void setKeyDeserializer(String keyDeserializer) { - this.keyDeserializer = keyDeserializer; - } - - /** - * Sets the value deserializer. - * - * @param valueDeserializer the new value deserializer - */ - public void setValueDeserializer(String valueDeserializer) { - this.valueDeserializer = valueDeserializer; - } - /** * {@inheritDoc}. */ diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperDistributorParameters.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperDistributorParameters.java index 0d021c919..3c34369d0 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperDistributorParameters.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperDistributorParameters.java @@ -1,33 +1,40 @@ /*- * ============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.service.engine.parameters.dummyclasses; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; import org.onap.policy.apex.context.parameters.DistributorParameters; /** * Distributor parameters for the Super Dooper Distributor. - * + * * @author Liam Fallon (liam.fallon@ericsson.com) * @version */ +@Getter +@Setter +@ToString public class SuperDooperDistributorParameters extends DistributorParameters { // Constants for SuperDooper configuration file locations public static final String DEFAULT_SUPER_DOOPER_DISTRIBUTION_CONFIG_FILE = "superDooper/superDooper.xml"; @@ -41,46 +48,4 @@ public class SuperDooperDistributorParameters extends DistributorParameters { private String jgroupsFile = DEFAULT_SUPER_DOOPER_DISTRIBUTION_JGROUPS_FILE; private boolean preferIPv4Stack = DEFAULT_SUPER_DOOPER_JAVA_NET_PREFER_IPV4_STACK; private String jgroupsBindAddress = DEFAULT_INFINSPAN_JGROUPS_BIND_ADDRESS; - - public SuperDooperDistributorParameters() { - super(); - } - - public String getConfigFile() { - return configFile; - } - - public void setConfigFile(final String configFile) { - this.configFile = configFile; - } - - public String getJgroupsFile() { - return jgroupsFile; - } - - public void setJgroupsFile(final String jgroupsFile) { - this.jgroupsFile = jgroupsFile; - } - - public boolean isPreferIPv4Stack() { - return preferIPv4Stack; - } - - public void setPreferIPv4Stack(final boolean preferIPv4Stack) { - this.preferIPv4Stack = preferIPv4Stack; - } - - public String getJgroupsBindAddress() { - return jgroupsBindAddress; - } - - public void setjGroupsBindAddress(final String jgroupsBindAddress) { - this.jgroupsBindAddress = jgroupsBindAddress; - } - - @Override - public String toString() { - return "SuperDooperDistributorParameters [configFile=" + configFile + ", jgroupsFile=" + jgroupsFile - + ", preferIPv4Stack=" + preferIPv4Stack + ", jGroupsBindAddress=" + jgroupsBindAddress + "]"; - } } diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventProducer.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventProducer.java index 367bf5ce2..5bbc121da 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventProducer.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventProducer.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. @@ -22,6 +23,7 @@ package org.onap.policy.apex.service.engine.parameters.dummyclasses; 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.PeeredReference; @@ -39,12 +41,9 @@ public class SuperDooperEventProducer implements ApexEventProducer { private static final XLogger LOGGER = XLoggerFactory.getXLogger(SuperDooperEventProducer.class); + @Getter private String name; - public SuperDooperEventProducer() { - // Default constructor - } - /** * {@inheritDoc}. */ @@ -53,14 +52,6 @@ public class SuperDooperEventProducer implements ApexEventProducer { this.name = name; } - /** - * {@inheritDoc}. - */ - @Override - public String getName() { - return name; - } - /** * {@inheritDoc}. */ diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventSubscriber.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventSubscriber.java index 8eb1ca13e..64e23f570 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventSubscriber.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventSubscriber.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.service.engine.parameters.dummyclasses; +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; @@ -34,11 +36,9 @@ public class SuperDooperEventSubscriber implements ApexEventConsumer { private static final XLogger LOGGER = XLoggerFactory.getXLogger(SuperDooperEventSubscriber.class); + @Getter private String name; - public SuperDooperEventSubscriber() { - } - @Override public void init(final String name, final EventHandlerParameters consumerParameters, final ApexEventReceiver apexEventReceiver) throws ApexEventException { @@ -46,11 +46,6 @@ public class SuperDooperEventSubscriber implements ApexEventConsumer { LOGGER.info("Initialising Apex Consumer: " + this.getClass().getName() + ":" + this.name); } - @Override - public String getName() { - return name; - } - /** * {@inheritDoc}. */ -- cgit 1.2.3-korg