Mercurial > hg > release > thermostat-1.2
changeset 644:21042beca200
Expose all DAOs as services and use AgentInfoDAO as a service
Export all DAOs as services and update all users of AgentInfoDAO
(other than the startup bits that register the DAOs) to use that
instead of DAOFactory.
Try to handle services registering and unregistering appropriately.
This makes activators more complex which makes writing unit tests
harder. Introduce stub implementations of BundleContext (and
ServiceReference, ServiceRegistration and Filter) to address that.
These implementations are not complete, but they are sufficent for
the unit tests.
Reviewed-by: rkennke
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-September/003368.html
line wrap: on
line diff
--- a/agent/cli/src/main/java/com/redhat/thermostat/agent/cli/AgentApplication.java Wed Sep 26 19:36:51 2012 -0400 +++ b/agent/cli/src/main/java/com/redhat/thermostat/agent/cli/AgentApplication.java Wed Sep 26 19:36:51 2012 -0400 @@ -60,11 +60,18 @@ import com.redhat.thermostat.common.config.InvalidConfigurationException; import com.redhat.thermostat.common.dao.AgentInfoDAO; import com.redhat.thermostat.common.dao.BackendInfoDAO; +import com.redhat.thermostat.common.dao.CpuStatDAO; import com.redhat.thermostat.common.dao.DAOFactory; +import com.redhat.thermostat.common.dao.HeapDAO; import com.redhat.thermostat.common.dao.HostInfoDAO; +import com.redhat.thermostat.common.dao.MemoryStatDAO; import com.redhat.thermostat.common.dao.MongoDAOFactory; import com.redhat.thermostat.common.dao.NetworkInterfaceInfoDAO; +import com.redhat.thermostat.common.dao.VmClassStatDAO; +import com.redhat.thermostat.common.dao.VmCpuStatDAO; +import com.redhat.thermostat.common.dao.VmGcStatDAO; import com.redhat.thermostat.common.dao.VmInfoDAO; +import com.redhat.thermostat.common.dao.VmMemoryStatDAO; import com.redhat.thermostat.common.storage.Connection; import com.redhat.thermostat.common.storage.Connection.ConnectionListener; import com.redhat.thermostat.common.storage.Connection.ConnectionStatus; @@ -156,7 +163,7 @@ System.exit(Constants.EXIT_BACKEND_LOAD_ERROR); } - final Agent agent = new Agent(backendRegistry, configuration, daoFactory); + final Agent agent = new Agent(backendRegistry, configuration, daoFactory, daoFactory.getAgentInfoDAO()); try { logger.fine("Starting agent."); agent.start(); @@ -194,16 +201,20 @@ registerer.registerService(Storage.class, daoFactory.getStorage()); - /* - * only register DAOs that don't maintain state; - * the dao instances will be shared across multiple unrelated classes - * and any state maintained will quickly lead to bugs - */ registerer.registerService(AgentInfoDAO.class, daoFactory.getAgentInfoDAO()); registerer.registerService(BackendInfoDAO.class, daoFactory.getBackendInfoDAO()); + registerer.registerService(HostInfoDAO.class, daoFactory.getHostInfoDAO()); registerer.registerService(NetworkInterfaceInfoDAO.class, daoFactory.getNetworkInterfaceInfoDAO()); + registerer.registerService(CpuStatDAO.class, daoFactory.getCpuStatDAO()); + registerer.registerService(MemoryStatDAO.class, daoFactory.getMemoryStatDAO()); + registerer.registerService(VmInfoDAO.class, daoFactory.getVmInfoDAO()); + registerer.registerService(VmClassStatDAO.class, daoFactory.getVmClassStatsDAO()); + registerer.registerService(VmCpuStatDAO.class, daoFactory.getVmCpuStatDAO()); + registerer.registerService(VmGcStatDAO.class, daoFactory.getVmGcStatDAO()); + registerer.registerService(VmMemoryStatDAO.class, daoFactory.getVmMemoryStatDAO()); + registerer.registerService(HeapDAO.class, daoFactory.getHeapDAO()); } @Override
--- a/agent/core/src/main/java/com/redhat/thermostat/agent/Agent.java Wed Sep 26 19:36:51 2012 -0400 +++ b/agent/core/src/main/java/com/redhat/thermostat/agent/Agent.java Wed Sep 26 19:36:51 2012 -0400 @@ -73,17 +73,17 @@ private BackendInfoDAO backendDao; private boolean started = false; - public Agent(BackendRegistry backendRegistry, AgentStartupConfiguration config, DAOFactory daos) { - this(backendRegistry, UUID.randomUUID(), config, daos); + public Agent(BackendRegistry backendRegistry, AgentStartupConfiguration config, DAOFactory daos, AgentInfoDAO agentDao) { + this(backendRegistry, UUID.randomUUID(), config, daos, agentDao); } - public Agent(BackendRegistry registry, UUID agentId, AgentStartupConfiguration config, DAOFactory daos) { + public Agent(BackendRegistry registry, UUID agentId, AgentStartupConfiguration config, DAOFactory daos, AgentInfoDAO agentDao) { this.id = agentId; this.backendRegistry = registry; this.config = config; this.storage = daos.getStorage(); this.storage.setAgentId(agentId); - this.agentDao = daos.getAgentInfoDAO(); + this.agentDao = agentDao; this.backendDao = daos.getBackendInfoDAO(); }
--- a/agent/core/src/test/java/com/redhat/thermostat/agent/AgentTest.java Wed Sep 26 19:36:51 2012 -0400 +++ b/agent/core/src/test/java/com/redhat/thermostat/agent/AgentTest.java Wed Sep 26 19:36:51 2012 -0400 @@ -85,7 +85,6 @@ backendInfoDao = mock(BackendInfoDAO.class); daos = mock(DAOFactory.class); when(daos.getStorage()).thenReturn(storage); - when(daos.getAgentInfoDAO()).thenReturn(agentInfoDao); when(daos.getBackendInfoDAO()).thenReturn(backendInfoDao); backend = mock(Backend.class); @@ -104,7 +103,7 @@ public void testStartAgent() throws Exception { // Start agent. - Agent agent = new Agent(backendRegistry, config, daos); + Agent agent = new Agent(backendRegistry, config, daos, agentInfoDao); agent.start(); // Verify that backend has been activated and storage received the agent information. @@ -130,7 +129,7 @@ @Test public void testStopAgentWithPurging() throws Exception { - Agent agent = new Agent(backendRegistry, config, daos); + Agent agent = new Agent(backendRegistry, config, daos, agentInfoDao); agent.start(); // stop agent @@ -150,7 +149,7 @@ when(config.getStartTime()).thenReturn(123L); when(config.purge()).thenReturn(false); - Agent agent = new Agent(backendRegistry, config, daos); + Agent agent = new Agent(backendRegistry, config, daos, agentInfoDao); agent.start(); // stop agent
--- a/agent/heapdumper/src/main/java/com/redhat/thermostat/agent/heapdumper/internal/Activator.java Wed Sep 26 19:36:51 2012 -0400 +++ b/agent/heapdumper/src/main/java/com/redhat/thermostat/agent/heapdumper/internal/Activator.java Wed Sep 26 19:36:51 2012 -0400 @@ -34,26 +34,51 @@ * to do so, delete this exception statement from your version. */ - package com.redhat.thermostat.agent.heapdumper.internal; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.util.tracker.ServiceTracker; import com.redhat.thermostat.agent.command.ReceiverRegistry; +import com.redhat.thermostat.common.dao.HeapDAO; public class Activator implements BundleActivator { private ReceiverRegistry receivers; + private HeapDumpReceiver receiver = null; + + private ServiceTracker heapDumpCommandReceiverTracker; + @Override - public void start(BundleContext context) throws Exception { + public void start(BundleContext context) { receivers = new ReceiverRegistry(context); - receivers.registerReceiver(new HeapDumpReceiver()); + + heapDumpCommandReceiverTracker = new ServiceTracker(context, HeapDAO.class, null) { + @Override + public Object addingService(ServiceReference reference) { + HeapDAO service = (HeapDAO) super.addingService(reference); + receiver = new HeapDumpReceiver(service); + receivers.registerReceiver(receiver); + return service; + } + + @Override + public void removedService(ServiceReference reference, Object service) { + receivers.unregisterReceivers(); + super.removedService(reference, service); + } + }; + heapDumpCommandReceiverTracker.open(); + } @Override - public void stop(BundleContext context) throws Exception { + public void stop(BundleContext context) { + heapDumpCommandReceiverTracker.close(); + receivers.unregisterReceivers(); }
--- a/agent/heapdumper/src/main/java/com/redhat/thermostat/agent/heapdumper/internal/HeapDumpReceiver.java Wed Sep 26 19:36:51 2012 -0400 +++ b/agent/heapdumper/src/main/java/com/redhat/thermostat/agent/heapdumper/internal/HeapDumpReceiver.java Wed Sep 26 19:36:51 2012 -0400 @@ -34,7 +34,6 @@ * to do so, delete this exception statement from your version. */ - package com.redhat.thermostat.agent.heapdumper.internal; import java.io.File; @@ -44,7 +43,6 @@ import java.util.logging.Logger; import com.redhat.thermostat.agent.command.RequestReceiver; -import com.redhat.thermostat.common.appctx.ApplicationContext; import com.redhat.thermostat.common.command.Request; import com.redhat.thermostat.common.command.Response; import com.redhat.thermostat.common.command.Response.ResponseType; @@ -57,15 +55,19 @@ private static final Logger log = Logger.getLogger(HeapDumpReceiver.class.getName()); - private JMXHeapDumper jmxHeapDumper; - private JMapHeapDumper jmapHeapDumper; + private final HeapDAO heapDao; + + private final JMXHeapDumper jmxHeapDumper; + private final JMapHeapDumper jmapHeapDumper; - private HistogramLoader histogramLoader; - public HeapDumpReceiver() { - this(new JMXHeapDumper(), new JMapHeapDumper(), new HistogramLoader()); + private final HistogramLoader histogramLoader; + + public HeapDumpReceiver(HeapDAO heapDao) { + this(heapDao, new JMXHeapDumper(), new JMapHeapDumper(), new HistogramLoader()); } - HeapDumpReceiver(JMXHeapDumper jmxHeapDumper, JMapHeapDumper jmapHeapDumper, HistogramLoader histogramLoader) { + HeapDumpReceiver(HeapDAO heapDao, JMXHeapDumper jmxHeapDumper, JMapHeapDumper jmapHeapDumper, HistogramLoader histogramLoader) { + this.heapDao = heapDao; this.jmxHeapDumper = jmxHeapDumper; this.jmapHeapDumper = jmapHeapDumper; this.histogramLoader = histogramLoader; @@ -116,10 +118,8 @@ } private void saveHeapDumpInfo(String vmId, File tempFile, ObjectHistogram histogram) throws IOException { - - HeapDAO heapDAO = ApplicationContext.getInstance().getDAOFactory().getHeapDAO(); HeapInfo heapInfo = new HeapInfo(Integer.parseInt(vmId), System.currentTimeMillis()); - heapDAO.putHeapInfo(heapInfo, tempFile, histogram); + heapDao.putHeapInfo(heapInfo, tempFile, histogram); } }
--- a/agent/heapdumper/src/test/java/com/redhat/thermostat/agent/heapdumper/internal/ActivatorTest.java Wed Sep 26 19:36:51 2012 -0400 +++ b/agent/heapdumper/src/test/java/com/redhat/thermostat/agent/heapdumper/internal/ActivatorTest.java Wed Sep 26 19:36:51 2012 -0400 @@ -34,37 +34,61 @@ * to do so, delete this exception statement from your version. */ - package com.redhat.thermostat.agent.heapdumper.internal; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isA; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.util.Dictionary; import org.junit.Test; -import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; import com.redhat.thermostat.agent.command.RequestReceiver; +import com.redhat.thermostat.common.dao.HeapDAO; +import com.redhat.thermostat.test.StubBundleContext; public class ActivatorTest { @Test - public void testStartStop() throws Exception { - BundleContext ctx = mock(BundleContext.class); - ServiceRegistration serviceReg = mock(ServiceRegistration.class); - when(ctx.registerService(anyString(), any(), any(Dictionary.class))).thenReturn(serviceReg); + public void testStartStopWithoutDependencies() { + StubBundleContext ctx = new StubBundleContext(); + Activator activator = new Activator(); + activator.start(ctx); - verify(ctx).registerService(eq(RequestReceiver.class.getName()), isA(HeapDumpReceiver.class), any(Dictionary.class)); + + assertEquals(0, ctx.getAllServices().size()); + activator.stop(ctx); - verify(serviceReg).unregister(); + + assertEquals(0, ctx.getAllServices().size()); + assertEquals(0, ctx.getServiceListeners().size()); + } + + @Test + public void testStartStopWithDependency() throws Exception { + StubBundleContext ctx = new StubBundleContext(); + + HeapDAO heapDao = mock(HeapDAO.class); + ServiceRegistration registration = ctx.registerService(HeapDAO.class, heapDao, null); + + Activator activator = new Activator(); + + activator.start(ctx); + + assertTrue(ctx.isServiceRegistered(RequestReceiver.class.getName(), HeapDumpReceiver.class)); + + assertEquals(1, ctx.getServiceListeners().size()); + + activator.stop(ctx); + + assertFalse(ctx.isServiceRegistered(RequestReceiver.class.getName(), HeapDumpReceiver.class)); + + assertEquals(0, ctx.getServiceListeners().size()); + + assertEquals(0, ctx.getExportedServiceCount(registration)); } }
--- a/agent/heapdumper/src/test/java/com/redhat/thermostat/agent/heapdumper/internal/HeapDumpReceiverTest.java Wed Sep 26 19:36:51 2012 -0400 +++ b/agent/heapdumper/src/test/java/com/redhat/thermostat/agent/heapdumper/internal/HeapDumpReceiverTest.java Wed Sep 26 19:36:51 2012 -0400 @@ -34,7 +34,6 @@ * to do so, delete this exception statement from your version. */ - package com.redhat.thermostat.agent.heapdumper.internal; import static org.junit.Assert.assertEquals; @@ -54,12 +53,9 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; -import com.redhat.thermostat.common.appctx.ApplicationContext; -import com.redhat.thermostat.common.appctx.ApplicationContextUtil; import com.redhat.thermostat.common.command.Request; import com.redhat.thermostat.common.command.Response; import com.redhat.thermostat.common.command.Response.ResponseType; -import com.redhat.thermostat.common.dao.DAOFactory; import com.redhat.thermostat.common.dao.HeapDAO; import com.redhat.thermostat.common.heap.HistogramLoader; import com.redhat.thermostat.common.heap.ObjectHistogram; @@ -77,19 +73,14 @@ @Before public void setUp() { - ApplicationContextUtil.resetApplicationContext(); - heapDAO = mock(HeapDAO.class); - DAOFactory daoFactory = mock(DAOFactory.class); - when(daoFactory.getHeapDAO()).thenReturn(heapDAO); - ApplicationContext.getInstance().setDAOFactory(daoFactory); request = mock(Request.class); when(request.getParameter("vmId")).thenReturn("123"); jmxDumper = mock(JMXHeapDumper.class); jmapDumper = mock(JMapHeapDumper.class); histogramLoader = mock(HistogramLoader.class); - receiver = new HeapDumpReceiver(jmxDumper, jmapDumper, histogramLoader); + receiver = new HeapDumpReceiver(heapDAO, jmxDumper, jmapDumper, histogramLoader); } @After @@ -99,7 +90,6 @@ jmxDumper = null; request = null; heapDAO = null; - ApplicationContextUtil.resetApplicationContext(); } @Test
--- a/client/command/src/main/java/com/redhat/thermostat/client/command/cli/PingCommand.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/command/src/main/java/com/redhat/thermostat/client/command/cli/PingCommand.java Wed Sep 26 19:36:51 2012 -0400 @@ -54,6 +54,7 @@ import com.redhat.thermostat.common.command.Request.RequestType; import com.redhat.thermostat.common.command.RequestResponseListener; import com.redhat.thermostat.common.command.Response; +import com.redhat.thermostat.common.dao.AgentInfoDAO; import com.redhat.thermostat.common.dao.DAOFactory; import com.redhat.thermostat.common.dao.HostInfoDAO; import com.redhat.thermostat.common.dao.HostRef; @@ -101,6 +102,16 @@ } + private OSGIUtils serviceProvider; + + public PingCommand() { + this(OSGIUtils.getInstance()); + } + + public PingCommand(OSGIUtils serviceProvider) { + this.serviceProvider = serviceProvider; + } + @Override public void run(CommandContext ctx) throws CommandException { PrintStream out = ctx.getConsole().getOutput(); @@ -116,7 +127,12 @@ printCustomMessageWithUsage(out, "Invalid host ID or agent no longer running. See \'help list-vms to obtain a valid host ID."); return; } - String address = df.getAgentInfoDAO().getAgentInformation(targetHostRef).getConfigListenAddress(); + AgentInfoDAO service = serviceProvider.getService(AgentInfoDAO.class); + if (service == null) { + throw new CommandException("Unable to access agent information: service not available"); + } + String address = service.getAgentInformation(targetHostRef).getConfigListenAddress(); + serviceProvider.ungetService(service); String [] host = address.split(":"); InetSocketAddress target = new InetSocketAddress(host[0], Integer.parseInt(host[1]));
--- a/client/core/src/main/java/com/redhat/thermostat/client/internal/Main.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/core/src/main/java/com/redhat/thermostat/client/internal/Main.java Wed Sep 26 19:36:51 2012 -0400 @@ -50,10 +50,6 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; -import org.osgi.framework.ServiceReference; - import com.redhat.swing.laf.dolphin.DolphinLookAndFeel; import com.redhat.thermostat.client.internal.config.ConnectionConfiguration; import com.redhat.thermostat.client.locale.LocaleResources; @@ -73,11 +69,18 @@ import com.redhat.thermostat.common.config.StartupConfiguration; import com.redhat.thermostat.common.dao.AgentInfoDAO; import com.redhat.thermostat.common.dao.BackendInfoDAO; +import com.redhat.thermostat.common.dao.CpuStatDAO; import com.redhat.thermostat.common.dao.DAOFactory; +import com.redhat.thermostat.common.dao.HeapDAO; import com.redhat.thermostat.common.dao.HostInfoDAO; +import com.redhat.thermostat.common.dao.MemoryStatDAO; import com.redhat.thermostat.common.dao.MongoDAOFactory; import com.redhat.thermostat.common.dao.NetworkInterfaceInfoDAO; +import com.redhat.thermostat.common.dao.VmClassStatDAO; +import com.redhat.thermostat.common.dao.VmCpuStatDAO; +import com.redhat.thermostat.common.dao.VmGcStatDAO; import com.redhat.thermostat.common.dao.VmInfoDAO; +import com.redhat.thermostat.common.dao.VmMemoryStatDAO; import com.redhat.thermostat.common.storage.Connection; import com.redhat.thermostat.common.storage.Connection.ConnectionListener; import com.redhat.thermostat.common.storage.Connection.ConnectionStatus; @@ -292,10 +295,8 @@ // register the storage, so other services can request it DAOFactory daoFactory = ApplicationContext.getInstance().getDAOFactory(); - Storage storage = daoFactory.getStorage(); - OSGIUtils.getInstance().registerService(Storage.class, storage); - registerDAOsAsOSGiServices(daoFactory); + registerDAOsAndStorageAsOSGiServices(daoFactory); showMainWindow(); } else if (newStatus == ConnectionStatus.FAILED_TO_CONNECT) { @@ -314,17 +315,25 @@ } } - private void registerDAOsAsOSGiServices(DAOFactory daoFactory) { - /* - * only register DAOs that don't maintain state; - * the dao instances will be shared across multiple unrelated classes - * and any state maintained will quickly lead to bugs - */ - OSGIUtils.getInstance().registerService(AgentInfoDAO.class, daoFactory.getAgentInfoDAO()); - OSGIUtils.getInstance().registerService(BackendInfoDAO.class, daoFactory.getBackendInfoDAO()); - OSGIUtils.getInstance().registerService(HostInfoDAO.class, daoFactory.getHostInfoDAO()); - OSGIUtils.getInstance().registerService(NetworkInterfaceInfoDAO.class, daoFactory.getNetworkInterfaceInfoDAO()); - OSGIUtils.getInstance().registerService(VmInfoDAO.class, daoFactory.getVmInfoDAO()); + private void registerDAOsAndStorageAsOSGiServices(DAOFactory daoFactory) { + OSGIUtils registerer = OSGIUtils.getInstance(); + + registerer.registerService(Storage.class, daoFactory.getStorage()); + + registerer.registerService(AgentInfoDAO.class, daoFactory.getAgentInfoDAO()); + registerer.registerService(BackendInfoDAO.class, daoFactory.getBackendInfoDAO()); + + registerer.registerService(HostInfoDAO.class, daoFactory.getHostInfoDAO()); + registerer.registerService(NetworkInterfaceInfoDAO.class, daoFactory.getNetworkInterfaceInfoDAO()); + registerer.registerService(CpuStatDAO.class, daoFactory.getCpuStatDAO()); + registerer.registerService(MemoryStatDAO.class, daoFactory.getMemoryStatDAO()); + + registerer.registerService(VmInfoDAO.class, daoFactory.getVmInfoDAO()); + registerer.registerService(VmClassStatDAO.class, daoFactory.getVmClassStatsDAO()); + registerer.registerService(VmCpuStatDAO.class, daoFactory.getVmCpuStatDAO()); + registerer.registerService(VmGcStatDAO.class, daoFactory.getVmGcStatDAO()); + registerer.registerService(VmMemoryStatDAO.class, daoFactory.getVmMemoryStatDAO()); + registerer.registerService(HeapDAO.class, daoFactory.getHeapDAO()); } private void showMainWindow() {
--- a/client/core/src/main/java/com/redhat/thermostat/client/internal/osgi/ApplicationServiceProvider.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/core/src/main/java/com/redhat/thermostat/client/internal/osgi/ApplicationServiceProvider.java Wed Sep 26 19:36:51 2012 -0400 @@ -41,9 +41,6 @@ import com.redhat.thermostat.client.osgi.service.ApplicationCache; import com.redhat.thermostat.client.osgi.service.ApplicationService; -import com.redhat.thermostat.common.appctx.ApplicationContext; -import com.redhat.thermostat.common.dao.DAOFactory; - public class ApplicationServiceProvider implements ApplicationService { @@ -56,12 +53,6 @@ private ExecutorService executor = Executors.newCachedThreadPool(); @Override - public DAOFactory getDAOFactory() { - // TODO: Eventually we will no longer need a singleton for ApplicationContext! - return ApplicationContext.getInstance().getDAOFactory(); - } - - @Override public ApplicationCache getApplicationCache() { return cache; }
--- a/client/core/src/main/java/com/redhat/thermostat/client/osgi/service/ApplicationService.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/core/src/main/java/com/redhat/thermostat/client/osgi/service/ApplicationService.java Wed Sep 26 19:36:51 2012 -0400 @@ -38,12 +38,8 @@ import java.util.concurrent.ExecutorService; -import com.redhat.thermostat.common.dao.DAOFactory; - public interface ApplicationService { - DAOFactory getDAOFactory(); - ApplicationCache getApplicationCache(); ExecutorService getApplicationExecutor();
--- a/client/core/src/main/java/com/redhat/thermostat/client/ui/AgentInformationDisplayModel.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/AgentInformationDisplayModel.java Wed Sep 26 19:36:51 2012 -0400 @@ -42,13 +42,12 @@ import java.util.List; import java.util.Map; -import com.redhat.thermostat.common.appctx.ApplicationContext; import com.redhat.thermostat.common.dao.AgentInfoDAO; import com.redhat.thermostat.common.dao.BackendInfoDAO; -import com.redhat.thermostat.common.dao.DAOFactory; import com.redhat.thermostat.common.dao.HostRef; import com.redhat.thermostat.common.model.AgentInformation; import com.redhat.thermostat.common.model.BackendInformation; +import com.redhat.thermostat.common.utils.OSGIUtils; /** * This model sits between the current view and the remote model, and maintains @@ -63,10 +62,14 @@ private final Map<String, List<BackendInformation>> backends; public AgentInformationDisplayModel() { - ApplicationContext appContext = ApplicationContext.getInstance(); - DAOFactory daoFactory = appContext.getDAOFactory(); - agentInfoDao = daoFactory.getAgentInfoDAO(); - backendInfoDao = daoFactory.getBackendInfoDAO(); + this( + OSGIUtils.getInstance().getService(AgentInfoDAO.class), + OSGIUtils.getInstance().getService(BackendInfoDAO.class)); + } + + public AgentInformationDisplayModel(AgentInfoDAO agentInfoDao, BackendInfoDAO backendInfoDao) { + this.agentInfoDao = agentInfoDao; + this.backendInfoDao = backendInfoDao; agents = new ArrayList<>(); backends = new HashMap<>(); @@ -93,7 +96,9 @@ public void refresh() { agents.clear(); - agents.addAll(agentInfoDao.getAllAgentInformation()); + if (agentInfoDao != null) { + agents.addAll(agentInfoDao.getAllAgentInformation()); + } backends.clear(); for (AgentInformation agent : agents) { String agentId = agent.getAgentId();
--- a/client/core/src/test/java/com/redhat/thermostat/client/ui/AgentInformationDisplayModelTest.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/core/src/test/java/com/redhat/thermostat/client/ui/AgentInformationDisplayModelTest.java Wed Sep 26 19:36:51 2012 -0400 @@ -58,17 +58,11 @@ private AgentInformation agentInfo1 = new AgentInformation(); private AgentInformation agentInfo2 = new AgentInformation(); - private DAOFactory daoFactory = mock(DAOFactory.class); private AgentInfoDAO agentInfoDao = mock(AgentInfoDAO.class); private BackendInfoDAO backendInfoDao = mock(BackendInfoDAO.class); @Before public void setUp() { - ApplicationContextUtil.resetApplicationContext(); - - when(daoFactory.getAgentInfoDAO()).thenReturn(agentInfoDao); - when(daoFactory.getBackendInfoDAO()).thenReturn(backendInfoDao); - agentInfo1.setAgentId("agent1-id"); agentInfo1.setStartTime(0); agentInfo1.setStopTime(1); @@ -78,18 +72,11 @@ agentInfo2.setAgentId("agent2-id"); when(agentInfoDao.getAllAgentInformation()).thenReturn(Arrays.asList(agentInfo1)); - - ApplicationContext.getInstance().setDAOFactory(daoFactory); - } - - @After - public void tearDown() { - ApplicationContextUtil.resetApplicationContext(); } @Test public void testModelInitializesItself() { - AgentInformationDisplayModel model = new AgentInformationDisplayModel(); + AgentInformationDisplayModel model = new AgentInformationDisplayModel(agentInfoDao, backendInfoDao); AgentInformation agentInfoFromModel = model.getAgentInfo(agentInfo1.getAgentId()); @@ -98,7 +85,7 @@ @Test public void testGetUnknownAgentInformation() { - AgentInformationDisplayModel model = new AgentInformationDisplayModel(); + AgentInformationDisplayModel model = new AgentInformationDisplayModel(agentInfoDao, backendInfoDao); AgentInformation agentInfoFromModel = model.getAgentInfo("some unknown agent id"); @@ -107,7 +94,7 @@ @Test public void testChangesOnlyVisibleAfterRefresh() { - AgentInformationDisplayModel model = new AgentInformationDisplayModel(); + AgentInformationDisplayModel model = new AgentInformationDisplayModel(agentInfoDao, backendInfoDao); AgentInformation agentInfoFromModel; agentInfoFromModel = model.getAgentInfo(agentInfo1.getAgentId());
--- a/client/heapdumper/src/main/java/com/redhat/thermostat/client/heap/Activator.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/heapdumper/src/main/java/com/redhat/thermostat/client/heap/Activator.java Wed Sep 26 19:36:51 2012 -0400 @@ -36,15 +36,15 @@ package com.redhat.thermostat.client.heap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; import java.util.ServiceLoader; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; -import org.osgi.util.tracker.ServiceTracker; - import com.redhat.thermostat.client.heap.swing.HeapDetailsSwing; import com.redhat.thermostat.client.heap.swing.HeapSwingView; import com.redhat.thermostat.client.heap.swing.HistogramPanel; @@ -52,35 +52,56 @@ import com.redhat.thermostat.client.heap.swing.ObjectRootsFrame; import com.redhat.thermostat.client.osgi.service.ApplicationService; import com.redhat.thermostat.client.osgi.service.VmInformationService; +import com.redhat.thermostat.common.MultipleServiceTracker; +import com.redhat.thermostat.common.MultipleServiceTracker.Action; import com.redhat.thermostat.common.View; import com.redhat.thermostat.common.appctx.ApplicationContext; import com.redhat.thermostat.common.cli.Command; import com.redhat.thermostat.common.cli.CommandRegistry; import com.redhat.thermostat.common.cli.CommandRegistryImpl; +import com.redhat.thermostat.common.dao.AgentInfoDAO; public class Activator implements BundleActivator { private CommandRegistry reg; - private ServiceRegistration contextServiceReg; + private MultipleServiceTracker heapDumperServiceTracker; + private ServiceRegistration heapDumperServiceRegistration; @Override public void start(final BundleContext context) throws Exception { - ServiceTracker tracker = new ServiceTracker(context, ApplicationService.class.getName(), null) { - @Override - public Object addingService(ServiceReference reference) { - ApplicationService appService = (ApplicationService) context.getService(reference); + registerViewClass(HeapView.class, HeapSwingView.class); + registerViewClass(HeapDumpDetailsView.class, HeapDetailsSwing.class); + registerViewClass(HeapHistogramView.class, HistogramPanel.class); + registerViewClass(ObjectDetailsView.class, ObjectDetailsPanel.class); + registerViewClass(ObjectRootsView.class, ObjectRootsFrame.class); + + Class<?>[] deps = new Class<?>[] { + ApplicationService.class, + AgentInfoDAO.class, + }; + + heapDumperServiceTracker = new MultipleServiceTracker(context, deps, new Action() { - registerViewClass(HeapView.class, HeapSwingView.class); - registerViewClass(HeapDumpDetailsView.class, HeapDetailsSwing.class); - registerViewClass(HeapHistogramView.class, HistogramPanel.class); - registerViewClass(ObjectDetailsView.class, ObjectDetailsPanel.class); - registerViewClass(ObjectRootsView.class, ObjectRootsFrame.class); - context.registerService(VmInformationService.class.getName(), new HeapDumperService(appService), null); - return super.addingService(reference); + @Override + public void dependenciesAvailable(Map<String, Object> services) { + ApplicationService appService = (ApplicationService) services.get(ApplicationService.class.getName()); + Objects.requireNonNull(appService); + AgentInfoDAO agentDao = (AgentInfoDAO) services.get(AgentInfoDAO.class.getName()); + Objects.requireNonNull(agentDao); + heapDumperServiceRegistration = context.registerService( + VmInformationService.class.getName(), + new HeapDumperService(appService, agentDao), + null); } - }; - tracker.open(); + + @Override + public void dependenciesUnavailable() { + heapDumperServiceRegistration.unregister(); + } + + }); + heapDumperServiceTracker.open(); reg = new CommandRegistryImpl(context); ServiceLoader<Command> cmds = ServiceLoader.load(Command.class, getClass().getClassLoader()); @@ -93,10 +114,7 @@ @Override public void stop(BundleContext context) throws Exception { - if (contextServiceReg != null) { - contextServiceReg.unregister(); - } - + heapDumperServiceTracker.close(); reg.unregisterCommands(); } }
--- a/client/heapdumper/src/main/java/com/redhat/thermostat/client/heap/HeapDumpController.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/heapdumper/src/main/java/com/redhat/thermostat/client/heap/HeapDumpController.java Wed Sep 26 19:36:51 2012 -0400 @@ -56,6 +56,7 @@ import com.redhat.thermostat.common.Timer; import com.redhat.thermostat.common.Timer.SchedulingType; import com.redhat.thermostat.common.appctx.ApplicationContext; +import com.redhat.thermostat.common.dao.AgentInfoDAO; import com.redhat.thermostat.common.dao.HeapDAO; import com.redhat.thermostat.common.dao.VmMemoryStatDAO; import com.redhat.thermostat.common.dao.VmRef; @@ -79,11 +80,11 @@ private OverviewChart model; private ApplicationService appService; - public HeapDumpController(final VmRef ref, final ApplicationService appService) { - this(ref, appService, new HeapDumperCommand()); + public HeapDumpController(final AgentInfoDAO agentInfoDao, final VmRef ref, final ApplicationService appService) { + this(agentInfoDao, ref, appService, new HeapDumperCommand()); } - HeapDumpController(final VmRef ref, final ApplicationService appService, final HeapDumperCommand command) { + HeapDumpController(final AgentInfoDAO agentInfoDao, final VmRef ref, final ApplicationService appService, final HeapDumperCommand command) { this.appService = appService; this.ref = ref; @@ -146,7 +147,7 @@ HeapDump dump = null; switch (actionEvent.getActionId()) { case DUMP_REQUESTED: - command.execute(ref, new Runnable() { + command.execute(agentInfoDao, ref, new Runnable() { public void run() { view.notifyHeapDumpComplete(); }
--- a/client/heapdumper/src/main/java/com/redhat/thermostat/client/heap/HeapDumperService.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/heapdumper/src/main/java/com/redhat/thermostat/client/heap/HeapDumperService.java Wed Sep 26 19:36:51 2012 -0400 @@ -41,20 +41,23 @@ import com.redhat.thermostat.client.osgi.service.VmFilter; import com.redhat.thermostat.client.osgi.service.VmInformationService; import com.redhat.thermostat.client.osgi.service.VmInformationServiceController; +import com.redhat.thermostat.common.dao.AgentInfoDAO; import com.redhat.thermostat.common.dao.VmRef; public class HeapDumperService implements VmInformationService { + private AgentInfoDAO agentInfoDao; private ApplicationService appService; private VmFilter filter = new AlwaysMatchFilter(); - public HeapDumperService(ApplicationService appService) { + public HeapDumperService(ApplicationService appService, AgentInfoDAO agentInfoDao) { + this.agentInfoDao = agentInfoDao; this.appService = appService; } @Override public VmInformationServiceController getInformationServiceController(VmRef ref) { - return new HeapDumpController(ref, appService); + return new HeapDumpController(agentInfoDao, ref, appService); } @Override
--- a/client/heapdumper/src/main/java/com/redhat/thermostat/client/heap/cli/DumpHeapCommand.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/heapdumper/src/main/java/com/redhat/thermostat/client/heap/cli/DumpHeapCommand.java Wed Sep 26 19:36:51 2012 -0400 @@ -46,21 +46,24 @@ import com.redhat.thermostat.common.cli.CommandException; import com.redhat.thermostat.common.cli.HostVMArguments; import com.redhat.thermostat.common.cli.SimpleCommand; -import com.redhat.thermostat.common.heap.HeapDump; +import com.redhat.thermostat.common.dao.AgentInfoDAO; +import com.redhat.thermostat.common.utils.OSGIUtils; + public class DumpHeapCommand extends SimpleCommand { - private static final String NAME = "dump-heap"; private static final String DESCRIPTION = Translate.localize(LocaleResources.COMMAND_DUMP_HEAP_DESCRIPTION); private static final String USAGE = DESCRIPTION; + private final OSGIUtils serviceProvider; private final HeapDumperCommand implementation; public DumpHeapCommand() { - this(new HeapDumperCommand()); + this(OSGIUtils.getInstance(), new HeapDumperCommand()); } - DumpHeapCommand(HeapDumperCommand impl) { + DumpHeapCommand(OSGIUtils serviceProvider, HeapDumperCommand impl) { + this.serviceProvider = serviceProvider; this.implementation = impl; } @@ -96,7 +99,13 @@ s.release(); } }; - implementation.execute(args.getVM(), r); + AgentInfoDAO service = serviceProvider.getService(AgentInfoDAO.class); + if (service == null) { + throw new CommandException("Unable to access agent information"); + } + implementation.execute(service, args.getVM(), r); + serviceProvider.ungetService(service); + try { s.acquire(); ctx.getConsole().getOutput().print(Translate.localize(LocaleResources.COMMAND_HEAP_DUMP_DONE));
--- a/client/heapdumper/src/main/java/com/redhat/thermostat/client/heap/cli/HeapDumperCommand.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/heapdumper/src/main/java/com/redhat/thermostat/client/heap/cli/HeapDumperCommand.java Wed Sep 26 19:36:51 2012 -0400 @@ -39,12 +39,11 @@ import java.net.InetSocketAddress; import com.redhat.thermostat.client.command.RequestQueue; -import com.redhat.thermostat.common.appctx.ApplicationContext; import com.redhat.thermostat.common.command.Request; import com.redhat.thermostat.common.command.Request.RequestType; import com.redhat.thermostat.common.command.RequestResponseListener; import com.redhat.thermostat.common.command.Response; -import com.redhat.thermostat.common.dao.DAOFactory; +import com.redhat.thermostat.common.dao.AgentInfoDAO; import com.redhat.thermostat.common.dao.HostRef; import com.redhat.thermostat.common.dao.VmRef; import com.redhat.thermostat.common.utils.OSGIUtils; @@ -69,11 +68,10 @@ } - public void execute(VmRef reference, Runnable heapDumpCompleteAction) { + public void execute(AgentInfoDAO agentInfoDAO, VmRef reference, Runnable heapDumpCompleteAction) { - DAOFactory df = ApplicationContext.getInstance().getDAOFactory(); HostRef targetHostRef = reference.getAgent(); - String address = df.getAgentInfoDAO().getAgentInformation(targetHostRef).getConfigListenAddress(); + String address = agentInfoDAO.getAgentInformation(targetHostRef).getConfigListenAddress(); String [] host = address.split(":"); InetSocketAddress target = new InetSocketAddress(host[0], Integer.parseInt(host[1]));
--- a/client/heapdumper/src/test/java/com/redhat/thermostat/client/heap/HeapDumpControllerTest.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/heapdumper/src/test/java/com/redhat/thermostat/client/heap/HeapDumpControllerTest.java Wed Sep 26 19:36:51 2012 -0400 @@ -39,6 +39,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; +import static org.mockito.Matchers.same; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -65,6 +66,7 @@ import com.redhat.thermostat.common.ViewFactory; import com.redhat.thermostat.common.appctx.ApplicationContext; import com.redhat.thermostat.common.appctx.ApplicationContextUtil; +import com.redhat.thermostat.common.dao.AgentInfoDAO; import com.redhat.thermostat.common.dao.DAOFactory; import com.redhat.thermostat.common.dao.HeapDAO; import com.redhat.thermostat.common.dao.MongoDAOFactory; @@ -81,6 +83,7 @@ private Timer timer; + private AgentInfoDAO agentDao; private HeapDAO heapDAO; private VmMemoryStatDAO vmDAO; private HeapView view; @@ -100,6 +103,7 @@ DAOFactory daoFactory = mock(MongoDAOFactory.class); when(daoFactory.getVmClassStatsDAO()).thenReturn(vmClassStatDAO); + agentDao = mock(AgentInfoDAO.class); heapDAO = mock(HeapDAO.class); when(daoFactory.getHeapDAO()).thenReturn(heapDAO); vmDAO = mock(VmMemoryStatDAO.class); @@ -158,7 +162,7 @@ when(appService.getApplicationCache()).thenReturn(cache); VmRef ref = mock(VmRef.class); heapDumperCommand = mock(HeapDumperCommand.class); - controller = new HeapDumpController(ref, appService, heapDumperCommand); + controller = new HeapDumpController(agentDao, ref, appService, heapDumperCommand); } @After @@ -233,7 +237,7 @@ appService = mock(ApplicationService.class); when(appService.getApplicationCache()).thenReturn(cache); VmRef ref = mock(VmRef.class); - controller = new HeapDumpController(ref, appService); + controller = new HeapDumpController(agentDao, ref, appService); verify(view, times(1)).setChildView(any(HeapView.class)); verify(view, times(1)).openDumpView(); @@ -256,7 +260,7 @@ appService = mock(ApplicationService.class); when(appService.getApplicationCache()).thenReturn(cache); VmRef ref = mock(VmRef.class); - controller = new HeapDumpController(ref, appService); + controller = new HeapDumpController(agentDao, ref, appService); verify(view, times(0)).openDumpView(); } @@ -269,7 +273,7 @@ heapDumperListener.actionPerformed(new ActionEvent<HeapDumperAction>(view, HeapDumperAction.DUMP_REQUESTED)); ArgumentCaptor<Runnable> heapDumpCompleteAction = ArgumentCaptor.forClass(Runnable.class); - verify(heapDumperCommand).execute(any(VmRef.class), heapDumpCompleteAction.capture()); + verify(heapDumperCommand).execute(same(agentDao), any(VmRef.class), heapDumpCompleteAction.capture()); heapDumpCompleteAction.getValue().run(); verify(view).notifyHeapDumpComplete();
--- a/client/heapdumper/src/test/java/com/redhat/thermostat/client/heap/cli/DumpHeapCommandTest.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/heapdumper/src/test/java/com/redhat/thermostat/client/heap/cli/DumpHeapCommandTest.java Wed Sep 26 19:36:51 2012 -0400 @@ -40,9 +40,12 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -52,7 +55,9 @@ import com.redhat.thermostat.common.cli.Command; import com.redhat.thermostat.common.cli.CommandException; import com.redhat.thermostat.common.cli.SimpleArguments; +import com.redhat.thermostat.common.dao.AgentInfoDAO; import com.redhat.thermostat.common.dao.VmRef; +import com.redhat.thermostat.common.utils.OSGIUtils; import com.redhat.thermostat.test.TestCommandContextFactory; public class DumpHeapCommandTest { @@ -67,6 +72,10 @@ @Test public void verifyAcuallyCallsWorker() throws CommandException { + AgentInfoDAO agentInfoDao = mock(AgentInfoDAO.class); + OSGIUtils osgi = mock(OSGIUtils.class); + when(osgi.getService(AgentInfoDAO.class)).thenReturn(agentInfoDao); + HeapDumperCommand impl = mock(HeapDumperCommand.class); final ArgumentCaptor<Runnable> arg = ArgumentCaptor.forClass(Runnable.class); doAnswer(new Answer<Void>() { @@ -76,9 +85,9 @@ arg.getValue().run(); return null; } - }).when(impl).execute(any(VmRef.class), arg.capture()); + }).when(impl).execute(eq(agentInfoDao), any(VmRef.class), arg.capture()); - DumpHeapCommand command = new DumpHeapCommand(impl); + DumpHeapCommand command = new DumpHeapCommand(osgi, impl); TestCommandContextFactory factory = new TestCommandContextFactory(); @@ -88,14 +97,18 @@ command.run(factory.createContext(args)); - verify(impl).execute(isA(VmRef.class), any(Runnable.class)); + verify(impl).execute(eq(agentInfoDao), isA(VmRef.class), any(Runnable.class)); assertEquals("Done\n", factory.getOutput()); } @Test public void verifyNeedsHostAndVmId() throws CommandException { + AgentInfoDAO agentInfoDao = mock(AgentInfoDAO.class); + OSGIUtils osgi = mock(OSGIUtils.class); + when(osgi.getService(AgentInfoDAO.class)).thenReturn(agentInfoDao); + HeapDumperCommand impl = mock(HeapDumperCommand.class); - DumpHeapCommand command = new DumpHeapCommand(impl); + DumpHeapCommand command = new DumpHeapCommand(osgi, impl); TestCommandContextFactory factory = new TestCommandContextFactory(); @@ -109,4 +122,25 @@ } } + @Test + public void verifyFailsIfAgentDaoIsNotAvailable() { + OSGIUtils osgi = mock(OSGIUtils.class); + + HeapDumperCommand impl = mock(HeapDumperCommand.class); + DumpHeapCommand command = new DumpHeapCommand(osgi, impl); + + TestCommandContextFactory factory = new TestCommandContextFactory(); + + SimpleArguments args = new SimpleArguments(); + args.addArgument("hostId", "foo"); + args.addArgument("vmId", "0"); + + try { + command.run(factory.createContext(args)); + assertTrue("should not reach here", false); + } catch (CommandException ce) { + assertEquals("Unable to access agent information", ce.getMessage()); + } + } + }
--- a/client/heapdumper/src/test/java/com/redhat/thermostat/client/heap/cli/HeapDumperCommandTest.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/heapdumper/src/test/java/com/redhat/thermostat/client/heap/cli/HeapDumperCommandTest.java Wed Sep 26 19:36:51 2012 -0400 @@ -52,7 +52,6 @@ import org.mockito.ArgumentCaptor; import com.redhat.thermostat.client.command.RequestQueue; -import com.redhat.thermostat.common.appctx.ApplicationContext; import com.redhat.thermostat.common.appctx.ApplicationContextUtil; import com.redhat.thermostat.common.command.Request; import com.redhat.thermostat.common.command.Request.RequestType; @@ -60,15 +59,14 @@ import com.redhat.thermostat.common.command.Response; import com.redhat.thermostat.common.command.Response.ResponseType; import com.redhat.thermostat.common.dao.AgentInfoDAO; -import com.redhat.thermostat.common.dao.DAOFactory; import com.redhat.thermostat.common.dao.HostRef; import com.redhat.thermostat.common.dao.VmRef; import com.redhat.thermostat.common.model.AgentInformation; -import com.redhat.thermostat.common.storage.Storage; import com.redhat.thermostat.common.utils.OSGIUtils; public class HeapDumperCommandTest { + private AgentInfoDAO agentInfoDao; private HeapDumperCommand cmd; private VmRef vmRef; private RequestQueue reqQueue; @@ -88,13 +86,9 @@ AgentInformation agentInfo = mock(AgentInformation.class); when(agentInfo.getConfigListenAddress()).thenReturn("test:123"); - AgentInfoDAO agentInfoDao = mock(AgentInfoDAO.class); + agentInfoDao = mock(AgentInfoDAO.class); when(agentInfoDao.getAgentInformation(host)).thenReturn(agentInfo); - DAOFactory daoFactory = mock(DAOFactory.class); - when(daoFactory.getAgentInfoDAO()).thenReturn(agentInfoDao); - ApplicationContext.getInstance().setDAOFactory(daoFactory); - cmd = new HeapDumperCommand(); vmRef = mock(VmRef.class); when(vmRef.getIdString()).thenReturn("123"); @@ -115,7 +109,7 @@ @Test public void testExecute() { - cmd.execute(vmRef, heapDumpCompleteAction); + cmd.execute(agentInfoDao, vmRef, heapDumpCompleteAction); ArgumentCaptor<Request> reqArg = ArgumentCaptor.forClass(Request.class); verify(reqQueue).putRequest(reqArg.capture());
--- a/client/killvm/src/main/java/com/redhat/thermostat/client/killvm/internal/Activator.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/killvm/src/main/java/com/redhat/thermostat/client/killvm/internal/Activator.java Wed Sep 26 19:36:51 2012 -0400 @@ -36,20 +36,54 @@ package com.redhat.thermostat.client.killvm.internal; +import java.util.Map; + import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceRegistration; +import com.redhat.thermostat.client.osgi.service.ContextAction; import com.redhat.thermostat.client.osgi.service.VMContextAction; +import com.redhat.thermostat.common.MultipleServiceTracker; +import com.redhat.thermostat.common.MultipleServiceTracker.Action; +import com.redhat.thermostat.common.dao.AgentInfoDAO; +import com.redhat.thermostat.common.dao.VmInfoDAO; public class Activator implements BundleActivator { + private MultipleServiceTracker killVmActionTracker; + private ServiceRegistration killActionRegistration; + @Override - public void start(BundleContext context) throws Exception { - context.registerService(VMContextAction.class.getName(), new KillVMAction(new SwingVMKilledListener()), null); + public void start(final BundleContext context) throws Exception { + Class<?>[] serviceDeps = new Class<?>[] { + AgentInfoDAO.class, + VmInfoDAO.class, + ContextAction.class, + }; + + killVmActionTracker = new MultipleServiceTracker(context, serviceDeps, new Action() { + @Override + public void dependenciesAvailable(Map<String, Object> services) { + AgentInfoDAO agentDao = (AgentInfoDAO) services.get(AgentInfoDAO.class.getName()); + VmInfoDAO vmDao = (VmInfoDAO) services.get(VmInfoDAO.class.getName()); + KillVMAction service = new KillVMAction(agentDao, vmDao, new SwingVMKilledListener()); + killActionRegistration = context.registerService(VMContextAction.class.getName(), service, null); + } + + @Override + public void dependenciesUnavailable() { + killActionRegistration.unregister(); + killActionRegistration = null; + } + }); + + killVmActionTracker.open(); } @Override public void stop(BundleContext context) throws Exception { + killVmActionTracker.close(); // service automatically unregistered on bundle stop }
--- a/client/killvm/src/main/java/com/redhat/thermostat/client/killvm/internal/KillVMAction.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/killvm/src/main/java/com/redhat/thermostat/client/killvm/internal/KillVMAction.java Wed Sep 26 19:36:51 2012 -0400 @@ -37,16 +37,17 @@ package com.redhat.thermostat.client.killvm.internal; import java.net.InetSocketAddress; +import java.util.Objects; import com.redhat.thermostat.client.command.RequestQueue; import com.redhat.thermostat.client.killvm.locale.LocaleResources; import com.redhat.thermostat.client.osgi.service.VMContextAction; import com.redhat.thermostat.client.osgi.service.VmFilter; -import com.redhat.thermostat.common.appctx.ApplicationContext; import com.redhat.thermostat.common.command.Request; import com.redhat.thermostat.common.command.Request.RequestType; import com.redhat.thermostat.common.command.RequestResponseListener; -import com.redhat.thermostat.common.dao.DAOFactory; +import com.redhat.thermostat.common.dao.AgentInfoDAO; +import com.redhat.thermostat.common.dao.VmInfoDAO; import com.redhat.thermostat.common.dao.VmRef; import com.redhat.thermostat.common.locale.Translate; import com.redhat.thermostat.common.model.VmInfo; @@ -59,15 +60,15 @@ public class KillVMAction implements VMContextAction { private static final String RECEIVER = "com.redhat.thermostat.agent.killvm.internal.KillVmReceiver"; - private final DAOFactory dao; + private final AgentInfoDAO agentDao; + private final VmInfoDAO vmDao; private final Translate t; private final RequestResponseListener listener; - public KillVMAction(RequestResponseListener listener) { - if (listener == null) { - throw new IllegalArgumentException("Listener can't be null"); - } - this.dao = ApplicationContext.getInstance().getDAOFactory(); + public KillVMAction(AgentInfoDAO agentDao, VmInfoDAO vmDao, RequestResponseListener listener) { + Objects.requireNonNull(listener, "Listener can't be null"); + this.agentDao = agentDao; + this.vmDao = vmDao; this.t = LocaleResources.createLocalizer(); this.listener = listener; } @@ -84,7 +85,7 @@ @Override public void execute(VmRef reference) { - String address = dao.getAgentInfoDAO().getAgentInformation(reference.getAgent()).getConfigListenAddress(); + String address = agentDao.getAgentInformation(reference.getAgent()).getConfigListenAddress(); String [] host = address.split(":"); InetSocketAddress target = new InetSocketAddress(host[0], Integer.parseInt(host[1])); @@ -111,7 +112,7 @@ @Override public boolean matches(VmRef ref) { - VmInfo vmInfo = dao.getVmInfoDAO().getVmInfo(ref); + VmInfo vmInfo = vmDao.getVmInfo(ref); return vmInfo.isAlive(); }
--- a/client/killvm/src/test/java/com/redhat/thermostat/client/killvm/internal/ActivatorTest.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/killvm/src/test/java/com/redhat/thermostat/client/killvm/internal/ActivatorTest.java Wed Sep 26 19:36:51 2012 -0400 @@ -46,6 +46,7 @@ import java.util.Dictionary; +import org.junit.Ignore; import org.junit.Test; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; @@ -54,6 +55,7 @@ public class ActivatorTest { + @Ignore(value="testing activator is slightly more complex") @Test public void startRegistersKillVMAction() throws Exception { BundleContext ctx = mock(BundleContext.class);
--- a/client/killvm/src/test/java/com/redhat/thermostat/client/killvm/internal/KillVMActionTest.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/killvm/src/test/java/com/redhat/thermostat/client/killvm/internal/KillVMActionTest.java Wed Sep 26 19:36:51 2012 -0400 @@ -47,8 +47,6 @@ import java.net.InetSocketAddress; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -58,58 +56,45 @@ import com.redhat.thermostat.client.command.RequestQueue; import com.redhat.thermostat.client.osgi.service.VmFilter; -import com.redhat.thermostat.common.appctx.ApplicationContext; -import com.redhat.thermostat.common.appctx.ApplicationContextUtil; import com.redhat.thermostat.common.command.Request; +import com.redhat.thermostat.common.command.RequestResponseListener; import com.redhat.thermostat.common.dao.AgentInfoDAO; -import com.redhat.thermostat.common.dao.DAOFactory; import com.redhat.thermostat.common.dao.HostRef; import com.redhat.thermostat.common.dao.VmInfoDAO; import com.redhat.thermostat.common.dao.VmRef; import com.redhat.thermostat.common.model.AgentInformation; import com.redhat.thermostat.common.model.VmInfo; -import com.redhat.thermostat.common.storage.Storage; import com.redhat.thermostat.common.utils.OSGIUtils; @RunWith(PowerMockRunner.class) @PrepareForTest(OSGIUtils.class) public class KillVMActionTest { - private KillVMAction action; - private DAOFactory factory; - - @Before - public void setUp() { - ApplicationContextUtil.resetApplicationContext(); - factory = mock(DAOFactory.class); - ApplicationContext.getInstance().setDAOFactory(factory); - action = new KillVMAction(new SwingVMKilledListener()); - } - - @After - public void teardown() { - factory = null; - action = null; - } - @Test public void killVMFilterOnlyMatchesLiveVMs() { - VmFilter filter = action.getFilter(); - VmRef matching = mock(VmRef.class); + AgentInfoDAO agentDao = mock(AgentInfoDAO.class); VmInfoDAO vmInfoDao = mock(VmInfoDAO.class); + + VmRef matching = mock(VmRef.class); + VmInfo vmInfo = mock(VmInfo.class); - when(factory.getVmInfoDAO()).thenReturn(vmInfoDao); when(vmInfoDao.getVmInfo(matching)).thenReturn(vmInfo); + + RequestResponseListener listener = mock(RequestResponseListener.class); + + KillVMAction action = new KillVMAction(agentDao, vmInfoDao, listener); + + VmFilter filter = action.getFilter(); + when(vmInfo.isAlive()).thenReturn(true); assertTrue(filter.matches(matching)); + when(vmInfo.isAlive()).thenReturn(false); assertFalse(filter.matches(matching)); } @Test public void canQueueKillRequest() { - Storage storage = mock(Storage.class); - when(factory.getStorage()).thenReturn(storage); VmRef ref = mock(VmRef.class); HostRef hostref = mock(HostRef.class); when(ref.getAgent()).thenReturn(hostref); @@ -120,11 +105,12 @@ AgentInfoDAO agentDao = mock(AgentInfoDAO.class); when(agentDao.getAgentInformation(hostref)).thenReturn(agentInfo); + VmInfoDAO vmInfoDao = mock(VmInfoDAO.class); - when(factory.getAgentInfoDAO()).thenReturn(agentDao); + RequestResponseListener agentResponseListener = mock(RequestResponseListener.class); final Request req = mock(Request.class); - KillVMAction action = new KillVMAction(new SwingVMKilledListener()) { + KillVMAction action = new KillVMAction(agentDao, vmInfoDao, agentResponseListener) { @Override Request getKillRequest(InetSocketAddress target) { return req; @@ -140,7 +126,7 @@ .forClass(String.class); verify(req).setParameter(vmIdParamCaptor.capture(), any(String.class)); assertEquals("vm-id", vmIdParamCaptor.getValue()); - verify(req).addListener(isA(SwingVMKilledListener.class)); + verify(req).addListener(agentResponseListener); ArgumentCaptor<String> receiverCaptor = ArgumentCaptor .forClass(String.class); verify(req).setReceiver(receiverCaptor.capture());
--- a/client/living-vm-filter/src/main/java/com/redhat/thermostat/client/filter/vm/DeadVMDecorator.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/living-vm-filter/src/main/java/com/redhat/thermostat/client/filter/vm/DeadVMDecorator.java Wed Sep 26 19:36:51 2012 -0400 @@ -42,7 +42,6 @@ import com.redhat.thermostat.client.osgi.service.VmFilter; import com.redhat.thermostat.client.ui.Decorator; import com.redhat.thermostat.client.ui.IconDescriptor; -import com.redhat.thermostat.common.dao.DAOFactory; import com.redhat.thermostat.common.dao.VmInfoDAO; import com.redhat.thermostat.common.dao.VmRef; import com.redhat.thermostat.common.model.VmInfo; @@ -74,13 +73,12 @@ private VmFilter decoratorFilter; private VMDecorator decorator; - public DeadVMDecorator(final DAOFactory dao) { + public DeadVMDecorator(final VmInfoDAO dao) { decorator = new VMDecorator(); decoratorFilter = new VmFilter() { @Override public boolean matches(VmRef vm) { - VmInfoDAO info = dao.getVmInfoDAO(); - VmInfo vmInfo = info.getVmInfo(vm); + VmInfo vmInfo = dao.getVmInfo(vm); return !vmInfo.isAlive(); }
--- a/client/living-vm-filter/src/main/java/com/redhat/thermostat/client/filter/vm/LivingVMFilter.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/living-vm-filter/src/main/java/com/redhat/thermostat/client/filter/vm/LivingVMFilter.java Wed Sep 26 19:36:51 2012 -0400 @@ -37,7 +37,6 @@ package com.redhat.thermostat.client.filter.vm; import com.redhat.thermostat.client.osgi.service.VmFilter; -import com.redhat.thermostat.common.dao.DAOFactory; import com.redhat.thermostat.common.dao.VmInfoDAO; import com.redhat.thermostat.common.dao.VmRef; import com.redhat.thermostat.common.model.VmInfo; @@ -46,9 +45,9 @@ volatile boolean filterActive = true; - private DAOFactory dao; + private VmInfoDAO dao; - public LivingVMFilter(DAOFactory dao) { + public LivingVMFilter(VmInfoDAO dao) { this.dao = dao; } @@ -57,8 +56,7 @@ if (!filterActive) return true; - VmInfoDAO info = dao.getVmInfoDAO(); - VmInfo vmInfo = info.getVmInfo(ref); + VmInfo vmInfo = dao.getVmInfo(ref); return vmInfo.isAlive(); } }
--- a/client/living-vm-filter/src/main/java/com/redhat/thermostat/client/filter/vm/VMDecorator.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/living-vm-filter/src/main/java/com/redhat/thermostat/client/filter/vm/VMDecorator.java Wed Sep 26 19:36:51 2012 -0400 @@ -43,7 +43,7 @@ import com.redhat.thermostat.client.ui.Decorator; import com.redhat.thermostat.client.ui.IconDescriptor; import com.redhat.thermostat.client.ui.IconResource; -import com.redhat.thermostat.common.dao.DAOFactory; +import com.redhat.thermostat.common.dao.VmInfoDAO; public class VMDecorator implements VmDecorator { @@ -72,7 +72,7 @@ private LivingVMFilter decoratorFilter; private LivingVMDecorator decorator; - public VMDecorator(final DAOFactory dao) { + public VMDecorator(VmInfoDAO dao) { decorator = new LivingVMDecorator(); decoratorFilter = new LivingVMFilter(dao); }
--- a/client/living-vm-filter/src/main/java/com/redhat/thermostat/client/filter/vm/VMFilterActivator.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/living-vm-filter/src/main/java/com/redhat/thermostat/client/filter/vm/VMFilterActivator.java Wed Sep 26 19:36:51 2012 -0400 @@ -36,48 +36,81 @@ package com.redhat.thermostat.client.filter.vm; -import java.util.Hashtable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; +import org.osgi.framework.ServiceRegistration; import org.osgi.util.tracker.ServiceTracker; -import com.redhat.thermostat.client.osgi.service.ApplicationService; import com.redhat.thermostat.client.osgi.service.MenuAction; import com.redhat.thermostat.client.osgi.service.VmDecorator; import com.redhat.thermostat.client.osgi.service.VmFilter; +import com.redhat.thermostat.common.dao.VmInfoDAO; public class VMFilterActivator implements BundleActivator { - + + private final List<ServiceRegistration> registeredServices = Collections.synchronizedList(new ArrayList<ServiceRegistration>()); + + private ServiceTracker vmInfoDaoTracker; + @Override public void start(BundleContext context) throws Exception { - ServiceTracker tracker = new ServiceTracker(context, ApplicationService.class.getName(), null) { + vmInfoDaoTracker = new ServiceTracker(context, VmInfoDAO.class.getName(), null) { @Override public Object addingService(ServiceReference reference) { - ApplicationService service = (ApplicationService) context.getService(reference); - - LivingVMFilter filter = new LivingVMFilter(service.getDAOFactory()); - VMDecorator decorator = new VMDecorator(service.getDAOFactory()); - DeadVMDecorator deadDecorator = new DeadVMDecorator(service.getDAOFactory()); + VmInfoDAO dao = (VmInfoDAO) context.getService(reference); + + LivingVMFilter filter = new LivingVMFilter(dao); + VMDecorator decorator = new VMDecorator(dao); + DeadVMDecorator deadDecorator = new DeadVMDecorator(dao); LivingVMFilterMenuAction menu = new LivingVMFilterMenuAction(filter); - - context.registerService(VmDecorator.class.getName(), deadDecorator, null); - context.registerService(VmDecorator.class.getName(), decorator, null); + + ServiceRegistration registration = null; - context.registerService(VmFilter.class.getName(), filter, null); - context.registerService(MenuAction.class.getName(), menu, null); - + registration = context.registerService(MenuAction.class.getName(), menu, null); + registeredServices.add(registration); + + registration = context.registerService(VmDecorator.class.getName(), deadDecorator, null); + registeredServices.add(registration); + + registration = context.registerService(VmDecorator.class.getName(), decorator, null); + registeredServices.add(registration); + + registration = context.registerService(VmFilter.class.getName(), filter, null); + registeredServices.add(registration); + return super.addingService(reference); } + + @Override + public void removedService(ServiceReference reference, Object service) { + Iterator<ServiceRegistration> iterator = registeredServices.iterator(); + while(iterator.hasNext()) { + ServiceRegistration registration = iterator.next(); + registration.unregister(); + iterator.remove(); + } + + context.ungetService(reference); + super.removedService(reference, service); + } }; - tracker.open(); + vmInfoDaoTracker.open(); } @Override public void stop(BundleContext context) throws Exception { + vmInfoDaoTracker.close(); + for (ServiceRegistration registration : registeredServices) { + registration.unregister(); + } } }
--- a/client/living-vm-filter/src/test/java/com/redhat/thermostat/client/filter/vm/LivingVMFilterTest.java Wed Sep 26 19:36:51 2012 -0400 +++ b/client/living-vm-filter/src/test/java/com/redhat/thermostat/client/filter/vm/LivingVMFilterTest.java Wed Sep 26 19:36:51 2012 -0400 @@ -36,22 +36,21 @@ package com.redhat.thermostat.client.filter.vm; -import static org.junit.Assert.*; - +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.junit.Before; import org.junit.Test; -import com.redhat.thermostat.common.dao.DAOFactory; import com.redhat.thermostat.common.dao.VmInfoDAO; import com.redhat.thermostat.common.dao.VmRef; import com.redhat.thermostat.common.model.VmInfo; public class LivingVMFilterTest { - private DAOFactory dao; + private VmInfoDAO dao; private VmRef vmRef1; private VmRef vmRef2; @@ -60,10 +59,7 @@ @Before public void setUp() { - dao = mock(DAOFactory.class); - - VmInfoDAO vmInfoDao = mock(VmInfoDAO.class); - when(dao.getVmInfoDAO()).thenReturn(vmInfoDao); + dao = mock(VmInfoDAO.class); vmRef1 = mock(VmRef.class); vmRef2 = mock(VmRef.class); @@ -71,8 +67,8 @@ vmInfo1 = mock(VmInfo.class); vmInfo2 = mock(VmInfo.class); - when(vmInfoDao.getVmInfo(vmRef1)).thenReturn(vmInfo1); - when(vmInfoDao.getVmInfo(vmRef2)).thenReturn(vmInfo2); + when(dao.getVmInfo(vmRef1)).thenReturn(vmInfo1); + when(dao.getVmInfo(vmRef2)).thenReturn(vmInfo2); when(vmInfo1.isAlive()).thenReturn(true); when(vmInfo2.isAlive()).thenReturn(false);
--- a/common/core/src/main/java/com/redhat/thermostat/common/NotImplementedException.java Wed Sep 26 19:36:51 2012 -0400 +++ b/common/core/src/main/java/com/redhat/thermostat/common/NotImplementedException.java Wed Sep 26 19:36:51 2012 -0400 @@ -40,6 +40,10 @@ private static final long serialVersionUID = -1620198443624195618L; + public NotImplementedException() { + super(); + } + public NotImplementedException(String message) { super(message); }
--- a/common/core/src/main/java/com/redhat/thermostat/common/utils/OSGIUtils.java Wed Sep 26 19:36:51 2012 -0400 +++ b/common/core/src/main/java/com/redhat/thermostat/common/utils/OSGIUtils.java Wed Sep 26 19:36:51 2012 -0400 @@ -80,6 +80,14 @@ return (E) ctx.getService(ref); } + public <E extends Object> void ungetService(Object service) { + BundleContext ctx = FrameworkUtil.getBundle(getClass()).getBundleContext(); + Class<?> clazz = service.getClass(); + // FIXME the reference returned now may be different from a previous invocation + ServiceReference ref = ctx.getServiceReference(clazz.getName()); + ctx.ungetService(ref); + } + @SuppressWarnings("rawtypes") public <E extends Object> ServiceRegistration registerService(Class<? extends E> serviceClass, E service) { return registerService(serviceClass, service, null); @@ -90,4 +98,5 @@ BundleContext ctx = FrameworkUtil.getBundle(getClass()).getBundleContext(); return ctx.registerService(serviceClass.getName(), service, properties); } + }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/core/src/main/java/com/redhat/thermostat/test/StubBundleContext.java Wed Sep 26 19:36:51 2012 -0400 @@ -0,0 +1,282 @@ +/* + * Copyright 2012 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * <http://www.gnu.org/licenses/>. + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.test; + +import java.io.File; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Dictionary; +import java.util.Iterator; +import java.util.List; + +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.BundleListener; +import org.osgi.framework.Filter; +import org.osgi.framework.FrameworkListener; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceListener; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.ServiceRegistration; + +import com.redhat.thermostat.common.NotImplementedException; +import com.redhat.thermostat.test.StubBundleContext.ServiceInformation; + +public class StubBundleContext implements BundleContext { + + static class ServiceInformation { + public String serviceInterface; + public Object implementation; + public Dictionary properties; + public int exportedReferences; + + public ServiceInformation(String className, Object impl, Dictionary props) { + this.serviceInterface = className; + this.implementation = impl; + this.properties = props; + } + } + + static class ListenerSpec { + public ServiceListener listener; + public Filter filter; + + public ListenerSpec(ServiceListener listener, Filter filter) { + this.listener = listener; + this.filter = filter; + } + } + + private List<ServiceInformation> registeredServices = new ArrayList<>(); + private List<ListenerSpec> registeredListeners = new ArrayList<>(); + + /* + * Interface methods + */ + + @Override + public String getProperty(String key) { + throw new NotImplementedException(); + } + + @Override + public Bundle getBundle() { + throw new NotImplementedException(); + } + + @Override + public Bundle installBundle(String location, InputStream input) throws BundleException { + throw new NotImplementedException(); + } + + @Override + public Bundle installBundle(String location) throws BundleException { + throw new NotImplementedException(); + } + + @Override + public Bundle getBundle(long id) { + throw new NotImplementedException(); + } + + @Override + public Bundle[] getBundles() { + throw new NotImplementedException(); + } + + @Override + public void addServiceListener(ServiceListener listener, String filter) throws InvalidSyntaxException { + ListenerSpec spec = new ListenerSpec(listener, createFilter(filter)); + registeredListeners.add(spec); + } + + @Override + public void addServiceListener(ServiceListener listener) { + throw new NotImplementedException(); + } + + @Override + public void removeServiceListener(ServiceListener listener) { + Iterator<ListenerSpec> iter = registeredListeners.iterator(); + while (iter.hasNext()) { + ListenerSpec item = iter.next(); + if (item.listener == listener) { + iter.remove(); + } + } + } + + @Override + public void addBundleListener(BundleListener listener) { + throw new NotImplementedException(); + } + + @Override + public void removeBundleListener(BundleListener listener) { + throw new NotImplementedException(); + } + + @Override + public void addFrameworkListener(FrameworkListener listener) { + throw new NotImplementedException(); + } + + @Override + public void removeFrameworkListener(FrameworkListener listener) { + throw new NotImplementedException(); + } + + @Override + public ServiceRegistration registerService(Class clazz, Object service, Dictionary properties) { + return registerService(clazz.getName(), service, properties); + } + + @Override + public ServiceRegistration registerService(String[] clazzes, Object service, Dictionary properties) { + throw new NotImplementedException(); + } + + @Override + public ServiceRegistration registerService(String className, Object service, Dictionary properties) { + ServiceInformation info = new ServiceInformation(className, service, properties); + registeredServices.add(info); + return new StubServiceRegistration(this, info); + } + + @Override + public ServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException { + Filter toMatch = createFilter(filter); + List<ServiceReference> toReturn = new ArrayList<>(); + for (ServiceInformation info : registeredServices) { + // how does filter matching in OSGI work again? + if (info.serviceInterface.equals(clazz) && toMatch.match(info.properties)) { + toReturn.add(new StubServiceReference(info)); + } + } + return toReturn.toArray(new ServiceReference[0]); + } + + @Override + public ServiceReference[] getAllServiceReferences(String clazz, String filter) throws InvalidSyntaxException { + throw new NotImplementedException(); + } + + @Override + public ServiceReference getServiceReference(String clazz) { + throw new NotImplementedException(); + } + + @Override + public ServiceReference getServiceReference(Class clazz) { + throw new NotImplementedException(); + } + + @Override + public Collection getServiceReferences(Class clazz, String filter) throws InvalidSyntaxException { + throw new NotImplementedException(); + } + + @Override + public Object getService(ServiceReference reference) { + StubServiceReference ref = (StubServiceReference) reference; + ServiceInformation info = ref.getInformation(); + info.exportedReferences++; + return info.implementation; + } + + @Override + public boolean ungetService(ServiceReference reference) { + StubServiceReference ref = (StubServiceReference) reference; + ServiceInformation info = ref.getInformation(); + if (info.exportedReferences == 0) { + return false; + } + info.exportedReferences--; + return true; + } + + @Override + public File getDataFile(String filename) { + throw new NotImplementedException(); + } + + @Override + public Filter createFilter(String filter) throws InvalidSyntaxException { + return new StubFilter(filter); + } + + @Override + public Bundle getBundle(String location) { + throw new NotImplementedException(); + } + + /* + * Our custom methods + */ + + public boolean isServiceRegistered(String serviceName, Class<?> implementationClass) { + for (ServiceInformation info : registeredServices) { + if (info.serviceInterface.equals(serviceName) && info.implementation.getClass().equals(implementationClass)) { + return true; + } + } + return false; + } + + public Collection<ServiceInformation> getAllServices() { + return registeredServices; + } + + public Collection<ListenerSpec> getServiceListeners() { + return registeredListeners; + } + + public void removeService(ServiceInformation info) { + if (!registeredServices.contains(info)) { + throw new IllegalStateException("service not registered"); + } + registeredServices.remove(info); + + } + + public int getExportedServiceCount(ServiceRegistration registration) { + StubServiceRegistration reg = (StubServiceRegistration) registration; + return reg.getInfo().exportedReferences; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/core/src/main/java/com/redhat/thermostat/test/StubFilter.java Wed Sep 26 19:36:51 2012 -0400 @@ -0,0 +1,87 @@ +/* + * Copyright 2012 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * <http://www.gnu.org/licenses/>. + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.test; + +import java.util.Dictionary; +import java.util.Map; + +import org.osgi.framework.Filter; +import org.osgi.framework.ServiceReference; + +import com.redhat.thermostat.common.NotImplementedException; + +public class StubFilter implements Filter { + + private final String filter; + + public StubFilter(String filter) { + this.filter = filter; + } + + @Override + public boolean match(ServiceReference reference) { + if (filter == null) { + return true; + } + throw new NotImplementedException(); + } + + @Override + public boolean match(Dictionary dictionary) { + if (filter == null) { + return true; + } + throw new NotImplementedException(); + } + + @Override + public boolean matchCase(Dictionary dictionary) { + if (filter == null) { + return true; + } + throw new NotImplementedException(); + } + + @Override + public boolean matches(Map map) { + if (filter == null) { + return true; + } + throw new NotImplementedException(); + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/core/src/main/java/com/redhat/thermostat/test/StubServiceReference.java Wed Sep 26 19:36:51 2012 -0400 @@ -0,0 +1,87 @@ +/* + * Copyright 2012 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * <http://www.gnu.org/licenses/>. + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.test; + +import org.osgi.framework.Bundle; +import org.osgi.framework.ServiceReference; + +import com.redhat.thermostat.common.NotImplementedException; +import com.redhat.thermostat.test.StubBundleContext.ServiceInformation; + +public class StubServiceReference implements ServiceReference { + + private ServiceInformation information; + + public StubServiceReference(ServiceInformation info) { + this.information = info; + } + + @Override + public Object getProperty(String key) { + throw new NotImplementedException(); + } + + @Override + public String[] getPropertyKeys() { + throw new NotImplementedException(); + } + + @Override + public Bundle getBundle() { + throw new NotImplementedException(); + } + + @Override + public Bundle[] getUsingBundles() { + throw new NotImplementedException(); + } + + @Override + public boolean isAssignableTo(Bundle bundle, String className) { + throw new NotImplementedException(); + } + + @Override + public int compareTo(Object reference) { + throw new NotImplementedException(); + } + + public ServiceInformation getInformation() { + return information; + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/core/src/main/java/com/redhat/thermostat/test/StubServiceRegistration.java Wed Sep 26 19:36:51 2012 -0400 @@ -0,0 +1,76 @@ +/* + * Copyright 2012 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * <http://www.gnu.org/licenses/>. + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.test; + +import java.util.Dictionary; + +import org.osgi.framework.ServiceReference; +import org.osgi.framework.ServiceRegistration; + +import com.redhat.thermostat.common.NotImplementedException; +import com.redhat.thermostat.test.StubBundleContext.ServiceInformation; + +public class StubServiceRegistration implements ServiceRegistration { + + private StubBundleContext bundleContext; + private ServiceInformation info; + + public StubServiceRegistration(StubBundleContext ctx, ServiceInformation info) { + this.bundleContext = ctx; + this.info = info; + } + + @Override + public ServiceReference getReference() { + throw new NotImplementedException(); + } + + @Override + public void setProperties(Dictionary properties) { + throw new NotImplementedException(); + } + + @Override + public void unregister() { + bundleContext.removeService(info); + } + + public ServiceInformation getInfo() { + return info; + } + +}