[DRAFT] API Refactor

src/main/java/ca/bc/gov/iamp/bcparis/api/MessageController.java

@@ -0,0 +1,67 @@
+package ca.bc.gov.iamp.bcparis.api;
+
+import ca.bc.gov.iamp.bcparis.exception.message.InvalidMessageType;
+import ca.bc.gov.iamp.bcparis.repository.Layer7MessageRepository;
+import ca.bc.gov.iamp.bcparis.message.DatagramProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import ca.bc.gov.iamp.bcparis.model.message.Layer7Message;
+import ca.bc.gov.iamp.bcparis.util.RequestContext;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * The message API Controller accepts request to search drivers, vehicles or por and return information.
+ *
+ * There is a global exception handler ca.bc.gov.iamp.api.exception.handling.CustomRestExceptionHandler that handles any exception thrown.
+ * There is a local exception handler ca.bc.gov.iamp.bcparis.api.exception.ExceptionHandlerController that handles known ICBC, layer7 or POR exception (an email is send in this case)
+ *
+ */
+@RestController
+@RequestMapping("/api/v1/message")
+public class MessageController {
+
+	private final Logger log = LoggerFactory.getLogger(MessageController.class);
+
+	@Autowired
+	private RequestContext context;
+
+	@Autowired
+	private List<DatagramProcessor> datagramProcessorList;
+
+	@Autowired
+	private Layer7MessageRepository layer7Repository;
+
+	@PutMapping(consumes=MediaType.APPLICATION_JSON_VALUE)
+	private ResponseEntity<Layer7Message> message( @RequestBody Layer7Message message ){
+
+		log.info("Message received");
+
+		context.setRequestObject(message);
+		Layer7Message response = null;
+
+		Optional<DatagramProcessor> processor = datagramProcessorList.stream().filter(x -> x.getType() == message.getMessageType()).findFirst();
+
+		if(processor.isPresent()) {
+			response =  processor.get().process(message);
+		} else {
+			throw new InvalidMessageType("Invalid Message type");
+		}
+
+		return ResponseEntity.ok(response);
+	}
+
+
+	@PostMapping( path="test/layer7", consumes=MediaType.APPLICATION_JSON_VALUE)
+	private ResponseEntity<String> testPutMessageLayer7( @RequestBody Layer7Message message ){
+		final String response = layer7Repository.sendMessage(message);
+		return ResponseEntity.ok(response);
+	}
+
+}

src/main/java/ca/bc/gov/iamp/bcparis/message/DatagramProcessor.java

@@ -0,0 +1,12 @@
+package ca.bc.gov.iamp.bcparis.message;
+
+import ca.bc.gov.iamp.bcparis.model.MessageType;
+import ca.bc.gov.iamp.bcparis.model.message.Layer7Message;
+
+public interface DatagramProcessor {
+
+	MessageType getType();
+
+	Layer7Message process(Layer7Message message);
+
+}

src/main/java/ca/bc/gov/iamp/bcparis/processor/datagram/DriverProcessor.java → src/main/java/ca/bc/gov/iamp/bcparis/message/DriverProcessor.java

@@ -1,12 +1,14 @@
 
 
-package ca.bc.gov.iamp.bcparis.processor.datagram;
+package ca.bc.gov.iamp.bcparis.message;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import ca.bc.gov.iamp.bcparis.model.MessageType;
+import ca.bc.gov.iamp.bcparis.service.MessageService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +19,6 @@
 import ca.bc.gov.iamp.bcparis.model.message.body.Body;
 import ca.bc.gov.iamp.bcparis.repository.ICBCRestRepository;
 import ca.bc.gov.iamp.bcparis.repository.query.IMSRequest;
