Merge branch 'master' into maven-publish

Narine Cholakyan · Narine Cholakyan · commit d23405ca3535 · 2017-04-04T14:38:05.000-05:00
* master:
  Added error handling on login
  Added build status image
  Added tests
  Build only on master and prs
  specify jdk for travis
  testing travis.yml
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,6 @@
+language: java
+jdk:
+  - oraclejdk8
+branches:
+  only:
+  - master
diff --git a/README.md b/README.md
@@ -1,5 +1,11 @@
 # Contextual Sync 
 
+[![Build Status - Master](https://travis-ci.org/csync/csync-java.svg?branch=master)](https://travis-ci.org/csync/csync-java)
+[![License][license-svg]][license-link] 
+
+[license-svg]: https://img.shields.io/hexpm/l/plug.svg
+[license-link]: https://github.com/csync/csync-server/blob/master/LICENSE
+
 Contextual Sync (CSync) is an open source, real-time, continuous data synchronization service for building modern applications. The CSync data store is organized with key/values where keys have a hierarchical structure. Clients can obtain the current value for a key and any subsequent updates by listening on the key. Updates are delivered to all online clients in near-real time. Clients can also listen on a key pattern where some components contain wildcards. 
 
 ## Keys
diff --git a/src/main/java/com/ibm/csync/CSync.java b/src/main/java/com/ibm/csync/CSync.java
@@ -121,7 +121,7 @@ public static class Builder {
 		private Builder() {}
 
 		public Builder defaultBlockingTimeout(final Timeout timeout) {
-			if (timeout == null) throw new IllegalArgumentException();
+			if (timeout == null || timeout.ms < 0) throw new IllegalArgumentException();
 			this.defaultBlockingTimeout = timeout;
 			return this;
 		}
diff --git a/src/main/java/com/ibm/csync/impl/Transport.java b/src/main/java/com/ibm/csync/impl/Transport.java
@@ -56,7 +56,7 @@ public class Transport implements WebSocketListener {
 	private Promise<WebSocket> socketPromise = null;
 	private Futur<WebSocket> socketFutur = null;
 	private final Executor sendExec = Executors.newSingleThreadExecutor();
-
+	private WebSocket loginWebSocket = null; //Needs to be stored so that we callback when we are sure auth succeeded
 	// TODO: handle concurrency
 	//private final Set<Callback<WebSocket>> waitingForSocket = ConcurrentHashMap.newKeySet();
 	private final Map<Long, Promise<Envelope>> waitingForResponse = Collections.synchronizedMap(new WeakHashMap<>());
@@ -115,18 +115,16 @@ public synchronized  <T> Futur<T> rpc(final String kind, final Object request, C
 
 	@Override
 	public synchronized void onOpen(WebSocket webSocket, Response response) {
-		final Promise<WebSocket> thePromise = socketPromise;
-		socketPromise = null;
-
-		if (thePromise == null) {
+		if (socketPromise == null) {
 			try {
 				webSocket.close(0,"not needed");
 			} catch (IOException e) {
 				tracer.onError(e, "onOpen");
 			}
-		} else {
-			thePromise.set(null, webSocket);
 		}
+		//set login websocket to callback if it isn't already set
+		if(loginWebSocket == null)
+			loginWebSocket = webSocket;
 	}
 
 	@Override
@@ -159,8 +157,24 @@ public void onMessage(final ResponseBody message_) throws IOException {
 				final Connect.Response r = gson.fromJson(env.payload, Connect.Response.class);
 				// TODO: check uuid
 				tracer.onConnect(r);
+
+				//Auth was successful and we are waiting on the callback, so send it
+				if(loginWebSocket != null ) {
+					final Promise<WebSocket> thePromise = socketPromise;
+					socketPromise = null;
+					thePromise.set(null, loginWebSocket);
+					loginWebSocket = null;
+				}
+
 			} else {
 				tracer.onError(new Exception(),"unknown kind %s",env);
+				//If we failed login and are waiting on a callback, send a failure.
+				if(loginWebSocket != null){
+					final Promise<WebSocket> thePromise = socketPromise;
+					socketPromise = null;
+					thePromise.set(new Exception("Auth failed"),loginWebSocket);
+					loginWebSocket = null;
+				}
 			}
 		}
 	}
@@ -175,9 +189,11 @@ public synchronized void onClose(int code, String reason) {
 		final Promise<WebSocket> thePromise = socketPromise;
 		socketPromise = null;
 		socketFutur = null;
+		loginWebSocket = null;
 		if (thePromise != null) {
 			thePromise.set(new Exception(reason),null);
 		}
+
 	}
 
 }
diff --git a/src/test/java/com/ibm/csync/AdvanceTestsIT.java b/src/test/java/com/ibm/csync/AdvanceTestsIT.java
@@ -22,16 +22,14 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.assertTrue;
 
-/**
- * Created by thomasboop on 3/13/17.
- */
 public class AdvanceTestsIT {
 
     CSync csync;
@@ -67,25 +65,26 @@ public void testSimpleAdvance() throws Exception{
         String uuid = UUID.randomUUID().toString();
 
 
-        CompletableFuture<String> future = new CompletableFuture<>();
+        CompletableFuture<Boolean> future = new CompletableFuture<>();
         csync.blocking.pub("tests.java." + uuid + ".a",String.valueOf(0));
         csync.blocking.pub("tests.java." + uuid + ".a.b",String.valueOf(0));
         csync.blocking.pub("tests.java." + uuid + ".a.b.c",String.valueOf(0));
         csync.blocking.pub("tests.java." + uuid + ".a.b.c.d",String.valueOf(0));
-        csync.listen(
+        Closeable listener = csync.listen(
                 Key.of("tests.java."+uuid+".#"),
                 data -> {
                     totalCount++;
                     if (totalCount == 200){
-                        future.complete("pass");
+                        future.complete(true);
                     }
 
                     int value = Integer.parseInt(data.data);
                     if(value < 50){
                         csync.blocking.pub(data.key.string,String.valueOf(value+1));
                     }
                 });
-        assertTrue(future.get(30, TimeUnit.SECONDS).equals("pass"));
+        assertTrue(future.get(30, TimeUnit.SECONDS));
+        listener.close();
         keysToCleanup.add("tests.java." + uuid + ".a");
         keysToCleanup.add("tests.java." + uuid + ".a.b");
         keysToCleanup.add("tests.java." + uuid + ".a.b.c");
diff --git a/src/test/java/com/ibm/csync/BuilderTestsIT.java b/src/test/java/com/ibm/csync/BuilderTestsIT.java
@@ -0,0 +1,59 @@
+/*
+ *
+ *  * Copyright IBM Corporation 2016-2017
+ *  *
+ *  * 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.
+ *
+ */
+
+package com.ibm.csync;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class BuilderTestsIT {
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testNullTimeout() throws Exception{
+        CSync csync = CSync.builder()
+                .defaultBlockingTimeout(null)
+                .build();
+        fail("Was able to build with no timeout");
+    }
+
+   @Test(expected=IllegalArgumentException.class)
+    public void testNullWorkers() throws Exception{
+        CSync csync = CSync.builder()
+                .workers(null)
+                .build();
+        fail("Was able to build with null workers");
+    }
+
+  @Test(expected=IllegalArgumentException.class)
+    public void testBadWorkers() throws Exception{
+        CSync csync = CSync.builder()
+                .defaultBlockingTimeout(Timeout.of(-5))
+                .build();
+        fail("Was able to build with negative timeout");
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testBadPort() throws Exception{
+        CSync csync = CSync.builder()
+                .port(-5)
+                .build();
+        fail("Was able to build with negative port");
+    }
+
+
+}
diff --git a/src/test/java/com/ibm/csync/ConnectTestsIT.java b/src/test/java/com/ibm/csync/ConnectTestsIT.java
@@ -18,8 +18,6 @@
 
 package com.ibm.csync;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import java.util.concurrent.CompletableFuture;
@@ -47,85 +45,87 @@ public void guestLogin() {
         }
     }
 
-   /* @Test
-    public void badProvider() throws Exception{
-        CompletableFuture<String> future = new CompletableFuture<>();
-        try {
-            final CSync csync = CSync.builder()
-                    .token("demoToken")
-                    .provider("demozzzzzzzz")
-                    .sessionId("xyz")
-                    .build();
-            csync.pub("a","b");
-
-        }
-        catch (Exception e){
-            future.complete("pass");
-        }
-        assertTrue(future.get(20, TimeUnit.SECONDS).equals("pass"));
-    }*/
-
     @Test
-    public void badProvider() {
+    public void badProvider() throws Exception{
+        CompletableFuture<Boolean> future = new CompletableFuture<>();
         try {
             final CSync csync = CSync.builder()
-                    .token("faketokendoesntwork")
-                    .provider("demozz")
+                    .token(System.getenv("CSYNC_DEMO_TOKEN"))
+                    .provider("thisisafakeprovider")
+                    .host(System.getenv("CSYNC_HOST"))
+                    .port(Integer.parseInt(System.getenv("CSYNC_PORT")))
                     .build();
 
             csync.blocking.pub("a","a");
-            fail("Test failed, was able to pub with a bad guest login");
+            fail("should have been able to do a blocking pub with a bad login");
 
         }
         catch (Exception e){
+            future.complete(true);
         }
+        assertTrue(future.get(10, TimeUnit.SECONDS));
     }
 
     @Test
-    public void badGuestLogin() {
+    public void badGuestLogin() throws Exception{
+        CompletableFuture<Boolean> future = new CompletableFuture<>();
         try {
             final CSync csync = CSync.builder()
-                    .token("faketokendoesntwork")
-                    .provider("demo")
+                    .token("thistokenshouldfail")
+                    .provider(System.getenv("CSYNC_DEMO_PROVIDER"))
+                    .host(System.getenv("CSYNC_HOST"))
+                    .port(Integer.parseInt(System.getenv("CSYNC_PORT")))
                     .build();
 
             csync.blocking.pub("a","a");
-            fail("Test failed, was able to pub with a bad guest login");
+            fail("should have been able to do a blocking pub with a bad login");
 
         }
         catch (Exception e){
+            future.complete(true);
         }
+        assertTrue(future.get(10, TimeUnit.SECONDS));
     }
 
     @Test
-    public void badFacebookLogin() {
+    public void badFacebookLogin() throws Exception{
+        CompletableFuture<Boolean> future = new CompletableFuture<>();
         try {
             final CSync csync = CSync.builder()
-                    .token("iamnotarealfacebooktoken")
+                    .token("thisisafaketoken")
                     .provider("facebook")
+                    .host(System.getenv("CSYNC_HOST"))
+                    .port(Integer.parseInt(System.getenv("CSYNC_PORT")))
                     .build();
 
             csync.blocking.pub("a","a");
-            fail("Test failed, was able to pub with a bad facebook token");
+            fail("should have been able to do a blocking pub with a bad login");
 
         }
         catch (Exception e){
+            future.complete(true);
         }
+        assertTrue(future.get(10, TimeUnit.SECONDS));
     }
 
     @Test
-    public void badGoogleLogin() {
+    public void badGoogleLogin() throws Exception{
+        CompletableFuture<Boolean> future = new CompletableFuture<>();
         try {
             final CSync csync = CSync.builder()
-                    .token("iamnotarealgoogletoken")
+                    .token("thisisafaketoken")
                     .provider("google")
+                    .host(System.getenv("CSYNC_HOST"))
+                    .port(Integer.parseInt(System.getenv("CSYNC_PORT")))
                     .build();
 
             csync.blocking.pub("a","a");
-            fail("Test failed, was able to pub with a bad google token");
+            fail("should have been able to do a blocking pub with a bad login");
 
         }
         catch (Exception e){
+            future.complete(true);
         }
+        assertTrue(future.get(10, TimeUnit.SECONDS));
     }
 }
diff --git a/src/test/java/com/ibm/csync/KeyTests.java b/src/test/java/com/ibm/csync/KeyTests.java
@@ -57,16 +57,6 @@ public void testMatches() {
 		nomatch("a.b","x.*");
 	}
 
-	//Test the max length of the key, this should fail.
-	@Test
-	public void testMaxLength(){
-		Key testKey = Key.of("a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z");
-		//comment back in when fixed
-		//assertTrue(testKey.string.equals(""));
-	}
-
-	//Tests that keys created two different ways are seen as equal
-	@Test
 	public void testInitializer(){
 		Key keyOne = Key.of("a","b","c");
 		Key keyTwo = Key.of("a.b.c");
diff --git a/src/test/java/com/ibm/csync/PubTestsIT.java b/src/test/java/com/ibm/csync/PubTestsIT.java
@@ -73,19 +73,18 @@ public void testSimpleBlockingPub() {
     @Test
     public void testSimpleNonBlockingPub() throws Exception {
         String uuid = UUID.randomUUID().toString();
-        CompletableFuture<String> future = new CompletableFuture<>();
+        CompletableFuture<Boolean> future = new CompletableFuture<>();
         try {
             csync.pub("tests.java."+uuid+".a.b.c","abc", (error, vts) -> {
                     if (error == null && vts > 0)
-                        future.complete("pass");
+                        future.complete(true);
                 }
             );
         }
         catch (Exception e) {
             fail("Failed to send a nonblocking pub");
         }
-        String pass = future.get(10,TimeUnit.SECONDS);
-        assertTrue(pass.equals("pass"));
+        assertTrue(future.get(10,TimeUnit.SECONDS));
         keysToCleanup.add("tests.java."+uuid+".a.b.c");
     }
 
@@ -103,4 +102,16 @@ public void testDeleteWildcard() throws Exception{
         keysToCleanup.add("tests.java."+uuid+".e.e");
 
     }
+
+    @Test
+    public void testPubWithTooManyParts() throws Exception{
+        CompletableFuture<Boolean> future = new CompletableFuture<>();
+        try {
+            csync.blocking.pub("tests.java.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z", "a");
+        }
+        catch (Exception e){
+            future.complete(true);
+        }
+        assertTrue(future.get(10,TimeUnit.SECONDS));
+    }
 }
diff --git a/src/test/java/com/ibm/csync/SubTestsIT.java b/src/test/java/com/ibm/csync/SubTestsIT.java

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public static class Builder {`
`121`	`121`	`private Builder() {}`
`122`	`122`
`123`	`123`	`public Builder defaultBlockingTimeout(final Timeout timeout) {`
`124`		`- if (timeout == null) throw new IllegalArgumentException();`
	`124`	`+ if (timeout == null \|\| timeout.ms < 0) throw new IllegalArgumentException();`
`125`	`125`	`this.defaultBlockingTimeout = timeout;`
`126`	`126`	`return this;`
`127`	`127`	`}`