Polishing
This commit is contained in:
parent
f854803e18
commit
f0f450a18d
|
|
@ -141,6 +141,7 @@ class YamlProcessorTests {
|
|||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void standardTypesSupportedByDefault() throws Exception {
|
||||
setYaml("value: !!set\n ? first\n ? second");
|
||||
this.processor.process((properties, map) -> {
|
||||
|
|
|
|||
|
|
@ -423,6 +423,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
|
|||
return new CachedMessageProducer(producer);
|
||||
}
|
||||
|
||||
@SuppressWarnings("resource")
|
||||
private MessageConsumer getCachedConsumer(Destination dest, @Nullable String selector,
|
||||
@Nullable Boolean noLocal, @Nullable String subscription, boolean durable) throws JMSException {
|
||||
|
||||
|
|
|
|||
|
|
@ -48,9 +48,6 @@ import org.springframework.web.reactive.socket.WebSocketSession;
|
|||
@WebSocket
|
||||
public class Jetty10WebSocketHandlerAdapter {
|
||||
|
||||
private static final ByteBuffer EMPTY_PAYLOAD = ByteBuffer.wrap(new byte[0]);
|
||||
|
||||
|
||||
private final WebSocketHandler delegateHandler;
|
||||
|
||||
private final Function<Session, JettyWebSocketSession> sessionFactory;
|
||||
|
|
@ -97,7 +94,9 @@ public class Jetty10WebSocketHandlerAdapter {
|
|||
// TODO: onWebSocketFrame can't be declared without compiling against Jetty 10
|
||||
// Jetty 10: org.eclipse.jetty.websocket.api.Frame
|
||||
// Jetty 9: org.eclipse.jetty.websocket.api.extensions.Frame
|
||||
|
||||
//
|
||||
// private static final ByteBuffer EMPTY_PAYLOAD = ByteBuffer.wrap(new byte[0]);
|
||||
//
|
||||
// @OnWebSocketFrame
|
||||
// public void onWebSocketFrame(Frame frame) {
|
||||
// if (this.delegateSession != null) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2002-2020 the original author or authors.
|
||||
* Copyright 2002-2021 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
@ -90,8 +90,7 @@ class SseServerResponseTests {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void builder() throws Exception {
|
||||
String body = "foo bar";
|
||||
void builder() throws Exception {
|
||||
ServerResponse response = ServerResponse.sse(sse -> {
|
||||
try {
|
||||
sse.id("id")
|
||||
|
|
@ -132,14 +131,15 @@ class SseServerResponseTests {
|
|||
this.age = age;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
public String getName() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
public int getAge() {
|
||||
return this.age;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2002-2020 the original author or authors.
|
||||
* Copyright 2002-2021 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
|
|||
|
||||
import org.springframework.core.MethodParameter;
|
||||
import org.springframework.web.context.request.ServletWebRequest;
|
||||
import org.springframework.web.method.support.ModelAndViewContainer;
|
||||
import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
|
||||
import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
|
||||
|
||||
|
|
@ -41,32 +40,25 @@ import static org.assertj.core.api.Assertions.assertThat;
|
|||
*
|
||||
* @author Rossen Stoyanchev
|
||||
*/
|
||||
public class PrincipalMethodArgumentResolverTests {
|
||||
class PrincipalMethodArgumentResolverTests {
|
||||
|
||||
private PrincipalMethodArgumentResolver resolver;
|
||||
private PrincipalMethodArgumentResolver resolver = new PrincipalMethodArgumentResolver();
|
||||
|
||||
private ModelAndViewContainer mavContainer;
|
||||
private MockHttpServletRequest servletRequest = new MockHttpServletRequest("GET", "");
|
||||
|
||||
private MockHttpServletRequest servletRequest;
|
||||
|
||||
private ServletWebRequest webRequest;
|
||||
private ServletWebRequest webRequest = new ServletWebRequest(servletRequest, new MockHttpServletResponse());
|
||||
|
||||
private Method method;
|
||||
|
||||
|
||||
@BeforeEach
|
||||
public void setup() throws Exception {
|
||||
resolver = new PrincipalMethodArgumentResolver();
|
||||
mavContainer = new ModelAndViewContainer();
|
||||
servletRequest = new MockHttpServletRequest("GET", "");
|
||||
webRequest = new ServletWebRequest(servletRequest, new MockHttpServletResponse());
|
||||
|
||||
void setup() throws Exception {
|
||||
method = getClass().getMethod("supportedParams", ServletRequest.class, Principal.class);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void principal() throws Exception {
|
||||
void principal() throws Exception {
|
||||
Principal principal = () -> "Foo";
|
||||
servletRequest.setUserPrincipal(principal);
|
||||
|
||||
|
|
@ -78,7 +70,7 @@ public class PrincipalMethodArgumentResolverTests {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void principalAsNull() throws Exception {
|
||||
void principalAsNull() throws Exception {
|
||||
MethodParameter principalParameter = new MethodParameter(method, 1);
|
||||
assertThat(resolver.supportsParameter(principalParameter)).as("Principal not supported").isTrue();
|
||||
|
||||
|
|
@ -87,7 +79,7 @@ public class PrincipalMethodArgumentResolverTests {
|
|||
}
|
||||
|
||||
@Test // gh-25780
|
||||
public void annotatedPrincipal() throws Exception {
|
||||
void annotatedPrincipal() throws Exception {
|
||||
Principal principal = () -> "Foo";
|
||||
servletRequest.setUserPrincipal(principal);
|
||||
Method principalMethod = getClass().getMethod("supportedParamsWithAnnotatedPrincipal", Principal.class);
|
||||
|
|
|
|||
|
|
@ -151,6 +151,7 @@ public class ResourceUrlProviderTests {
|
|||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("resource")
|
||||
void initializeOnCurrentContext() {
|
||||
AnnotationConfigWebApplicationContext parentContext = new AnnotationConfigWebApplicationContext();
|
||||
parentContext.setServletContext(new MockServletContext());
|
||||
|
|
|
|||
Loading…
Reference in New Issue