Merge branch 'master' into bugfix/issue-13-messages-sending-problem

Author: majusko

README.md

@@ -91,6 +91,7 @@ pulsar.connectionTimeoutSec=10
 pulsar.operationTimeoutSec=15
 pulsar.startingBackoffIntervalMs=100
 pulsar.maxBackoffIntervalSec=10
+pulsar.consumerNameDelimiter=
 ```
 
 Properties explained:
@@ -104,6 +105,7 @@ Properties explained:
 - `pulsar.operationTimeoutSec` - Operation timeout.
 - `pulsar.startingBackoffIntervalMs` - Duration of time for a backoff interval (Retry algorithm).
 - `pulsar.maxBackoffIntervalSec` - The maximum duration of time for a backoff interval (Retry algorithm).
+- `pulsar.consumerNameDelimiter` - Consumer names are connection of bean name and method with a delimiter. By default there is no delimiter and words are connected together.
 
 ## Contributing
 

src/main/java/io/github/majusko/pulsar/PulsarProperties.java

@@ -13,6 +13,7 @@ public class PulsarProperties {
     private Integer operationTimeoutSec = 15;
     private Integer startingBackoffIntervalMs = 100;
     private Integer maxBackoffIntervalSec = 10;
+    private String consumerNameDelimiter = "";
 
     public String getServiceUrl() {
         return serviceUrl;
@@ -85,4 +86,12 @@ public Integer getMaxBackoffIntervalSec() {
     public void setMaxBackoffIntervalSec(Integer maxBackoffIntervalSec) {
         this.maxBackoffIntervalSec = maxBackoffIntervalSec;
     }
+
+    public String getConsumerNameDelimiter() {
+        return consumerNameDelimiter;
+    }
+
+    public void setConsumerNameDelimiter(String consumerNameDelimiter) {
+        this.consumerNameDelimiter = consumerNameDelimiter;
+    }
 }

src/main/java/io/github/majusko/pulsar/collector/ConsumerCollector.java

@@ -1,9 +1,9 @@
 package io.github.majusko.pulsar.collector;
 
 import io.github.majusko.pulsar.annotation.PulsarConsumer;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -14,6 +14,9 @@
 @Configuration
 public class ConsumerCollector implements BeanPostProcessor {
 
+    @Value("${pulsar.consumerNameDelimiter:}")
+    private String consumerNameDelimiter;
+
     private Map<String, ConsumerHolder> consumers = new ConcurrentHashMap<>();
 
     @Override
@@ -23,7 +26,7 @@ public Object postProcessBeforeInitialization(Object bean, String beanName) {
         consumers.putAll(Arrays.stream(beanClass.getDeclaredMethods())
             .filter($ -> $.isAnnotationPresent(PulsarConsumer.class))
             .collect(Collectors.toMap(
-                method -> beanClass.getName() + "#" + method.getName(),
+                method -> beanClass.getName() + consumerNameDelimiter + method.getName(),
                 method -> new ConsumerHolder(method.getAnnotation(PulsarConsumer.class), method, bean))));
 
         return bean;

src/test/java/io/github/majusko/pulsar/PulsarJavaSpringBootStarterApplicationTests.java

@@ -76,8 +76,8 @@ void testConsumerRegistration1() throws Exception {
 
     @Test
     void testConsumerRegistration2() {
-        final Class<TestConsumers> clazz = TestConsumers.class;
-        final String descriptor = clazz.getName() + "#" + clazz.getMethods()[0].getName();
+        final Class<TestConsumerConfiguration> clazz = TestConsumerConfiguration.class;
+        final String descriptor = clazz.getName() + clazz.getMethods()[0].getName();
         final ConsumerHolder consumerHolder = consumerCollector.getConsumer(descriptor).orElse(null);
 
         Assertions.assertNotNull(consumerHolder);