Browse Source

XhrTransport implementations do not need to redeclare interface when extending from AbstractXhrTransport

(cherry picked from commit df0b26f)
pull/931/head
Juergen Hoeller 11 years ago
parent
commit
f1acd2882c
  1. 4
      spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java
  2. 4
      spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransport.java
  3. 2
      spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java

4
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java

@ -44,7 +44,6 @@ import org.springframework.web.socket.sockjs.SockJsException;
import org.springframework.web.socket.sockjs.SockJsTransportFailureException; import org.springframework.web.socket.sockjs.SockJsTransportFailureException;
import org.springframework.web.socket.sockjs.frame.SockJsFrame; import org.springframework.web.socket.sockjs.frame.SockJsFrame;
/** /**
* An XHR transport based on Jetty's {@link org.eclipse.jetty.client.HttpClient}. * An XHR transport based on Jetty's {@link org.eclipse.jetty.client.HttpClient}.
* *
@ -61,7 +60,7 @@ import org.springframework.web.socket.sockjs.frame.SockJsFrame;
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @since 4.1 * @since 4.1
*/ */
public class JettyXhrTransport extends AbstractXhrTransport implements XhrTransport, Lifecycle { public class JettyXhrTransport extends AbstractXhrTransport implements Lifecycle {
private final HttpClient httpClient; private final HttpClient httpClient;
@ -105,6 +104,7 @@ public class JettyXhrTransport extends AbstractXhrTransport implements XhrTransp
return this.httpClient.isRunning(); return this.httpClient.isRunning();
} }
@Override @Override
protected ResponseEntity<String> executeInfoRequestInternal(URI infoUrl) { protected ResponseEntity<String> executeInfoRequestInternal(URI infoUrl) {
return executeRequest(infoUrl, HttpMethod.GET, getRequestHeaders(), null); return executeRequest(infoUrl, HttpMethod.GET, getRequestHeaders(), null);

4
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransport.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -50,7 +50,7 @@ import org.springframework.web.socket.sockjs.frame.SockJsFrame;
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @since 4.1 * @since 4.1
*/ */
public class RestTemplateXhrTransport extends AbstractXhrTransport implements XhrTransport { public class RestTemplateXhrTransport extends AbstractXhrTransport {
private final RestOperations restTemplate; private final RestOperations restTemplate;

2
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java

@ -85,7 +85,7 @@ import org.springframework.web.socket.sockjs.frame.SockJsFrame;
* @since 4.1.2 * @since 4.1.2
* @see org.xnio.Options * @see org.xnio.Options
*/ */
public class UndertowXhrTransport extends AbstractXhrTransport implements XhrTransport { public class UndertowXhrTransport extends AbstractXhrTransport {
private static final AttachmentKey<String> RESPONSE_BODY = AttachmentKey.create(String.class); private static final AttachmentKey<String> RESPONSE_BODY = AttachmentKey.create(String.class);

Loading…
Cancel
Save