Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deprecate JSONP and disable it by default in Jackson view

Browse Source 
Issue: SPR-16798
This commit is contained in:
Sebastien Deleuze
2018-06-08 12:31:40 +02:00
parent 7bfd683816
commit b80c13b722
11 changed files with 62 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportType.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 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.
@@ -28,6 +28,8 @@ import org.springframework.lang.Nullable;
/**
* SockJS transport types.
*
* <p>JSONP support will be removed as of Spring Framework 5.1, use others transports instead.
*
* @author Rossen Stoyanchev
* @author Sebastien Deleuze
* @since 4.0
@@ -40,8 +42,10 @@ public enum TransportType {
XHR_SEND("xhr_send", HttpMethod.POST, "cors", "jsessionid", "no_cache"),
@Deprecated
JSONP("jsonp", HttpMethod.GET, "jsessionid", "no_cache"),
@Deprecated
JSONP_SEND("jsonp_send", HttpMethod.POST, "jsessionid", "no_cache"),
XHR_STREAMING("xhr_streaming", HttpMethod.POST, "cors", "jsessionid", "no_cache"),

3
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2018 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.
@@ -79,6 +79,7 @@ public class DefaultSockJsService extends TransportHandlingSockJsService impleme
}
@SuppressWarnings("deprecation")
private static Set<TransportHandler> getDefaultTransportHandlers(@Nullable Collection<TransportHandler> overrides) {
Set<TransportHandler> result = new LinkedHashSet<>(8);
result.add(new XhrPollingTransportHandler());

4
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/JsonpPollingTransportHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2018 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.
@@ -41,7 +41,9 @@ import org.springframework.web.util.JavaScriptUtils;
*
* @author Rossen Stoyanchev
* @since 4.0
* @deprecated Will be removed as of Spring Framework 5.1, use others transports instead.
*/
@Deprecated
public class JsonpPollingTransportHandler extends AbstractHttpSendingTransportHandler {
@Override

4
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/JsonpReceivingTransportHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2018 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.
@@ -38,7 +38,9 @@ import org.springframework.web.socket.sockjs.transport.session.AbstractHttpSockJ
* A {@link TransportHandler} that receives messages over HTTP.
*
* @author Rossen Stoyanchev
* @deprecated Will be removed as of Spring Framework 5.1, use others transports instead.
*/
@Deprecated
public class JsonpReceivingTransportHandler extends AbstractHttpReceivingTransportHandler {
private final FormHttpMessageConverter formConverter = new FormHttpMessageConverter();