Mercurial > hg > release > thermostat-0.15

changeset 1222:945e5d5c60ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use Add over Replace in DAOs. Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-August/007975.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Tue, 20 Aug 2013 11:18:22 +0200
parents 39c571af1003
children 1fd7faa8502a
files numa/common/src/main/java/com/redhat/thermostat/numa/common/internal/NumaDAOImpl.java numa/common/src/test/java/com/redhat/thermostat/numa/common/internal/NumaDAOImplTest.java storage/core/src/main/java/com/redhat/thermostat/storage/internal/dao/AgentInfoDAOImpl.java storage/core/src/main/java/com/redhat/thermostat/storage/internal/dao/VmInfoDAOImpl.java storage/core/src/test/java/com/redhat/thermostat/storage/internal/dao/AgentInfoDAOTest.java storage/core/src/test/java/com/redhat/thermostat/storage/internal/dao/VmInfoDAOTest.java
diffstat 6 files changed, 36 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/numa/common/src/main/java/com/redhat/thermostat/numa/common/internal/NumaDAOImpl.java	Mon Aug 19 14:56:18 2013 +0200
+++ b/numa/common/src/main/java/com/redhat/thermostat/numa/common/internal/NumaDAOImpl.java	Tue Aug 20 11:18:22 2013 +0200
@@ -44,6 +44,7 @@
 import com.redhat.thermostat.numa.common.NumaDAO;
 import com.redhat.thermostat.numa.common.NumaHostInfo;
 import com.redhat.thermostat.numa.common.NumaStat;
+import com.redhat.thermostat.storage.core.Add;
 import com.redhat.thermostat.storage.core.Cursor;
 import com.redhat.thermostat.storage.core.DescriptorParsingException;
 import com.redhat.thermostat.storage.core.HostLatestPojoListGetter;
@@ -51,7 +52,6 @@
 import com.redhat.thermostat.storage.core.Key;
 import com.redhat.thermostat.storage.core.PreparedStatement;
 import com.redhat.thermostat.storage.core.Put;
-import com.redhat.thermostat.storage.core.Replace;
 import com.redhat.thermostat.storage.core.StatementDescriptor;
 import com.redhat.thermostat.storage.core.StatementExecutionException;
 import com.redhat.thermostat.storage.core.Storage;
@@ -87,7 +87,7 @@
 
     @Override
     public void putNumberOfNumaNodes(int numNodes) {
-        Replace replace = storage.createReplace(numaHostCategory);
+        Add replace = storage.createAdd(numaHostCategory);
         NumaHostInfo numaHostInfo = new NumaHostInfo();
         numaHostInfo.setNumNumaNodes(numNodes);
         replace.setPojo(numaHostInfo);
--- a/numa/common/src/test/java/com/redhat/thermostat/numa/common/internal/NumaDAOImplTest.java	Mon Aug 19 14:56:18 2013 +0200
+++ b/numa/common/src/test/java/com/redhat/thermostat/numa/common/internal/NumaDAOImplTest.java	Tue Aug 20 11:18:22 2013 +0200
@@ -46,12 +46,14 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 
 import com.redhat.thermostat.numa.common.NumaDAO;
 import com.redhat.thermostat.numa.common.NumaHostInfo;
 import com.redhat.thermostat.numa.common.NumaNodeStat;
 import com.redhat.thermostat.numa.common.NumaStat;
 import com.redhat.thermostat.storage.core.Add;
+import com.redhat.thermostat.storage.core.Category;
 import com.redhat.thermostat.storage.core.Cursor;
 import com.redhat.thermostat.storage.core.DescriptorParsingException;
 import com.redhat.thermostat.storage.core.HostRef;
@@ -118,6 +120,24 @@
     }
     
     @Test
