improve validation slightly

Author: Ronny Bräunlich

src/main/java/de/codecentric/spring/additionalvalidation/controller/ValidationController.java

@@ -14,6 +14,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.context.annotation.RequestScope;
 
 import java.util.stream.Collectors;
 
@@ -29,9 +30,7 @@ public ValidationController(StringValueValidator stringValueValidator) {
 
     @RequestMapping(value = "/validation", method = RequestMethod.POST)
     public ResponseEntity<?> acceptData(@Validated @RequestBody Data data, Errors errors, @RequestHeader(HttpHeaders.ACCEPT_LANGUAGE) String language) {
-        if (!"de-DE".equals(language)) {
-            stringValueValidator.validate(data, errors);
-        }
+        stringValueValidator.validate(language, data, errors);
         if (errors.hasErrors()) {
             return new ResponseEntity<>(createErrorString(errors), HttpStatus.BAD_REQUEST);
         }

src/main/java/de/codecentric/spring/additionalvalidation/validator/StringValueValidator.java

@@ -1,16 +1,23 @@
 package de.codecentric.spring.additionalvalidation.validator;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import de.codecentric.spring.additionalvalidation.controller.Data;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.Errors;
 
+import javax.servlet.http.HttpServletRequest;
+
 @Component
 public class StringValueValidator {
 
-    public void validate(Data data, Errors errors) {
-        if (data.getSomeStringValue().length() > 140) {
-            errors.reject("someStringValue");
+    public void validate(String language, Data data, Errors errors) {
+        if (!"de-DE".equals(language)) {
+            if (data.getSomeStringValue().length() > 140) {
+                errors.reject("someStringValue");
+            }
         }
     }
 }

src/test/java/de/codecentric/spring/additionalvalidation/ValidationControllerTest.java

@@ -99,4 +99,24 @@ public void shouldAcceptLongerStringForDe() throws Exception {
                 .andExpect(status().isBadRequest());
     }
 
+    @Test
+    public void shouldSwitchLanguageBetweenTwoRequests() throws Exception {
+        this.mockMvc.perform(post("/validation")
+                .contentType(MediaType.APPLICATION_JSON_UTF8)
+                .header(HttpHeaders.ACCEPT_LANGUAGE, "en-GB")
+                .content("{" +
+                        "\"someStringValue\":\"MSsX0DHN2FKHCjkkyMuCnj9PNQ10wD0QmN863rQZOPZIXiJg2vvRMdC9AJDDXeX5AVnglYG2lkHtVv9L47gI40IBdKS4MrgPe13GaS0iKgZeukJJS3zcOHywx39QyjejadI46wSmhi8si\"," +
+                        "\"someIntValue\":1" +
+                        "}"))
+                .andExpect(status().isBadRequest());
+        this.mockMvc.perform(post("/validation")
+                .contentType(MediaType.APPLICATION_JSON_UTF8)
+                .header(HttpHeaders.ACCEPT_LANGUAGE, "de-DE")
+                .content("{" +
+                        "\"someStringValue\":\"MSsX0DHN2FKHCjkkyMuCnj9PNQ10wD0QmN863rQZOPZIXiJg2vvRMdC9AJDDXeX5AVnglYG2lkHtVv9L47gI40IBdKS4MrgPe13GaS0iKgZeukJJS3zcOHywx39QyjejadI46wSmhi8si\"," +
+                        "\"someIntValue\":1" +
+                        "}"))
+                .andExpect(status().isOk());
+    }
+
 }