alpha

.gitignore

@@ -1,3 +1,4 @@
+upload_to_ext.sh
 HELP.md
 target/
 !.mvn/wrapper/maven-wrapper.jar

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

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);
     }
 }
+
+

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);
     }

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);
     }

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);
     }

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);
     }

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.OrderStatusChangedMsg;
-import pl.adaptiveapps.service.kafkamodel.msg.external.WorktimeSavedMsg;
 import pl.adaptiveapps.serviceexternalserver.kafka.StatusProducer;
 
 @RequiredArgsConstructor
-@RestController("/status")
+@RestController
 public class StatusController {
 
     private final StatusProducer statusProducer;
 
-    @PostMapping("/")
+    @PostMapping("/status")
-    public void postStatus(@RequestBody StatusChangedMsg statusChangedMsg){
+    public void postStatus(@RequestBody OrderStatusChangedMsg statusChangedMsg){
         statusProducer.sendMessage(statusChangedMsg);
     }
 }

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);
     }

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);
     }

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<String, String> 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();

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