lib/amqp.swc src/com/squarespace/hopper/json/JSONSerializer.as @@ -3,12 +3,14 @@ layout="absolute" creationComplete="onCreationComplete()" width="412" height="238" backgroundGradientAlphas="[0.0, 0.0]"> <mx:Script> <![CDATA[ - import com.squarespace.hopper.json.JSONEvent; + import com.squarespace.hopper.json.JSONSerializer; + import org.amqp.patterns.impl.RpcClientImpl; + import org.amqp.patterns.CorrelatedMessageEvent; import com.squarespace.hopper.json.util.ClientContext; import org.pranaframework.ioc.factory.xml.XMLObjectFactory; - import com.squarespace.hopper.json.impl.AMQPClientProxy; - private var proxy:AMQPClientProxy; + private var proxy:RpcClientImpl; + private var json:JSONSerializer; private var factory:XMLObjectFactory = new XMLObjectFactory(); private var ctx:ClientContext = new ClientContext(); @@ -24,7 +26,7 @@ proxy.send(o,onResponse); } - public function onResponse(event:JSONEvent):void { + public function onResponse(event:CorrelatedMessageEvent):void { result.text = "fib(" + event.result.question + ") -> " + event.result.answer; } src/client.mxml @@ -14,8 +14,11 @@ <constructor-arg ref="connectionState"/> </object> - <object id="client" class="com.squarespace.hopper.json.impl.AMQPClientProxy"> + <object id="serializer" class="com.squarespace.hopper.json.JSONSerializer"/> + + <object id="client" class="org.amqp.patterns.impl.RpcClientImpl"> <constructor-arg ref="connection"/> + <property name="serializer" ref="serializer"/> <property name="connection" ref="connection"/> <property name="realm" value="/data"/> <property name="exchange" value="x"/> src/clientContext.xml @@ -17,8 +17,8 @@ **/ package com.squarespace.hopper.json.demo { - import com.squarespace.hopper.json.RequestHandler; - + import org.amqp.patterns.RequestHandler; + public class Fibonacci implements RequestHandler { src/com/squarespace/hopper/json/demo/Fibonacci.as @@ -18,13 +18,14 @@ package com.squarespace.hopper.json.mock { import com.adobe.serialization.json.JSON; - import com.squarespace.hopper.json.AMQPClient; - import com.squarespace.hopper.json.JSONEvent; - import com.squarespace.hopper.json.util.Guid; import flash.events.EventDispatcher; + + import org.amqp.patterns.CorrelatedMessageEvent; + import org.amqp.patterns.RpcClient; + import org.amqp.util.Guid; - public class MockClient implements AMQPClient + public class MockClient implements RpcClient { private var server:MockServer; @@ -43,12 +44,10 @@ package com.squarespace.hopper.json.mock var decoded:* = JSON.decode(encoded); var result:* = server.process(decoded); - //result.correlationId = guid; - var resultEncoded = JSON.encode(result); var resultDecoded = JSON.decode(resultEncoded); - dispatcher.dispatchEvent(new JSONEvent(guid, resultDecoded)); + dispatcher.dispatchEvent(new CorrelatedMessageEvent(guid, resultDecoded)); } } src/com/squarespace/hopper/json/mock/MockClient.as @@ -17,7 +17,7 @@ **/ package com.squarespace.hopper.json.mock { - import com.squarespace.hopper.json.RequestHandler; + import org.amqp.patterns.RequestHandler; public class MockServer implements RequestHandler { src/com/squarespace/hopper/json/mock/MockServer.as @@ -17,12 +17,11 @@ **/ package com.squarespace.hopper.json.test { - import com.squarespace.hopper.json.AMQPClient; - import com.squarespace.hopper.json.JSONEvent; - import flexunit.framework.TestCase; import flexunit.framework.TestSuite; + import org.amqp.patterns.CorrelatedMessageEvent; + import org.amqp.patterns.RpcClient; import org.pranaframework.context.support.XMLApplicationContext; public class MockClientTest extends TestCase @@ -44,14 +43,14 @@ package com.squarespace.hopper.json.test } public function testClient():void { - var client:AMQPClient = ctx.getObject("client") as AMQPClient; + var client:RpcClient = ctx.getObject("client") as RpcClient; var testObject:* = new Object(); testObject.first = "foo"; testObject.second = "bar"; client.send(testObject, addAsync(onResult, TIMEOUT) ); } - public function onResult(event:JSONEvent):void { + public function onResult(event:CorrelatedMessageEvent):void { trace("finished"); assertEquals("foobar",event.result); } src/com/squarespace/hopper/json/test/MockClientTest.as @@ -4,12 +4,14 @@ creationComplete="onCreationComplete()" width="446" height="210" verticalAlign="middle" horizontalAlign="center"> <mx:Script> <![CDATA[ + import com.squarespace.hopper.json.JSONSerializer; + import org.amqp.patterns.impl.RpcServer; import com.squarespace.hopper.json.demo.Fibonacci; - import com.squarespace.hopper.json.impl.AMQPServer; import com.squarespace.hopper.json.util.ServerContext; import org.pranaframework.ioc.factory.xml.XMLObjectFactory; - private var amqpServer:AMQPServer; + private var amqpServer:RpcServer; + private var json:JSONSerializer; private var fib:Fibonacci; private var factory:XMLObjectFactory = new XMLObjectFactory(); private var ctx:ServerContext = new ServerContext(); src/server.mxml @@ -14,8 +14,11 @@ <constructor-arg ref="connectionState"/> </object> - <object id="server" class="com.squarespace.hopper.json.impl.AMQPServer"> + <object id="serializer" class="com.squarespace.hopper.json.JSONSerializer"/> + + <object id="server" class="org.amqp.patterns.impl.RpcServer"> <constructor-arg ref="connection"/> + <property name="serializer" ref="serializer"/> <property name="realm" value="/data"/> <property name="exchange" value="x"/> <property name="exchangeType" value="topic"/> src/serverContext.xml lib/as3amqp.swc src/com/squarespace/hopper/json/AMQPClient.as src/com/squarespace/hopper/json/JSONEvent.as src/com/squarespace/hopper/json/RequestHandler.as src/com/squarespace/hopper/json/impl/AMQPClientProxy.as src/com/squarespace/hopper/json/impl/AMQPDelegate.as src/com/squarespace/hopper/json/impl/AMQPServer.as src/com/squarespace/hopper/json/util/Guid.as 2b160ae7a4abadb0d8449761e8bfa68023daef7e Ben Hood 0x6e6562@gmail.com http://github.com/0x6e6562/json-over-amqp/commit/d9e08ba81b8c800e1c5a39663ace2b8113db4244 d9e08ba81b8c800e1c5a39663ace2b8113db4244 2008-07-05T12:00:35-07:00 2008-07-05T12:00:35-07:00 Refactored RPC pattern into core AMQP library 26dca5ec7ffcc3aff3ffec77b017aac4e8ce6ef0 Ben Hood 0x6e6562@gmail.com