SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing Pulsar binder tests

Browse Source 
* Fixing Pulsar binder tests for Boot 3.2/3.3 compatibility
This commit is contained in:
Soby Chacko
2024-03-04 16:18:45 -05:00
parent cabefa74fa
commit 48dcc5dfd7
1 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
binders/pulsar-binder/spring-cloud-stream-binder-pulsar/src/test/java/org/springframework/cloud/stream/binder/pulsar/PulsarBinderIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2023-2023 the original author or authors.
* Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import java.util.function.Consumer;
import java.util.function.Supplier;
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.impl.schema.JSONSchema;
import org.apache.pulsar.common.schema.KeyValue;
@@ -672,25 +671,43 @@ class PulsarBinderIntegrationTests implements PulsarTestContainerSupport {
}
@Override
public Producer<String> createProducer(Schema<String> schema, String topic) throws PulsarClientException {
var producer = this.trackedProducerFactory.createProducer(schema, topic);
public Producer<String> createProducer(Schema<String> schema, String topic) {
Producer<String> producer = null;
try {
producer = this.trackedProducerFactory.createProducer(schema, topic);
}
catch (Exception e) {
// pass through
}
this.producersCreated.add(producer);
return producer;
}
@Override
public Producer<String> createProducer(Schema<String> schema, String topic,
ProducerBuilderCustomizer<String> customizer) throws PulsarClientException {
var producer = this.trackedProducerFactory.createProducer(schema, topic, customizer);
ProducerBuilderCustomizer<String> customizer) {
Producer<String> producer = null;
try {
producer = this.trackedProducerFactory.createProducer(schema, topic, customizer);
}
catch (Exception e) {
// pass through
}
this.producersCreated.add(producer);
return producer;
}
@Override
public Producer<String> createProducer(Schema<String> schema, String topic, Collection<String> encryptionKeys,
List<ProducerBuilderCustomizer<String>> producerBuilderCustomizers) throws PulsarClientException {
var producer = this.trackedProducerFactory.createProducer(schema, topic, encryptionKeys,
producerBuilderCustomizers);
List<ProducerBuilderCustomizer<String>> producerBuilderCustomizers) {
Producer<String> producer = null;
try {
producer = this.trackedProducerFactory.createProducer(schema, topic, encryptionKeys,
producerBuilderCustomizers);
}
catch (Exception e) {
// pass through
}
this.producersCreated.add(producer);
return producer;
}
@@ -726,9 +743,14 @@ class PulsarBinderIntegrationTests implements PulsarTestContainerSupport {
@Override
public org.apache.pulsar.client.api.Consumer<String> createConsumer(Schema<String> schema,
Collection<String> topics, String subscriptionName, ConsumerBuilderCustomizer<String> customizer)
throws PulsarClientException {
var consumer = this.trackedConsumerFactory.createConsumer(schema, topics, subscriptionName, customizer);
Collection<String> topics, String subscriptionName, ConsumerBuilderCustomizer<String> customizer) {
org.apache.pulsar.client.api.Consumer<String> consumer = null;
try {
consumer = this.trackedConsumerFactory.createConsumer(schema, topics, subscriptionName, customizer);
}
catch (Exception e) {
// pass through
}
this.consumersCreated.add(consumer);
return consumer;
}
@@ -736,9 +758,15 @@ class PulsarBinderIntegrationTests implements PulsarTestContainerSupport {
@Override
public org.apache.pulsar.client.api.Consumer<String> createConsumer(Schema<String> schema,
Collection<String> topics, String subscriptionName, Map<String, String> metadataProperties,
List<ConsumerBuilderCustomizer<String>> consumerBuilderCustomizers) throws PulsarClientException {
var consumer = this.trackedConsumerFactory.createConsumer(schema, topics, subscriptionName,
metadataProperties, consumerBuilderCustomizers);
List<ConsumerBuilderCustomizer<String>> consumerBuilderCustomizers) {
org.apache.pulsar.client.api.Consumer<String> consumer = null;
try {
consumer = this.trackedConsumerFactory.createConsumer(schema, topics, subscriptionName,
metadataProperties, consumerBuilderCustomizers);
}
catch (Exception e) {
// pass through
}
this.consumersCreated.add(consumer);
return consumer;
}