Issue 64 Incorporated second async patch from Matthijs

Author: Sasha Ovsankin

src/org/jabsorb/client/async/AsyncSessionUtil.java

@@ -18,7 +18,7 @@
 public class AsyncSessionUtil {
 	private static final Logger log = LoggerFactory.getLogger(AsyncSessionUtil.class);
 
-	public static Session ToSyncSession(final AsyncSession asyncSession) {
+	public static Session toSyncSession(final AsyncSession asyncSession) {
 		// unwrap if possible
 		if (asyncSession instanceof AsyncedSyncSession) {
 			return ((AsyncedSyncSession)asyncSession).getSession();
@@ -27,7 +27,7 @@ public static Session ToSyncSession(final AsyncSession asyncSession) {
 		return new SyncedAsyncSession(asyncSession);
 	}
 
-	public static AsyncSession ToAsyncSession(final Session session) {
+	public static AsyncSession toAsyncSession(final Session session) {
 		// unwrap if possible
 		if (session instanceof SyncedAsyncSession) {
 			return ((SyncedAsyncSession)session).getAsyncSession();

test/src/org/jabsorb/client/async/AsyncSessionUtilTest.java

@@ -23,7 +23,7 @@ public class AsyncSessionUtilTest extends TestCase {
 	public void testToSyncSession() throws Exception {
 		final AsyncSession asyncSession = new DummyAsyncSession(1000, "testToSyncSession");
 
-		final Session session = AsyncSessionUtil.ToSyncSession(asyncSession);
+		final Session session = AsyncSessionUtil.toSyncSession(asyncSession);
 
 		long time = System.currentTimeMillis();
 		final JSONObject response = session.sendAndReceive(null);
@@ -41,7 +41,7 @@ public void testToSyncSession() throws Exception {
 	public void testToAsyncSession() throws Exception {
 		final Session session = new DummySession(1000, "testToAsyncSession");
 
-		final AsyncSession asyncSession = AsyncSessionUtil.ToAsyncSession(session);
+		final AsyncSession asyncSession = AsyncSessionUtil.toAsyncSession(session);
 
 		long time = System.currentTimeMillis();
 		final Future<JSONObject> future = asyncSession.send(null);
@@ -61,14 +61,13 @@ public void testToAsyncSession() throws Exception {
 	public void testToAsyncSessionCallback() throws Exception {
 		final Session session = new DummySession(1000, "testToAsyncSessionCallback");
 
-		final AsyncSession asyncSession = AsyncSessionUtil.ToAsyncSession(session);
+		final AsyncSession asyncSession = AsyncSessionUtil.toAsyncSession(session);
 
 		final long time = System.currentTimeMillis();
 
 		final boolean[] callbackCalled = new boolean[] { false };
 
 		final Future<JSONObject> future = asyncSession.send(null, new AsyncResultCallback<AsyncSession, JSONObject, JSONObject>() {
-			@Override
 			public void onAsyncResult(final AsyncSession source, final Future<JSONObject> result, final JSONObject context) {
 				try {
 					assertEquals("testToAsyncSessionCallback", result.get().get(JSONSerializer.RESULT_FIELD));
@@ -92,11 +91,11 @@ public void onAsyncResult(final AsyncSession source, final Future<JSONObject> re
 
 	public void testUnwrapSession() throws Exception {
 		final Session session = new DummySession(1000, "testUnwrapSession");
-		assertSame(session, AsyncSessionUtil.ToSyncSession(AsyncSessionUtil.ToAsyncSession(session)));
+		assertSame(session, AsyncSessionUtil.toSyncSession(AsyncSessionUtil.toAsyncSession(session)));
 	}
 
 	public void testUnwrapAsyncSession() throws Exception {
 		final AsyncSession session = new DummyAsyncSession(1000, "testUnwrapSession");
-		assertSame(session, AsyncSessionUtil.ToAsyncSession(AsyncSessionUtil.ToSyncSession(session)));
+		assertSame(session, AsyncSessionUtil.toAsyncSession(AsyncSessionUtil.toSyncSession(session)));
 	}
 }

test/src/org/jabsorb/client/async/DummyAsyncSession.java

@@ -18,12 +18,10 @@ public DummyAsyncSession(final int duration, final String response) {
 		this.response = response;
 	}
 
-	@Override
 	public void close() {
 		// nothing
 	}
 
-	@Override
 	public Future<JSONObject> send(final JSONObject request, final AsyncResultCallback<AsyncSession, JSONObject, JSONObject> callback) {
 		final SettableFuture<JSONObject> future = new SettableFuture<JSONObject>();
 
@@ -52,7 +50,6 @@ public void run() {
 		return future;
 	}
 
-	@Override
 	public Future<JSONObject> send(final JSONObject request) {
 		return send(request, null);
 	}

test/src/org/jabsorb/client/async/DummySession.java

@@ -19,12 +19,10 @@ public DummySession(final int duration, final String response) {
 		this.response = response;
 	}
 
-	@Override
 	public void close() {
 		// nothing
 	}
 
-	@Override
 	public JSONObject sendAndReceive(final JSONObject message) {
 		try {
 			Thread.sleep(duration);