From 82e055a4bce81ac48da7de5bd7889b43b5e280dc Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Fri, 27 Jan 2023 17:56:21 -0500 Subject: [PATCH] Renaming ListenerEndpointRegistry ListenerEndpointRegistry -> GenericListenerEndpointRegistry --- .../config/ReactivePulsarListenerEndpointRegistry.java | 8 ++++---- ...istry.java => GenericListenerEndpointRegistry.java} | 4 ++-- .../pulsar/config/PulsarListenerEndpointRegistrar.java | 10 +++++----- .../pulsar/config/PulsarListenerEndpointRegistry.java | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) rename spring-pulsar/src/main/java/org/springframework/pulsar/config/{ListenerEndpointRegistry.java => GenericListenerEndpointRegistry.java} (97%) diff --git a/spring-pulsar-reactive/src/main/java/org/springframework/pulsar/reactive/config/ReactivePulsarListenerEndpointRegistry.java b/spring-pulsar-reactive/src/main/java/org/springframework/pulsar/reactive/config/ReactivePulsarListenerEndpointRegistry.java index 2db09a14..45d38f1f 100644 --- a/spring-pulsar-reactive/src/main/java/org/springframework/pulsar/reactive/config/ReactivePulsarListenerEndpointRegistry.java +++ b/spring-pulsar-reactive/src/main/java/org/springframework/pulsar/reactive/config/ReactivePulsarListenerEndpointRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 the original author or authors. + * Copyright 2022-2023 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. @@ -16,7 +16,7 @@ package org.springframework.pulsar.reactive.config; -import org.springframework.pulsar.config.ListenerEndpointRegistry; +import org.springframework.pulsar.config.GenericListenerEndpointRegistry; import org.springframework.pulsar.reactive.listener.ReactivePulsarMessageListenerContainer; /** @@ -36,8 +36,8 @@ import org.springframework.pulsar.reactive.listener.ReactivePulsarMessageListene * @param Message payload type. * @author Christophe Bornet */ -public class ReactivePulsarListenerEndpointRegistry - extends ListenerEndpointRegistry, ReactivePulsarListenerEndpoint> { +public class ReactivePulsarListenerEndpointRegistry extends + GenericListenerEndpointRegistry, ReactivePulsarListenerEndpoint> { public ReactivePulsarListenerEndpointRegistry() { super(ReactivePulsarMessageListenerContainer.class); diff --git a/spring-pulsar/src/main/java/org/springframework/pulsar/config/ListenerEndpointRegistry.java b/spring-pulsar/src/main/java/org/springframework/pulsar/config/GenericListenerEndpointRegistry.java similarity index 97% rename from spring-pulsar/src/main/java/org/springframework/pulsar/config/ListenerEndpointRegistry.java rename to spring-pulsar/src/main/java/org/springframework/pulsar/config/GenericListenerEndpointRegistry.java index 16743c59..d02f57dd 100644 --- a/spring-pulsar/src/main/java/org/springframework/pulsar/config/ListenerEndpointRegistry.java +++ b/spring-pulsar/src/main/java/org/springframework/pulsar/config/GenericListenerEndpointRegistry.java @@ -58,7 +58,7 @@ import org.springframework.util.Assert; * @author Soby Chacko * @author Christophe Bornet */ -public class ListenerEndpointRegistry> +public class GenericListenerEndpointRegistry> implements PulsarListenerContainerRegistry, DisposableBean, SmartLifecycle, ApplicationContextAware, ApplicationListener { @@ -75,7 +75,7 @@ public class ListenerEndpointRegistry type) { + protected GenericListenerEndpointRegistry(Class type) { this.type = (Class) type; } diff --git a/spring-pulsar/src/main/java/org/springframework/pulsar/config/PulsarListenerEndpointRegistrar.java b/spring-pulsar/src/main/java/org/springframework/pulsar/config/PulsarListenerEndpointRegistrar.java index ed806412..35b3ad8a 100644 --- a/spring-pulsar/src/main/java/org/springframework/pulsar/config/PulsarListenerEndpointRegistrar.java +++ b/spring-pulsar/src/main/java/org/springframework/pulsar/config/PulsarListenerEndpointRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 the original author or authors. + * Copyright 2022-2023 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. @@ -27,7 +27,7 @@ import org.springframework.util.Assert; /** * Helper bean for registering {@link ListenerEndpoint} with a - * {@link ListenerEndpointRegistry}. + * {@link GenericListenerEndpointRegistry}. * * @author Soby Chacko * @author Christophe Bornet @@ -39,7 +39,7 @@ public class PulsarListenerEndpointRegistrar implements BeanFactoryAware, Initia private final List endpointDescriptors = new ArrayList<>(); - private ListenerEndpointRegistry endpointRegistry; + private GenericListenerEndpointRegistry endpointRegistry; private ListenerContainerFactory containerFactory; @@ -53,12 +53,12 @@ public class PulsarListenerEndpointRegistrar implements BeanFactoryAware, Initia this.type = type; } - public void setEndpointRegistry(ListenerEndpointRegistry endpointRegistry) { + public void setEndpointRegistry(GenericListenerEndpointRegistry endpointRegistry) { this.endpointRegistry = endpointRegistry; } @Nullable - public ListenerEndpointRegistry getEndpointRegistry() { + public GenericListenerEndpointRegistry getEndpointRegistry() { return this.endpointRegistry; } diff --git a/spring-pulsar/src/main/java/org/springframework/pulsar/config/PulsarListenerEndpointRegistry.java b/spring-pulsar/src/main/java/org/springframework/pulsar/config/PulsarListenerEndpointRegistry.java index 4fc32146..a95e235a 100644 --- a/spring-pulsar/src/main/java/org/springframework/pulsar/config/PulsarListenerEndpointRegistry.java +++ b/spring-pulsar/src/main/java/org/springframework/pulsar/config/PulsarListenerEndpointRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 the original author or authors. + * Copyright 2022-2023 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. @@ -35,7 +35,7 @@ import org.springframework.pulsar.listener.PulsarMessageListenerContainer; * @author Christophe Bornet */ public class PulsarListenerEndpointRegistry - extends ListenerEndpointRegistry { + extends GenericListenerEndpointRegistry { public PulsarListenerEndpointRegistry() { super(PulsarMessageListenerContainer.class);