Author: pferraro Date: 2008-09-09 18:33:01 -0400 (Tue, 09 Sep 2008) New Revision: 1793 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/DefaultJBossWebEventHandler.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/AdvertiseListenerFactory.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerFactoryImpl.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerImpl.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPHandler.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerTestCase.java Log: Replace MCMPHandler.getConfiguration() with injection where necessary. Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/DefaultJBossWebEventHandler.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/DefaultJBossWebEventHandler.java 2008-09-09 22:27:15 UTC (rev 1792) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/DefaultJBossWebEventHandler.java 2008-09-09 22:33:01 UTC (rev 1793) @@ -51,7 +51,7 @@ */ public class DefaultJBossWebEventHandler implements JBossWebEventHandler { - protected static Logger log = Logger.getLogger(DefaultJBossWebEventHandler.class); + static Logger log = Logger.getLogger(DefaultJBossWebEventHandler.class); // ----------------------------------------------------------------- Fields @@ -59,8 +59,9 @@ * The string manager for this package. */ private final StringManager sm = StringManager.getManager(Constants.Package); - private final NodeConfiguration nodeConfiguration; - private final BalancerConfiguration balancerConfiguration; + private final NodeConfiguration nodeConfig; + private final BalancerConfiguration balancerConfig; + private final MCMPHandlerConfiguration mcmpHandlerConfig; private final MCMPHandler mcmpHandler; private final LoadBalanceFactorProvider loadBalanceFactorProvider; private final AdvertiseListenerFactory listenerFactory; @@ -72,16 +73,18 @@ // ----------------------------------------------------------- Constructors public DefaultJBossWebEventHandler(NodeConfiguration nodeConfig, BalancerConfiguration balancerConfig, - MCMPHandler mcmpHandler, LoadBalanceFactorProvider loadBalanceFactorProvider) + MCMPHandlerConfiguration mcmpHandlerConfig, MCMPHandler mcmpHandler, LoadBalanceFactorProvider loadBalanceFactorProvider) { - this(nodeConfig, balancerConfig, mcmpHandler, loadBalanceFactorProvider, new AdvertiseListenerFactoryImpl()); + this(nodeConfig, balancerConfig, mcmpHandlerConfig, mcmpHandler, loadBalanceFactorProvider, new AdvertiseListenerFactoryImpl()); } - protected DefaultJBossWebEventHandler(NodeConfiguration nodeConfiguration, BalancerConfiguration balancerConfiguration, - MCMPHandler mcmpHandler, LoadBalanceFactorProvider loadBalanceFactorProvider, AdvertiseListenerFactory listenerFactory) + protected DefaultJBossWebEventHandler(NodeConfiguration nodeConfig, BalancerConfiguration balancerConfig, + MCMPHandlerConfiguration mcmpHandlerConfig, MCMPHandler mcmpHandler, + LoadBalanceFactorProvider loadBalanceFactorProvider, AdvertiseListenerFactory listenerFactory) { - this.nodeConfiguration = nodeConfiguration; - this.balancerConfiguration = balancerConfiguration; + this.nodeConfig = nodeConfig; + this.balancerConfig = balancerConfig; + this.mcmpHandlerConfig = mcmpHandlerConfig; this.mcmpHandler = mcmpHandler; this.loadBalanceFactorProvider = loadBalanceFactorProvider; this.listenerFactory = listenerFactory; @@ -91,15 +94,14 @@ public synchronized void init() { - MCMPHandlerConfiguration handlerConfig = this.mcmpHandler.getConfiguration(); - List<AddressPort> initialProxies = MCMPUtils.parseProxies(handlerConfig.getProxyList()); + List<AddressPort> initialProxies = MCMPUtils.parseProxies(this.mcmpHandlerConfig.getProxyList()); this.mcmpHandler.init(initialProxies); - Boolean advertise = handlerConfig.getAdvertise(); + Boolean advertise = this.mcmpHandlerConfig.getAdvertise(); if (Boolean.TRUE.equals(advertise) || (advertise == null && initialProxies.isEmpty())) { - this.advertiseListener = this.listenerFactory.createListener(this.mcmpHandler); + this.advertiseListener = this.listenerFactory.createListener(this.mcmpHandler, this.mcmpHandlerConfig); try { @@ -192,7 +194,7 @@ return; } - MCMPRequest request = MCMPUtils.createConfigRequest(engine, this.nodeConfiguration, this.balancerConfiguration); + MCMPRequest request = MCMPUtils.createConfigRequest(engine, this.nodeConfig, this.balancerConfig); // Send CONFIG request this.mcmpHandler.sendRequest(request); @@ -277,23 +279,6 @@ this.mcmpHandler.sendRequest(request); } - // ----------------------------------------------------------------- Public - - public BalancerConfiguration getBalancerConfiguration() - { - return this.balancerConfiguration; - } - - public NodeConfiguration getNodeConfiguration() - { - return this.nodeConfiguration; - } - - public LoadBalanceFactorProvider getLoadBalanceFactorProvider() - { - return this.loadBalanceFactorProvider; - } - // ---------------------------------------------------------------- Private private void checkInit() Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java 2008-09-09 22:27:15 UTC (rev 1792) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java 2008-09-09 22:33:01 UTC (rev 1793) @@ -152,7 +152,7 @@ // this.localHandler.init(); this.clusteredHandler = new ClusteredMCMPHandlerImpl(this.localHandler, this, this); this.loadManager = loadFactorProvider; - this.eventHandlerDelegate = new DefaultJBossWebEventHandler(config, config, this.clusteredHandler, loadFactorProvider); + this.eventHandlerDelegate = new DefaultJBossWebEventHandler(config, config, config, this.clusteredHandler, loadFactorProvider); this.domain = config.getDomain(); this.masterPerDomain = config.isMasterPerDomain(); Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/AdvertiseListenerFactory.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/AdvertiseListenerFactory.java 2008-09-09 22:27:15 UTC (rev 1792) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/AdvertiseListenerFactory.java 2008-09-09 22:33:01 UTC (rev 1793) @@ -21,6 +21,7 @@ */ package org.jboss.modcluster.advertise; +import org.jboss.modcluster.config.MCMPHandlerConfiguration; import org.jboss.modcluster.mcmp.MCMPHandler; /** @@ -29,5 +30,5 @@ */ public interface AdvertiseListenerFactory { - public AdvertiseListener createListener(MCMPHandler handler); + public AdvertiseListener createListener(MCMPHandler handler, MCMPHandlerConfiguration config); } Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerFactoryImpl.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerFactoryImpl.java 2008-09-09 22:27:15 UTC (rev 1792) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerFactoryImpl.java 2008-09-09 22:33:01 UTC (rev 1793) @@ -23,6 +23,7 @@ import org.jboss.modcluster.advertise.AdvertiseListener; import org.jboss.modcluster.advertise.AdvertiseListenerFactory; +import org.jboss.modcluster.config.MCMPHandlerConfiguration; import org.jboss.modcluster.mcmp.MCMPHandler; /** @@ -36,8 +37,8 @@ * @{inheritDoc} * @see org.jboss.modcluster.advertise.AdvertiseListenerFactory#createListener(org.jboss.modcluster.mcmp.MCMPHandler) */ - public AdvertiseListener createListener(MCMPHandler handler) + public AdvertiseListener createListener(MCMPHandler handler, MCMPHandlerConfiguration config) { - return new AdvertiseListenerImpl(handler); + return new AdvertiseListenerImpl(handler, config); } } Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java 2008-09-09 22:27:15 UTC (rev 1792) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java 2008-09-09 22:33:01 UTC (rev 1793) @@ -114,12 +114,10 @@ * @param eventHandler The event handler that will be used for * status and new server notifications. */ - public AdvertiseListenerImpl(MCMPHandler commHandler) + public AdvertiseListenerImpl(MCMPHandler commHandler, MCMPHandlerConfiguration config) { this.commHandler = commHandler; - MCMPHandlerConfiguration config = commHandler.getConfiguration(); - try { this.setGroupAddress(config.getAdvertiseGroupAddress()); Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerImpl.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerImpl.java 2008-09-09 22:27:15 UTC (rev 1792) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerImpl.java 2008-09-09 22:33:01 UTC (rev 1793) @@ -222,15 +222,6 @@ /** * @{inheritDoc} - * @see org.jboss.modcluster.mcmp.MCMPHandler#getConfiguration() - */ - public MCMPHandlerConfiguration getConfiguration() - { - return this.localHandler.getConfiguration(); - } - - /** - * @{inheritDoc} * @see org.jboss.modcluster.mcmp.MCMPHandler#addProxy(java.net.InetAddress, int) */ public synchronized void addProxy(InetAddress address, int port) Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPHandler.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPHandler.java 2008-09-09 22:27:15 UTC (rev 1792) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPHandler.java 2008-09-09 22:33:01 UTC (rev 1793) @@ -27,8 +27,6 @@ import java.util.List; import java.util.Set; -import org.jboss.modcluster.config.MCMPHandlerConfiguration; - /** * Handles communication via MCMP with the httpd side. * @@ -37,9 +35,6 @@ */ public interface MCMPHandler { - /** Gets this handler's configuration */ - MCMPHandlerConfiguration getConfiguration(); - /** Initialize the handler with the given list of proxies */ void init(List<AddressPort> initialProxies); Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java 2008-09-09 22:27:15 UTC (rev 1792) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java 2008-09-09 22:33:01 UTC (rev 1793) @@ -78,37 +78,19 @@ /** Our configuration */ private final MCMPHandlerConfiguration config; - - /** - * Source for reset requests when we need to reset a proxy. - */ + /** Source for reset requests when we need to reset a proxy. */ private final ResetRequestSource resetRequestSource; - - /** - * URL encoder used to generate requests bodies. - */ + + /** URL encoder used to generate requests bodies. */ private UEncoder encoder = new UEncoder(); - - /** - * Proxies. - */ + /** Proxies. */ private volatile Proxy[] proxies = new Proxy[0]; - - /** - * Add proxy list. - */ + /** Add proxy list. */ private List<Proxy> addProxies = new ArrayList<Proxy>(); - - /** - * Remove proxy list. - */ + /** Remove proxy list. */ private List<Proxy> removeProxies = new ArrayList<Proxy>(); - - /** - * Socket factory. - */ + /** Socket factory. */ private JSSESocketFactory sslSocketFactory = null; - /** Initialization completion flag */ private boolean init; @@ -125,20 +107,8 @@ } } - // -------------------------------------------------------------- Properties - - public ResetRequestSource getResetRequestSource() - { - return this.resetRequestSource; - } - // ------------------------------------------------------------ MCMPHandler - public MCMPHandlerConfiguration getConfiguration() - { - return this.config; - } - public synchronized void init(List<AddressPort> initialProxies) { if (this.init) return; Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java =================================================================== --- trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java 2008-09-09 22:27:15 UTC (rev 1792) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java 2008-09-09 22:33:01 UTC (rev 1793) @@ -59,6 +59,7 @@ { private final NodeConfiguration nodeConfig = EasyMock.createStrictMock(NodeConfiguration.class); private final BalancerConfiguration balancerConfig = EasyMock.createStrictMock(BalancerConfiguration.class); + private final MCMPHandlerConfiguration mcmpHandlerConfig = EasyMock.createStrictMock(MCMPHandlerConfiguration.class); private final MCMPHandler mcmpHandler = EasyMock.createStrictMock(MCMPHandler.class); private final LoadBalanceFactorProvider provider = EasyMock.createStrictMock(LoadBalanceFactorProvider.class); private final AdvertiseListenerFactory listenerFactory = EasyMock.createStrictMock(AdvertiseListenerFactory.class); @@ -72,7 +73,7 @@ @Override protected void setUp() throws Exception { - this.handler = new DefaultJBossWebEventHandler(this.nodeConfig, this.balancerConfig, this.mcmpHandler, this.provider, this.listenerFactory); + this.handler = new DefaultJBossWebEventHandler(this.nodeConfig, this.balancerConfig, this.mcmpHandlerConfig, this.mcmpHandler, this.provider, this.listenerFactory); } public void testInit() throws IOException @@ -80,81 +81,76 @@ InetAddress localAddress = InetAddress.getLocalHost(); String localHostName = localAddress.getHostName(); - MCMPHandlerConfiguration config = EasyMock.createStrictMock(MCMPHandlerConfiguration.class); AdvertiseListener listener = EasyMock.createStrictMock(AdvertiseListener.class); // Test advertise = false - EasyMock.expect(this.mcmpHandler.getConfiguration()).andReturn(config); - EasyMock.expect(config.getProxyList()).andReturn(localHostName); + EasyMock.expect(this.mcmpHandlerConfig.getProxyList()).andReturn(localHostName); this.mcmpHandler.init(Collections.singletonList(new AddressPort(localAddress, 8000))); - EasyMock.expect(config.getAdvertise()).andReturn(Boolean.FALSE); + EasyMock.expect(this.mcmpHandlerConfig.getAdvertise()).andReturn(Boolean.FALSE); - EasyMock.replay(this.mcmpHandler, config, listener); + EasyMock.replay(this.mcmpHandler, this.mcmpHandlerConfig, listener); this.handler.init(); - EasyMock.verify(this.mcmpHandler, config, listener); - EasyMock.reset(this.mcmpHandler, config, listener); + EasyMock.verify(this.mcmpHandler, this.mcmpHandlerConfig, listener); + EasyMock.reset(this.mcmpHandler, this.mcmpHandlerConfig, listener); // Test advertise = true - EasyMock.expect(this.mcmpHandler.getConfiguration()).andReturn(config); - EasyMock.expect(config.getProxyList()).andReturn(localHostName); + EasyMock.expect(this.mcmpHandlerConfig.getProxyList()).andReturn(localHostName); this.mcmpHandler.init(Collections.singletonList(new AddressPort(localAddress, 8000))); - EasyMock.expect(config.getAdvertise()).andReturn(Boolean.TRUE); + EasyMock.expect(this.mcmpHandlerConfig.getAdvertise()).andReturn(Boolean.TRUE); - EasyMock.expect(this.listenerFactory.createListener(this.mcmpHandler)).andReturn(listener); + EasyMock.expect(this.listenerFactory.createListener(this.mcmpHandler, this.mcmpHandlerConfig)).andReturn(listener); listener.start(); - EasyMock.replay(this.mcmpHandler, this.listenerFactory, config, listener); + EasyMock.replay(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); this.handler.init(); - EasyMock.verify(this.mcmpHandler, this.listenerFactory, config, listener); - EasyMock.reset(this.mcmpHandler, this.listenerFactory, config, listener); + EasyMock.verify(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); + EasyMock.reset(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); // Test advertise = null, proxies configured - EasyMock.expect(this.mcmpHandler.getConfiguration()).andReturn(config); - EasyMock.expect(config.getProxyList()).andReturn(localHostName); + EasyMock.expect(this.mcmpHandlerConfig.getProxyList()).andReturn(localHostName); this.mcmpHandler.init(Collections.singletonList(new AddressPort(localAddress, 8000))); - EasyMock.expect(config.getAdvertise()).andReturn(null); + EasyMock.expect(this.mcmpHandlerConfig.getAdvertise()).andReturn(null); - EasyMock.replay(this.mcmpHandler, config, listener); + EasyMock.replay(this.mcmpHandler, this.mcmpHandlerConfig, listener); this.handler.init(); - EasyMock.verify(this.mcmpHandler, config, listener); - EasyMock.reset(this.mcmpHandler, config, listener); + EasyMock.verify(this.mcmpHandler, this.mcmpHandlerConfig, listener); + EasyMock.reset(this.mcmpHandler, this.mcmpHandlerConfig, listener); // Test advertise = null, no proxies configured - EasyMock.expect(this.mcmpHandler.getConfiguration()).andReturn(config); - EasyMock.expect(config.getProxyList()).andReturn(null); + EasyMock.expect(this.mcmpHandlerConfig.getProxyList()).andReturn(null); List<AddressPort> emptyList = Collections.emptyList(); this.mcmpHandler.init(emptyList); - EasyMock.expect(config.getAdvertise()).andReturn(null); + EasyMock.expect(this.mcmpHandlerConfig.getAdvertise()).andReturn(null); - EasyMock.expect(this.listenerFactory.createListener(this.mcmpHandler)).andReturn(listener); + EasyMock.expect(this.listenerFactory.createListener(this.mcmpHandler, this.mcmpHandlerConfig)).andReturn(listener); listener.start(); - EasyMock.replay(this.mcmpHandler, this.listenerFactory, config, listener); + EasyMock.replay(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); this.handler.init(); - EasyMock.verify(this.mcmpHandler, this.listenerFactory, config, listener); - EasyMock.reset(this.mcmpHandler, this.listenerFactory, config, listener); + EasyMock.verify(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); + EasyMock.reset(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); } public void testShutdown() throws IOException @@ -175,26 +171,24 @@ InetAddress localAddress = InetAddress.getLocalHost(); String localHostName = localAddress.getHostName(); - MCMPHandlerConfiguration config = EasyMock.createStrictMock(MCMPHandlerConfiguration.class); AdvertiseListener listener = EasyMock.createStrictMock(AdvertiseListener.class); - EasyMock.expect(this.mcmpHandler.getConfiguration()).andReturn(config); - EasyMock.expect(config.getProxyList()).andReturn(localHostName); + EasyMock.expect(this.mcmpHandlerConfig.getProxyList()).andReturn(localHostName); this.mcmpHandler.init(Collections.singletonList(new AddressPort(localAddress, 8000))); - EasyMock.expect(config.getAdvertise()).andReturn(Boolean.TRUE); + EasyMock.expect(this.mcmpHandlerConfig.getAdvertise()).andReturn(Boolean.TRUE); - EasyMock.expect(this.listenerFactory.createListener(this.mcmpHandler)).andReturn(listener); + EasyMock.expect(this.listenerFactory.createListener(this.mcmpHandler, this.mcmpHandlerConfig)).andReturn(listener); listener.start(); - EasyMock.replay(this.mcmpHandler, this.listenerFactory, config, listener); + EasyMock.replay(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); this.handler.init(); - EasyMock.verify(this.mcmpHandler, this.listenerFactory, config, listener); - EasyMock.reset(this.mcmpHandler, this.listenerFactory, config, listener); + EasyMock.verify(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); + EasyMock.reset(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); // Now test shutdown() listener.destroy(); Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerTestCase.java =================================================================== --- trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerTestCase.java 2008-09-09 22:27:15 UTC (rev 1792) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerTestCase.java 2008-09-09 22:33:01 UTC (rev 1793) @@ -37,9 +37,6 @@ import org.jboss.ha.framework.interfaces.HAPartition; import org.jboss.ha.framework.interfaces.HAServiceKeyProvider; import org.jboss.ha.framework.interfaces.HASingletonMBean; -import org.jboss.modcluster.config.MCMPHandlerConfiguration; -import org.jboss.modcluster.ha.ClusteredMCMPHandler; -import org.jboss.modcluster.ha.ClusteredMCMPHandlerImpl; import org.jboss.modcluster.ha.rpc.BooleanGroupRpcResponse; import org.jboss.modcluster.ha.rpc.GroupRpcResponse; import org.jboss.modcluster.ha.rpc.GroupRpcResponseFilter; @@ -188,23 +185,6 @@ EasyMock.reset(this.localHandler, this.singleton, server, state); } - public void testGetConfiguration() - { - MCMPHandlerConfiguration configuration = EasyMock.createMock(MCMPHandlerConfiguration.class); - - EasyMock.expect(this.localHandler.getConfiguration()).andReturn(configuration); - - EasyMock.replay(this.localHandler, this.singleton); - - MCMPHandlerConfiguration result = this.handler.getConfiguration(); - - EasyMock.verify(this.localHandler, this.singleton); - - assertSame(configuration, result); - - EasyMock.reset(this.localHandler, this.singleton); - } - public void testAddProxy() throws Exception { InetAddress address = InetAddress.getLocalHost();