Merge branch 'feature/rabbit-mq-stream' into 'master'

Implements rabbit mq with stream

See merge request customer-projects/cardif/brasil/poc-measure-kafka!1

pom.xml

@@ -31,13 +31,9 @@
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-tracing-bridge-brave</artifactId>
 		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>org.springframework.cloud</groupId>-->
-<!--			<artifactId>spring-cloud-starter-stream-kafka</artifactId>-->
-<!--		</dependency>-->
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-amqp</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/com/cardiff/pocmeasurekafka/config/RabbitMQConfig.java

-package com.cardiff.pocmeasurekafka.config;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import org.springframework.amqp.core.AmqpTemplate;
-import org.springframework.amqp.core.Queue;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
-import org.springframework.amqp.support.converter.MessageConverter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class RabbitMQConfig {
-
-  @Value("${spring.rabbitmq.queue}")
-  private String queue;
-
-  @Bean
-  public Queue queue() {
-    return new Queue(queue, false);
-  }
-
-  @Bean
-  public MessageConverter messageConverter(ObjectMapper objectMapper) {
-    return new Jackson2JsonMessageConverter(objectMapper);
-  }
-
-  @Bean
-  public ObjectMapper objectMapper() {
-    ObjectMapper objectMapper = new ObjectMapper();
-    objectMapper.registerModule(new JavaTimeModule());
-    return objectMapper;
-  }
-
-  @Bean
-  public AmqpTemplate template(ConnectionFactory connectionFactory,
-      MessageConverter messageConverter) {
-    RabbitTemplate template = new RabbitTemplate(connectionFactory);
-    template.setMessageConverter(messageConverter);
-    return template;
-  }
-}

src/main/java/com/cardiff/pocmeasurekafka/in/stream/MeasureConsumer.java

@@ -2,7 +2,6 @@ package com.cardiff.pocmeasurekafka.in.stream;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 
 import com.cardiff.pocmeasurekafka.model.Measure;
@@ -10,23 +9,19 @@ import com.cardiff.pocmeasurekafka.service.MeasureService;
 
 import lombok.RequiredArgsConstructor;
 
+import java.util.function.Consumer;
+
 @Component("measureConsumer")
 @RequiredArgsConstructor
-public class MeasureConsumer {
+public class MeasureConsumer implements Consumer<Measure> {
 
   private static final Logger log = LoggerFactory.getLogger(MeasureConsumer.class);
   private final MeasureService measureService;
 
-//  @Override
-//  public void accept(Measure measure) {
-//    measureService.saveMeasure(measure);
-//    log.info("Catch event {}", measure);
-//  }
-
-  @RabbitListener(queues = "${spring.rabbitmq.queue}")
-  public void receiveMessage(Measure message) {
-    measureService.saveMeasure(message);
-    log.info("Received message: [{}]", message);
-
+  @Override
+  public void accept(Measure measure) {
+    measureService.saveMeasure(measure);
+    log.info("Catch event {}", measure);
   }
+
 }

src/main/java/com/cardiff/pocmeasurekafka/service/MeasureService.java

@@ -18,6 +18,7 @@ public class MeasureService {
   private final RedisAdapter redisAdapter;
   private final RestAdapter restAdapter;
   public void saveMeasure(Measure measure){
+    log.info("catch measure to save: {}", measure);
     String deviceIdRedis = redisAdapter.saveMeasureRedis(measure).deviceId();
     log.info("catch deviceID save in redis {}", deviceIdRedis);
     String deviceIdFromRedis = redisAdapter.getByDeviceId(measure.deviceId()).deviceId();

src/main/resources/application-local.properties

-spring.application.name=@project.artifactId@
-server.shutdown=graceful
-management.server.port=8080
-spring.jmx.enabled=false
-
-management.endpoint.health.show-components=always
-management.endpoint.health.show-details=always
-
-#server configurations
-server.port=8080
-
-#logs
-logging.pattern.level=%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]
-
-# Actuator
-management.endpoints.jmx.exposure.exclude=*
-management.endpoints.web.exposure.include=health,info,metrics,prometheus
-management.info.git.enabled=true
-management.info.java.enabled=true
-management.info.os.enabled=true
-
-# Web
-spring.jackson.default-property-inclusion=non_empty
-spring.jackson.visibility.field=any
-spring.jackson.visibility.getter=none
-spring.jackson.visibility.setter=none
-spring.jackson.visibility.is-getter=none
-
 # Stream
 #spring.cloud.stream.kafka.binder.brokers=localhost:9092
-#spring.cloud.function.definition=measureConsumer
 #spring.cloud.stream.kafka.binder.configuration.key.serializer=org.apache.kafka.common.serialization.StringSerializer
 
 # RabbitMQ
@@ -38,15 +9,6 @@ spring.rabbitmq.port=5672
 spring.rabbitmq.username=user
 spring.rabbitmq.password=p@ssword
 
-#Producer
-#spring.cloud.stream.bindings.measureProducer.destination=measure
-
-
-## Consumer
-#spring.cloud.stream.bindings.measureConsumer-in-0.destination=measure
-#spring.cloud.stream.bindings.measureConsumer-in-0.group=measureGroup
-
-
 # Redis
 spring.data.redis.host=localhost
 spring.data.redis.port=6379

src/main/resources/application.properties

@@ -19,27 +19,15 @@ logging.pattern.level=%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-
 
 # Web
 spring.jackson.default-property-inclusion=non_empty
-spring.jackson.visibility.field=any
-spring.jackson.visibility.getter=none
-spring.jackson.visibility.setter=none
-spring.jackson.visibility.is-getter=none
-
-#Producer
-spring.cloud.stream.bindings.measureProducer.destination=measure
 
 # Stream
-#spring.cloud.stream.kafka.binder.brokers=${SPRING_CLOUD_STREAM_KAFKA_BINDER_BROKERS}
-#spring.cloud.function.definition=measureConsumer
-#spring.cloud.stream.kafka.binder.configuration.key.serializer=org.apache.kafka.common.serialization.StringSerializer
+spring.cloud.function.definition=measureConsumer
 
 ## Consumer
-#spring.cloud.stream.bindings.measureConsumer-in-0.destination=measure
-#spring.cloud.stream.bindings.measureConsumer-in-0.group=measureGroup
+spring.cloud.stream.bindings.measureConsumer-in-0.destination=measure
+spring.cloud.stream.bindings.measureConsumer-in-0.group=${spring.application.name}
 
 # Redis
-#spring.data.redis.host=localhost
-#spring.data.redis.port=6379
-#spring.data.redis.password=pa55word
 spring.data.redis.jedis.pool.max-active=15
 spring.data.redis.jedis.pool.min-idle=3
 spring.cache.redis.time-to-live=1m