Streaming protocols

build.gradle

@@ -12,16 +12,6 @@ buildscript {
 def globalVersion = new Version(currentVersion)
 def hasbintray = hasProperty("bintrayUsername")
 
-//compileJava {
-//  sourceCompatibility = 1.7
-//  targetCompatibility = 1.7
-//}
-//
-//compileTestJava {
-//  sourceCompatibility = 1.7
-//  targetCompatibility = 1.7
-//}
-
 ext {
     gradleVersion = '2.4'
 
@@ -43,6 +33,7 @@ subprojects { subproject ->
     dependencies {
         compile "org.codehaus.groovy:groovy-all:2.4.1"
         testCompile "org.spockframework:spock-core:1.0-groovy-2.4"
+        testCompile 'cglib:cglib:2.2.2'
     }
 
     compileJava {
@@ -110,68 +101,67 @@ project('muon-core') {
 
         //Gson codec (the default)
         compile 'com.google.code.gson:gson:2.3.1'
-        testCompile "org.spockframework:spock-core:1.0-groovy-2.3"
         testCompile "io.projectreactor:reactor-stream:$reactorVersion"
         testCompile 'org.slf4j:slf4j-jdk14:1.7.12'
     }
 }
 
-project('muon-tck') {
-    apply plugin: 'application'
-
-    description = 'Muon TCK Implementation for testing the validity of this Muon library'
-
-    mainClassName = "com.simplicity.services.TCKService"
-
-    repositories {
-        maven { url 'http://repo.spring.io/libs-milestone' }
-    }
-    dependencies {
-        compile project(":muon-core")
-        compile project(":muon-transport-amqp")
-        compile project(":muon-discovery-amqp")
-        compile project(":muon-codec-kryo")
-        compile "io.projectreactor:reactor-stream:$reactorVersion"
-        compile 'org.slf4j:slf4j-jdk14:1.7.12'
-    }
-}
-
+//project('muon-tck') {
+//    apply plugin: 'application'
+//
+//    description = 'Muon TCK Implementation for testing the validity of this Muon library'
+//
+//    mainClassName = "com.simplicity.services.TCKService"
+//
+//    repositories {
+//        maven { url 'http://repo.spring.io/libs-milestone' }
+//    }
+//    dependencies {
+//        compile project(":muon-core")
+//        compile project(":muon-transport-amqp")
+//        compile project(":muon-discovery-amqp")
+//        compile project(":muon-codec-kryo")
+//        compile "io.projectreactor:reactor-stream:$reactorVersion"
+//        compile 'org.slf4j:slf4j-jdk14:1.7.12'
+//    }
+//}
+//
 project('muon-transport-amqp') {
     description = 'Core Muon for Java'
     dependencies {
         compile project(":muon-core")
         compile "com.rabbitmq:amqp-client:3.3.2"
     }
 }
-
-project('muon-discovery-amqp') {
-    description = 'A discovery system running on AMQP'
-    dependencies {
-        compile project(":muon-transport-amqp")
-    }
-}
-
-project('muon-codec-kryo') {
-    description = 'Codec implementation using Kryo (for communication with other JVMs only)'
-    dependencies {
-        compile project(":muon-core")
-        compile 'com.esotericsoftware:kryo-shaded:3.0.0'
-    }
-}
-
-project('muon-spring') {
-    description = 'Spring integration for Muon'
-    dependencies {
-        compile project(":muon-core")
-        compile("io.projectreactor:reactor-stream:$reactorVersion")
-        compile('org.springframework:spring-context:4.1.6.RELEASE')
-        testCompile('junit:junit:4.12')
-        testCompile('org.mockito:mockito-core:1.10.19')
-        //TODO remove these when MuonBuilder hardcoded forClass is removed
-        testCompile project(":muon-transport-amqp")
-        testCompile project(":muon-discovery-amqp")
-    }
-}
+//
+//project('muon-discovery-amqp') {
+//    description = 'A discovery system running on AMQP'
+//    dependencies {
+//        compile project(":muon-transport-amqp")
+//    }
+//}
+//
+//project('muon-codec-kryo') {
+//    description = 'Codec implementation using Kryo (for communication with other JVMs only)'
+//    dependencies {
+//        compile project(":muon-core")
+//        compile 'com.esotericsoftware:kryo-shaded:3.0.0'
+//    }
+//}
+//
+//project('muon-spring') {
+//    description = 'Spring integration for Muon'
+//    dependencies {
+//        compile project(":muon-core")
+//        compile("io.projectreactor:reactor-stream:$reactorVersion")
+//        compile('org.springframework:spring-context:4.1.6.RELEASE')
+//        testCompile('junit:junit:4.12')
+//        testCompile('org.mockito:mockito-core:1.10.19')
+//        //TODO remove these when MuonBuilder hardcoded forClass is removed
+//        testCompile project(":muon-transport-amqp")
+//        testCompile project(":muon-discovery-amqp")
+//    }
+//}
 
 task wrapper(type: Wrapper) {
     gradleVersion = '2.5'

muon-codec-kryo/src/main/java/io/muoncore/codec/KryoBinaryCodec.java → muon-codec-kryo/src/main/java/io/muoncore/crud/codec/KryoBinaryCodec.java

@@ -1,12 +1,9 @@
-package io.muoncore.codec;
+package io.muoncore.crud.codec;
 
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
 import java.util.Map;
 
 public class KryoBinaryCodec implements BinaryCodec {

muon-codec-kryo/src/main/java/io/muoncore/codec/KryoExtension.java → muon-codec-kryo/src/main/java/io/muoncore/crud/codec/KryoExtension.java

@@ -1,8 +1,7 @@
-package io.muoncore.codec;
+package io.muoncore.crud.codec;
 
 import io.muoncore.MuonExtension;
-import io.muoncore.MuonExtensionApi;
-import io.muoncore.MuonService;
+import io.muoncore.crud.MuonService;
 
 public class KryoExtension implements MuonExtension {
 

muon-codec-kryo/src/test/groovy/io/muoncore/codec/KryoBinaryCodecSpec.groovy → muon-codec-kryo/src/test/groovy/io/muoncore/crud/codec/KryoBinaryCodecSpec.groovy

@@ -1,4 +1,4 @@
-package io.muoncore.codec
+package io.muoncore.crud.codec
 
 import spock.lang.Specification
 

muon-core/src/main/java/io/muoncore/Discovery.java

@@ -2,12 +2,27 @@
 
 import java.net.URI;
 import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 public interface Discovery {
     /**
-     * Lookup a remote service via the muon:// url scheme
+     * Lookup a remote service in the cache via the muon:// url scheme
      */
-    ServiceDescriptor getService(URI uri);
+    default Optional<ServiceDescriptor> getService(URI uri) {
+        if (!uri.getScheme().equals("muon")) {
+            throw new IllegalArgumentException("Discovery requires muon://XXX scheme urls for lookup");
+        }
+        return findService(serviceDescriptor -> uri.getHost().equals(serviceDescriptor.getIdentifier()));
+    }
+
+    /**
+     * Lookup a remote service in the cache via some predicate
+     */
+    default Optional<ServiceDescriptor> findService(Predicate<ServiceDescriptor> predicate) {
+        return getKnownServices().stream().filter(predicate).findFirst();
+    }
 
     /**
      * Return all of the services that are currently visible by this discovery mechanism

muon-core/src/main/java/io/muoncore/DiscoverySource.java

@@ -0,0 +1,5 @@
+package io.muoncore;
+
+public interface DiscoverySource {
+    Discovery getDiscovery();
+}