Mercurial > hg > release > thermostat-0.15

changeset 227:c26b63405ae1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Warnings cleanup reviewed-by: rkennke review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-April/000810.html
author Jon VanAlten <jon.vanalten@redhat.com>
date Fri, 13 Apr 2012 10:16:10 -0400
parents 085b44ad8ccb
children b2659f4f8bf0
files agent/src/main/java/com/redhat/thermostat/agent/config/AgentStartupConfiguration.java agent/src/test/java/com/redhat/thermostat/TestUtils.java agent/src/test/java/com/redhat/thermostat/backend/system/JvmStatVmClassListenerTest.java client/src/main/java/com/redhat/thermostat/client/ui/AgentConfigurationFrame.java client/src/main/java/com/redhat/thermostat/client/ui/ClientConfigurationFrame.java client/src/main/java/com/redhat/thermostat/client/ui/MainWindow.java client/src/test/java/com/redhat/thermostat/client/MainWindowControllerImplTest.java client/src/test/java/com/redhat/thermostat/client/VmClassStatControllerTest.java client/src/test/java/com/redhat/thermostat/client/ui/AgentConfigurationControllerTest.java client/src/test/java/com/redhat/thermostat/client/ui/ClientConfigurationFrameTest.java client/src/test/java/com/redhat/thermostat/client/ui/HostMemoryControllerTest.java client/src/test/java/com/redhat/thermostat/client/ui/MainWindowTest.java client/src/test/java/com/redhat/thermostat/client/ui/VmCpuControllerTest.java common/src/main/java/com/redhat/thermostat/cli/CommandException.java common/src/main/java/com/redhat/thermostat/common/ActionEvent.java common/src/main/java/com/redhat/thermostat/common/config/InvalidConfigurationException.java common/src/main/java/com/redhat/thermostat/common/storage/ChunkConverter.java common/src/main/java/com/redhat/thermostat/tools/ApplicationException.java common/src/test/java/com/redhat/thermostat/common/dao/HostInfoDAOTest.java common/src/test/java/com/redhat/thermostat/tools/BasicCommandTest.java
diffstat 20 files changed, 23 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/agent/src/main/java/com/redhat/thermostat/agent/config/AgentStartupConfiguration.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/agent/src/main/java/com/redhat/thermostat/agent/config/AgentStartupConfiguration.java	Fri Apr 13 10:16:10 2012 -0400
@@ -38,9 +38,7 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
--- a/agent/src/test/java/com/redhat/thermostat/TestUtils.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/agent/src/test/java/com/redhat/thermostat/TestUtils.java	Fri Apr 13 10:16:10 2012 -0400
@@ -43,10 +43,6 @@
 import java.util.Properties;
 import java.util.Random;
 
-import junit.framework.Assert;
-
-import org.junit.BeforeClass;
-
 import com.redhat.thermostat.agent.config.AgentProperties;
 import com.redhat.thermostat.backend.BackendsProperties;
 
--- a/agent/src/test/java/com/redhat/thermostat/backend/system/JvmStatVmClassListenerTest.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/agent/src/test/java/com/redhat/thermostat/backend/system/JvmStatVmClassListenerTest.java	Fri Apr 13 10:16:10 2012 -0400
@@ -51,9 +51,6 @@
 import com.redhat.thermostat.common.dao.DAOFactory;
 import com.redhat.thermostat.common.dao.VmClassStatDAO;
 import com.redhat.thermostat.common.model.VmClassStat;
