Aggregation of reactivesocket-java-impl into reactivesocket-java

.travis.yml

@@ -19,7 +19,7 @@ cache:
   directories:
   - $HOME/.m2
   - $HOME/.gradle
-  
+
 env:
   global:
   - secure: cXHzd2WHqmdmJEyEKlELt8Rp9qCvhTRXTEHpQz0sKt55KorI8vO33sSOBs8uBqknWgGgOzHsB7cw0dJRxCmW+BRy90ELtdg/dVLzU8D8BrI6/DHzd/Bhyt9wx2eVdLmDV7lQ113AqJ7lphbH+U8ceTBlbNYDPKcIjFhsPO0WcPxQYed45na8XRK0UcAOpVmmNlTE6fHy5acQblNO84SN6uevCFqWAZJY7rc6xGrzFzca+ul5kR8xIzdE5jKs2Iw0MDeWi8cshkhj9c0FDtfsNIB1F+NafDtEdqjt6kMqYAUUiTAM2QdNoffzgmWEbVOj3uvthlm+S11XaU3Cn2uC7CiZTn2ebuoqCuV5Ge6KQI0ysEQVUfLhIF7iJG6dJvoyYy8ta8LEcjcsYAdF34BVddoUJkp+eJuhlto2aTZsDdXpmnwRM1PPDRoyrLjRcKiWYPR2tO2RG9sb0nRAGEpHTDd5ju2Ta4zpvgpWGUiKprs5R+YY7TEg16VSTYMmCJj5C9ap2lYIH4EoxsQpuxYig9AV1sOUJujLSa4TXqlcOmSM0IkHJ/i0VE8TZg4nV4XowyH6nKZ63InF4pUDcG13BpJQyTFKbK2D0lFn8MzpWvIV2oOUxNkOaOBg9cGhAnv9Sfw/Iv1UVaUgCNQd2M0R0rwfJoPCg2mmWVxsvh3cW4M=

README.md

@@ -9,7 +9,7 @@ It enables the following interaction models via async message passing over a sin
 - fire-and-forget (no response)
 - event subscription (infinite stream of many)
 
-This is the core project for Java that implements the protocol and exposes Reactive Stream APIs. Typically most use will come via another library that uses this one. 
+This is the core project for Java that implements the protocol and exposes Reactive Stream APIs. Typically most use will come via another library that uses this one.
 
 For example:
 
