use reject instead of new since it has been registered as a spring bean.

citerus · Nov 21, 2024 · 266cd6b · 266cd6b
1 parent cf2eacd
commit 266cd6b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 21 deletions.
diff --git a/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java b/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java
@@ -61,8 +61,14 @@ public FixedLocaleResolver localeResolver() {
     }
 
     @Bean
-    public CargoTrackingController cargoTrackingController(MessageSource messageSource, CargoRepository cargoRepository, HandlingEventRepository handlingEventRepository) {
-        return new CargoTrackingController(cargoRepository, handlingEventRepository, messageSource);
+    public CargoTrackingController cargoTrackingController(MessageSource messageSource,
+                                                           CargoRepository cargoRepository,
+                                                           HandlingEventRepository handlingEventRepository,
+                                                           TrackCommandValidator TrackCommandValidator) {
+        return new CargoTrackingController(cargoRepository,
+            handlingEventRepository,
+            messageSource,
+            TrackCommandValidator);
     }
 
     @Bean
@@ -106,10 +112,10 @@ public ThreadPoolTaskScheduler myScheduler(@Nullable UploadDirectoryScanner scan
             return null;
         }
         ThreadPoolTaskScheduler threadPoolTaskScheduler
-                = new ThreadPoolTaskScheduler();
+            = new ThreadPoolTaskScheduler();
         threadPoolTaskScheduler.setPoolSize(10);
         threadPoolTaskScheduler.setThreadNamePrefix(
-                "ThreadPoolTaskScheduler");
+            "ThreadPoolTaskScheduler");
         threadPoolTaskScheduler.initialize();
         threadPoolTaskScheduler.scheduleAtFixedRate(scanner, 5000);
         return threadPoolTaskScheduler;

diff --git a/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java b/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java
@@ -1,6 +1,7 @@
 package se.citerus.dddsample.interfaces.tracking;
 
 import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
 import org.springframework.context.MessageSource;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
@@ -28,35 +29,32 @@
  * helps us shield the domain model classes.
  * <p>
  *
- * @eee se.citerus.dddsample.application.web.CargoTrackingViewAdapter
+ * @see CargoTrackingViewAdapter
  * @see se.citerus.dddsample.interfaces.booking.web.CargoAdminController
  */
 @Controller
+@RequiredArgsConstructor
 @RequestMapping("/track")
 public final class CargoTrackingController {
 
-    private CargoRepository cargoRepository;
-    private HandlingEventRepository handlingEventRepository;
-    private MessageSource messageSource;
-
-    public CargoTrackingController(CargoRepository cargoRepository, HandlingEventRepository handlingEventRepository, MessageSource messageSource) {
-        this.cargoRepository = cargoRepository;
-        this.handlingEventRepository = handlingEventRepository;
-        this.messageSource = messageSource;
-    }
+    private final CargoRepository cargoRepository;
+    private final HandlingEventRepository handlingEventRepository;
+    private final MessageSource messageSource;
+    private final TrackCommandValidator trackCommandValidator;
 
     @RequestMapping(method = RequestMethod.GET)
-    public String get(final Map<String, Object> model) {
-        model.put("trackCommand", new TrackCommand()); // TODO why is this method adding a TrackCommand without id?
+    public String index(final Map<String, Object> model) {
+        // using the empty command to support the thymeleaf form `<form method="post" th:object="${trackCommand}">`
+        model.put("trackCommand", new TrackCommand());
         return "track";
     }
 
     @RequestMapping(method = RequestMethod.POST)
-    protected String onSubmit(final HttpServletRequest request,
-                                                             final TrackCommand command,
-                                                             final Map<String, Object> model,
-                                                             final BindingResult bindingResult) {
-        new TrackCommandValidator().validate(command, bindingResult);
+    private String onSubmit(final HttpServletRequest request,
+                            final TrackCommand command,
+                            final Map<String, Object> model,
+                            final BindingResult bindingResult) {
+        trackCommandValidator.validate(command, bindingResult);
 
         final TrackingId trackingId = new TrackingId(command.getTrackingId());
         final Cargo cargo = cargoRepository.find(trackingId);