-import ca.bc.gov.iamp.bcparis.service.MessageService;
 
 @Service
 public class DriverProcessor implements DatagramProcessor{
@@ -29,7 +30,12 @@ public class DriverProcessor implements DatagramProcessor{
 
 	@Autowired
 	private MessageService messageService;
-
+
+	@Override
+	public MessageType getType() {
+		return MessageType.DRIVER;
+	}
+
 	public Layer7Message process(Layer7Message message) {
 		log.info("Processing Driver message.");
 

src/main/java/ca/bc/gov/iamp/bcparis/processor/datagram/PORProcessor.java → src/main/java/ca/bc/gov/iamp/bcparis/message/PORProcessor.java

@@ -1,7 +1,9 @@
-package ca.bc.gov.iamp.bcparis.processor.datagram;
+package ca.bc.gov.iamp.bcparis.message;
 
 import java.util.List;
 
+import ca.bc.gov.iamp.bcparis.model.MessageType;
+import ca.bc.gov.iamp.bcparis.service.MessageService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,10 +14,9 @@
 import ca.bc.gov.iamp.bcparis.model.message.body.Body;
 import ca.bc.gov.iamp.bcparis.model.por.POROutput;
 import ca.bc.gov.iamp.bcparis.repository.PORRestRepository;
-import ca.bc.gov.iamp.bcparis.service.MessageService;
 
 @Service
-public class PORProcessor {
+public class PORProcessor implements DatagramProcessor {
 
 	private final Logger log = LoggerFactory.getLogger(PORProcessor.class);
 
@@ -24,7 +25,12 @@ public class PORProcessor {
 
 	@Autowired
 	private MessageService messageService;
-
+
+	@Override
+	public MessageType getType() {
+		return MessageType.POR;
+	}
+
 	public Layer7Message process(Layer7Message message) {
 		log.info("Processing POR message.");
 		Body body = message.getEnvelope().getBody();

src/main/java/ca/bc/gov/iamp/bcparis/message/ReportProcessor.java

@@ -0,0 +1,18 @@
+package ca.bc.gov.iamp.bcparis.message;
+
+import ca.bc.gov.iamp.bcparis.model.MessageType;
+import ca.bc.gov.iamp.bcparis.model.message.Layer7Message;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ReportProcessor implements DatagramProcessor {
+    @Override
+    public MessageType getType() {
+        return MessageType.REPORT;
+    }
+
+    @Override
+    public Layer7Message process(Layer7Message message) {
+        return message;
+    }
+}

src/main/java/ca/bc/gov/iamp/bcparis/processor/datagram/VehicleProcessor.java → src/main/java/ca/bc/gov/iamp/bcparis/message/VehicleProcessor.java

@@ -1,5 +1,5 @@
 
-package ca.bc.gov.iamp.bcparis.processor.datagram;
+package ca.bc.gov.iamp.bcparis.message;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -8,6 +8,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import ca.bc.gov.iamp.bcparis.model.MessageType;
+import ca.bc.gov.iamp.bcparis.service.MessageService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +21,6 @@
 import ca.bc.gov.iamp.bcparis.model.message.body.Body;
 import ca.bc.gov.iamp.bcparis.repository.ICBCRestRepository;
 import ca.bc.gov.iamp.bcparis.repository.query.IMSRequest;
-import ca.bc.gov.iamp.bcparis.service.MessageService;
 
 @Service
 public class VehicleProcessor implements DatagramProcessor{
@@ -31,7 +32,12 @@ public class VehicleProcessor implements DatagramProcessor{
 
 	@Autowired
 	private MessageService messageService;
-
+
+	@Override
+	public MessageType getType() {
+		return MessageType.VEHICLE;
+	}
+
 	public Layer7Message process(Layer7Message message) {
 		log.info("Processing Vehicle message.");
 

src/main/java/ca/bc/gov/iamp/bcparis/repository/ICBCRestRepository.java

@@ -87,7 +87,6 @@ private String generateAuditTransactionId(final Layer7Message l7message) {
                 correlationIdByte = correlationIdByte.replaceAll("\\s+", "");
                 return correlationIdByte;
             }
-
         }
         return UUID.randomUUID().toString();
     }