From 90c696bd54b36c07dcea7d13c2d9eda3fa462b4a Mon Sep 17 00:00:00 2001 From: tszyszkowski Date: Thu, 24 Mar 2022 15:30:04 +0100 Subject: [PATCH] alpha --- .gitignore | 1 + .../serviceexternalserver/config/SecurityConfig.java | 2 +- .../controller/FormSavedController.java | 6 ++++-- .../controller/NotesController.java | 4 ++-- .../controller/PhotosController.java | 4 ++-- .../controller/RecipienceController.java | 4 ++-- .../controller/ServicemanController.java | 4 ++-- .../controller/StatusController.java | 9 ++++----- .../controller/WarehouseController.java | 4 ++-- .../controller/WorktimeController.java | 4 ++-- .../serviceexternalserver/kafka/StatusProducer.java | 4 ++-- src/main/resources/application.properties | 6 ++++++ 12 files changed, 30 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 549e00a..07632c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +upload_to_ext.sh HELP.md target/ !.mvn/wrapper/maven-wrapper.jar diff --git a/src/main/java/pl/adaptiveapps/serviceexternalserver/config/SecurityConfig.java b/src/main/java/pl/adaptiveapps/serviceexternalserver/config/SecurityConfig.java index 99baf12..d7d8035 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/config/SecurityConfig.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/config/SecurityConfig.java @@ -44,7 +44,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { http .csrf().disable() .authorizeRequests().antMatchers(HttpMethod.OPTIONS).permitAll() - .antMatchers("/api/**").authenticated() + .antMatchers("/**").authenticated() .and() .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS); http diff --git a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/FormSavedController.java b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/FormSavedController.java index 9185d72..c59bb7b 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/FormSavedController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/FormSavedController.java @@ -9,13 +9,15 @@ import pl.adaptiveapps.service.kafkamodel.msg.external.WorktimeSavedMsg; import pl.adaptiveapps.serviceexternalserver.kafka.FormSavedProducer; @RequiredArgsConstructor -@RestController("/form") +@RestController public class FormSavedController { private final FormSavedProducer formSavedProducer; - @PostMapping("/") + @PostMapping("/form") public void postForm(@RequestBody FormSavedMsg formSavedMsg){ 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 7489dcc..1b7995d 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/NotesController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/NotesController.java @@ -9,12 +9,12 @@ import pl.adaptiveapps.service.kafkamodel.msg.external.WorktimeSavedMsg; import pl.adaptiveapps.serviceexternalserver.kafka.NotesProducer; @RequiredArgsConstructor -@RestController("/note") +@RestController public class NotesController { private final NotesProducer notesProducer; - @PostMapping("/") + @PostMapping("/note") public void postNote(@RequestBody NoteSavedMsg 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 d12f895..acc9590 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/PhotosController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/PhotosController.java @@ -9,12 +9,12 @@ import pl.adaptiveapps.service.kafkamodel.msg.external.WorktimeSavedMsg; import pl.adaptiveapps.serviceexternalserver.kafka.PhotosProducer; @RequiredArgsConstructor -@RestController("/photo") +@RestController public class PhotosController { private final PhotosProducer photosProducer; - @PostMapping("/") + @PostMapping("/photo") public void postPhoto(@RequestBody PhotoSavedMsg 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 6c5d126..210a8d8 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/RecipienceController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/RecipienceController.java @@ -9,12 +9,12 @@ import pl.adaptiveapps.service.kafkamodel.msg.external.WorktimeSavedMsg; import pl.adaptiveapps.serviceexternalserver.kafka.RecipienceProducer; @RequiredArgsConstructor -@RestController("/recipience") +@RestController public class RecipienceController { private final RecipienceProducer recipienceProducer; - @PostMapping("/") + @PostMapping("/recipience") public void postRecipience(@RequestBody RecipienceLogSavedMsg 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 637251e..424fd1a 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/ServicemanController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/ServicemanController.java @@ -9,12 +9,12 @@ import pl.adaptiveapps.service.kafkamodel.msg.external.WorktimeSavedMsg; import pl.adaptiveapps.serviceexternalserver.kafka.ServicemanProducer; @RequiredArgsConstructor -@RestController("/serviceman") +@RestController public class ServicemanController { private final ServicemanProducer servicemanProducer; - @PostMapping("/") + @PostMapping("/serviceman") public void postServiceman(@RequestBody ServicemanChangedMsg 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 6ac6488..99b64f6 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/StatusController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/StatusController.java @@ -4,18 +4,17 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import pl.adaptiveapps.service.kafkamodel.msg.external.StatusChangedMsg; -import pl.adaptiveapps.service.kafkamodel.msg.external.WorktimeSavedMsg; +import pl.adaptiveapps.service.kafkamodel.msg.external.OrderStatusChangedMsg; import pl.adaptiveapps.serviceexternalserver.kafka.StatusProducer; @RequiredArgsConstructor -@RestController("/status") +@RestController public class StatusController { private final StatusProducer statusProducer; - @PostMapping("/") - public void postStatus(@RequestBody StatusChangedMsg statusChangedMsg){ + @PostMapping("/status") + public void postStatus(@RequestBody OrderStatusChangedMsg 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 243468b..d932c94 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/WarehouseController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/WarehouseController.java @@ -9,12 +9,12 @@ import pl.adaptiveapps.service.kafkamodel.msg.external.WorktimeSavedMsg; import pl.adaptiveapps.serviceexternalserver.kafka.WarehouseProducer; @RequiredArgsConstructor -@RestController("/warehouse") +@RestController public class WarehouseController { private final WarehouseProducer warehouseProducer; - @PostMapping("/") + @PostMapping("/warehouse") public void postWarehouse(@RequestBody WarehouseItemReleaseMsg 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 abde1f3..9f45755 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/WorktimeController.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/controller/WorktimeController.java @@ -8,12 +8,12 @@ import pl.adaptiveapps.service.kafkamodel.msg.external.WorktimeSavedMsg; import pl.adaptiveapps.serviceexternalserver.kafka.WorktimeProducer; @RequiredArgsConstructor -@RestController("/worktime") +@RestController public class WorktimeController { private final WorktimeProducer worktimeProducer; - @PostMapping("/") + @PostMapping("/worktime") public void postWorktime(@RequestBody WorktimeSavedMsg worktimeSavedMsg){ worktimeProducer.sendMessage(worktimeSavedMsg); } diff --git a/src/main/java/pl/adaptiveapps/serviceexternalserver/kafka/StatusProducer.java b/src/main/java/pl/adaptiveapps/serviceexternalserver/kafka/StatusProducer.java index 9678cca..d030a8a 100644 --- a/src/main/java/pl/adaptiveapps/serviceexternalserver/kafka/StatusProducer.java +++ b/src/main/java/pl/adaptiveapps/serviceexternalserver/kafka/StatusProducer.java @@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.stereotype.Service; import pl.adaptiveapps.service.kafkamodel.common.KafkaTopic; -import pl.adaptiveapps.service.kafkamodel.msg.external.StatusChangedMsg; +import pl.adaptiveapps.service.kafkamodel.msg.external.OrderStatusChangedMsg; import java.util.concurrent.ExecutionException; @@ -18,7 +18,7 @@ public class StatusProducer { private final KafkaTemplate kafkaTemplate; - public void sendMessage(StatusChangedMsg statusChangedMsg) { + public void sendMessage(OrderStatusChangedMsg statusChangedMsg) { try { String message = new Gson().toJson(statusChangedMsg); var res = this.kafkaTemplate.send(KafkaTopic.STATUS_CHANGE, message).get(); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8b13789..51dc2f3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,7 @@ +ext.client.token=1d47e72e-d154-43ce-b2f7-95b9467f32e5 +server.port=9095 +spring.kafka.producer.bootstrap-servers=localhost:9092 +spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer +spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer +spring.kafka.producer.properties.max.request.size=20242880 \ No newline at end of file