Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.0.x #2

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Release 2.0.x #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2109e29
Update to 2.0.0-SNAPSHOT for Spring Boot 2 / Spring 5 build
nealeu Mar 7, 2018
307c337
Migrate to @SpringBootTest (needed for SB 1.5 and above)
nealeu Mar 7, 2018
295c74b
Implement additional methods added to ClientHttpRequest in Spring 5
nealeu Mar 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.0.RELEASE</version>
<version>2.0.0.RELEASE</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<groupId>ucles.weblab</groupId>
<artifactId>weblab-api-tunnel</artifactId>
<version>0.4-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand All @@ -22,7 +22,7 @@
</modules>

<properties>
<common-java.version>0.4-SNAPSHOT</common-java.version>
<common-java.version>2.0.0-SNAPSHOT</common-java.version>
<websocket.version>1.1</websocket.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion weblab-api-tunnel-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>weblab-api-tunnel</artifactId>
<groupId>ucles.weblab</groupId>
<version>0.4-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
11 changes: 6 additions & 5 deletions ...ent/src/test/java/ucles/weblab/common/tunnel/client/WebSocketConnectionInstigator_IT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
Expand All @@ -18,17 +17,19 @@
import javax.websocket.Session;
import javax.websocket.WebSocketContainer;

import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;

/**
* @since 07/09/2016
*/
@RunWith(SpringJUnit4ClassRunner.class)
@IntegrationTest
@SpringApplicationConfiguration(classes = { WebSocketConnectionInstigator_IT.Config.class, WebSocketTunnelConfiguration.class })
@SpringBootTest(
classes = { WebSocketConnectionInstigator_IT.Config.class, WebSocketTunnelConfiguration.class },
webEnvironment = NONE)
@TestPropertySource(locations = "classpath:test.properties")
public class WebSocketConnectionInstigator_IT {
@Configuration
Expand Down
2 changes: 1 addition & 1 deletion weblab-api-tunnel-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>weblab-api-tunnel</artifactId>
<groupId>ucles.weblab</groupId>
<version>0.4-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion weblab-api-tunnel-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>weblab-api-tunnel</artifactId>
<groupId>ucles.weblab</groupId>
<version>0.4-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
10 changes: 10 additions & 0 deletions ...l-server/src/main/java/ucles/weblab/common/tunnel/server/WebSocketHttpRequestFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,16 @@ private class WebSocketHttpRequest implements ClientHttpRequest {
this.method = method;
}

@Override
public HttpMethod getMethod() {
return method;
}

@Override
public String getMethodValue() {
return method == null ? null : method.name();
}

@JsonIgnore
public URI getURI() {
return url;
Expand Down