From 38d5ff472e2cc884b8772d51f28eb354c54f934a Mon Sep 17 00:00:00 2001 From: Ram Krishna Verma Date: Mon, 17 Oct 2022 16:11:54 +0000 Subject: Revert "Add support for KafkaAvroSerializer in apex-pdp" This reverts commit 9bf76281dae15941f3d53c1f1a419a8faa5f20f4. Reason for revert: Will cherry pick the changes from master branch instead to keep them in sync across releases. Issue-ID: POLICY-4369 Change-Id: Ia73e177d432db32352324a800b09426c3bf145c1 Signed-off-by: Ram Krishna Verma --- .../apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src') diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java index 21ffd63a3..2957a1a11 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2019-2020 Nordix Foundation. - * Modifications Copyright (C) 2021-2022 Bell Canada. 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. @@ -74,7 +74,7 @@ public class ApexKafkaConsumer extends ApexPluginsEventConsumer { @Override public void run() { // Kick off the Kafka consumer - try (KafkaConsumer kafkaConsumer = + try (KafkaConsumer kafkaConsumer = new KafkaConsumer<>(kafkaConsumerProperties.getKafkaConsumerProperties())) { kafkaConsumer.subscribe(kafkaConsumerProperties.getConsumerTopicListAsCollection()); if (LOGGER.isDebugEnabled()) { @@ -85,11 +85,11 @@ public class ApexKafkaConsumer extends ApexPluginsEventConsumer { // The endless loop that receives events over Kafka while (consumerThread.isAlive() && !stopOrderedFlag) { try { - final ConsumerRecords records = + final ConsumerRecords records = kafkaConsumer.poll(kafkaConsumerProperties.getConsumerPollDuration()); - for (final ConsumerRecord record : records) { + for (final ConsumerRecord record : records) { traceIfTraceEnabled(record); - eventReceiver.receiveEvent(new Properties(), record.value().toString()); + eventReceiver.receiveEvent(new Properties(), record.value()); } } catch (final Exception e) { LOGGER.debug("error receiving events on thread {}", consumerThread.getName(), e); @@ -103,7 +103,7 @@ public class ApexKafkaConsumer extends ApexPluginsEventConsumer { * * @param record the record to trace */ - private void traceIfTraceEnabled(final ConsumerRecord record) { + private void traceIfTraceEnabled(final ConsumerRecord record) { if (LOGGER.isTraceEnabled()) { LOGGER.trace("event received for {} for forwarding to Apex engine : {} {}", this.getClass().getName() + ":" + this.name, record.key(), record.value()); -- cgit 1.2.3-korg