From 42bced139ff58acc5efe84b4addc3ed2cbef94b5 Mon Sep 17 00:00:00 2001
From: Andrew DeMaria <lostonamountain@gmail.com>
Date: Tue, 2 Jul 2019 00:59:38 -0600
Subject: [PATCH] Small refactor on httpservletrequest injection

---
 .../player/controller/UserSettingsController.java    |  6 ++----
 .../player/validator/UserSettingsValidator.java      | 12 ++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java
index 073126ea..23e2b3af 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java
@@ -66,12 +66,10 @@ public class UserSettingsController {
     private SettingsService settingsService;
     @Autowired
     private TranscodingService transcodingService;
-    @Autowired
-    private UserSettingsValidator userSettingsValidator;
 
     @InitBinder
-    protected void initBinder(WebDataBinder binder) {
-        binder.addValidators(userSettingsValidator);
+    protected void initBinder(WebDataBinder binder, HttpServletRequest request) {
+        binder.addValidators(new UserSettingsValidator(securityService, settingsService, request));
     }
 
     @GetMapping
diff --git a/airsonic-main/src/main/java/org/airsonic/player/validator/UserSettingsValidator.java b/airsonic-main/src/main/java/org/airsonic/player/validator/UserSettingsValidator.java
index e44f2bb0..1c3cc153 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/validator/UserSettingsValidator.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/validator/UserSettingsValidator.java
@@ -24,8 +24,6 @@ import org.airsonic.player.controller.UserSettingsController;
 import org.airsonic.player.service.SecurityService;
 import org.airsonic.player.service.SettingsService;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
 
@@ -36,16 +34,18 @@ import javax.servlet.http.HttpServletRequest;
  *
  * @author Sindre Mehus
  */
-@Component
 public class UserSettingsValidator implements Validator {
 
-    @Autowired
     private SecurityService securityService;
-    @Autowired
     private SettingsService settingsService;
-    @Autowired
     private HttpServletRequest request;
 
+    public UserSettingsValidator(SecurityService securityService, SettingsService settingsService, HttpServletRequest request) {
+        this.securityService = securityService;
+        this.settingsService = settingsService;
+        this.request = request;
+    }
+
     /**
      * {@inheritDoc}
      */