This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.discovery.commons-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-commons.git
commit cf6bb536e7010452d7a109892261d3f9bbb1ae94 Author: Stefan Egli <[email protected]> AuthorDate: Wed Oct 21 11:03:11 2015 +0000 SLING-5173 related : EventFactory renamed to EventHelper - and introduced toShortString() for a few base view classes to shorten and make the log output more readable git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/commons@1709794 13f79535-47bb-0310-9956-ffa450edef68 --- .../commons/providers/BaseTopologyView.java | 20 +++++++ .../{EventFactory.java => EventHelper.java} | 32 +++++++++- .../providers/base/ViewStateManagerImpl.java | 18 +++--- .../commons/providers/EventFactoryTest.java | 30 +++++----- .../commons/providers/base/TestHelper.java | 8 +-- .../providers/base/TestMinEventDelayHandler.java | 10 ++-- .../providers/base/TestViewStateManager.java | 70 +++++++++++----------- 7 files changed, 118 insertions(+), 70 deletions(-) diff --git a/src/main/java/org/apache/sling/discovery/commons/providers/BaseTopologyView.java b/src/main/java/org/apache/sling/discovery/commons/providers/BaseTopologyView.java index e8796b4..6464ffc 100644 --- a/src/main/java/org/apache/sling/discovery/commons/providers/BaseTopologyView.java +++ b/src/main/java/org/apache/sling/discovery/commons/providers/BaseTopologyView.java @@ -18,6 +18,7 @@ */ package org.apache.sling.discovery.commons.providers; +import org.apache.sling.discovery.InstanceDescription; import org.apache.sling.discovery.TopologyView; /** @@ -82,4 +83,23 @@ public abstract class BaseTopologyView implements TopologyView { */ public abstract String getLocalClusterSyncTokenId(); + public String toShortString() { + StringBuffer sb = new StringBuffer(); + for (InstanceDescription instance : getInstances()) { + if (sb.length()!=0) { + sb.append(","); + } + sb.append(instance.getSlingId()); + sb.append("["); + sb.append("local="); + sb.append(instance.isLocal()); + sb.append(",leader="); + sb.append(instance.isLeader()); + sb.append("]"); + } + return "DefaultTopologyView[current=" + isCurrent() + + ", num=" + getInstances().size() + + ", instances=" + sb.toString() + "]"; + } + } diff --git a/src/main/java/org/apache/sling/discovery/commons/providers/EventFactory.java b/src/main/java/org/apache/sling/discovery/commons/providers/EventHelper.java similarity index 71% rename from src/main/java/org/apache/sling/discovery/commons/providers/EventFactory.java rename to src/main/java/org/apache/sling/discovery/commons/providers/EventHelper.java index 9d95689..8be1482 100644 --- a/src/main/java/org/apache/sling/discovery/commons/providers/EventFactory.java +++ b/src/main/java/org/apache/sling/discovery/commons/providers/EventHelper.java @@ -20,9 +20,11 @@ package org.apache.sling.discovery.commons.providers; import org.apache.sling.discovery.TopologyEvent; import org.apache.sling.discovery.TopologyEvent.Type; +import org.apache.sling.discovery.TopologyView; -/** Factory for creating TopologyEvents with BaseTopologyView **/ -public class EventFactory { +/** Contains static factory methods for creating TopologyEvents with BaseTopologyView + * as well as some TopologyEvent related helper methods**/ +public class EventHelper { /** Simple factory method for creating a TOPOLOGY_INIT event with the given newView **/ public static TopologyEvent newInitEvent(final BaseTopologyView newView) { @@ -78,5 +80,31 @@ public class EventFactory { } return new TopologyEvent(Type.PROPERTIES_CHANGED, oldView, newView); } + + /** + * Returns a shorter toString than the default TopologyEvent.toString() + * which can be rather large and unusable in log files + */ + public static String toShortString(TopologyEvent event) { + final TopologyView oldView = event.getOldView(); + final TopologyView newView = event.getNewView(); + final String oldViewToString; + final String newViewtoString; + if (oldView instanceof BaseTopologyView) { + final BaseTopologyView baseOldView = (BaseTopologyView)oldView; + oldViewToString = baseOldView.toShortString(); + } else { + oldViewToString = String.valueOf(oldView); + } + if (newView instanceof BaseTopologyView) { + final BaseTopologyView baseNewView = (BaseTopologyView)newView; + newViewtoString = baseNewView.toShortString(); + } else { + newViewtoString = String.valueOf(newView); + } + return "TopologyEvent [type=" + event.getType() + + ", oldView=" + oldViewToString + + ", newView=" + newViewtoString + "]"; + } } diff --git a/src/main/java/org/apache/sling/discovery/commons/providers/base/ViewStateManagerImpl.java b/src/main/java/org/apache/sling/discovery/commons/providers/base/ViewStateManagerImpl.java index 310fd7e..b5fa9fa 100644 --- a/src/main/java/org/apache/sling/discovery/commons/providers/base/ViewStateManagerImpl.java +++ b/src/main/java/org/apache/sling/discovery/commons/providers/base/ViewStateManagerImpl.java @@ -36,7 +36,7 @@ import org.apache.sling.discovery.TopologyEventListener; import org.apache.sling.discovery.commons.InstancesDiff; import org.apache.sling.discovery.commons.InstancesDiff.InstanceCollection; import org.apache.sling.discovery.commons.providers.BaseTopologyView; -import org.apache.sling.discovery.commons.providers.EventFactory; +import org.apache.sling.discovery.commons.providers.EventHelper; import org.apache.sling.discovery.commons.providers.ViewStateManager; import org.apache.sling.discovery.commons.providers.spi.ConsistencyService; import org.slf4j.Logger; @@ -204,7 +204,7 @@ public class ViewStateManagerImpl implements ViewStateManager { // otherwise we can send the TOPOLOGY_INIT now logger.debug("bind: view is defined, sending INIT now to {}", eventListener); - enqueue(eventListener, EventFactory.newInitEvent(previousView), true); + enqueue(eventListener, EventHelper.newInitEvent(previousView), true); eventListeners.add(eventListener); } } else { @@ -258,7 +258,7 @@ public class ViewStateManagerImpl implements ViewStateManager { return; } if (logInfo) { - logger.info("enqueue: enqueuing topologyEvent {}, to {}", event, da); + logger.info("enqueue: enqueuing topologyEvent {}, to {}", EventHelper.toShortString(event), da); } else { logger.debug("enqueue: enqueuing topologyEvent {}, to {}", event, da); } @@ -269,7 +269,7 @@ public class ViewStateManagerImpl implements ViewStateManager { /** Internal helper method that sends a given event to a list of listeners **/ private void enqueueForAll(final List<TopologyEventListener> audience, final TopologyEvent event) { - logger.info("enqueueForAll: sending topologyEvent {}, to all ({}) listeners", event, audience.size()); + logger.info("enqueueForAll: sending topologyEvent {}, to all ({}) listeners", EventHelper.toShortString(event), audience.size()); for (Iterator<TopologyEventListener> it = audience.iterator(); it.hasNext();) { TopologyEventListener topologyEventListener = it.next(); enqueue(topologyEventListener, event, false); @@ -300,7 +300,7 @@ public class ViewStateManagerImpl implements ViewStateManager { th.start(); if (previousView!=null && !isChanging) { - enqueueForAll(unInitializedEventListeners, EventFactory.newInitEvent(previousView)); + enqueueForAll(unInitializedEventListeners, EventHelper.newInitEvent(previousView)); eventListeners.addAll(unInitializedEventListeners); unInitializedEventListeners.clear(); } @@ -387,7 +387,7 @@ public class ViewStateManagerImpl implements ViewStateManager { logger.debug("handleChanging: sending TOPOLOGY_CHANGING to initialized listeners"); previousView.setNotCurrent(); - enqueueForAll(eventListeners, EventFactory.newChangingEvent(previousView)); + enqueueForAll(eventListeners, EventHelper.newChangingEvent(previousView)); } finally { lock.unlock(); logger.trace("handleChanging: finally"); @@ -476,7 +476,7 @@ public class ViewStateManagerImpl implements ViewStateManager { // and that one does not go via consistencyservice logger.info("handleNewViewNonDelayed: properties changed to: "+newView); previousView.setNotCurrent(); - enqueueForAll(eventListeners, EventFactory.newPropertiesChangedEvent(previousView, newView)); + enqueueForAll(eventListeners, EventHelper.newPropertiesChangedEvent(previousView, newView)); logger.trace("handleNewViewNonDelayed: setting previousView to {}", newView); previousView = newView; return true; @@ -608,7 +608,7 @@ public class ViewStateManagerImpl implements ViewStateManager { } else { logger.debug("doHandleConsistent: sending TOPOLOGY_CHANGED to initialized listeners"); previousView.setNotCurrent(); - enqueueForAll(eventListeners, EventFactory.newChangedEvent(previousView, newView)); + enqueueForAll(eventListeners, EventHelper.newChangedEvent(previousView, newView)); } if (unInitializedEventListeners.size()>0) { @@ -617,7 +617,7 @@ public class ViewStateManagerImpl implements ViewStateManager { // waiting for oh so long logger.debug("doHandleConsistent: sending TOPOLOGY_INIT to uninitialized listeners ({})", unInitializedEventListeners.size()); - enqueueForAll(unInitializedEventListeners, EventFactory.newInitEvent(newView)); + enqueueForAll(unInitializedEventListeners, EventHelper.newInitEvent(newView)); eventListeners.addAll(unInitializedEventListeners); unInitializedEventListeners.clear(); } diff --git a/src/test/java/org/apache/sling/discovery/commons/providers/EventFactoryTest.java b/src/test/java/org/apache/sling/discovery/commons/providers/EventFactoryTest.java index eea02e1..42a3e57 100644 --- a/src/test/java/org/apache/sling/discovery/commons/providers/EventFactoryTest.java +++ b/src/test/java/org/apache/sling/discovery/commons/providers/EventFactoryTest.java @@ -31,55 +31,55 @@ public class EventFactoryTest { @Test public void testInitEvent() throws Exception { try{ - EventFactory.newInitEvent(null); + EventHelper.newInitEvent(null); fail("should complain"); } catch(Exception e) { // ok } - EventFactory.newInitEvent(newView()); + EventHelper.newInitEvent(newView()); } @Test public void testChangingEvent() throws Exception { try{ - EventFactory.newChangingEvent(null); + EventHelper.newChangingEvent(null); fail("should complain"); } catch(Exception e) { // ok } try{ - EventFactory.newChangingEvent(newView()); + EventHelper.newChangingEvent(newView()); fail("should complain"); } catch(Exception e) { // ok } BaseTopologyView view = newView(); view.setNotCurrent(); - EventFactory.newChangingEvent(view); + EventHelper.newChangingEvent(view); } @Test public void testChangedEvent() throws Exception { try{ - EventFactory.newChangedEvent(null, null); + EventHelper.newChangedEvent(null, null); fail("should complain"); } catch(Exception e) { // ok } try{ - EventFactory.newChangedEvent(newView(), null); + EventHelper.newChangedEvent(newView(), null); fail("should complain"); } catch(Exception e) { // ok } try{ - EventFactory.newChangedEvent(null, newView()); + EventHelper.newChangedEvent(null, newView()); fail("should complain"); } catch(Exception e) { // ok } try{ - EventFactory.newChangedEvent(newView(), newView()); + EventHelper.newChangedEvent(newView(), newView()); fail("should complain"); } catch(Exception e) { // ok @@ -87,31 +87,31 @@ public class EventFactoryTest { BaseTopologyView oldView = newView(); oldView.setNotCurrent(); BaseTopologyView newView = newView(); - EventFactory.newChangedEvent(oldView, newView); + EventHelper.newChangedEvent(oldView, newView); } @Test public void testPropertiesEvent() throws Exception { try{ - EventFactory.newPropertiesChangedEvent(null, null); + EventHelper.newPropertiesChangedEvent(null, null); fail("should complain"); } catch(Exception e) { // ok } try{ - EventFactory.newPropertiesChangedEvent(newView(), null); + EventHelper.newPropertiesChangedEvent(newView(), null); fail("should complain"); } catch(Exception e) { // ok } try{ - EventFactory.newPropertiesChangedEvent(null, newView()); + EventHelper.newPropertiesChangedEvent(null, newView()); fail("should complain"); } catch(Exception e) { // ok } try{ - EventFactory.newPropertiesChangedEvent(newView(), newView()); + EventHelper.newPropertiesChangedEvent(newView(), newView()); fail("should complain"); } catch(Exception e) { // ok @@ -119,6 +119,6 @@ public class EventFactoryTest { BaseTopologyView oldView = newView(); oldView.setNotCurrent(); BaseTopologyView newView = newView(); - EventFactory.newPropertiesChangedEvent(oldView, newView); + EventHelper.newPropertiesChangedEvent(oldView, newView); } } diff --git a/src/test/java/org/apache/sling/discovery/commons/providers/base/TestHelper.java b/src/test/java/org/apache/sling/discovery/commons/providers/base/TestHelper.java index f77dc21..23b6821 100644 --- a/src/test/java/org/apache/sling/discovery/commons/providers/base/TestHelper.java +++ b/src/test/java/org/apache/sling/discovery/commons/providers/base/TestHelper.java @@ -31,7 +31,7 @@ import org.apache.sling.discovery.commons.providers.BaseTopologyView; import org.apache.sling.discovery.commons.providers.DefaultClusterView; import org.apache.sling.discovery.commons.providers.DefaultInstanceDescription; import org.apache.sling.discovery.commons.providers.DummyTopologyView; -import org.apache.sling.discovery.commons.providers.EventFactory; +import org.apache.sling.discovery.commons.providers.EventHelper; import org.apache.sling.discovery.commons.providers.base.ViewStateManagerImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -110,7 +110,7 @@ public class TestHelper { waitForAsyncEvents(mgr); logger.debug("randomEventLoop: asserting CHANGING event was sent..."); for(int j=0; j<listeners.length; j++) { - assertEvents(mgr, listeners[j], EventFactory.newChangingEvent(listeners[j].getLastView())); + assertEvents(mgr, listeners[j], EventHelper.newChangingEvent(listeners[j].getLastView())); } } else { logger.debug("randomEventLoop: asserting no events..."); @@ -138,12 +138,12 @@ public class TestHelper { // in that case I should still get a CHANGING - by contract logger.debug("randomEventLoop: asserting CHANGING, CHANGED events were sent"); for(int j=0; j<listeners.length; j++) { - assertEvents(mgr, listeners[j], EventFactory.newChangingEvent(lastViews[j]), EventFactory.newChangedEvent(lastViews[j], view)); + assertEvents(mgr, listeners[j], EventHelper.newChangingEvent(lastViews[j]), EventHelper.newChangedEvent(lastViews[j], view)); } } else { logger.debug("randomEventLoop: asserting CHANGED event was sent"); for(int j=0; j<listeners.length; j++) { - assertEvents(mgr, listeners[j], EventFactory.newChangedEvent(lastViews[j], clonedView)); + assertEvents(mgr, listeners[j], EventHelper.newChangedEvent(lastViews[j], clonedView)); } } } diff --git a/src/test/java/org/apache/sling/discovery/commons/providers/base/TestMinEventDelayHandler.java b/src/test/java/org/apache/sling/discovery/commons/providers/base/TestMinEventDelayHandler.java index a4974df..84ec22f 100644 --- a/src/test/java/org/apache/sling/discovery/commons/providers/base/TestMinEventDelayHandler.java +++ b/src/test/java/org/apache/sling/discovery/commons/providers/base/TestMinEventDelayHandler.java @@ -30,7 +30,7 @@ import org.apache.log4j.LogManager; import org.apache.sling.discovery.commons.providers.BaseTopologyView; import org.apache.sling.discovery.commons.providers.DefaultClusterView; import org.apache.sling.discovery.commons.providers.DummyTopologyView; -import org.apache.sling.discovery.commons.providers.EventFactory; +import org.apache.sling.discovery.commons.providers.EventHelper; import org.apache.sling.discovery.commons.providers.base.ViewStateManagerImpl; import org.apache.sling.discovery.commons.providers.spi.ConsistencyService; import org.junit.After; @@ -102,7 +102,7 @@ public class TestMinEventDelayHandler { final BaseTopologyView view = new DummyTopologyView().addInstance(); logger.info("testNormalDelaying: calling handleNewView..."); mgr.handleNewView(view); - TestHelper.assertEvents(mgr, listener, EventFactory.newInitEvent(view)); + TestHelper.assertEvents(mgr, listener, EventHelper.newInitEvent(view)); for(int i=0; i<7; i++) { logger.info("testNormalDelaying: calling randomEventLoop..."); TestHelper.randomEventLoop(mgr, sds, 4, 1500, defaultRandom, listener); @@ -124,7 +124,7 @@ public class TestMinEventDelayHandler { assertNoEvents(listener); final BaseTopologyView view = new DummyTopologyView().addInstance(); mgr.handleNewView(view); - TestHelper.assertEvents(mgr, listener, EventFactory.newInitEvent(view)); + TestHelper.assertEvents(mgr, listener, EventHelper.newInitEvent(view)); for(int i=0; i<7; i++) { TestHelper.randomEventLoop(mgr, sds, 100, -1, defaultRandom, listener); Thread.sleep(1000); @@ -150,13 +150,13 @@ public class TestMinEventDelayHandler { DummyTopologyView clonedView = view.clone(); logger.info("testLongMinDelay: calling handleNewView..."); mgr.handleNewView(view); - TestHelper.assertEvents(mgr, listener, EventFactory.newInitEvent(view)); + TestHelper.assertEvents(mgr, listener, EventHelper.newInitEvent(view)); final DummyTopologyView view2 = new DummyTopologyView().addInstance(); view2.addInstance(UUID.randomUUID().toString(), (DefaultClusterView) view2.getLocalInstance().getClusterView(), false, false); logger.info("testLongMinDelay: calling handleNewView..."); clonedView.setNotCurrent(); mgr.handleNewView(view2); - TestHelper.assertEvents(mgr, listener, EventFactory.newChangingEvent(clonedView)); + TestHelper.assertEvents(mgr, listener, EventHelper.newChangingEvent(clonedView)); assertFalse(view.isCurrent()); } } diff --git a/src/test/java/org/apache/sling/discovery/commons/providers/base/TestViewStateManager.java b/src/test/java/org/apache/sling/discovery/commons/providers/base/TestViewStateManager.java index 5901c11..df90dfc 100644 --- a/src/test/java/org/apache/sling/discovery/commons/providers/base/TestViewStateManager.java +++ b/src/test/java/org/apache/sling/discovery/commons/providers/base/TestViewStateManager.java @@ -35,7 +35,7 @@ import org.apache.sling.discovery.commons.providers.BaseTopologyView; import org.apache.sling.discovery.commons.providers.DefaultClusterView; import org.apache.sling.discovery.commons.providers.DefaultInstanceDescription; import org.apache.sling.discovery.commons.providers.DummyTopologyView; -import org.apache.sling.discovery.commons.providers.EventFactory; +import org.apache.sling.discovery.commons.providers.EventHelper; import org.apache.sling.discovery.commons.providers.base.ViewStateManagerImpl; import org.apache.sling.discovery.commons.providers.spi.ConsistencyService; import org.junit.After; @@ -133,7 +133,7 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); final BaseTopologyView view = new DummyTopologyView().addInstance(); mgr.handleNewView(view); - assertEvents(listener, EventFactory.newInitEvent(view)); + assertEvents(listener, EventHelper.newInitEvent(view)); randomEventLoop(defaultRandom, listener); } @@ -148,7 +148,7 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); final BaseTopologyView view = new DummyTopologyView().addInstance(); mgr.handleNewView(view); - assertEvents(listener, EventFactory.newInitEvent(view)); + assertEvents(listener, EventHelper.newInitEvent(view)); randomEventLoop(defaultRandom, listener); } @@ -163,7 +163,7 @@ public class TestViewStateManager { mgr.handleNewView(view); TestHelper.assertNoEvents(listener); mgr.handleActivated(); - assertEvents(listener, EventFactory.newInitEvent(view)); + assertEvents(listener, EventHelper.newInitEvent(view)); randomEventLoop(defaultRandom, listener); } @@ -183,7 +183,7 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); final BaseTopologyView view2 = new DummyTopologyView().addInstance(); mgr.handleNewView(view2); - assertEvents(listener, EventFactory.newInitEvent(view2)); + assertEvents(listener, EventHelper.newInitEvent(view2)); randomEventLoop(defaultRandom, listener); } @@ -201,7 +201,7 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); final BaseTopologyView view2 = new DummyTopologyView().addInstance(); mgr.handleNewView(view2); - assertEvents(listener, EventFactory.newInitEvent(view2)); + assertEvents(listener, EventHelper.newInitEvent(view2)); randomEventLoop(defaultRandom, listener); } @@ -218,7 +218,7 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); final BaseTopologyView view = new DummyTopologyView().addInstance(); mgr.handleNewView(view); - assertEvents(listener, EventFactory.newInitEvent(view)); + assertEvents(listener, EventHelper.newInitEvent(view)); randomEventLoop(defaultRandom, listener); } @@ -233,7 +233,7 @@ public class TestViewStateManager { (DefaultInstanceDescription) oldView.getLocalInstance(); localInstance.setProperty("foo", "bar1"); mgr.handleNewView(oldView); - TopologyEvent initEvent = EventFactory.newInitEvent(oldView.clone()); + TopologyEvent initEvent = EventHelper.newInitEvent(oldView.clone()); assertEvents(listener, initEvent); DummyTopologyView newView = oldView.clone(); oldView.setNotCurrent(); @@ -241,7 +241,7 @@ public class TestViewStateManager { localInstance.setProperty("foo", "bar2"); mgr.handleNewView(newView); Thread.sleep(2000); - TopologyEvent propertiesChangedEvent = EventFactory.newPropertiesChangedEvent(oldView.clone(), newView.clone()); + TopologyEvent propertiesChangedEvent = EventHelper.newPropertiesChangedEvent(oldView.clone(), newView.clone()); assertEvents(listener, propertiesChangedEvent); } @@ -258,7 +258,7 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); // no changed event yet final BaseTopologyView view = new DummyTopologyView().addInstance(); mgr.handleNewView(view); - assertEvents(listener, EventFactory.newInitEvent(view)); + assertEvents(listener, EventHelper.newInitEvent(view)); randomEventLoop(defaultRandom, listener); } @@ -275,7 +275,7 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); // no listener yet // then bind mgr.bind(listener); - assertEvents(listener, EventFactory.newInitEvent(view)); + assertEvents(listener, EventHelper.newInitEvent(view)); randomEventLoop(defaultRandom, listener); } @@ -296,8 +296,8 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener2); final BaseTopologyView view = new DummyTopologyView().addInstance(); mgr.handleNewView(view); - assertEvents(listener1, EventFactory.newInitEvent(view)); - assertEvents(listener2, EventFactory.newInitEvent(view)); + assertEvents(listener1, EventHelper.newInitEvent(view)); + assertEvents(listener2, EventHelper.newInitEvent(view)); randomEventLoop(defaultRandom, listener1, listener2); } @@ -318,8 +318,8 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener2); final BaseTopologyView view = new DummyTopologyView().addInstance(); mgr.handleNewView(view); - assertEvents(listener1, EventFactory.newInitEvent(view)); - assertEvents(listener2, EventFactory.newInitEvent(view)); + assertEvents(listener1, EventHelper.newInitEvent(view)); + assertEvents(listener2, EventHelper.newInitEvent(view)); randomEventLoop(defaultRandom, listener1, listener2); } @@ -332,7 +332,7 @@ public class TestViewStateManager { mgr.handleChanging(); final DummyTopologyView view = new DummyTopologyView().addInstance(); mgr.handleNewView(view); - assertEvents(listener, EventFactory.newInitEvent(view)); + assertEvents(listener, EventHelper.newInitEvent(view)); mgr.handleNewView(DummyTopologyView.clone(view)); TestHelper.assertNoEvents(listener); randomEventLoop(defaultRandom, listener); @@ -346,13 +346,13 @@ public class TestViewStateManager { mgr.handleChanging(); final DummyTopologyView view = new DummyTopologyView().addInstance(); mgr.handleNewView(view); - assertEvents(listener1, EventFactory.newInitEvent(view)); + assertEvents(listener1, EventHelper.newInitEvent(view)); final DummyListener listener2 = new DummyListener(); mgr.bind(listener2); mgr.handleNewView(DummyTopologyView.clone(view)); TestHelper.assertNoEvents(listener1); - assertEvents(listener2, EventFactory.newInitEvent(view)); + assertEvents(listener2, EventHelper.newInitEvent(view)); randomEventLoop(defaultRandom, listener1, listener2); } @@ -365,7 +365,7 @@ public class TestViewStateManager { mgr.handleNewView(view); TestHelper.assertNoEvents(listener); mgr.bind(listener); - assertEvents(listener, EventFactory.newInitEvent(view)); + assertEvents(listener, EventHelper.newInitEvent(view)); mgr.handleNewView(DummyTopologyView.clone(view)); TestHelper.assertNoEvents(listener); randomEventLoop(defaultRandom, listener); @@ -382,10 +382,10 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); final BaseTopologyView view1 = new DummyTopologyView().addInstance(); mgr.handleNewView(view1); - assertEvents(listener, EventFactory.newInitEvent(view1)); + assertEvents(listener, EventHelper.newInitEvent(view1)); final BaseTopologyView view2 = new DummyTopologyView().addInstance(); mgr.handleNewView(view2); - assertEvents(listener, EventFactory.newChangingEvent(view1), EventFactory.newChangedEvent(view1, view2)); + assertEvents(listener, EventHelper.newChangingEvent(view1), EventHelper.newChangedEvent(view1, view2)); randomEventLoop(defaultRandom, listener); } @@ -398,7 +398,7 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); final BaseTopologyView view1 = new DummyTopologyView().addInstance(); mgr.handleNewView(view1); - assertEvents(listener, EventFactory.newInitEvent(view1)); + assertEvents(listener, EventHelper.newInitEvent(view1)); mgr.handleDeactivated(); TestHelper.assertNoEvents(listener); mgr.handleChanging(); @@ -408,7 +408,7 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); final BaseTopologyView view2 = new DummyTopologyView().addInstance(); mgr.handleNewView(view2); - assertEvents(listener, EventFactory.newInitEvent(view2)); + assertEvents(listener, EventHelper.newInitEvent(view2)); } @Test @@ -420,7 +420,7 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); final BaseTopologyView view1 = new DummyTopologyView().addInstance(); mgr.handleNewView(view1); - assertEvents(listener, EventFactory.newInitEvent(view1)); + assertEvents(listener, EventHelper.newInitEvent(view1)); mgr.handleDeactivated(); TestHelper.assertNoEvents(listener); final BaseTopologyView view2 = new DummyTopologyView().addInstance(); @@ -428,10 +428,10 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); mgr.bind(listener); // need to bind again after deactivate mgr.handleActivated(); - assertEvents(listener, EventFactory.newInitEvent(view2)); + assertEvents(listener, EventHelper.newInitEvent(view2)); final BaseTopologyView view3 = new DummyTopologyView().addInstance(); mgr.handleNewView(view3); - assertEvents(listener, EventFactory.newChangingEvent(view2), EventFactory.newChangedEvent(view2, view3)); + assertEvents(listener, EventHelper.newChangingEvent(view2), EventHelper.newChangedEvent(view2, view3)); } @Test @@ -443,9 +443,9 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); final BaseTopologyView view1 = new DummyTopologyView().addInstance(); mgr.handleNewView(view1); - assertEvents(listener, EventFactory.newInitEvent(view1)); + assertEvents(listener, EventHelper.newInitEvent(view1)); mgr.handleChanging(); - assertEvents(listener, EventFactory.newChangingEvent(view1)); + assertEvents(listener, EventHelper.newChangingEvent(view1)); mgr.handleDeactivated(); TestHelper.assertNoEvents(listener); mgr.bind(listener); // need to bind again after deactivate @@ -455,7 +455,7 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); final BaseTopologyView view2 = new DummyTopologyView().addInstance(); mgr.handleNewView(view2); - assertEvents(listener, EventFactory.newInitEvent(view2)); + assertEvents(listener, EventHelper.newInitEvent(view2)); } @Test @@ -490,10 +490,10 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); serviceSemaphore.release(1); Thread.sleep(1000); - assertEvents(listener, EventFactory.newInitEvent(view1)); + assertEvents(listener, EventHelper.newInitEvent(view1)); final DummyTopologyView view2 = view1.clone(); mgr.handleChanging(); - assertEvents(listener, EventFactory.newChangingEvent(view1)); + assertEvents(listener, EventHelper.newChangingEvent(view1)); view2.removeInstance(slingId2); async(new Runnable() { @@ -511,7 +511,7 @@ public class TestViewStateManager { logger.debug("run: waiting 1sec"); Thread.sleep(1000); logger.debug("run: asserting 1 event"); - assertEvents(listener, EventFactory.newChangedEvent(view1, view2)); + assertEvents(listener, EventHelper.newChangedEvent(view1, view2)); commonsLogger.setLevel(Level.INFO); // back to default } @@ -556,9 +556,9 @@ public class TestViewStateManager { TestHelper.assertNoEvents(listener); serviceSemaphore.release(1); // release the first one only Thread.sleep(1000); - assertEvents(listener, EventFactory.newInitEvent(view1)); + assertEvents(listener, EventHelper.newInitEvent(view1)); mgr.handleChanging(); - assertEvents(listener, EventFactory.newChangingEvent(view1)); + assertEvents(listener, EventHelper.newChangingEvent(view1)); async(new Runnable() { public void run() { @@ -610,7 +610,7 @@ public class TestViewStateManager { logger.debug("run: waiting 1sec"); Thread.sleep(1000); logger.debug("run: asserting 1 event"); - final TopologyEvent changedEvent = EventFactory.newChangedEvent(view1, view3); + final TopologyEvent changedEvent = EventHelper.newChangedEvent(view1, view3); assertEvents(listener, changedEvent); commonsLogger.setLevel(Level.INFO); // back to default } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
