Skip to content

Commit e6804cb

Browse files
committed
Update to latest reactivesocket
1 parent d554742 commit e6804cb

13 files changed

Lines changed: 116 additions & 33 deletions

File tree

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ subprojects {
1414
}
1515

1616
dependencies {
17-
compile 'io.reactivex:rxjava:1.1.2'
18-
compile 'io.reactivex:rxjava-reactive-streams:1.0.1'
19-
compile 'io.reactivesocket:reactivesocket:0.0.5'
20-
compile 'org.hdrhistogram:HdrHistogram:2.1.7'
21-
compile 'org.slf4j:slf4j-api:1.7.12'
17+
compile 'io.reactivex:rxjava:latest.release'
18+
compile 'io.reactivex:rxjava-reactive-streams:latest.release'
19+
compile 'io.reactivesocket:reactivesocket:latest.release'
20+
compile 'org.hdrhistogram:HdrHistogram:latest.release'
21+
compile 'org.slf4j:slf4j-api:latest.release'
2222
testCompile 'junit:junit:4.12'
23-
testCompile 'org.mockito:mockito-core:1.8.5'
23+
testCompile 'org.mockito:mockito-core:1.10.19'
2424
testRuntime 'org.slf4j:slf4j-simple:1.7.12'
2525
}
2626
}

reactivesocket-aeron/src/main/java/io/reactivesocket/aeron/client/AeronReactiveSocketFactory.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
1+
/**
2+
* Copyright 2016 Netflix, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package io.reactivesocket.aeron.client;
217

318
import io.reactivesocket.ConnectionSetupPayload;
419
import io.reactivesocket.DefaultReactiveSocket;
520
import io.reactivesocket.ReactiveSocket;
621
import io.reactivesocket.ReactiveSocketFactory;
7-
import io.reactivesocket.ReactiveSocketSocketAddressFactory;
822
import io.reactivesocket.rx.Completable;
923
import org.agrona.LangUtil;
1024
import org.reactivestreams.Publisher;
@@ -26,7 +40,7 @@
2640
/**
2741
* An implementation of {@link ReactiveSocketFactory} that creates Aeron ReactiveSockets.
2842
*/
29-
public class AeronReactiveSocketFactory implements ReactiveSocketSocketAddressFactory<ReactiveSocket> {
43+
public class AeronReactiveSocketFactory implements ReactiveSocketFactory<SocketAddress, ReactiveSocket> {
3044
private static final Logger logger = LoggerFactory.getLogger(AeronReactiveSocketFactory.class);
3145

3246
private final ConnectionSetupPayload connectionSetupPayload;

reactivesocket-aeron/src/test/java/io/reactivesocket/aeron/server/ServerAeronManagerTest.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/**
2+
* Copyright 2016 Netflix, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package io.reactivesocket.aeron.server;
217

318
import io.aeron.driver.MediaDriver;

reactivesocket-jsr-356/src/main/java/io/reactivesocket/javax/websocket/client/WebSocketReactiveSocketFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import io.reactivesocket.DefaultReactiveSocket;
2020
import io.reactivesocket.ReactiveSocket;
2121
import io.reactivesocket.ReactiveSocketFactory;
22-
import io.reactivesocket.ReactiveSocketSocketAddressFactory;
2322
import io.reactivesocket.javax.websocket.WebSocketDuplexConnection;
2423
import io.reactivesocket.rx.Completable;
2524
import org.glassfish.tyrus.client.ClientManager;
@@ -37,7 +36,7 @@
3736
/**
3837
* An implementation of {@link ReactiveSocketFactory} that creates JSR-356 WebSocket ReactiveSockets.
3938
*/
40-
public class WebSocketReactiveSocketFactory implements ReactiveSocketSocketAddressFactory<ReactiveSocket> {
39+
public class WebSocketReactiveSocketFactory implements ReactiveSocketFactory<SocketAddress, ReactiveSocket> {
4140
private static final Logger logger = LoggerFactory.getLogger(WebSocketReactiveSocketFactory.class);
4241

4342
private final ConnectionSetupPayload connectionSetupPayload;

reactivesocket-local/build.gradle

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +0,0 @@
1-
group 'io.reactivesocket'
2-
version '0.1.3-SNAPSHOT'
3-
4-
apply plugin: 'java'
5-
6-
sourceCompatibility = 1.8
7-
8-
repositories {
9-
mavenCentral()
10-
}
11-
12-
dependencies {
13-
testCompile group: 'junit', name: 'junit', version: '4.11'
14-
}

reactivesocket-local/src/main/java/io/reactivesocket/local/LocalClientDuplexConnection.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/**
2+
* Copyright 2016 Netflix, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package io.reactivesocket.local;
217

318
import io.reactivesocket.DuplexConnection;

reactivesocket-local/src/main/java/io/reactivesocket/local/LocalClientReactiveSocketFactory.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/**
2+
* Copyright 2016 Netflix, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package io.reactivesocket.local;
217

318
import io.reactivesocket.ConnectionSetupPayload;

reactivesocket-local/src/main/java/io/reactivesocket/local/LocalReactiveSocketManager.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/**
2+
* Copyright 2016 Netflix, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package io.reactivesocket.local;
217

318
import java.util.concurrent.ConcurrentHashMap;

reactivesocket-local/src/main/java/io/reactivesocket/local/LocalServerDuplexConection.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/**
2+
* Copyright 2016 Netflix, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package io.reactivesocket.local;
217

318
import io.reactivesocket.DuplexConnection;

reactivesocket-local/src/main/java/io/reactivesocket/local/LocalServerReactiveSocketFactory.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/**
2+
* Copyright 2016 Netflix, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package io.reactivesocket.local;
217

318
import io.reactivesocket.ConnectionSetupHandler;

0 commit comments

Comments
 (0)