Author: kwall Date: Fri Jun 15 13:56:48 2012 New Revision: 1350623 URL: http://svn.apache.org/viewvc?rev=1350623&view=rev Log: QPID-4050: reduced verbosity of logging. Also removed unnecessary imports and casts in various perftests files.
Applied patch from Philip Harvey <[email protected]> Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java (original) +++ qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java Fri Jun 15 13:56:48 2012 @@ -25,7 +25,6 @@ import java.io.FileWriter; import java.io.FilenameFilter; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import javax.naming.Context; Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java (original) +++ qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java Fri Jun 15 13:56:48 2012 @@ -103,9 +103,9 @@ public class Client public void processInstruction(final Command command) { - if (LOGGER.isInfoEnabled()) + if (LOGGER.isDebugEnabled()) { - LOGGER.info("Client " + getClientName() + " received command: " + command); + LOGGER.debug("Client " + getClientName() + " received command: " + command); } String responseMessage = null; try @@ -174,7 +174,7 @@ public class Client { if (_state.compareAndSet(ClientState.RUNNING_TEST, ClientState.READY)) { - LOGGER.info("Tearing down test on client: " + _clientJmsDelegate.getClientName()); + LOGGER.debug("Tearing down test on client: " + _clientJmsDelegate.getClientName()); _clientJmsDelegate.closeTestConnections(); } @@ -190,7 +190,7 @@ public class Client public void sendResults(ParticipantResult testResult) { _clientJmsDelegate.sendResponseMessage(testResult); - LOGGER.info("Sent test results " + testResult); + LOGGER.debug("Sent test results " + testResult); } @Override Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java (original) +++ qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java Fri Jun 15 13:56:48 2012 @@ -56,7 +56,7 @@ public class ParticipantExecutor { _client = client; - LOGGER.info("Starting test participant in background thread: " + this); + LOGGER.debug("Starting test participant in background thread: " + this); _executor.execute(new ParticipantRunnable()); } @@ -94,9 +94,9 @@ public class ParticipantExecutor ParticipantResult result = null; try { - if (LOGGER.isInfoEnabled()) + if (LOGGER.isDebugEnabled()) { - LOGGER.info("About to run participant " + _participant); + LOGGER.debug("About to run participant " + _participant); } result = _participant.doIt(_client.getClientName()); } Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java (original) +++ qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java Fri Jun 15 13:56:48 2012 @@ -253,7 +253,7 @@ public class TestRunner setOriginalTestDetailsOn(result); _testResult.addParticipantResult(result); - LOGGER.info("Received result " + result); + LOGGER.debug("Received result " + result); _testResultsLatch.countDown(); checkForResponseError(result); Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java (original) +++ qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java Fri Jun 15 13:56:48 2012 @@ -193,7 +193,7 @@ public class ClientJmsDelegate final boolean transacted = command.getAcknowledgeMode() == Session.SESSION_TRANSACTED; final Session newSession = connection.createSession(transacted, command.getAcknowledgeMode()); - LOGGER.info("Created session " + command.getSessionName() + " with transacted = " + newSession.getTransacted() + " and acknowledgeMode = " + newSession.getAcknowledgeMode()); + LOGGER.debug("Created session " + command.getSessionName() + " with transacted = " + newSession.getTransacted() + " and acknowledgeMode = " + newSession.getAcknowledgeMode()); addSession(command.getSessionName(), newSession); } @@ -543,7 +543,7 @@ public class ClientJmsDelegate try { consumer.close(); - LOGGER.info("Closed test consumer " + consumerName); + LOGGER.debug("Closed test consumer " + consumerName); } catch (JMSException e) { Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java (original) +++ qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java Fri Jun 15 13:56:48 2012 @@ -69,7 +69,7 @@ public class QpidQueueCreator implements EMPTY_QUEUE_BIND_ARGUMENTS, destination.getExchangeName(), destination, autoDelete); - LOGGER.info("Created queue " + queueConfig); + LOGGER.debug("Created queue " + queueConfig); } catch (Exception e) { @@ -86,7 +86,7 @@ public class QpidQueueCreator implements // use #deleteQueue. AMQDestination destination = (AMQDestination) session.createQueue(queueConfig.getName()); session.sendQueueDelete(destination.getAMQQueueName()); - LOGGER.info("Deleted queue " + queueConfig.getName()); + LOGGER.debug("Deleted queue " + queueConfig.getName()); } catch (Exception e) { Modified: qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java (original) +++ qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java Fri Jun 15 13:56:48 2012 @@ -59,6 +59,7 @@ public class MessageProviderTest extends { MessageProvider messageProvider = new MessageProvider(null) { + @Override public String getMessagePayload(CreateProducerCommand command) { return super.getMessagePayload(command); Modified: qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java (original) +++ qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java Fri Jun 15 13:56:48 2012 @@ -121,7 +121,7 @@ public class ProducerParticipantTest ext _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); Modified: qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java (original) +++ qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java Fri Jun 15 13:56:48 2012 @@ -32,6 +32,7 @@ public class ListPropertyValueTest exten private ListPropertyValue _generator; private List<PropertyValue> _items; + @Override public void setUp() throws Exception { super.setUp(); Modified: qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java (original) +++ qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java Fri Jun 15 13:56:48 2012 @@ -24,6 +24,7 @@ public class PropertyValueFactoryTest ex { private PropertyValueFactory _factory; + @Override public void setUp() throws Exception { super.setUp(); Modified: qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java (original) +++ qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java Fri Jun 15 13:56:48 2012 @@ -26,6 +26,7 @@ public class RandomPropertyValueTest ext { private RandomPropertyValue _generator; + @Override public void setUp() throws Exception { super.setUp(); Modified: qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java (original) +++ qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java Fri Jun 15 13:56:48 2012 @@ -26,6 +26,7 @@ public class RangePropertyValueTest exte { private RangePropertyValue _generator; + @Override public void setUp() throws Exception { super.setUp(); Modified: qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java (original) +++ qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java Fri Jun 15 13:56:48 2012 @@ -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 { Modified: qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java (original) +++ qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java Fri Jun 15 13:56:48 2012 @@ -58,7 +58,6 @@ import org.apache.qpid.disttest.controll 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 { Modified: qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java?rev=1350623&r1=1350622&r2=1350623&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java (original) +++ qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java Fri Jun 15 13:56:48 2012 @@ -151,7 +151,7 @@ public class ControllerAndClientTest ext 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()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