+    public void testPutNumberOfNumaNodes() {
+        Storage storage = mock(Storage.class);
+        Add add = mock(Add.class);
+        when(storage.createAdd(any(Category.class))).thenReturn(add);
+
+        NumaDAOImpl dao = new NumaDAOImpl(storage);
+
+        dao.putNumberOfNumaNodes(4);
+
+        verify(storage).createAdd(NumaDAO.numaHostCategory);
+        ArgumentCaptor<NumaHostInfo> captor = ArgumentCaptor.forClass(NumaHostInfo.class);
+        verify(add).setPojo(captor.capture());
+        NumaHostInfo info = captor.getValue();
+        assertEquals(4, info.getNumNumaNodes());
+        verify(add).apply();
+    }
+    
+    @Test
     public void testGetNumberOfNumaNodes() throws DescriptorParsingException, StatementExecutionException {
         NumaHostInfo info = mock(NumaHostInfo.class);
         when(info.getNumNumaNodes()).thenReturn(2);
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/internal/dao/AgentInfoDAOImpl.java	Mon Aug 19 14:56:18 2013 +0200
+++ b/storage/core/src/main/java/com/redhat/thermostat/storage/internal/dao/AgentInfoDAOImpl.java	Tue Aug 20 11:18:22 2013 +0200
@@ -182,7 +182,7 @@
 
     @Override
     public void addAgentInformation(AgentInformation agentInfo) {
-        Put replace = storage.createReplace(CATEGORY);
+        Put replace = storage.createAdd(CATEGORY);
         replace.setPojo(agentInfo);
         replace.apply();
     }
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/internal/dao/VmInfoDAOImpl.java	Mon Aug 19 14:56:18 2013 +0200
+++ b/storage/core/src/main/java/com/redhat/thermostat/storage/internal/dao/VmInfoDAOImpl.java	Tue Aug 20 11:18:22 2013 +0200
@@ -173,7 +173,7 @@
 
     @Override
     public void putVmInfo(VmInfo info) {
-        Put replace = storage.createReplace(vmInfoCategory);
+        Put replace = storage.createAdd(vmInfoCategory);
         replace.setPojo(info);
         replace.apply();
     }
--- a/storage/core/src/test/java/com/redhat/thermostat/storage/internal/dao/AgentInfoDAOTest.java	Mon Aug 19 14:56:18 2013 +0200
+++ b/storage/core/src/test/java/com/redhat/thermostat/storage/internal/dao/AgentInfoDAOTest.java	Tue Aug 20 11:18:22 2013 +0200
@@ -52,6 +52,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import com.redhat.thermostat.storage.core.Add;
 import com.redhat.thermostat.storage.core.Category;
 import com.redhat.thermostat.storage.core.Cursor;
 import com.redhat.thermostat.storage.core.DescriptorParsingException;
@@ -59,7 +60,6 @@
 import com.redhat.thermostat.storage.core.Key;
 import com.redhat.thermostat.storage.core.PreparedStatement;
 import com.redhat.thermostat.storage.core.Remove;
-import com.redhat.thermostat.storage.core.Replace;
 import com.redhat.thermostat.storage.core.StatementDescriptor;
 import com.redhat.thermostat.storage.core.StatementExecutionException;
 import com.redhat.thermostat.storage.core.Storage;
@@ -261,16 +261,16 @@
     @Test
     public void verifyAddAgentInformation() {
         Storage storage = mock(Storage.class);
-        Replace replace = mock(Replace.class);
-        when(storage.createReplace(any(Category.class))).thenReturn(replace);
+        Add add = mock(Add.class);
+        when(storage.createAdd(any(Category.class))).thenReturn(add);
 
         AgentInfoDAO dao = new AgentInfoDAOImpl(storage);
 
         dao.addAgentInformation(agentInfo1);
 
-        verify(storage).createReplace(AgentInfoDAO.CATEGORY);
-        verify(replace).setPojo(agentInfo1);
-        verify(replace).apply();
+        verify(storage).createAdd(AgentInfoDAO.CATEGORY);
+        verify(add).setPojo(agentInfo1);
+        verify(add).apply();
     }
 
     @Test
--- a/storage/core/src/test/java/com/redhat/thermostat/storage/internal/dao/VmInfoDAOTest.java	Mon Aug 19 14:56:18 2013 +0200
+++ b/storage/core/src/test/java/com/redhat/thermostat/storage/internal/dao/VmInfoDAOTest.java	Tue Aug 20 11:18:22 2013 +0200
@@ -53,13 +53,13 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import com.redhat.thermostat.storage.core.Add;
 import com.redhat.thermostat.storage.core.Category;
 import com.redhat.thermostat.storage.core.Cursor;
 import com.redhat.thermostat.storage.core.DescriptorParsingException;
 import com.redhat.thermostat.storage.core.HostRef;
 import com.redhat.thermostat.storage.core.Key;
 import com.redhat.thermostat.storage.core.PreparedStatement;
-import com.redhat.thermostat.storage.core.Replace;
 import com.redhat.thermostat.storage.core.StatementDescriptor;
 import com.redhat.thermostat.storage.core.StatementExecutionException;
 import com.redhat.thermostat.storage.core.Storage;
@@ -315,8 +315,8 @@
     public void testPutVmInfo() {
 
         Storage storage = mock(Storage.class);
-        Replace replace = mock(Replace.class);
-        when(storage.createReplace(any(Category.class))).thenReturn(replace);
+        Add add = mock(Add.class);
+        when(storage.createAdd(any(Category.class))).thenReturn(add);
 
         VmInfo info = new VmInfo(vmId, vmPid, startTime, stopTime, jVersion, jHome,
                 mainClass, commandLine, vmName, vmInfo, vmVersion, vmArgs,
@@ -324,9 +324,9 @@
         VmInfoDAO dao = new VmInfoDAOImpl(storage);
         dao.putVmInfo(info);
 
-        verify(storage).createReplace(VmInfoDAO.vmInfoCategory);
-        verify(replace).setPojo(info);
-        verify(replace).apply();
+        verify(storage).createAdd(VmInfoDAO.vmInfoCategory);
+        verify(add).setPojo(info);
+        verify(add).apply();
     }
 
     @Test