Skip to content

Commit d72ad0b

Browse files
committed
Refactored code
1 parent d06893c commit d72ad0b

8 files changed

+56
-98
lines changed

src/main/java/mu/integration/consumer/rabbitmq/entity/CsvLineInformation.java renamed to src/main/java/mu/integration/consumer/rabbitmq/dto/CsvLineInformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package mu.integration.consumer.rabbitmq.entity;
1+
package mu.integration.consumer.rabbitmq.dto;
22

33
import lombok.Data;
44

src/main/java/mu/integration/consumer/rabbitmq/dto/CsvLineStatusDto.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/main/java/mu/integration/consumer/rabbitmq/entity/CsvLine.java

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package mu.integration.consumer.rabbitmq.listener;
2+
3+
import org.springframework.cloud.stream.annotation.StreamListener;
4+
import org.springframework.cloud.stream.messaging.Processor;
5+
import org.springframework.messaging.Message;
6+
import org.springframework.messaging.handler.annotation.Header;
7+
import org.springframework.messaging.handler.annotation.Payload;
8+
import org.springframework.messaging.support.MessageBuilder;
9+
import org.springframework.stereotype.Component;
10+
11+
import com.fasterxml.jackson.core.JsonProcessingException;
12+
import com.fasterxml.jackson.databind.ObjectMapper;
13+
14+
import lombok.RequiredArgsConstructor;
15+
import lombok.extern.slf4j.Slf4j;
16+
import mu.integration.consumer.rabbitmq.dto.CsvLineInformation;
17+
import mu.integration.consumer.rabbitmq.service.CsvLineInformationSender;
18+
import mu.integration.consumer.rabbitmq.service.CsvLineValidationService;
19+
20+
/**
21+
*
22+
* @author priteela
23+
*/
24+
@RequiredArgsConstructor
25+
@Slf4j
26+
@Component
27+
public class CsvLineInformationConsumer {
28+
29+
private final CsvLineValidationService csvLineValidationService;
30+
private final CsvLineInformationSender csvLineInformationSender;
31+
private final ObjectMapper mapper;
32+
33+
@StreamListener(Processor.INPUT)
34+
public void receiveOrder(@Header Message<String> header, @Payload CsvLineInformation csvLineInformation)
35+
throws JsonProcessingException {
36+
37+
log.debug("\n\n CsvLine received: {}", mapper.writeValueAsString(csvLineInformation));
38+
log.debug("\n\n Header received: {}", header);
39+
40+
//update csv line information
41+
csvLineInformation = csvLineValidationService.validate(csvLineInformation);
42+
43+
Message reply = MessageBuilder.withPayload(csvLineInformation)
44+
.copyHeaders(header.getHeaders())
45+
.build();
46+
47+
csvLineInformationSender.send(reply);
48+
49+
}
50+
}

src/main/java/mu/integration/consumer/rabbitmq/listener/RabbitmqListener.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/main/java/mu/integration/consumer/rabbitmq/service/CsvLineInformationSender.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
import org.springframework.beans.factory.annotation.Autowired;
44
import org.springframework.cloud.stream.messaging.Source;
55
import org.springframework.messaging.Message;
6-
import org.springframework.messaging.support.MessageBuilder;
76
import org.springframework.stereotype.Service;
87

98
import lombok.extern.slf4j.Slf4j;
10-
import mu.integration.consumer.rabbitmq.entity.CsvLineInformation;
119

1210
@Slf4j
1311
@Service
@@ -16,11 +14,8 @@ public class CsvLineInformationSender {
1614
@Autowired
1715
private Source source;
1816

19-
public void send(CsvLineInformation csvLineInformation) {
20-
Message message = MessageBuilder.withPayload(csvLineInformation).build();
21-
log.info("\n\nCsvLine sent: {}", message);
22-
this.source.output().send(MessageBuilder.withPayload(csvLineInformation).build());
17+
public void send(Message message) {
18+
log.debug("\n\n CsvLine sent: {}", message);
19+
this.source.output().send(message);
2320
}
24-
25-
2621
}

src/main/java/mu/integration/consumer/rabbitmq/service/CsvLineValidationService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package mu.integration.consumer.rabbitmq.service;
22

3-
import mu.integration.consumer.rabbitmq.entity.CsvLineInformation;
3+
import mu.integration.consumer.rabbitmq.dto.CsvLineInformation;
44

55
/**
66
*

src/main/java/mu/integration/consumer/rabbitmq/service/CsvLineValidationServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.fasterxml.jackson.databind.ObjectMapper;
88

99
import lombok.extern.slf4j.Slf4j;
10-
import mu.integration.consumer.rabbitmq.entity.CsvLineInformation;
10+
import mu.integration.consumer.rabbitmq.dto.CsvLineInformation;
1111

1212
/**
1313
*

0 commit comments

Comments
 (0)