-import com.redhat.thermostat.common.storage.Chunk;
-import com.redhat.thermostat.common.storage.Key;
-import com.redhat.thermostat.common.storage.Storage;
 
 public class JvmStatVmClassListenerTest {
 
--- a/client/src/main/java/com/redhat/thermostat/client/ui/AgentConfigurationFrame.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/client/src/main/java/com/redhat/thermostat/client/ui/AgentConfigurationFrame.java	Fri Apr 13 10:16:10 2012 -0400
@@ -70,6 +70,8 @@
 
 public class AgentConfigurationFrame extends JFrame implements AgentConfigurationView, java.awt.event.ActionListener, ListSelectionListener {
 
+    private static final long serialVersionUID = -6049272471909474886L;
+
     private final CopyOnWriteArrayList<ActionListener<ConfigurationAction>> listeners = new CopyOnWriteArrayList<>();
 
     private final Map<String, JCheckBox> backends = Collections.synchronizedMap(new HashMap<String, JCheckBox>());
--- a/client/src/main/java/com/redhat/thermostat/client/ui/ClientConfigurationFrame.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/client/src/main/java/com/redhat/thermostat/client/ui/ClientConfigurationFrame.java	Fri Apr 13 10:16:10 2012 -0400
@@ -55,6 +55,8 @@
 
 public class ClientConfigurationFrame extends JFrame implements ClientConfigurationView, java.awt.event.ActionListener {
 
+    private static final long serialVersionUID = 6888957994092403516L;
+
     private final JTextField storageUrl;
     private final JButton btnOk;
     private final JButton btnCancel;
--- a/client/src/main/java/com/redhat/thermostat/client/ui/MainWindow.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/client/src/main/java/com/redhat/thermostat/client/ui/MainWindow.java	Fri Apr 13 10:16:10 2012 -0400
@@ -86,7 +86,6 @@
 import javax.swing.tree.TreeSelectionModel;
 
 import com.redhat.thermostat.client.Configuration;
-import com.redhat.thermostat.client.AgentConfigurationSource;
 import com.redhat.thermostat.client.ApplicationInfo;
 import com.redhat.thermostat.client.HostsVMsLoader;
 import com.redhat.thermostat.client.MainView;
--- a/client/src/test/java/com/redhat/thermostat/client/MainWindowControllerImplTest.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/client/src/test/java/com/redhat/thermostat/client/MainWindowControllerImplTest.java	Fri Apr 13 10:16:10 2012 -0400
@@ -65,7 +65,6 @@
 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.storage.Chunk;
 
 public class MainWindowControllerImplTest {
 
@@ -80,6 +79,7 @@
     private HostInfoDAO mockHostsDAO;
     private VmInfoDAO mockVmsDAO;
 
+    @SuppressWarnings({ "unchecked", "rawtypes" }) // ActionListener fluff
     @Before
     public void setUp() {
         ApplicationContextUtil.resetApplicationContext();
--- a/client/src/test/java/com/redhat/thermostat/client/VmClassStatControllerTest.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/client/src/test/java/com/redhat/thermostat/client/VmClassStatControllerTest.java	Fri Apr 13 10:16:10 2012 -0400
@@ -58,6 +58,7 @@
 
 public class VmClassStatControllerTest {
 
+    @SuppressWarnings("unchecked") // any(List.class)
     @Test
     public void testChartUpdate() {
 
--- a/client/src/test/java/com/redhat/thermostat/client/ui/AgentConfigurationControllerTest.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/client/src/test/java/com/redhat/thermostat/client/ui/AgentConfigurationControllerTest.java	Fri Apr 13 10:16:10 2012 -0400
@@ -46,7 +46,6 @@
 import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -58,7 +57,6 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import com.redhat.thermostat.client.AgentConfigurationSource;
 import com.redhat.thermostat.client.ui.AgentConfigurationView.ConfigurationAction;
 import com.redhat.thermostat.common.ActionEvent;
 import com.redhat.thermostat.common.ActionListener;
@@ -154,6 +152,7 @@
     /**
      * Verify that the accepting the changes signals the controller
      */
+    @SuppressWarnings("unchecked") // All this ActionListener fluff
     @Test
     public void testViewEditedBackends() {
         final ActionListener<ConfigurationAction>[] listeners = (ActionListener<ConfigurationAction>[]) new ActionListener<?>[1];
@@ -195,6 +194,7 @@
     /**
      * Verify that controller handles cancel properly
      */
+    @SuppressWarnings("unchecked") // All this ActionListener fluff.
     @Test
     public void testViewCancelEditingBackends() {
         final ActionListener<ConfigurationAction>[] listeners = (ActionListener<ConfigurationAction>[]) new ActionListener<?>[1];
--- a/client/src/test/java/com/redhat/thermostat/client/ui/ClientConfigurationFrameTest.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/client/src/test/java/com/redhat/thermostat/client/ui/ClientConfigurationFrameTest.java	Fri Apr 13 10:16:10 2012 -0400
@@ -59,6 +59,7 @@
     private FrameFixture frameFixture;
     private ActionListener<ClientConfigurationView.Action> l;
 
+    @SuppressWarnings("unchecked") // ActionListener
     @Before
     public void setUp() {
         frame = new ClientConfigurationFrame();
--- a/client/src/test/java/com/redhat/thermostat/client/ui/HostMemoryControllerTest.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/client/src/test/java/com/redhat/thermostat/client/ui/HostMemoryControllerTest.java	Fri Apr 13 10:16:10 2012 -0400
@@ -58,6 +58,7 @@
 
 public class HostMemoryControllerTest {
 
+    @SuppressWarnings("unchecked") // any(List.class)
     @Test
     public void testUpdate() {
         HostInfo hostInfo = new HostInfo("someHost", "someOS", "linux_0.0.1", "lreally_fast_cpu", 2, 1024);
--- a/client/src/test/java/com/redhat/thermostat/client/ui/MainWindowTest.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/client/src/test/java/com/redhat/thermostat/client/ui/MainWindowTest.java	Fri Apr 13 10:16:10 2012 -0400
@@ -42,9 +42,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.beans.PropertyChangeEvent;
-import java.util.Objects;
-
 import org.fest.swing.annotation.GUITest;
 import org.fest.swing.edt.GuiActionRunner;
 import org.fest.swing.edt.GuiTask;
@@ -52,13 +49,11 @@
 import org.fest.swing.fixture.JMenuItemFixture;
 import org.fest.swing.fixture.JTextComponentFixture;
 import org.fest.swing.junit.v4_5.runner.GUITestRunner;
-import org.hamcrest.Description;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatcher;
 
 import com.redhat.thermostat.client.ChangeableText;
 import com.redhat.thermostat.client.MainView;
@@ -70,34 +65,11 @@
 @RunWith(GUITestRunner.class)
 public class MainWindowTest {
 
-    private static class PropertyChangeEventMatcher extends ArgumentMatcher<PropertyChangeEvent> {
-
-        private PropertyChangeEvent event;
-
-        private PropertyChangeEventMatcher(PropertyChangeEvent ev) {
-            event = ev;
-        }
-
-        @Override
-        public boolean matches(Object argument) {
-            PropertyChangeEvent other = (PropertyChangeEvent) argument;
-            return event.getSource() == other.getSource()
-                    && Objects.equals(event.getPropertyName(), other.getPropertyName())
-                    && Objects.equals(event.getNewValue(), other.getNewValue())
-                    && Objects.equals(event.getOldValue(), other.getOldValue());
-        }
-
-        @Override
-        public void describeTo(Description description) {
-            super.describeTo(description);
-            description.appendText(event.getSource() + ", " + event.getPropertyName() + ", " + event.getOldValue() + ", " + event.getNewValue());
-        }
-    }
-
     private FrameFixture frameFixture;
     private MainWindow window;
     private ActionListener<MainView.Action> l;
 
+    @SuppressWarnings("unchecked") // mock(ActionListener.class)
     @Before
     public void setUp() {
 
--- a/client/src/test/java/com/redhat/thermostat/client/ui/VmCpuControllerTest.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/client/src/test/java/com/redhat/thermostat/client/ui/VmCpuControllerTest.java	Fri Apr 13 10:16:10 2012 -0400
@@ -57,6 +57,7 @@
 
 public class VmCpuControllerTest {
 
+    @SuppressWarnings("unchecked") // any(List.class)
     @Test
     public void testChartUpdate() {
 
--- a/common/src/main/java/com/redhat/thermostat/cli/CommandException.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/common/src/main/java/com/redhat/thermostat/cli/CommandException.java	Fri Apr 13 10:16:10 2012 -0400
@@ -38,6 +38,8 @@
 
 public class CommandException extends Exception {
 
+    private static final long serialVersionUID = 3730368617641245016L;
+
     public CommandException() {
         super();
     }
--- a/common/src/main/java/com/redhat/thermostat/common/ActionEvent.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/common/src/main/java/com/redhat/thermostat/common/ActionEvent.java	Fri Apr 13 10:16:10 2012 -0400
@@ -40,6 +40,8 @@
 
 public class ActionEvent<T extends Enum<?>> extends EventObject {
 
+    private static final long serialVersionUID = -8648206929150142342L;
+
     public ActionEvent(Object source, T actionId) {
         super(source);
         if (actionId == null) {
--- a/common/src/main/java/com/redhat/thermostat/common/config/InvalidConfigurationException.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/common/src/main/java/com/redhat/thermostat/common/config/InvalidConfigurationException.java	Fri Apr 13 10:16:10 2012 -0400
@@ -39,6 +39,8 @@
 
 public class InvalidConfigurationException extends Exception {
 
+    private static final long serialVersionUID = -6555406006758264587L;
+
     public InvalidConfigurationException() {
         super();
     }
--- a/common/src/main/java/com/redhat/thermostat/common/storage/ChunkConverter.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/common/src/main/java/com/redhat/thermostat/common/storage/ChunkConverter.java	Fri Apr 13 10:16:10 2012 -0400
@@ -117,12 +117,14 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     private void dbObjectToChunkRecursively(Chunk chunk, DBObject dbObject, Category category, String dbKey, String fullKey) {
         Object value = dbObject.get(dbKey);
         if (value instanceof DBObject) {
             DBObject dbObj = (DBObject) value;
             dbObjectToChunkRecurse(chunk, dbObj, category, fullKey);
         } else {
+            @SuppressWarnings("rawtypes")
             Key key = category.getKey(fullKey);
             if (key != null) {
                 chunk.put(key, value);
--- a/common/src/main/java/com/redhat/thermostat/tools/ApplicationException.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/common/src/main/java/com/redhat/thermostat/tools/ApplicationException.java	Fri Apr 13 10:16:10 2012 -0400
@@ -38,6 +38,8 @@
 
 public class ApplicationException extends Exception {
 
+    private static final long serialVersionUID = 5910852125476383826L;
+
     public ApplicationException() {
     }
 
--- a/common/src/test/java/com/redhat/thermostat/common/dao/HostInfoDAOTest.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/common/src/test/java/com/redhat/thermostat/common/dao/HostInfoDAOTest.java	Fri Apr 13 10:16:10 2012 -0400
@@ -44,7 +44,6 @@
 
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
-import org.mockito.internal.verification.Times;
 
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
--- a/common/src/test/java/com/redhat/thermostat/tools/BasicCommandTest.java	Fri Apr 13 15:22:56 2012 +0200
+++ b/common/src/test/java/com/redhat/thermostat/tools/BasicCommandTest.java	Fri Apr 13 10:16:10 2012 -0400
@@ -36,9 +36,7 @@
 
 package com.redhat.thermostat.tools;
 
-import static org.junit.Assert.*;
-
-import java.util.List;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.After;
 import org.junit.Before;
@@ -46,7 +44,6 @@
 
 import com.redhat.thermostat.cli.CommandContext;
 import com.redhat.thermostat.cli.CommandException;
-import com.redhat.thermostat.common.config.InvalidConfigurationException;
 import com.redhat.thermostat.common.config.StartupConfiguration;
 
 public class BasicCommandTest {