root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed Undertow10BufferSupport to UndertowXnioBufferSupport 

Issue: SPR-13366
This commit is contained in:
Juergen Hoeller 2015-09-24 20:53:12 +02:00
parent 7f700cc63e
commit 90409cbe98
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java
View File

@ -69,7 +69,7 @@ import org.springframework.web.socket.sockjs.frame.SockJsFrame;
/** /**
* An XHR transport based on Undertow's {@link io.undertow.client.UndertowClient}. * An XHR transport based on Undertow's {@link io.undertow.client.UndertowClient}.
* Compatible with Undertow from version 1.0 to 1.3. * Compatible with Undertow 1.0 to 1.3, as of Spring Framework 4.2.2.
* *
* <p>When used for testing purposes (e.g. load testing) or for specific use cases * <p>When used for testing purposes (e.g. load testing) or for specific use cases
* (like HTTPS configuration), a custom OptionMap should be provided: * (like HTTPS configuration), a custom OptionMap should be provided:
@ -92,11 +92,11 @@ import org.springframework.web.socket.sockjs.frame.SockJsFrame;
*/ */
public class UndertowXhrTransport extends AbstractXhrTransport { public class UndertowXhrTransport extends AbstractXhrTransport {
private static final boolean undertow13Present = ClassUtils.isPresent("io.undertow.connector.ByteBufferPool",
UndertowXhrTransport.class.getClassLoader());
private static final AttachmentKey<String> RESPONSE_BODY = AttachmentKey.create(String.class); private static final AttachmentKey<String> RESPONSE_BODY = AttachmentKey.create(String.class);
private static final boolean undertow13Present = ClassUtils.isPresent(
"io.undertow.connector.ByteBufferPool", UndertowXhrTransport.class.getClassLoader());
private final OptionMap optionMap; private final OptionMap optionMap;
@ -116,12 +116,8 @@ public class UndertowXhrTransport extends AbstractXhrTransport {
this.optionMap = optionMap; this.optionMap = optionMap;
this.httpClient = UndertowClient.getInstance(); this.httpClient = UndertowClient.getInstance();
this.worker = Xnio.getInstance().createWorker(optionMap); this.worker = Xnio.getInstance().createWorker(optionMap);
if (undertow13Present) { this.undertowBufferSupport =
this.undertowBufferSupport = new Undertow13BufferSupport(); (undertow13Present ? new Undertow13BufferSupport() : new UndertowXnioBufferSupport());
}
else {
this.undertowBufferSupport = new Undertow10BufferSupport();
}
} }
@ -490,6 +486,7 @@ public class UndertowXhrTransport extends AbstractXhrTransport {
} }
} }
private interface UndertowBufferSupport { private interface UndertowBufferSupport {
Object allocatePooledResource(); Object allocatePooledResource();
@ -505,7 +502,8 @@ public class UndertowXhrTransport extends AbstractXhrTransport {
final XnioWorker worker, OptionMap options); final XnioWorker worker, OptionMap options);
} }
private class Undertow10BufferSupport implements UndertowBufferSupport {
private class UndertowXnioBufferSupport implements UndertowBufferSupport {
private final org.xnio.Pool<ByteBuffer> xnioBufferPool; private final org.xnio.Pool<ByteBuffer> xnioBufferPool;
@ -513,7 +511,7 @@ public class UndertowXhrTransport extends AbstractXhrTransport {
private final Method httpClientConnectMethod; private final Method httpClientConnectMethod;
public Undertow10BufferSupport() { public UndertowXnioBufferSupport() {
this.xnioBufferPool = new org.xnio.ByteBufferSlicePool(1048, 1048); this.xnioBufferPool = new org.xnio.ByteBufferSlicePool(1048, 1048);
this.httpClientConnectCallbackMethod = ReflectionUtils.findMethod(UndertowClient.class, "connect", this.httpClientConnectCallbackMethod = ReflectionUtils.findMethod(UndertowClient.class, "connect",
ClientCallback.class, URI.class, XnioWorker.class, Pool.class, OptionMap.class); ClientCallback.class, URI.class, XnioWorker.class, Pool.class, OptionMap.class);
@ -543,7 +541,6 @@ public class UndertowXhrTransport extends AbstractXhrTransport {
XnioWorker worker, OptionMap options) { XnioWorker worker, OptionMap options) {
ReflectionUtils.invokeMethod(httpClientConnectCallbackMethod, httpClient, listener, uri, worker, ReflectionUtils.invokeMethod(httpClientConnectCallbackMethod, httpClient, listener, uri, worker,
this.xnioBufferPool, options); this.xnioBufferPool, options);
} }
@Override @Override
@ -555,6 +552,7 @@ public class UndertowXhrTransport extends AbstractXhrTransport {
} }
} }
private class Undertow13BufferSupport implements UndertowBufferSupport { private class Undertow13BufferSupport implements UndertowBufferSupport {
private final ByteBufferPool undertowBufferPool; private final ByteBufferPool undertowBufferPool;