Revert "Update Raft tests to use primitive client/service APIs."

This reverts commit ce78bae.
atomix · May 3, 2018 · e5f3f6d · e5f3f6d
1 parent ce78bae
commit e5f3f6d
Show file tree

Hide file tree

Showing 2 changed files with 135 additions and 257 deletions.
diff --git a/primitive/src/main/java/io/atomix/primitive/service/AbstractPrimitiveService.java b/primitive/src/main/java/io/atomix/primitive/service/AbstractPrimitiveService.java
@@ -330,12 +330,8 @@ protected void acceptAll(Consumer<C> event) {
   @SuppressWarnings("unchecked")
   public final void register(PrimitiveSession session) {
     SessionProxyHandler sessionProxyHandler = new SessionProxyHandler(session);
-    if (clientInterface != null) {
-      C sessionProxy = (C) java.lang.reflect.Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{clientInterface}, sessionProxyHandler);
-      sessions.put(session.sessionId(), new SessionProxy(session, sessionProxy));
-    } else {
-      sessions.put(session.sessionId(), new SessionProxy(session, null));
-    }
+    C sessionProxy = (C) java.lang.reflect.Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{clientInterface}, sessionProxyHandler);
+    sessions.put(session.sessionId(), new SessionProxy(session, sessionProxy));
     onOpen(session);
   }
 
@@ -451,7 +447,7 @@ private final class SessionProxyHandler implements InvocationHandler {
 
     private SessionProxyHandler(PrimitiveSession session) {
       this.session = session;
-      this.events = clientInterface != null ? Events.getMethodMap(clientInterface) : Maps.newHashMap();
+      this.events = Events.getMethodMap(clientInterface);
     }
 
     @Override