MetadataWriter and MetadataReader

.gitattributes

@@ -0,0 +1 @@
+text=auto eol=lf

.gitignore

@@ -253,3 +253,7 @@ generated/
 .settings
 
 # End of https://www.gitignore.io/api/node,java,macos,linux,cmake,gradle,intellij+all
+.flattened-pom.xml
+
+
+.factorypath

README.md

@@ -1,3 +1,87 @@
+# Updated RSocket IPC Metadata Handling
+
+This is intended to be used as an add on to the IPC module of rsocket/rsocket-rpc-java found here: https://github.com/rsocket/rsocket-rpc-java
+
+The rsocket/rsocket-rpc-java project uses an outdated version of RSocket and doesn't work well with CompositeMetadata. It uses custom parsing and encoding of metadata content to route messages.
+
+This project provides drop in (assuming RSocket RC1.7 and up) replacement MetadataDecoder and MetadataEncoder classes.
+
+The two classes at work are MetadataDecoderLFP and MetadataEncoderLFP. They use MetadataWriter and MetadataReader classes to allow for custom serialization of metadata content.
+
+Out of the box they support the service/method/trace requirements of rsocket/rsocket-rpc-java but also allow for custom interceptors.
+
+For example, we can use the following code to require a password on all requests:
+
+```java
+MetadataDecoderLFP decoder = new MetadataDecoderLFP();
+RequestHandlingRSocket requestHandler = new RequestHandlingRSocket(decoder);
+{// start server
+    SocketAcceptor socketAcceptor = (setup, client) -> Mono.just(requestHandler);
+    RSocketServer.create(socketAcceptor).interceptors(ir -> {
+    }).errorConsumer(t -> {
+        java.util.logging.Logger.getLogger("[server]").log(Level.SEVERE, "uncaught error", t);
+    }).bind(TcpServerTransport.create("localhost", 7000)).block();
+}
+decoder.addInterceptor(reader -> {
+    boolean match = reader.containsString(MimeTypes.create("password"), "thisIsACoolPassWord!");
+    if (!match)
+        throw new IllegalArgumentException("not authorized");
+});
+```
+If we try to access the server, we will receive the following:
+
+```
+SEVERE: uncaught error
+java.lang.IllegalArgumentException: not authorized
+	at com.lfp.rsocket.ipc.metadata.IntegrationTest.lambda$13(IntegrationTest.java:116)
+```
+
+We can then modify the client to add the password, and everything works fine:
+
+```java
+MetadataEncoderLFP encoder = new MetadataEncoderLFP();
+RSocket rsocket;
+{// start client
+    rsocket = RSocketConnector.create().connect(TcpClientTransport.create("localhost", 7000)).block();
+}
+encoder.addInterceptor(
+    writer -> writer.writeString(MimeTypes.create("password"), "thisIsACoolPassWord!"));
+```
+As a bonus, the writers and readers can handle Multimap values, by encoding the content as a url query. (EX: "key=val1&key=val2&neat=wow")
+
+To illustrate this we can look at how tracing is handled, which requires a multimap of key value pairs to be stored in metadata.
+
+Here's how it's encoded:
+
+```java
+private void appendTracing(MetadataWriter metadataWriter, SpanContext spanContext) {
+	if (spanContext == null)
+		return;
+	Iterable<Entry<String, String>> items = spanContext.baggageItems();
+	if (items == null)
+		return;
+	Map<String, Collection<String>> paramMap = new LinkedHashMap<>();
+	for (Entry<String, String> ent : items)
+		paramMap.computeIfAbsent(ent.getKey(), nil -> new LinkedHashSet<>()).add(ent.getValue());
+	metadataWriter.writeEntries(MimeTypes.MIME_TYPE_TRACER, paramMap);
+}
+```
+Here's how it's decoded:
+
+```java
+private SpanContext getTracingSpanContext(MetadataReader metadataReader) {
+	if (tracer == null)
+		return null;
+	Map<String, String> tracerMetadata = new LinkedHashMap<>();
+	metadataReader.streamEntriesNonEmpty(MimeTypes.MIME_TYPE_TRACER)
+			.forEach(ent -> tracerMetadata.computeIfAbsent(ent.getKey(), nil -> ent.getValue()));
+	if (tracerMetadata.isEmpty())
+		return null;
+	return Tracing.deserializeTracingMetadata(tracer, tracerMetadata);
+}
+```
+
+
 # RSocket RPC - Java
 [![Build Status](https://travis-ci.org/rsocket/rsocket-rpc-java.svg?branch=master)](https://travis-ci.org/rsocket/rsocket-rpc-java)
 
@@ -16,7 +100,7 @@ The standard [RSocket](http://rsocket.io) RPC Java implementation.
 2. Run the following Gradle command to build the project:
 
         $ ./gradlew clean build
-        
+
 ## What Next?
 
  * [Motivation](./docs/motivation.md)

gradlew.bat

@@ -1,104 +1,104 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

jitpack.yml

@@ -0,0 +1,2 @@
+install:
+   - ./gradlew clean build publishToMavenLocal -x test -x verifyGoogleJavaFormat --settings-file settings.jitpack.gradle

jitpack.yml.bak

@@ -0,0 +1,2 @@
+install:
+   - .clean build publishToMavenLocal -x test -x verifyGoogleJavaFormat 

publishToMavenLocal.ps1

@@ -0,0 +1,4 @@
+$NOW=[Math]::Round((Get-Date).ToFileTime() / 10000000 - 11644473600)
+echo "versionSuffix: -$NOW"
+echo "args: $args"
+./gradlew build publishToMavenLocal -x test -x javadoc -x verifyGoogleJavaFormat -c settings.jitpack.gradle -PversionSuffix="-$NOW" "$args"

publishToMavenLocal.sh

@@ -0,0 +1,3 @@
+NOW=$(date +%s)
+echo "versionSuffix: -$NOW"
+./gradlew build publishToMavenLocal -x test -x javadoc -x verifyGoogleJavaFormat -c settings.jitpack.gradle -PversionSuffix="-$NOW" "$@"

rsocket-ipc-core/bin/.gitignore

@@ -0,0 +1,6 @@
+/main/
+/test/
+.flattened-pom.xml
+
+
+.factorypath