@@ -27,7 +27,7 @@ Others can be found in the [ReactiveSocket Github](https://github.com/ReactiveSo
 
 <a href='https://travis-ci.org/ReactiveSocket/reactivesocket-java/builds'><img src='https://travis-ci.org/ReactiveSocket/reactivesocket-java.svg?branch=master'></a>
 
-Snapshots are available via JFrog. 
+Snapshots are available via JFrog.
 
 Example:
 
@@ -48,7 +48,6 @@ No releases to Maven Central or JCenter have occurred yet.
 
 For bugs, questions and discussions please use the [Github Issues](https://github.com/ReactiveSocket/reactivesocket-java/issues).
 
-
 ## LICENSE
 
 Copyright 2015 Netflix, Inc.

build.gradle

@@ -1,27 +1,43 @@
 buildscript {
-  repositories {
-      jcenter()
-   }
-
-  dependencies { classpath 'io.reactivesocket:gradle-nebula-plugin-reactivesocket:1.0.5' }
+    repositories { jcenter() }
+    dependencies { classpath 'io.reactivesocket:gradle-nebula-plugin-reactivesocket:1.0.6' }
 }
 
 description = 'ReactiveSocket: stream oriented messaging passing with Reactive Stream semantics.'
 
 apply plugin: 'reactivesocket-project'
-apply plugin: 'java'
-
-repositories {
-    maven { url 'https://oss.jfrog.org/libs-snapshot' }
-}
-
-dependencies {
-	compile 'org.reactivestreams:reactive-streams:1.0.0.final'
-	compile 'org.agrona:Agrona:0.4.13'
 
-	testCompile 'io.reactivex:rxjava:2.0.0-DP0-20151003.214425-143'
-	testCompile 'junit:junit:4.12'
-	testCompile 'org.mockito:mockito-core:1.10.19'
+subprojects {
+    apply plugin: 'reactivesocket-project'
+    apply plugin: 'java'
+
+    compileJava {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+
+    repositories {
+        jcenter()
+        maven { url 'https://oss.jfrog.org/libs-snapshot' }
+        maven { url 'https://dl.bintray.com/reactivesocket/ReactiveSocket' }
+    }
+
+    dependencies {
+        compile 'org.reactivestreams:reactive-streams:1.0.0.final'
+        compile 'org.agrona:Agrona:0.4.13'
+        compile 'io.reactivex:rxjava:latest.release'
+        compile 'io.reactivex:rxjava-reactive-streams:latest.release'
+        compile 'org.hdrhistogram:HdrHistogram:latest.release'
+        compile 'org.slf4j:slf4j-api:latest.release'
+
+        testCompile 'junit:junit:4.12'
+        testCompile 'org.mockito:mockito-core:1.10.19'
+        testRuntime 'org.slf4j:slf4j-simple:1.7.12'
+    }
+
+    test {
+        testLogging.showStandardStreams = true
+    }
 }
 
 // support for snapshot/final releases via versioned branch names like 1.x
@@ -33,12 +49,3 @@ nebulaRelease {
 if (project.hasProperty('release.useLastTag')) {
     tasks.prepare.enabled = false
 }
-
-test {
-    testLogging.showStandardStreams = true
-}
-
-compileJava {
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Mar 07 16:10:12 PST 2016
+#Tue Mar 15 03:05:19 MSK 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip

reactivesocket-core/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    testCompile 'io.reactivex:rxjava:2.0.0-DP0-20151003.214425-143'
+}

reactivesocket-mime-types/README.md

@@ -0,0 +1,66 @@
+## Overview
+
+This module provides support for encoding/decoding ReactiveSocket data and metadata into using different mime types as defined by [ReactiveSocket protocol](https://github.com/ReactiveSocket/reactivesocket/blob/master/Protocol.md#setup-frame).
+The support for mime types is not comprehensive but it will at least support the [default metadata mime type](https://github.com/ReactiveSocket/reactivesocket/blob/mimetypes/MimeTypes.md)
+
+## Usage
+
+#### Supported Codecs
+
+Supported mime types are listed as [SupportedMimeTypes](src/main/java/io/reactivesocket/mimetypes/SupportedMimeTypes.java).
+
+#### Obtaining the appropriate codec
+
+[MimeType](src/main/java/io/reactivesocket/mimetypes/MimeType.java) is the interface that provides different methods for encoding/decoding ReactiveSocket data and metadata.
+An instance of `MimeType` can be obtained via [MimeTypeFactory](src/main/java/io/reactivesocket/mimetypes/MimeTypeFactory.java).
+
+A simple usage of `MimeType` is as follows:
+
+```java
+public class ConnectionSetupHandlerImpl implements ConnectionSetupHandler {
+
+    @Override
+    public RequestHandler apply(ConnectionSetupPayload setupPayload, ReactiveSocket reactiveSocket) throws SetupException {
+
+        final MimeType mimeType = MimeTypeFactory.from(setupPayload); // If the mime types aren't supported, throws an error.
+
+        return new RequestHandler() {
+
+            // Not a complete implementation, just a method to demonstrate usage.
+            @Override
+            public Publisher<Payload> handleRequestResponse(Payload payload) {
+                // use (en/de)codeMetadata() methods to encode/decode metadata
+                mimeType.decodeMetadata(payload.getMetadata(), KVMetadata.class);
+                // use (en/de)codeData() methods to encode/decode data
+                mimeType.decodeData(payload.getData(), Person.class);
+                return PublisherUtils.empty(); // Do something useful in reality!
+            }
+        };
+    }
+}
+```
+
+## Build and Binaries
+
+<a href='https://travis-ci.org/ReactiveSocket/reactivesocket-java/builds'><img src='https://travis-ci.org/ReactiveSocket/reactivesocket-java.svg?branch=master'></a>
+
+Artifacts are available via JCenter.
+
+Example:
+
+```groovy
+repositories {
+    maven { url 'https://jcenter.bintray.com' }
+}
+
+dependencies {
+    compile 'io.reactivesocket:reactivesocket-mime-types:x.y.z'
+}
+```
+
+No releases to Maven Central have occurred yet.
+
+
+## Bugs and Feedback
+
+For bugs, questions and discussions please use the [Github Issues](https://github.com/ReactiveSocket/reactivesocket-java-impl/issues).

reactivesocket-mime-types/build.gradle

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2016 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+dependencies {
+    compile project(':reactivesocket-core')
+    compile 'com.fasterxml.jackson.core:jackson-core:latest.release'
+    compile 'com.fasterxml.jackson.core:jackson-databind:latest.release'
+    compile 'com.fasterxml.jackson.module:jackson-module-afterburner:latest.release'
+    compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:latest.release'
+
+    testCompile "org.hamcrest:hamcrest-library:1.3"
+}

reactivesocket-mime-types/src/main/java/io/reactivesocket/mimetypes/KVMetadata.java

@@ -0,0 +1,37 @@
+package io.reactivesocket.mimetypes;
+
+import org.agrona.MutableDirectBuffer;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * A representation of ReactiveSocket metadata as a key-value pair.
+ *
+ * <b>Implementations are not required to be thread-safe.</b>
+ */
+public interface KVMetadata extends Map<String, ByteBuffer> {
+
+    /**
+     * Lookup the value for the passed key and return the value as a string.
+     *
+     * @param key To Lookup.
+     * @param valueEncoding Encoding for the value.
+     *
+     * @return Value as a string with the passed {@code valueEncoding}
+     * @throws NullPointerException If the key does not exist.
+     */
+    String getAsString(String key, Charset valueEncoding);
+
+    /**
+     * Creates a new copy of this metadata.
+     *
+     * @param newBufferFactory A factory to create new buffer instances to copy, if required. The argument to the
+     * function is the capacity of the new buffer.
+     *
+     * @return New copy of this metadata.
+     */
+    KVMetadata duplicate(Function<Integer, MutableDirectBuffer> newBufferFactory);
+}