Rename to rsocket (#38)

Author: yschimke

CHANGES.md

@@ -1,3 +1,3 @@
-# ReactiveSocket Releases #
+# RSocket Releases #
 
 No releases yet.

CONTRIBUTING.md

@@ -1,12 +1,12 @@
-# Contributing to ReactiveSocket
+# Contributing to RSocket
 
 If you would like to contribute code you can do so through GitHub by forking the repository and sending a pull request (on a branch other than `master`, `0.x`, `1.x`, or `gh-pages`).
 
 When submitting code, please make every effort to follow existing conventions and style in order to keep the code as readable as possible.
 
 ## License
 
-By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/ReactiveSocket/reactivesocket-java/blob/master/LICENSE
+By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/RSocket/reactivesocket-java/blob/master/LICENSE
 
 All files are released with the Apache 2.0 license.
 

README.md

@@ -1,11 +1,11 @@
-# ReactiveSocket CLI
+# RSocket CLI
 
 ## Description
 
-Simple ReactiveSocket CLI currently for two main purposes
+Simple RSocket CLI currently for two main purposes
 
 1. Early testing of new protocol server implementations e.g. websocket
-2. Sending some basic traffic to servers built using ReactiveSocket e.g. help debug a mobile <=> server integration issue. 
+2. Sending some basic traffic to servers built using RSocket e.g. help debug a mobile <=> server integration issue. 
 
 # Build Status
 

build.gradle

@@ -3,24 +3,23 @@ buildscript {
   dependencies { classpath 'io.reactivesocket:gradle-nebula-plugin-reactivesocket:1.0.6' }
 }
 
-description = 'ReactiveSocket CLI.'
+description = 'RSocket CLI.'
 
 apply plugin: 'reactivesocket-project'
 apply plugin: 'java'
 apply plugin: 'application'
 
-mainClassName = "io.reactivesocket.cli.Main"
+mainClassName = "io.rsocket.cli.Main"
 
 repositories {
     mavenLocal()
     maven { url 'https://oss.jfrog.org/libs-snapshot' }
-    maven { url 'https://dl.bintray.com/reactivesocket/ReactiveSocket' }
+    maven { url 'https://dl.bintray.com/reactivesocket/RSocket' }
 }
 
 dependencies {
-    compile 'io.reactivesocket:reactivesocket-transport-netty:0.9-SNAPSHOT'
-    compile 'io.reactivesocket:reactivesocket-transport-local:0.9-SNAPSHOT'
-    compile 'io.reactivex.rxjava2:rxjava:2.0.2'
+    compile 'io.rsocket:rsocket-transport-netty:0.9-SNAPSHOT'
+    compile 'io.rsocket:rsocket-transport-local:0.9-SNAPSHOT'
 
     compile 'io.airlift:airline:0.7'
     compile 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.8'

src/main/java/io/reactivesocket/cli/ConnectionHelper.java src/main/java/io/rsocket/cli/ConnectionHelper.java

@@ -11,12 +11,12 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.reactivesocket.cli;
+package io.rsocket.cli;
 
-import io.reactivesocket.transport.TransportClient;
-import io.reactivesocket.transport.TransportServer;
-import io.reactivesocket.transport.netty.client.TcpTransportClient;
-import io.reactivesocket.transport.netty.server.TcpTransportServer;
+import io.rsocket.transport.TransportClient;
+import io.rsocket.transport.TransportServer;
+import io.rsocket.transport.netty.client.TcpTransportClient;
+import io.rsocket.transport.netty.server.TcpTransportServer;
 import reactor.ipc.netty.tcp.TcpClient;
 import reactor.ipc.netty.tcp.TcpServer;
 

src/main/java/io/reactivesocket/cli/ConsoleOutputHandler.java src/main/java/io/rsocket/cli/ConsoleOutputHandler.java

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.reactivesocket.cli;
+package io.rsocket.cli;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/io/reactivesocket/cli/Main.java src/main/java/io/rsocket/cli/Main.java

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.reactivesocket.cli;
+package io.rsocket.cli;
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Throwables;
@@ -23,18 +23,18 @@
 import io.airlift.airline.Option;
 import io.airlift.airline.ParseException;
 import io.airlift.airline.SingleCommand;
-import io.reactivesocket.AbstractReactiveSocket;
-import io.reactivesocket.ConnectionSetupPayload;
-import io.reactivesocket.Payload;
-import io.reactivesocket.ReactiveSocket;
-import io.reactivesocket.cli.util.LoggingUtil;
-import io.reactivesocket.client.KeepAliveProvider;
-import io.reactivesocket.client.ReactiveSocketClient;
-import io.reactivesocket.client.SetupProvider;
-import io.reactivesocket.lease.DisabledLeaseAcceptingSocket;
-import io.reactivesocket.server.ReactiveSocketServer;
-import io.reactivesocket.transport.TransportServer;
-import io.reactivesocket.util.PayloadImpl;
+import io.rsocket.AbstractRSocket;
+import io.rsocket.ConnectionSetupPayload;
+import io.rsocket.Payload;
+import io.rsocket.RSocket;
+import io.rsocket.cli.util.LoggingUtil;
+import io.rsocket.client.KeepAliveProvider;
+import io.rsocket.client.RSocketClient;
+import io.rsocket.client.SetupProvider;
+import io.rsocket.lease.DisabledLeaseAcceptingSocket;
+import io.rsocket.server.RSocketServer;
+import io.rsocket.transport.TransportServer;
+import io.rsocket.util.PayloadImpl;
 
 import java.nio.ByteBuffer;
 import java.util.LinkedHashMap;
@@ -54,15 +54,15 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import static io.reactivesocket.cli.TimeUtil.*;
+import static io.rsocket.cli.TimeUtil.*;
 
 /**
- * Simple command line tool to make a ReactiveSocket connection and send/receive elements.
+ * Simple command line tool to make a RSocket connection and send/receive elements.
  * <p>
  * Currently limited in features, only supports a text/line based approach.
  */
 @SuppressWarnings({"WeakerAccess", "CanBeFinal", "unused"})
-@Command(name = Main.NAME, description = "CLI for ReactiveSocket.")
+@Command(name = Main.NAME, description = "CLI for RSocket.")
 public class Main {
   static final String NAME = "reactivesocket-cli";
 
@@ -122,7 +122,7 @@ public class Main {
   @Arguments(title = "target", description = "Endpoint URL", required = true)
   public List<String> arguments = new ArrayList<>();
 
-  public ReactiveSocket client;
+  public RSocket client;
 
   public OutputHandler outputHandler;
   private TransportServer.StartedServer server;
@@ -138,7 +138,7 @@ public void run() {
       URI uri = new URI(arguments.get(0));
 
       if (serverMode) {
-        server = ReactiveSocketServer.create(ConnectionHelper.buildServerConnection(uri))
+        server = RSocketServer.create(ConnectionHelper.buildServerConnection(uri))
             .start((setupPayload, reactiveSocket) -> new DisabledLeaseAcceptingSocket(
                 createServerRequestHandler(setupPayload)));
 
@@ -147,7 +147,7 @@ public void run() {
         SetupProvider setupProvider = buildSetupProvider();
 
         client = Mono.from(
-            ReactiveSocketClient
+            RSocketClient
                 .create(ConnectionHelper.buildClientConnection(uri), setupProvider)
                 .connect()).block();
 
@@ -229,10 +229,10 @@ private KeepAliveProvider keepAlive() {
     return KeepAliveProvider.from(parseShortDuration(keepalive));
   }
 
-  public ReactiveSocket createServerRequestHandler(ConnectionSetupPayload setupPayload) {
+  public RSocket createServerRequestHandler(ConnectionSetupPayload setupPayload) {
     LoggerFactory.getLogger(Main.class).debug("setup payload " + setupPayload);
 
-    return new AbstractReactiveSocket() {
+    return new AbstractRSocket() {
       @Override
       public Mono<Void> fireAndForget(Payload payload) {
         showPayload(payload);
@@ -277,7 +277,7 @@ private String toUtf8String(ByteBuffer data) {
     return StandardCharsets.UTF_8.decode(data).toString();
   }
 
-  public Flux<Void> run(ReactiveSocket client) {
+  public Flux<Void> run(RSocket client) {
     try {
       return runAllOperations(client);
     } catch (Exception e) {
@@ -291,11 +291,11 @@ private void handleError(Throwable e) {
     outputHandler.error("error", e);
   }
 
-  private Flux<Void> runAllOperations(ReactiveSocket client) {
+  private Flux<Void> runAllOperations(RSocket client) {
     return Flux.range(0, operations).flatMap(i -> runSingleOperation(client));
   }
 
-  private Flux<Void> runSingleOperation(ReactiveSocket client) {
+  private Flux<Void> runSingleOperation(RSocket client) {
     try {
       Flux<Payload> source;
 

src/main/java/io/reactivesocket/cli/MetadataUtil.java src/main/java/io/rsocket/cli/MetadataUtil.java

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.reactivesocket.cli;
+package io.rsocket.cli;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

src/main/java/io/reactivesocket/cli/OutputHandler.java src/main/java/io/rsocket/cli/OutputHandler.java

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.reactivesocket.cli;
+package io.rsocket.cli;
 
 public interface OutputHandler {
     void showOutput(String output);

src/main/java/io/reactivesocket/cli/Publishers.java src/main/java/io/rsocket/cli/Publishers.java

@@ -13,22 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivesocket.cli;
+package io.rsocket.cli;
 
 import com.google.common.io.CharSource;
-import com.google.common.io.LineProcessor;
-import io.reactivesocket.Payload;
-import io.reactivesocket.util.PayloadImpl;
-import io.reactivex.Flowable;
-import io.reactivex.schedulers.Schedulers;
-import java.nio.charset.StandardCharsets;
-import java.util.function.Function;
-import org.reactivestreams.Publisher;
-import org.reactivestreams.Subscription;
+import io.rsocket.Payload;
+import io.rsocket.util.PayloadImpl;
+import reactor.core.publisher.Flux;
 
 import java.io.IOException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import reactor.core.publisher.Flux;
+import java.nio.charset.StandardCharsets;
+import java.util.function.Function;
 
 public final class Publishers {
 

src/main/java/io/reactivesocket/cli/SDF.java src/main/java/io/rsocket/cli/SDF.java

@@ -1,4 +1,4 @@
-package io.reactivesocket.cli;
+package io.rsocket.cli;
 
 public class SDF {
     public static void main(String[] args) throws Exception {

src/main/java/io/reactivesocket/cli/SystemInCharSource.java src/main/java/io/rsocket/cli/SystemInCharSource.java

@@ -1,4 +1,4 @@
-package io.reactivesocket.cli;
+package io.rsocket.cli;
 
 import com.google.common.io.CharSource;
 

src/main/java/io/reactivesocket/cli/TimeUtil.java src/main/java/io/rsocket/cli/TimeUtil.java

@@ -1,4 +1,4 @@
-package io.reactivesocket.cli;
+package io.rsocket.cli;
 
 import io.airlift.airline.ParseException;
 

src/main/java/io/reactivesocket/cli/UsageException.java src/main/java/io/rsocket/cli/UsageException.java

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.reactivesocket.cli;
+package io.rsocket.cli;
 
 public class UsageException extends RuntimeException {
     public UsageException(String message) {

src/main/java/io/reactivesocket/cli/util/LoggingUtil.java src/main/java/io/rsocket/cli/util/LoggingUtil.java

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.reactivesocket.cli.util;
+package io.rsocket.cli.util;
 
 import com.google.common.collect.Lists;
 import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -40,13 +40,13 @@ public static void configureLogging(boolean debug) {
       getLogger("").setLevel(Level.INFO);
       getLogger("io.netty").setLevel(Level.INFO);
       getLogger("io.reactivex").setLevel(Level.FINE);
-      getLogger("io.reactivesocket").setLevel(Level.FINEST);
+      getLogger("io.rsocket").setLevel(Level.FINEST);
       getLogger("reactor.ipc.netty").setLevel(Level.FINEST);
     } else {
       getLogger("").setLevel(Level.SEVERE);
       getLogger("io.netty").setLevel(Level.SEVERE);
       getLogger("io.reactivex").setLevel(Level.SEVERE);
-      getLogger("io.reactivesocket").setLevel(Level.SEVERE);
+      getLogger("io.rsocket").setLevel(Level.SEVERE);
     }
   }
 

src/main/java/io/reactivesocket/cli/util/OneLineLogFormat.java src/main/java/io/rsocket/cli/util/OneLineLogFormat.java

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.reactivesocket.cli.util;
+package io.rsocket.cli.util;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;