From 968492c28b93fca25ef99c589e94cee5a18eca59 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 28 Jul 2014 14:11:02 -0400 Subject: [PATCH] Update constructor for AbstractJsonpResponseBodyAdvice --- .../annotation/AbstractJsonpResponseBodyAdvice.java | 9 ++++----- .../annotation/RequestMappingHandlerAdapterTests.java | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractJsonpResponseBodyAdvice.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractJsonpResponseBodyAdvice.java index c595cf937c4..765d93d05a9 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractJsonpResponseBodyAdvice.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractJsonpResponseBodyAdvice.java @@ -23,10 +23,9 @@ import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.util.Assert; -import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; import javax.servlet.http.HttpServletRequest; -import java.util.Collection; /** * A convenient base class for a {@code ResponseBodyAdvice} to instruct the @@ -48,9 +47,9 @@ public abstract class AbstractJsonpResponseBodyAdvice extends AbstractMappingJac private final String[] jsonpQueryParamNames; - protected AbstractJsonpResponseBodyAdvice(Collection queryParamNames) { - Assert.isTrue(!CollectionUtils.isEmpty(queryParamNames), "At least one query param name is required"); - this.jsonpQueryParamNames = queryParamNames.toArray(new String[queryParamNames.size()]); + protected AbstractJsonpResponseBodyAdvice(String... queryParamNames) { + Assert.isTrue(!ObjectUtils.isEmpty(queryParamNames), "At least one query param name is required"); + this.jsonpQueryParamNames = queryParamNames; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java index 97cd2a59a09..dde3afccae9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java @@ -355,12 +355,12 @@ public class RequestMappingHandlerAdapterTests { } } - @ControllerAdvice - private static class JsonpAdvice extends AbstractJsonpResponseBodyAdvice { +@ControllerAdvice +private static class JsonpAdvice extends AbstractJsonpResponseBodyAdvice { - public JsonpAdvice() { - super(Arrays.asList("c")); - } + public JsonpAdvice() { + super("c"); } +} }