From b81ccde75b456d7ea188c9096a14b2c83fdff4dd Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 6 Nov 2008 18:24:44 +0000 Subject: [PATCH] ClientFactory -> SessionFactory, etc. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5509 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../bureau/server/BureauRegistry.java | 6 +++--- ...tFactory.java => BureauSessionFactory.java} | 18 +++++++++--------- .../threerings/crowd/server/CrowdServer.java | 6 +++--- .../presents/peer/server/PeerManager.java | 2 +- .../presents/peer/server/PeerSession.java | 2 +- ...entFactory.java => PeerSessionFactory.java} | 16 ++++++++-------- .../presents/server/ClientManager.java | 10 +++++----- ...{ClientFactory.java => SessionFactory.java} | 8 ++++---- .../threerings/bureau/server/TestServer.java | 2 +- 9 files changed, 35 insertions(+), 35 deletions(-) rename src/java/com/threerings/bureau/server/{BureauClientFactory.java => BureauSessionFactory.java} (82%) rename src/java/com/threerings/presents/peer/server/{PeerClientFactory.java => PeerSessionFactory.java} (79%) rename src/java/com/threerings/presents/server/{ClientFactory.java => SessionFactory.java} (87%) diff --git a/src/java/com/threerings/bureau/server/BureauRegistry.java b/src/java/com/threerings/bureau/server/BureauRegistry.java index 0e8e39151..95b8b2d1c 100644 --- a/src/java/com/threerings/bureau/server/BureauRegistry.java +++ b/src/java/com/threerings/bureau/server/BureauRegistry.java @@ -120,7 +120,7 @@ public class BureauRegistry * Provides the Bureau registry with necessary runtime configuration. Inserts the bureau * client factory into the client manager and registers observers to track the progress * of launched bureaus. - * @see BureauClientFactory + * @see BureauSessionFactory */ public void init () { @@ -145,10 +145,10 @@ public class BureauRegistry * client factories are in place. The installed factory will simply create presents clients and * client objects for bureaus. */ - public void setDefaultClientFactory () + public void setDefaultSessionFactory () { // add the client factory, but later, after all the other modules have been initialized - _clmgr.setClientFactory(new BureauClientFactory(_clmgr.getClientFactory())); + _clmgr.setSessionFactory(new BureauSessionFactory(_clmgr.getSessionFactory())); } /** diff --git a/src/java/com/threerings/bureau/server/BureauClientFactory.java b/src/java/com/threerings/bureau/server/BureauSessionFactory.java similarity index 82% rename from src/java/com/threerings/bureau/server/BureauClientFactory.java rename to src/java/com/threerings/bureau/server/BureauSessionFactory.java index a5172a286..eea391340 100644 --- a/src/java/com/threerings/bureau/server/BureauClientFactory.java +++ b/src/java/com/threerings/bureau/server/BureauSessionFactory.java @@ -24,7 +24,7 @@ package com.threerings.bureau.server; import com.threerings.util.Name; import com.threerings.presents.net.AuthRequest; -import com.threerings.presents.server.ClientFactory; +import com.threerings.presents.server.SessionFactory; import com.threerings.presents.server.ClientResolver; import com.threerings.presents.server.PresentsSession; @@ -34,28 +34,28 @@ import com.threerings.bureau.data.BureauCredentials; * Handles resolution of bureaus and passes non-bureau resolution requests through to a normal * factory. For bureaus, creates base class instances {@link PresentsSession} and * {@link ClientResolver}. - * @see BureauRegistry#setDefaultClientFactory() + * @see BureauRegistry#setDefaultSessionFactory() */ -public class BureauClientFactory implements ClientFactory +public class BureauSessionFactory implements SessionFactory { - public BureauClientFactory (ClientFactory delegate) + public BureauSessionFactory (SessionFactory delegate) { _delegate = delegate; } - // from interface ClientFactory - public Class getClientClass (AuthRequest areq) + // from interface SessionFactory + public Class getSessionClass (AuthRequest areq) { // Just give bureaus a vanilla PresentsSession client for now. // TODO: will bureaus need a more tailored client? if (areq.getCredentials() instanceof BureauCredentials) { return PresentsSession.class; } else { - return _delegate.getClientClass(areq); + return _delegate.getSessionClass(areq); } } - // from interface ClientFactory + // from interface SessionFactory public Class getClientResolverClass (Name username) { // Just give bureaus a vanilla ClientResolver for now. @@ -67,5 +67,5 @@ public class BureauClientFactory implements ClientFactory } } - protected ClientFactory _delegate; + protected SessionFactory _delegate; } diff --git a/src/java/com/threerings/crowd/server/CrowdServer.java b/src/java/com/threerings/crowd/server/CrowdServer.java index 69f5a59d9..d96e3b922 100644 --- a/src/java/com/threerings/crowd/server/CrowdServer.java +++ b/src/java/com/threerings/crowd/server/CrowdServer.java @@ -29,7 +29,7 @@ import com.google.inject.Singleton; import com.threerings.util.Name; import com.threerings.presents.net.AuthRequest; -import com.threerings.presents.server.ClientFactory; +import com.threerings.presents.server.SessionFactory; import com.threerings.presents.server.ClientResolver; import com.threerings.presents.server.PresentsSession; import com.threerings.presents.server.PresentsServer; @@ -63,8 +63,8 @@ public class CrowdServer extends PresentsServer super.init(injector); // configure the client manager to use our bits - _clmgr.setClientFactory(new ClientFactory() { - public Class getClientClass (AuthRequest areq) { + _clmgr.setSessionFactory(new SessionFactory() { + public Class getSessionClass (AuthRequest areq) { return CrowdSession.class; } public Class getClientResolverClass (Name username) { diff --git a/src/java/com/threerings/presents/peer/server/PeerManager.java b/src/java/com/threerings/presents/peer/server/PeerManager.java index a48b2f2e5..89e9eeb03 100644 --- a/src/java/com/threerings/presents/peer/server/PeerManager.java +++ b/src/java/com/threerings/presents/peer/server/PeerManager.java @@ -197,7 +197,7 @@ public abstract class PeerManager // wire ourselves into the server _conmgr.addChainedAuthenticator(new PeerAuthenticator(this)); - _clmgr.setClientFactory(new PeerClientFactory(_clmgr.getClientFactory())); + _clmgr.setSessionFactory(new PeerSessionFactory(_clmgr.getSessionFactory())); // create our node object _nodeobj = _omgr.registerObject(createNodeObject()); diff --git a/src/java/com/threerings/presents/peer/server/PeerSession.java b/src/java/com/threerings/presents/peer/server/PeerSession.java index a699d62c5..d4c5c32db 100644 --- a/src/java/com/threerings/presents/peer/server/PeerSession.java +++ b/src/java/com/threerings/presents/peer/server/PeerSession.java @@ -40,7 +40,7 @@ public class PeerSession extends PresentsSession { /** * Creates a peer session and provides it with a reference to the peer manager. This is only - * done by the {@link PeerClientFactory}. + * done by the {@link PeerSessionFactory}. */ @Inject public PeerSession (PeerManager peermgr) { diff --git a/src/java/com/threerings/presents/peer/server/PeerClientFactory.java b/src/java/com/threerings/presents/peer/server/PeerSessionFactory.java similarity index 79% rename from src/java/com/threerings/presents/peer/server/PeerClientFactory.java rename to src/java/com/threerings/presents/peer/server/PeerSessionFactory.java index 3cd41f82e..540612b25 100644 --- a/src/java/com/threerings/presents/peer/server/PeerClientFactory.java +++ b/src/java/com/threerings/presents/peer/server/PeerSessionFactory.java @@ -25,7 +25,7 @@ import com.threerings.util.Name; import com.threerings.presents.net.AuthRequest; import com.threerings.presents.peer.net.PeerCreds; -import com.threerings.presents.server.ClientFactory; +import com.threerings.presents.server.SessionFactory; import com.threerings.presents.server.ClientResolver; import com.threerings.presents.server.PresentsSession; @@ -33,24 +33,24 @@ import com.threerings.presents.server.PresentsSession; * Handles resolution of peer servers and passes non-peer resolution requests through to a normal * factory. */ -public class PeerClientFactory implements ClientFactory +public class PeerSessionFactory implements SessionFactory { - public PeerClientFactory (ClientFactory delegate) + public PeerSessionFactory (SessionFactory delegate) { _delegate = delegate; } - // documentation inherited from interface ClientFactory - public Class getClientClass (AuthRequest areq) + // documentation inherited from interface SessionFactory + public Class getSessionClass (AuthRequest areq) { if (areq.getCredentials() instanceof PeerCreds) { return PeerSession.class; } else { - return _delegate.getClientClass(areq); + return _delegate.getSessionClass(areq); } } - // documentation inherited from interface ClientFactory + // documentation inherited from interface SessionFactory public Class getClientResolverClass (Name username) { if (username.toString().startsWith(PeerCreds.PEER_PREFIX)) { @@ -60,5 +60,5 @@ public class PeerClientFactory implements ClientFactory } } - protected ClientFactory _delegate; + protected SessionFactory _delegate; } diff --git a/src/java/com/threerings/presents/server/ClientManager.java b/src/java/com/threerings/presents/server/ClientManager.java index cb964a100..275b8f255 100644 --- a/src/java/com/threerings/presents/server/ClientManager.java +++ b/src/java/com/threerings/presents/server/ClientManager.java @@ -149,15 +149,15 @@ public class ClientManager * Configures the client manager with a factory for creating {@link PresentsSession} and {@link * ClientResolver} classes for authenticated client connections. */ - public void setClientFactory (ClientFactory factory) + public void setSessionFactory (SessionFactory factory) { _factory = factory; } /** - * Returns the {@link ClientFactory} currently in use. + * Returns the {@link SessionFactory} currently in use. */ - public ClientFactory getClientFactory () + public SessionFactory getSessionFactory () { return _factory; } @@ -384,7 +384,7 @@ public class ClientManager } else { log.info("Session initiated [username=" + username + ", conn=" + conn + "]."); // create a new client and stick'em in the table - client = _injector.getInstance(_factory.getClientClass(req)); + client = _injector.getInstance(_factory.getSessionClass(req)); client.startSession(req, conn, rsp.authdata); // map their client instance @@ -565,7 +565,7 @@ public class ClientManager protected Map _penders = Maps.newHashMap(); /** Lets us know what sort of client classes to use. */ - protected ClientFactory _factory = ClientFactory.DEFAULT; + protected SessionFactory _factory = SessionFactory.DEFAULT; /** Tracks registered {@link ClientObserver}s. */ protected ObserverList _clobservers = ObserverList.newSafeInOrder(); diff --git a/src/java/com/threerings/presents/server/ClientFactory.java b/src/java/com/threerings/presents/server/SessionFactory.java similarity index 87% rename from src/java/com/threerings/presents/server/ClientFactory.java rename to src/java/com/threerings/presents/server/SessionFactory.java index a8322065a..407535c6a 100644 --- a/src/java/com/threerings/presents/server/ClientFactory.java +++ b/src/java/com/threerings/presents/server/SessionFactory.java @@ -29,11 +29,11 @@ import com.threerings.presents.net.AuthRequest; * Used to determine what type of {@link PresentsSession} to use to manage an authenticated client * as well the type of {@link ClientResolver} to use when resolving clients' runtime data. */ -public interface ClientFactory +public interface SessionFactory { /** The default client factory. */ - public static ClientFactory DEFAULT = new ClientFactory() { - public Class getClientClass (AuthRequest areq) { + public static SessionFactory DEFAULT = new SessionFactory() { + public Class getSessionClass (AuthRequest areq) { return PresentsSession.class; } public Class getClientResolverClass (Name username) { @@ -45,7 +45,7 @@ public interface ClientFactory * Returns the {@link PresentsSession} derived class to use for the session that authenticated * with the supplied request. */ - Class getClientClass (AuthRequest areq); + Class getSessionClass (AuthRequest areq); /** * Returns the {@link ClientResolver} derived class to use to resolve a client with the diff --git a/tests/src/java/com/threerings/bureau/server/TestServer.java b/tests/src/java/com/threerings/bureau/server/TestServer.java index b9a4e2328..1cabc3d59 100644 --- a/tests/src/java/com/threerings/bureau/server/TestServer.java +++ b/tests/src/java/com/threerings/bureau/server/TestServer.java @@ -74,7 +74,7 @@ public class TestServer extends PresentsServer { super.init(injector); _bureauReg.init(); - _bureauReg.setDefaultClientFactory(); + _bureauReg.setDefaultSessionFactory(); } public void setClientTarget (String target)