QPID-4050: reduced verbosity of logging. Also removed unnecessary imports and casts in various perftests files.

Applied patch from Philip Harvey <phil@philharveyonline.com>

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1350623 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 7 insertions, 5 deletions

diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
index ffc3733eb7..1ff8d3e5d7 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
@@ -59,6 +59,7 @@ public class MessageProviderTest extends TestCase
     {
         MessageProvider messageProvider = new MessageProvider(null)
         {
+            @Override
             public String getMessagePayload(CreateProducerCommand command)
             {
                 return super.getMessagePayload(command);
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java
index cf05623e8f..a3ac11b756 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java
@@ -121,7 +121,7 @@ public class ProducerParticipantTest extends TestCase
         _command.setBatchSize(batchSize);
         _command.setDeliveryMode(deliveryMode);
 
-        ParticipantResult result = (ParticipantResult) _producer.doIt(CLIENT_NAME);
+        ParticipantResult result = _producer.doIt(CLIENT_NAME);
         assertExpectedProducerResults(result, PARTICIPANT_NAME1, CLIENT_NAME, _testStartTime,
                                       Session.AUTO_ACKNOWLEDGE, null, numberOfMessages, PAYLOAD_SIZE_PER_MESSAGE, totalPayloadSize, null);
 
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java
index 75a634ba54..c54355bc76 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java
@@ -32,6 +32,7 @@ public class ListPropertyValueTest extends TestCase
     private ListPropertyValue _generator;
     private List<PropertyValue> _items;
 
+    @Override
     public void setUp() throws Exception
     {
         super.setUp();
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java
index 2d560163c2..17397db5b8 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java
@@ -24,6 +24,7 @@ public class PropertyValueFactoryTest extends TestCase
 {
     private PropertyValueFactory _factory;
 
+    @Override
     public void setUp() throws Exception
     {
         super.setUp();
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java
index bd5de3e370..878141895c 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java
@@ -26,6 +26,7 @@ public class RandomPropertyValueTest extends TestCase
 {
     private RandomPropertyValue _generator;
 
+    @Override
     public void setUp() throws Exception
     {
         super.setUp();
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java
index 91791c9d55..6932919bed 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java
@@ -26,6 +26,7 @@ public class RangePropertyValueTest extends TestCase
 {
     private RangePropertyValue _generator;
 
+    @Override
     public void setUp() throws Exception
     {
         super.setUp();
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java
index af9ec28db0..91b219585a 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java
@@ -26,9 +26,7 @@ import java.util.Map;
 import junit.framework.TestCase;
 
 import org.apache.qpid.disttest.ConfigFileHelper;
-import org.apache.qpid.disttest.client.MessageProvider;
 import org.apache.qpid.disttest.client.property.PropertyValue;
-import org.apache.qpid.disttest.controller.CommandForClient;
 
 public class ConfigReaderTest extends TestCase
 {
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java
index 088746d8cd..6b4157a9b3 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java
@@ -58,7 +58,6 @@ import org.apache.qpid.disttest.controller.ResultsForAllTests;
 import org.apache.qpid.disttest.controller.TestResult;
 import org.apache.qpid.disttest.message.ParticipantAttribute;
 import org.apache.qpid.disttest.message.ParticipantResult;
-import org.apache.qpid.qmf.QMFProperty.AccessCode;
 
 public class CSVFormaterTest extends TestCase
 {
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
index 9fd90d3215..e06ace156f 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
@@ -151,7 +151,7 @@ public class ControllerAndClientTest extends DistributedTestSystemTestBase
         List<ParticipantResult> test1ParticipantResults = testResult.getParticipantResults();
         assertEquals("Unexpected number of participant results for test", 2, test1ParticipantResults.size());
 
-        ParticipantResult producer1 = (ParticipantResult) test1ParticipantResults.get(1);
+        ParticipantResult producer1 = test1ParticipantResults.get(1);
 
         assertEquals(expectedMessageSize, producer1.getPayloadSize());
         assertEquals(iterationNumber, producer1.getIterationNumber());