Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
id 'io.spring.nohttp' version '0.0.11'
id 'io.spring.dependency-management' version '1.1.7' apply false
id 'io.freefair.aggregate-javadoc' version '8.11'
id 'io.spring.nullability' version '0.0.5' apply false
id 'io.spring.nullability' version '0.0.6' apply false
}

apply plugin: 'io.spring.nohttp'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ protected AbstractMessageListenerContainer(@Nullable ConsumerFactory<? super K,
Assert.notNull(containerProperties, "'containerProperties' cannot be null");
Assert.notNull(consumerFactory, "'consumerFactory' cannot be null");
this.consumerFactory = (ConsumerFactory<K, V>) consumerFactory;
@Nullable String @Nullable [] topics = containerProperties.getTopics();
String @Nullable [] topics = containerProperties.getTopics();
if (topics != null) {
this.containerProperties = new ContainerProperties(topics);
}
Expand All @@ -167,7 +167,7 @@ protected AbstractMessageListenerContainer(@Nullable ConsumerFactory<? super K,
this.containerProperties = new ContainerProperties(topicPattern);
}
else {
@Nullable TopicPartitionOffset @Nullable [] topicPartitions = containerProperties.getTopicPartitions();
TopicPartitionOffset @Nullable [] topicPartitions = containerProperties.getTopicPartitions();
if (topicPartitions != null) {
this.containerProperties = new ContainerProperties(topicPartitions);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ protected AbstractShareKafkaMessageListenerContainer(ShareConsumerFactory<? supe
Assert.notNull(containerProperties, "'containerProperties' cannot be null");
Assert.notNull(shareConsumerFactory, "'shareConsumerFactory' cannot be null");
this.shareConsumerFactory = (ShareConsumerFactory<K, V>) shareConsumerFactory;
@Nullable String @Nullable [] topics = containerProperties.getTopics();
String @Nullable [] topics = containerProperties.getTopics();
if (topics != null) {
this.containerProperties = new ContainerProperties(topics);
}
Expand All @@ -104,7 +104,7 @@ protected AbstractShareKafkaMessageListenerContainer(ShareConsumerFactory<? supe
this.containerProperties = new ContainerProperties(topicPattern);
}
else {
@Nullable TopicPartitionOffset @Nullable [] topicPartitions = containerProperties.getTopicPartitions();
TopicPartitionOffset @Nullable [] topicPartitions = containerProperties.getTopicPartitions();
if (topicPartitions != null) {
this.containerProperties = new ContainerProperties(topicPartitions);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class ConsumerProperties {
/**
* Topic names.
*/
private final @Nullable String @Nullable [] topics;
private final String @Nullable [] topics;

/**
* Topic pattern.
Expand All @@ -62,7 +62,7 @@ public class ConsumerProperties {
/**
* Topics/partitions/initial offsets.
*/
private final @Nullable TopicPartitionOffset @Nullable [] topicPartitions;
private final TopicPartitionOffset @Nullable [] topicPartitions;

/**
* The max time to block in the consumer waiting for records.
Expand Down Expand Up @@ -160,7 +160,6 @@ public ConsumerProperties(TopicPartitionOffset... topicPartitions) {
* Return the configured topics.
* @return the topics.
*/
@Nullable
public String @Nullable [] getTopics() {
return this.topics != null
? Arrays.copyOf(this.topics, this.topics.length)
Expand All @@ -181,7 +180,6 @@ public Pattern getTopicPattern() {
* @return the topics/partitions.
* @since 2.5
*/
@Nullable
public TopicPartitionOffset @Nullable [] getTopicPartitions() {
return this.topicPartitions != null
? Arrays.copyOf(this.topicPartitions, this.topicPartitions.length)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public class ListenerContainerFactoryConfigurer {
@Nullable
private BackOff providedBlockingBackOff;

private @Nullable Class<? extends Exception> @Nullable [] blockingExceptionTypes;
private Class<? extends Exception> @Nullable [] blockingExceptionTypes;

private boolean retainStandardFatal;

Expand Down