diff options
author | 2022-10-17 16:11:54 +0000 | |
---|---|---|
committer | 2022-10-17 16:11:54 +0000 | |
commit | 38d5ff472e2cc884b8772d51f28eb354c54f934a (patch) | |
tree | 668985c5c008a76fa13d0c19be522a2e8206c2dc /plugins/plugins-event/plugins-event-carrier | |
parent | 9bf76281dae15941f3d53c1f1a419a8faa5f20f4 (diff) |
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 <ram_krishna.verma@bell.ca>
Diffstat (limited to 'plugins/plugins-event/plugins-event-carrier')
2 files changed, 6 insertions, 19 deletions
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml index 88df7afab..92cec0696 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml @@ -1,7 +1,6 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2022 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. @@ -43,17 +42,5 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>io.confluent</groupId> - <artifactId>kafka-avro-serializer</artifactId> - <version>7.2.1</version> - </dependency> </dependencies> - - <repositories> - <repository> - <id>confluent</id> - <url>https://packages.confluent.io/maven/</url> - </repository> - </repositories> </project> 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<String, Object> kafkaConsumer = + try (KafkaConsumer<String, String> 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<String, Object> records = + final ConsumerRecords<String, String> records = kafkaConsumer.poll(kafkaConsumerProperties.getConsumerPollDuration()); - for (final ConsumerRecord<String, Object> record : records) { + for (final ConsumerRecord<String, String> 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<String, Object> record) { + private void traceIfTraceEnabled(final ConsumerRecord<String, String> record) { if (LOGGER.isTraceEnabled()) { LOGGER.trace("event received for {} for forwarding to Apex engine : {} {}", this.getClass().getName() + ":" + this.name, record.key(), record.value()); |