Remove Dmaap references from policy-common

- updated dependencies for jakarta.* compabilities
- other dependency updates for security fixes

Issue-ID: POLICY-4881
Change-Id: I979d944fcd21279f618d1bcbfe12e914ba30077f
Signed-off-by: rameshiyer27 <ramesh.murugan.iyer@est.tech>

1 files changed, 0 insertions, 253 deletions

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumer.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumer.java
index d6fa0645..539a78c2 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumer.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumer.java
@@ -55,11 +55,6 @@ import org.apache.kafka.clients.consumer.OffsetAndMetadata;
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.header.Headers;
 import org.jetbrains.annotations.NotNull;
-import org.onap.dmaap.mr.client.MRClientFactory;
-import org.onap.dmaap.mr.client.impl.MRConsumerImpl;
-import org.onap.dmaap.mr.client.impl.MRConsumerImpl.MRConsumerImplBuilder;
-import org.onap.dmaap.mr.client.response.MRConsumerResponse;
-import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
 import org.onap.policy.common.endpoints.properties.PolicyEndPointProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -377,254 +372,6 @@ public interface BusConsumer {
             return "KafkaConsumerWrapper [fetchTimeout=" + fetchTimeout + "]";
         }
     }
-
-    /**
-     * MR based consumer.
-     */
-    public abstract class DmaapConsumerWrapper extends FetchingBusConsumer {
-
-        /**
-         * logger.
-         */
-        private static final Logger logger = LoggerFactory.getLogger(DmaapConsumerWrapper.class);
-
-        /**
-         * Name of the "protocol" property.
-         */
-        protected static final String PROTOCOL_PROP = "Protocol";
-
-        /**
-         * MR Consumer.
-         */
-        protected MRConsumerImpl consumer;
-
-        /**
-         * MR Consumer Wrapper.
-         *
-         * <p>servers - messaging bus hosts
-         * topic - topic
-         * apiKey - API Key
-         * apiSecret - API Secret
-         * username - AAF Login
-         * password - AAF Password
-         * consumerGroup - Consumer Group
-         * consumerInstance - Consumer Instance
-         * fetchTimeout - Fetch Timeout
-         * fetchLimit - Fetch Limit
-         *
-         * @param busTopicParams contains above listed attributes
-         * @throws MalformedURLException URL should be valid
-         */
-        protected DmaapConsumerWrapper(BusTopicParams busTopicParams) throws MalformedURLException {
-            super(busTopicParams);
-
-            if (busTopicParams.isTopicInvalid()) {
-                throw new IllegalArgumentException("No topic for DMaaP");
-            }
-
-            this.consumer = new MRConsumerImplBuilder()
-                .setHostPart(busTopicParams.getServers())
-                .setTopic(busTopicParams.getTopic())
-                .setConsumerGroup(busTopicParams.getConsumerGroup())
-                .setConsumerId(busTopicParams.getConsumerInstance())
-                .setTimeoutMs(busTopicParams.getFetchTimeout())
-                .setLimit(busTopicParams.getFetchLimit())
-                .setApiKey(busTopicParams.getApiKey())
-                .setApiSecret(busTopicParams.getApiSecret())
-                .createMRConsumerImpl();
-
-            this.consumer.setUsername(busTopicParams.getUserName());
-            this.consumer.setPassword(busTopicParams.getPassword());
-        }
-
-        @Override
-        public Iterable<String> fetch() {
-            final MRConsumerResponse response = this.consumer.fetchWithReturnConsumerResponse();
-            if (response == null) {
-                logger.warn("{}: DMaaP NULL response received", this);
-
-                sleepAfterFetchFailure();
-                return new ArrayList<>();
-            } else {
-                logger.debug("DMaaP consumer received {} : {}", response.getResponseCode(),
-                    response.getResponseMessage());
-
-                if (!"200".equals(response.getResponseCode())) {
-
-                    logger.error("DMaaP consumer received: {} : {}", response.getResponseCode(),
-                        response.getResponseMessage());
-
-                    sleepAfterFetchFailure();
-
-                    /* fall through */
-                }
-            }
-
-            if (response.getActualMessages() == null) {
-                return new ArrayList<>();
-            } else {
-                return response.getActualMessages();
-            }
-        }
-
-        @Override
-        public void close() {
-            super.close();
-            this.consumer.close();
-        }
-
-        @Override
-        public String toString() {
-            return "DmaapConsumerWrapper [" + "consumer.getAuthDate()=" + consumer.getAuthDate()
-                + ", consumer.getAuthKey()=" + consumer.getAuthKey() + ", consumer.getHost()=" + consumer.getHost()
-                + ", consumer.getProtocolFlag()=" + consumer.getProtocolFlag() + ", consumer.getUsername()="
-                + consumer.getUsername() + "]";
-        }
-    }
-
-    /**
-     * MR based consumer.
-     */
-    class DmaapAafConsumerWrapper extends DmaapConsumerWrapper {
-
-        private static final Logger logger = LoggerFactory.getLogger(DmaapAafConsumerWrapper.class);
-
-        /**
-         * BusTopicParams contain the following parameters.
-         * MR Consumer Wrapper.
-         *
-         * <p>servers messaging bus hosts
-         * topic - topic
-         * apiKey - API Key
-         * apiSecret - API Secret
-         * aafLogin - AAF Login
-         * aafPassword - AAF Password
-         * consumerGroup - Consumer Group
-         * consumerInstance - Consumer Instance
-         * fetchTimeout - Fetch Timeout
-         * fetchLimit - Fetch Limit
-         *
-         * @param busTopicParams contains above listed params
-         * @throws MalformedURLException URL should be valid
-         */
-        public DmaapAafConsumerWrapper(BusTopicParams busTopicParams) throws MalformedURLException {
-
-            super(busTopicParams);
-
-            // super constructor sets servers = {""} if empty to avoid errors when using DME2
-            if (busTopicParams.isServersInvalid()) {
-                throw new IllegalArgumentException("Must provide at least one host for HTTP AAF");
-            }
-
-            this.consumer.setProtocolFlag(ProtocolTypeConstants.AAF_AUTH.getValue());
-
-            Properties props = new Properties();
-
-            if (busTopicParams.isUseHttps()) {
-                props.setProperty(PROTOCOL_PROP, "https");
-                this.consumer.setHost(busTopicParams.getServers().get(0) + ":3905");
-
-            } else {
-                props.setProperty(PROTOCOL_PROP, "http");
-                this.consumer.setHost(busTopicParams.getServers().get(0) + ":3904");
-            }
-
-            this.consumer.setProps(props);
-            logger.info("{}: CREATION", this);
-        }
-
-        @Override
-        public String toString() {
-            final MRConsumerImpl consumer = this.consumer;
-
-            return "DmaapConsumerWrapper [" + "consumer.getAuthDate()=" + consumer.getAuthDate()
-                + ", consumer.getAuthKey()=" + consumer.getAuthKey() + ", consumer.getHost()=" + consumer.getHost()
-                + ", consumer.getProtocolFlag()=" + consumer.getProtocolFlag() + ", consumer.getUsername()="
-                + consumer.getUsername() + "]";
-        }
-    }
-
-    class DmaapDmeConsumerWrapper extends DmaapConsumerWrapper {
-
-        private static final Logger logger = LoggerFactory.getLogger(DmaapDmeConsumerWrapper.class);
-
-        /**
-         * Constructor.
-         *
-         * @param busTopicParams topic parameters
-         * @throws MalformedURLException must provide a valid URL
-         */
-        public DmaapDmeConsumerWrapper(BusTopicParams busTopicParams) throws MalformedURLException {
-
-
-            super(busTopicParams);
-
-
-            final String dme2RouteOffer = (busTopicParams.isAdditionalPropsValid()
-                ? busTopicParams.getAdditionalProps().get(
-                PolicyEndPointProperties.DME2_ROUTE_OFFER_PROPERTY)
-                : null);
-
-            BusHelper.validateBusTopicParams(busTopicParams, PolicyEndPointProperties.PROPERTY_DMAAP_SOURCE_TOPICS);
-
-            if ((busTopicParams.isPartnerInvalid())
-                && StringUtils.isBlank(dme2RouteOffer)) {
-                throw new IllegalArgumentException(
-                    "Must provide at least " + PolicyEndPointProperties.PROPERTY_DMAAP_SOURCE_TOPICS
-                        + "." + busTopicParams.getTopic()
-                        + PolicyEndPointProperties.PROPERTY_DMAAP_DME2_PARTNER_SUFFIX + " or "
-                        + PolicyEndPointProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "."
-                        + busTopicParams.getTopic()
-                        + PolicyEndPointProperties.PROPERTY_DMAAP_DME2_ROUTE_OFFER_SUFFIX + " for DME2");
-            }
-
-            final String serviceName = busTopicParams.getServers().get(0);
-
-            this.consumer.setProtocolFlag(ProtocolTypeConstants.DME2.getValue());
-
-            this.consumer.setUsername(busTopicParams.getUserName());
-            this.consumer.setPassword(busTopicParams.getPassword());
-
-            Properties props = getProperties(busTopicParams, serviceName, dme2RouteOffer);
-
-            MRClientFactory.prop = props;
-            this.consumer.setProps(props);
-
-            logger.info("{}: CREATION", this);
-        }
-
-        @NotNull
-        private static Properties getProperties(BusTopicParams busTopicParams, String serviceName,
-                                                String dme2RouteOffer) {
-            Properties props = new Properties();
-
-            props.setProperty(PolicyEndPointProperties.DME2_SERVICE_NAME_PROPERTY, serviceName);
-
-            props.setProperty("username", busTopicParams.getUserName());
-            props.setProperty("password", busTopicParams.getPassword());
-
-            /* These are required, no defaults */
-            props.setProperty("topic", busTopicParams.getTopic());
-
-            BusHelper.setCommonProperties(busTopicParams, dme2RouteOffer, props);
-
-            props.setProperty("MethodType", "GET");
-
-            if (busTopicParams.isUseHttps()) {
-                props.setProperty(PROTOCOL_PROP, "https");
-
-            } else {
-                props.setProperty(PROTOCOL_PROP, "http");
-            }
-
-            props.setProperty("contenttype", "application/json");
-
-            if (busTopicParams.isAdditionalPropsValid()) {
-                props.putAll(busTopicParams.getAdditionalProps());
-            }
-            return props;
-        }
-    }
 }