From 79a9f7770ce28c5b19235b7884605072f7907d45 Mon Sep 17 00:00:00 2001 From: Colin McDonald Date: Mon, 25 Jul 2016 21:10:34 -0400 Subject: [PATCH] Remove test code in main class, fix small issue in UserSessionUtils --- src/main/java/net/frozenorb/apiv3/APIv3.java | 26 ------------------- .../apiv3/util/UserSessionUtils.java | 3 +-- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/main/java/net/frozenorb/apiv3/APIv3.java b/src/main/java/net/frozenorb/apiv3/APIv3.java index 04404b7..a77a87f 100644 --- a/src/main/java/net/frozenorb/apiv3/APIv3.java +++ b/src/main/java/net/frozenorb/apiv3/APIv3.java @@ -103,9 +103,6 @@ import net.frozenorb.apiv3.serialization.jackson.UuidJsonDeserializer; import net.frozenorb.apiv3.serialization.jackson.UuidJsonSerializer; import net.frozenorb.apiv3.serialization.mongodb.UuidCodecProvider; import net.frozenorb.apiv3.util.EmailUtils; -import net.frozenorb.apiv3.util.MojangUtils; -import net.frozenorb.apiv3.util.SyncUtils; -import net.frozenorb.apiv3.util.UserSessionUtils; import org.bson.Document; import org.bson.codecs.BsonValueCodecProvider; import org.bson.codecs.DocumentCodecProvider; @@ -140,29 +137,6 @@ public final class APIv3 extends AbstractVerticle { setupMetrics(); setupHttpServer(); - UserSessionUtils.setupRedis(); - - try { - Thread.sleep(2000L); - } catch (Exception ex) { - ex.printStackTrace(); - } - - UserSessionUtils.createSession(UUID.randomUUID(), "192.168.1.1", (v, i) -> { - if (i == null) { - System.out.println("a: " + v); - } else { - i.printStackTrace(); - } - }); - UserSessionUtils.createSession(UUID.randomUUID(), "::1", (v, i) -> { - if (i == null) { - System.out.println("b: " + v); - } else { - i.printStackTrace(); - } - }); - /*User.findAll((users, error) -> { if (error != null) { error.printStackTrace(); diff --git a/src/main/java/net/frozenorb/apiv3/util/UserSessionUtils.java b/src/main/java/net/frozenorb/apiv3/util/UserSessionUtils.java index e9d537c..5cce56d 100644 --- a/src/main/java/net/frozenorb/apiv3/util/UserSessionUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/UserSessionUtils.java @@ -42,12 +42,11 @@ public class UserSessionUtils { if (result.succeeded()) { redisClient.sadd("apiv3:sessions:" + user, key, (result2) -> { if (result2.succeeded()) { - callback.onResult(null, null); + callback.onResult(userSession, null); } else { callback.onResult(null, result2.cause()); } }); - callback.onResult(null, null); } else { callback.onResult(null, result.cause()); }