diff --git a/pom.xml b/pom.xml index 3ce279d..cb91bb3 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,12 @@ service-kafka-model 0.0.1-SNAPSHOT + + com.google.code.gson + gson + 2.9.0 + + org.projectlombok diff --git a/src/main/java/pl/adaptiveapps/serviceexternalserver/config/KeyDeserializerConfig.java b/src/main/java/pl/adaptiveapps/serviceexternalserver/config/KeyDeserializerConfig.java new file mode 100644 index 0000000..d019143 --- /dev/null +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/config/KeyDeserializerConfig.java @@ -0,0 +1,8 @@ +package pl.adaptiveapps.serviceexternalserver.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; + +@Configuration +public class KeyDeserializerConfig { +} diff --git a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/FormSavedController.java b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/FormSavedController.java index c59bb7b..452e3ab 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/FormSavedController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/FormSavedController.java @@ -1,21 +1,30 @@ package pl.adaptiveapps.serviceexternalserver.controller; +import com.google.gson.Gson; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import pl.adaptiveapps.service.kafkamodel.msg.external.FormSavedMsg; -import pl.adaptiveapps.service.kafkamodel.msg.external.WorktimeSavedMsg; import pl.adaptiveapps.serviceexternalserver.kafka.FormSavedProducer; +import static org.springframework.web.bind.annotation.RequestMethod.POST; + + @RequiredArgsConstructor @RestController public class FormSavedController { + private static final Logger logger = LoggerFactory.getLogger(FormSavedController.class); private final FormSavedProducer formSavedProducer; - @PostMapping("/form") - public void postForm(@RequestBody FormSavedMsg formSavedMsg){ + @RequestMapping(value = "/form", method = POST, consumes = MediaType.ALL_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + public void postForm(@RequestBody String raw){ + logger.info("Receive form: {}", raw); + FormSavedMsg formSavedMsg = new Gson().fromJson(raw, FormSavedMsg.class); formSavedProducer.sendMessage(formSavedMsg); } } diff --git a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/NotesController.java b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/NotesController.java index 1b7995d..1bdf868 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/NotesController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/NotesController.java @@ -1,6 +1,9 @@ package pl.adaptiveapps.serviceexternalserver.controller; +import com.google.gson.Gson; import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -13,9 +16,11 @@ import pl.adaptiveapps.serviceexternalserver.kafka.NotesProducer; public class NotesController { private final NotesProducer notesProducer; + private static final Logger logger = LoggerFactory.getLogger(NotesController.class); @PostMapping("/note") public void postNote(@RequestBody NoteSavedMsg noteSavedMsg){ + logger.info("Receive note: {}", new Gson().toJson(noteSavedMsg)); notesProducer.sendMessage(noteSavedMsg); } } diff --git a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/PhotosController.java b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/PhotosController.java index acc9590..375cb97 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/PhotosController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/PhotosController.java @@ -1,6 +1,9 @@ package pl.adaptiveapps.serviceexternalserver.controller; +import com.google.gson.Gson; import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -13,9 +16,11 @@ import pl.adaptiveapps.serviceexternalserver.kafka.PhotosProducer; public class PhotosController { private final PhotosProducer photosProducer; + private static final Logger logger = LoggerFactory.getLogger(PhotosController.class); @PostMapping("/photo") public void postPhoto(@RequestBody PhotoSavedMsg photoSavedMsg){ + logger.info("Receive photo: {}", new Gson().toJson(photoSavedMsg)); photosProducer.sendMessage(photoSavedMsg); } } diff --git a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/RecipienceController.java b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/RecipienceController.java index 210a8d8..1590677 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/RecipienceController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/RecipienceController.java @@ -1,6 +1,9 @@ package pl.adaptiveapps.serviceexternalserver.controller; +import com.google.gson.Gson; import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -13,9 +16,11 @@ import pl.adaptiveapps.serviceexternalserver.kafka.RecipienceProducer; public class RecipienceController { private final RecipienceProducer recipienceProducer; + private static final Logger logger = LoggerFactory.getLogger(RecipienceController.class); @PostMapping("/recipience") public void postRecipience(@RequestBody RecipienceLogSavedMsg recipienceLogSavedMsg){ + logger.info("Receive recipience: {}", new Gson().toJson(recipienceLogSavedMsg)); recipienceProducer.sendMessage(recipienceLogSavedMsg); } } diff --git a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/ServicemanController.java b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/ServicemanController.java index 424fd1a..278b7e6 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/ServicemanController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/ServicemanController.java @@ -1,6 +1,9 @@ package pl.adaptiveapps.serviceexternalserver.controller; +import com.google.gson.Gson; import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -13,9 +16,11 @@ import pl.adaptiveapps.serviceexternalserver.kafka.ServicemanProducer; public class ServicemanController { private final ServicemanProducer servicemanProducer; + private static final Logger logger = LoggerFactory.getLogger(ServicemanController.class); @PostMapping("/serviceman") public void postServiceman(@RequestBody ServicemanChangedMsg servicemanChangedMsg){ + logger.info("Receive serviceman: {}", new Gson().toJson(servicemanChangedMsg)); servicemanProducer.sendMessage(servicemanChangedMsg); } } diff --git a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/StatusController.java b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/StatusController.java index 99b64f6..b4055cb 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/StatusController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/StatusController.java @@ -1,6 +1,9 @@ package pl.adaptiveapps.serviceexternalserver.controller; +import com.google.gson.Gson; import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -12,9 +15,11 @@ import pl.adaptiveapps.serviceexternalserver.kafka.StatusProducer; public class StatusController { private final StatusProducer statusProducer; + private static final Logger logger = LoggerFactory.getLogger(StatusController.class); @PostMapping("/status") public void postStatus(@RequestBody OrderStatusChangedMsg statusChangedMsg){ + logger.info("Receive status: {}", new Gson().toJson(statusChangedMsg)); statusProducer.sendMessage(statusChangedMsg); } } diff --git a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/WarehouseController.java b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/WarehouseController.java index d932c94..db9ef3b 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/WarehouseController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/WarehouseController.java @@ -1,6 +1,9 @@ package pl.adaptiveapps.serviceexternalserver.controller; +import com.google.gson.Gson; import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -13,9 +16,11 @@ import pl.adaptiveapps.serviceexternalserver.kafka.WarehouseProducer; public class WarehouseController { private final WarehouseProducer warehouseProducer; + private static final Logger logger = LoggerFactory.getLogger(WarehouseController.class); @PostMapping("/warehouse") public void postWarehouse(@RequestBody WarehouseItemReleaseMsg warehouseItemReleaseMsg){ + logger.info("Receive warehouse: {}", new Gson().toJson(warehouseItemReleaseMsg)); warehouseProducer.sendMessage(warehouseItemReleaseMsg); } } diff --git a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/WorktimeController.java b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/WorktimeController.java index 9f45755..2673f74 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/WorktimeController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/WorktimeController.java @@ -1,6 +1,9 @@ package pl.adaptiveapps.serviceexternalserver.controller; +import com.google.gson.Gson; import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -12,9 +15,11 @@ import pl.adaptiveapps.serviceexternalserver.kafka.WorktimeProducer; public class WorktimeController { private final WorktimeProducer worktimeProducer; + private static final Logger logger = LoggerFactory.getLogger(WorktimeController.class); @PostMapping("/worktime") public void postWorktime(@RequestBody WorktimeSavedMsg worktimeSavedMsg){ + logger.info("Receive worktime: {}", new Gson().toJson(worktimeSavedMsg)); worktimeProducer.sendMessage(worktimeSavedMsg); } } diff --git a/src/main/java/pl/adaptiveapps/serviceexternalserver/kafka/FormSavedProducer.java b/src/main/java/pl/adaptiveapps/serviceexternalserver/kafka/FormSavedProducer.java index f575459..4acd360 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/kafka/FormSavedProducer.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/kafka/FormSavedProducer.java @@ -21,7 +21,7 @@ public class FormSavedProducer { public void sendMessage(FormSavedMsg formSavedMsg) { try { String message = new Gson().toJson(formSavedMsg); - var res = this.kafkaTemplate.send(KafkaTopic.FORM_SAVED, message).get(); + var res = this.kafkaTemplate.send(KafkaTopic.GENERATED_FORM_SAVED, message).get(); logger.info(String.format("#### -> formSavedMsg message sent -> %s", res.getRecordMetadata().topic())); } catch (InterruptedException | ExecutionException e) { logger.error(e.getMessage(), e); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2382ca4..e01cea0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -6,4 +6,6 @@ spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.Strin spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer spring.kafka.producer.properties.max.request.size=20242880 -logging.level.org.springframework.web=INFO \ No newline at end of file +logging.level.org.springframework.web=DEBUG + +server.tomcat.max-http-post-size=10MB \ No newline at end of file