Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java Tue Aug 2 16:46:10 2016 @@ -20,11 +20,9 @@ */ package org.apache.qpid.server.store; -import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.io.Reader; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/MessageHandle.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/MessageHandle.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/MessageHandle.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/MessageHandle.java Tue Aug 2 16:46:10 2016 @@ -20,8 +20,6 @@ */ package org.apache.qpid.server.store; -import java.nio.ByteBuffer; - import org.apache.qpid.bytebuffer.QpidByteBuffer; public interface MessageHandle<M extends StorableMessageMetaData> Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java Tue Aug 2 16:46:10 2016 @@ -20,7 +20,6 @@ */ package org.apache.qpid.server.store; -import java.nio.ByteBuffer; import java.util.Collection; import org.apache.qpid.bytebuffer.QpidByteBuffer; Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java Tue Aug 2 16:46:10 2016 @@ -41,7 +41,6 @@ import org.apache.qpid.server.logging.me import org.apache.qpid.server.logging.subjects.PortLogSubject; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.Protocol; -import org.apache.qpid.server.model.SystemConfig; import org.apache.qpid.server.model.Transport; import org.apache.qpid.server.model.port.AmqpPort; import org.apache.qpid.server.plugin.ProtocolEngineCreator; Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionDelegate.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionDelegate.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionDelegate.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionDelegate.java Tue Aug 2 16:46:10 2016 @@ -20,7 +20,6 @@ package org.apache.qpid.server.transport; import java.io.IOException; -import java.nio.ByteBuffer; import java.security.Principal; import java.security.cert.Certificate; import java.util.Collection; Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java Tue Aug 2 16:46:10 2016 @@ -23,7 +23,6 @@ package org.apache.qpid.server.txn; import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.message.MessageInstance; -import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.store.MessageEnqueueRecord; Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java Tue Aug 2 16:46:10 2016 @@ -31,11 +31,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.server.message.EnqueueableMessage; -import org.apache.qpid.server.model.NamedAddressSpace; -import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.store.MessageEnqueueRecord; -import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.StoreException; import org.apache.qpid.server.store.Transaction; import org.apache.qpid.server.store.TransactionLogResource; Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java Tue Aug 2 16:46:10 2016 @@ -31,7 +31,6 @@ import org.apache.qpid.server.model.Virt import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.StoreException; import org.apache.qpid.server.protocol.AMQSessionModel; -import org.apache.qpid.server.virtualhost.AbstractVirtualHost; import org.apache.qpid.transport.Xid; public class DtxRegistry Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java Tue Aug 2 16:46:10 2016 @@ -24,10 +24,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import com.google.common.util.concurrent.ForwardingListenableFuture; import com.google.common.util.concurrent.ListenableFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java Tue Aug 2 16:46:10 2016 @@ -39,7 +39,6 @@ import org.apache.qpid.server.message.Me import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.message.internal.InternalMessage; import org.apache.qpid.server.model.NamedAddressSpace; -import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.store.MessageDurability; import org.apache.qpid.server.store.MessageEnqueueRecord; Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Tue Aug 2 16:46:10 2016 @@ -78,7 +78,6 @@ import org.apache.qpid.server.message.Me import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.message.internal.InternalMessage; import org.apache.qpid.server.model.*; -import org.apache.qpid.server.model.Connection; import org.apache.qpid.server.model.port.AmqpPort; import org.apache.qpid.server.plugin.ConnectionValidator; import org.apache.qpid.server.plugin.QpidServiceLoader; Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNode.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNode.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNode.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNode.java Tue Aug 2 16:46:10 2016 @@ -33,7 +33,6 @@ import org.apache.qpid.server.message.Se import org.apache.qpid.server.message.internal.InternalMessage; import org.apache.qpid.server.message.internal.InternalMessageHeader; import org.apache.qpid.server.model.NamedAddressSpace; -import org.apache.qpid.server.model.VirtualHost; public class VirtualHostPropertiesNode extends AbstractSystemMessageSource { Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractVirtualHostAlias.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractVirtualHostAlias.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractVirtualHostAlias.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractVirtualHostAlias.java Tue Aug 2 16:46:10 2016 @@ -25,7 +25,6 @@ import java.util.Map; import com.google.common.util.concurrent.ListenableFuture; -import org.apache.qpid.server.logging.messages.PortMessages; import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.ManagedAttributeField; import org.apache.qpid.server.model.Port; Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java Tue Aug 2 16:46:10 2016 @@ -36,7 +36,6 @@ import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.logging.messages.ConfigStoreMessages; -import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.RemoteReplicationNode; Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java Tue Aug 2 16:46:10 2016 @@ -20,13 +20,11 @@ */ package org.apache.qpid.server.model; -import static java.util.Arrays.asList; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestElecEngineImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestElecEngineImpl.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestElecEngineImpl.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestElecEngineImpl.java Tue Aug 2 16:46:10 2016 @@ -25,10 +25,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; - -import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestEngine.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestEngine.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestEngine.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestEngine.java Tue Aug 2 16:46:10 2016 @@ -21,7 +21,6 @@ package org.apache.qpid.server.model.testmodels.hierarchy; import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.SettableFuture; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ManagedAttribute; Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestHybridEngineImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestHybridEngineImpl.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestHybridEngineImpl.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestHybridEngineImpl.java Tue Aug 2 16:46:10 2016 @@ -21,11 +21,6 @@ package org.apache.qpid.server.model.tes import java.util.Map; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; - -import org.apache.qpid.configuration.Validator; -import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestPetrolEngineImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestPetrolEngineImpl.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestPetrolEngineImpl.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestPetrolEngineImpl.java Tue Aug 2 16:46:10 2016 @@ -22,10 +22,6 @@ package org.apache.qpid.server.model.tes import java.util.Map; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; - -import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingleton.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingleton.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingleton.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingleton.java Tue Aug 2 16:46:10 2016 @@ -29,7 +29,6 @@ import java.util.Set; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.DerivedAttribute; -import org.apache.qpid.server.model.Initialization; import org.apache.qpid.server.model.ManagedAttribute; import org.apache.qpid.server.model.ManagedContextDefault; import org.apache.qpid.server.model.ManagedObject; Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java Tue Aug 2 16:46:10 2016 @@ -24,8 +24,6 @@ import static org.apache.qpid.test.utils import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.argThat; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -50,10 +48,7 @@ import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatcher; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor; Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java Tue Aug 2 16:46:10 2016 @@ -28,7 +28,6 @@ import static org.mockito.Mockito.when; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.ObjectInputStream; -import java.nio.ByteBuffer; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; import java.util.ArrayList; @@ -41,7 +40,6 @@ import org.mockito.ArgumentCaptor; import org.apache.qpid.bytebuffer.QpidByteBuffer; import org.apache.qpid.server.consumer.ConsumerImpl; import org.apache.qpid.server.consumer.ConsumerTarget; -import org.apache.qpid.server.message.AbstractServerMessageImpl; import org.apache.qpid.server.message.MessageInstance; import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.model.State; Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ManagedAuthenticationManagerTestBase.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ManagedAuthenticationManagerTestBase.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ManagedAuthenticationManagerTestBase.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ManagedAuthenticationManagerTestBase.java Tue Aug 2 16:46:10 2016 @@ -20,7 +20,6 @@ */ package org.apache.qpid.server.security.auth.manager; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Collections; Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java Tue Aug 2 16:46:10 2016 @@ -39,8 +39,6 @@ import org.eclipse.jetty.server.ssl.SslS import org.eclipse.jetty.util.ssl.SslContextFactory; import org.apache.qpid.configuration.CommonProperties; -import org.apache.qpid.server.model.ConfiguredObject; -import org.apache.qpid.server.model.Port; import org.apache.qpid.transport.network.security.ssl.SSLUtil; class OAuth2MockEndpointHolder Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java Tue Aug 2 16:46:10 2016 @@ -39,7 +39,6 @@ import org.apache.qpid.server.model.Brok import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.GroupProvider; import org.apache.qpid.server.model.JsonSystemConfigImpl; -import org.apache.qpid.server.model.Model; import org.apache.qpid.server.model.Port; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.SystemConfig; Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java Tue Aug 2 16:46:10 2016 @@ -21,7 +21,6 @@ package org.apache.qpid.server.store; import java.io.File; -import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; import java.util.UUID; Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java Tue Aug 2 16:46:10 2016 @@ -52,7 +52,6 @@ import org.apache.qpid.server.store.Stor import org.apache.qpid.server.store.TestMessageMetaData; import org.apache.qpid.server.store.Transaction; import org.apache.qpid.server.store.Transaction.EnqueueRecord; -import org.apache.qpid.server.store.TransactionLogResource; import org.apache.qpid.server.store.handler.DistributedTransactionHandler; import org.apache.qpid.server.store.handler.MessageHandler; import org.apache.qpid.server.store.handler.MessageInstanceHandler; Modified: qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java (original) +++ qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java Tue Aug 2 16:46:10 2016 @@ -23,7 +23,6 @@ package org.apache.qpid.server.security. import java.util.List; -import org.apache.qpid.server.model.AccessControlProvider; import org.apache.qpid.server.model.Content; import org.apache.qpid.server.model.ManagedAttribute; import org.apache.qpid.server.model.ManagedObject; Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10.java Tue Aug 2 16:46:10 2016 @@ -37,7 +37,6 @@ import org.apache.qpid.bytebuffer.QpidBy import org.apache.qpid.protocol.AMQConstant; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.Protocol; -import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.Transport; import org.apache.qpid.server.model.port.AmqpPort; import org.apache.qpid.server.security.SubjectCreator; Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java Tue Aug 2 16:46:10 2016 @@ -22,7 +22,6 @@ package org.apache.qpid.server.protocol. import java.io.IOException; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java Tue Aug 2 16:46:10 2016 @@ -23,7 +23,6 @@ package org.apache.qpid.server.protocol. import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -33,21 +32,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.bytebuffer.QpidByteBuffer; -import org.apache.qpid.codec.*; import org.apache.qpid.transport.DeliveryProperties; import org.apache.qpid.transport.Header; import org.apache.qpid.transport.MessageProperties; import org.apache.qpid.transport.Method; -import org.apache.qpid.transport.NetworkEventReceiver; import org.apache.qpid.transport.ProtocolError; import org.apache.qpid.transport.ProtocolEvent; import org.apache.qpid.transport.ProtocolHeader; import org.apache.qpid.transport.Struct; -import org.apache.qpid.transport.codec.BBDecoder; import org.apache.qpid.transport.network.Frame; -import org.apache.qpid.transport.network.NetworkDelegate; -import org.apache.qpid.transport.network.NetworkEvent; -import org.apache.qpid.transport.util.Functions; public class ServerAssembler { Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java Tue Aug 2 16:46:10 2016 @@ -42,7 +42,6 @@ import org.slf4j.LoggerFactory; import org.apache.qpid.protocol.AMQConstant; import org.apache.qpid.server.model.NamedAddressSpace; -import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.protocol.ConnectionClosingTicker; import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.model.Broker; Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java Tue Aug 2 16:46:10 2016 @@ -27,7 +27,6 @@ import static org.apache.qpid.transport. import static org.apache.qpid.transport.network.Frame.LAST_FRAME; import static org.apache.qpid.transport.network.Frame.LAST_SEG; -import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -47,9 +46,7 @@ import org.apache.qpid.transport.Protoco import org.apache.qpid.transport.ProtocolHeader; import org.apache.qpid.transport.SegmentType; import org.apache.qpid.transport.Struct; -import org.apache.qpid.transport.codec.Encoder; import org.apache.qpid.transport.network.Frame; -import org.apache.qpid.transport.util.Functions; /** * Disassembler Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java Tue Aug 2 16:46:10 2016 @@ -22,15 +22,11 @@ package org.apache.qpid.server.protocol. import static org.apache.qpid.transport.util.Functions.str; -import java.nio.ByteBuffer; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.bytebuffer.QpidByteBuffer; import org.apache.qpid.transport.SegmentType; -import org.apache.qpid.transport.network.NetworkDelegate; -import org.apache.qpid.transport.network.NetworkEvent; public final class ServerFrame Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Tue Aug 2 16:46:10 2016 @@ -81,7 +81,6 @@ import org.apache.qpid.server.store.Mess import org.apache.qpid.server.store.StoreException; import org.apache.qpid.server.store.StoredMessage; import org.apache.qpid.server.store.TransactionLogResource; -import org.apache.qpid.server.transport.AbstractAMQPConnection; import org.apache.qpid.server.txn.AlreadyKnownDtxException; import org.apache.qpid.server.txn.AsyncAutoCommitTransaction; import org.apache.qpid.server.txn.DistributedTransaction; Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java Tue Aug 2 16:46:10 2016 @@ -46,7 +46,6 @@ import org.apache.qpid.server.model.Conf import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.security.access.Operation; -import org.apache.qpid.server.transport.AbstractAMQPConnection; import org.apache.qpid.server.transport.ProtocolEngine; import org.apache.qpid.server.consumer.ConsumerImpl; import org.apache.qpid.server.store.MessageHandle; Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java Tue Aug 2 16:46:10 2016 @@ -24,7 +24,6 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.qpid.QpidException; import org.apache.qpid.server.message.MessageInstance; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java Tue Aug 2 16:46:10 2016 @@ -33,7 +33,6 @@ import org.apache.qpid.server.protocol.v import org.apache.qpid.server.protocol.v1_0.type.Binary; import org.apache.qpid.server.protocol.v1_0.type.DeliveryState; import org.apache.qpid.server.protocol.v1_0.type.Outcome; -import org.apache.qpid.server.protocol.v1_0.type.Source; import org.apache.qpid.server.protocol.v1_0.type.Target; import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger; import org.apache.qpid.server.protocol.v1_0.type.codec.AMQPDescribedTypeRegistry; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java Tue Aug 2 16:46:10 2016 @@ -24,7 +24,6 @@ package org.apache.qpid.server.protocol. import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.TimeoutException; import org.apache.qpid.server.protocol.v1_0.type.Binary; import org.apache.qpid.server.protocol.v1_0.type.DeliveryState; @@ -41,7 +40,6 @@ import org.apache.qpid.server.protocol.v import org.apache.qpid.server.protocol.v1_0.type.transport.ReceiverSettleMode; import org.apache.qpid.server.protocol.v1_0.type.transport.Role; import org.apache.qpid.server.protocol.v1_0.type.transport.SenderSettleMode; -import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer; public abstract class LinkEndpoint<T extends LinkEventListener> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_from_1_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_from_1_0.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_from_1_0.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_from_1_0.java Tue Aug 2 16:46:10 2016 @@ -51,7 +51,6 @@ import org.apache.qpid.server.protocol.v import org.apache.qpid.server.protocol.v1_0.type.messaging.AmqpValue; import org.apache.qpid.server.protocol.v1_0.type.messaging.Data; import org.apache.qpid.bytebuffer.QpidByteBuffer; -import org.apache.qpid.server.store.StoredMessage; import org.apache.qpid.server.util.ConnectionScopedRuntimeException; import org.apache.qpid.transport.codec.BBEncoder; import org.apache.qpid.typedmessage.TypedBytesContentWriter; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java Tue Aug 2 16:46:10 2016 @@ -72,7 +72,6 @@ import org.apache.qpid.server.model.Exch import org.apache.qpid.server.model.ExclusivityPolicy; import org.apache.qpid.server.model.LifetimePolicy; import org.apache.qpid.server.model.Queue; -import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.txn.AutoCommitTransaction; import org.apache.qpid.server.txn.ServerTransaction; import org.apache.qpid.server.util.ConnectionScopedRuntimeException; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DefaultDescribedTypeConstructor.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DefaultDescribedTypeConstructor.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DefaultDescribedTypeConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DefaultDescribedTypeConstructor.java Tue Aug 2 16:46:10 2016 @@ -20,14 +20,6 @@ */ package org.apache.qpid.server.protocol.v1_0.codec; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.LineNumberReader; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - public class DefaultDescribedTypeConstructor extends DescribedTypeConstructor { private Object _descriptor; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java Tue Aug 2 16:46:10 2016 @@ -24,8 +24,6 @@ package org.apache.qpid.server.protocol. import org.apache.qpid.server.protocol.v1_0.type.FrameBody; import org.apache.qpid.bytebuffer.QpidByteBuffer; -import java.nio.ByteBuffer; - public abstract class AMQFrame<T> { private T _frameBody; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/TransportFrame.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/TransportFrame.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/TransportFrame.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/TransportFrame.java Tue Aug 2 16:46:10 2016 @@ -21,8 +21,6 @@ package org.apache.qpid.server.protocol. import org.apache.qpid.server.protocol.v1_0.type.FrameBody; import org.apache.qpid.bytebuffer.QpidByteBuffer; -import java.nio.ByteBuffer; - public final class TransportFrame extends AMQFrame<FrameBody> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoder.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoder.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoder.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoder.java Tue Aug 2 16:46:10 2016 @@ -23,7 +23,6 @@ import org.apache.qpid.server.protocol.v import org.apache.qpid.server.protocol.v1_0.type.Section; import org.apache.qpid.bytebuffer.QpidByteBuffer; -import java.nio.ByteBuffer; import java.util.List; Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java (original) +++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java Tue Aug 2 16:46:10 2016 @@ -28,7 +28,6 @@ import java.util.Map; import org.apache.qpid.bytebuffer.QpidByteBuffer; import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.NamedAddressSpace; -import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.protocol.v0_10.MessageMetaData_0_10; Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java (original) +++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java Tue Aug 2 16:46:10 2016 @@ -35,7 +35,6 @@ import org.apache.qpid.framing.MessagePu import org.apache.qpid.server.message.MessageDestination; import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.NamedAddressSpace; -import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.protocol.v0_10.MessageTransferMessage; Modified: qpid/java/trunk/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java (original) +++ qpid/java/trunk/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java Tue Aug 2 16:46:10 2016 @@ -43,7 +43,6 @@ import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.BrokerModel; import org.apache.qpid.server.model.ConfiguredObject; -import org.apache.qpid.server.store.StoreException; import org.apache.qpid.server.store.preferences.AbstractJDBCPreferenceStore; import org.apache.qpid.server.store.preferences.PreferenceRecord; import org.apache.qpid.server.store.preferences.PreferenceRecordImpl; Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java (original) +++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java Tue Aug 2 16:46:10 2016 @@ -19,7 +19,6 @@ package org.apache.qpid.server.store.jdbc; -import static org.apache.qpid.server.store.AbstractJDBCConfigurationStore.State.CLOSED; import static org.apache.qpid.server.store.AbstractJDBCConfigurationStore.State.CONFIGURED; import static org.apache.qpid.server.store.AbstractJDBCConfigurationStore.State.OPEN; @@ -33,7 +32,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilter.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilter.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilter.java Tue Aug 2 16:46:10 2016 @@ -29,8 +29,6 @@ import ch.qos.logback.classic.spi.ILoggi import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.FilterReply; -import org.apache.qpid.server.logging.LogInclusionRule; - public class PrincipalLogEventFilter extends Filter<ILoggingEvent> implements LogBackLogInclusionRule { Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilter.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilter.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilter.java Tue Aug 2 16:46:10 2016 @@ -30,7 +30,6 @@ import ch.qos.logback.classic.spi.ILoggi import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.FilterReply; -import org.apache.qpid.server.logging.LogInclusionRule; import org.apache.qpid.server.model.BrokerLogger; import org.apache.qpid.server.virtualhost.VirtualHostPrincipal; Modified: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java Tue Aug 2 16:46:10 2016 @@ -32,7 +32,6 @@ import ch.qos.logback.classic.spi.ILoggi import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.FilterReply; -import org.apache.qpid.server.logging.LogInclusionRule; import org.apache.qpid.server.logging.logback.CompositeFilter; import org.apache.qpid.test.utils.QpidTestCase; Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpRequestPreemptiveAuthenticator.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpRequestPreemptiveAuthenticator.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpRequestPreemptiveAuthenticator.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpRequestPreemptiveAuthenticator.java Tue Aug 2 16:46:10 2016 @@ -23,7 +23,6 @@ package org.apache.qpid.server.managemen import javax.security.auth.Subject; import javax.servlet.http.HttpServletRequest; -import org.apache.qpid.server.model.port.HttpPort; import org.apache.qpid.server.plugin.Pluggable; public interface HttpRequestPreemptiveAuthenticator extends Pluggable Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticator.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticator.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticator.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticator.java Tue Aug 2 16:46:10 2016 @@ -41,7 +41,6 @@ import org.slf4j.LoggerFactory; import org.apache.qpid.server.management.plugin.HttpManagementConfiguration; import org.apache.qpid.server.management.plugin.HttpManagementUtil; import org.apache.qpid.server.management.plugin.HttpRequestInteractiveAuthenticator; -import org.apache.qpid.server.management.plugin.servlet.ServletConnectionPrincipal; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.security.SubjectCreator; Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticator.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticator.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticator.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticator.java Tue Aug 2 16:46:10 2016 @@ -20,8 +20,6 @@ */ package org.apache.qpid.server.management.plugin.auth; -import java.security.Principal; - import javax.security.auth.Subject; import javax.servlet.http.HttpServletRequest; Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/UsernamePasswordInteractiveLogin.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/UsernamePasswordInteractiveLogin.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/UsernamePasswordInteractiveLogin.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/UsernamePasswordInteractiveLogin.java Tue Aug 2 16:46:10 2016 @@ -22,7 +22,6 @@ package org.apache.qpid.server.managemen import java.io.IOException; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportRunner.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportRunner.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportRunner.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/report/ReportRunner.java Tue Aug 2 16:46:10 2016 @@ -40,8 +40,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.bytebuffer.QpidByteBuffer; -import org.apache.qpid.server.message.AMQMessageHeader; -import org.apache.qpid.server.message.MessageInfo; import org.apache.qpid.server.message.MessageInfoImpl; import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.model.Queue; Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java Tue Aug 2 16:46:10 2016 @@ -37,7 +37,6 @@ import javax.xml.datatype.DatatypeFactor import javax.xml.datatype.Duration; import org.apache.qpid.filter.Expression; -import org.apache.qpid.filter.SelectorParsingException; import org.apache.qpid.server.model.ConfiguredObject; public class ConfiguredObjectExpressionFactory Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParserTokenManager.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParserTokenManager.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParserTokenManager.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParserTokenManager.java Tue Aug 2 16:46:10 2016 @@ -21,20 +21,6 @@ */ package org.apache.qpid.server.management.plugin.servlet.query; -import java.io.StringReader; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Collections; -import org.apache.qpid.filter.ArithmeticExpression; -import org.apache.qpid.filter.BooleanExpression; -import org.apache.qpid.filter.ComparisonExpression; -import org.apache.qpid.filter.ConstantExpression; -import org.apache.qpid.filter.Expression; -import org.apache.qpid.filter.OrderByExpression; -import org.apache.qpid.filter.LogicExpression; -import org.apache.qpid.filter.UnaryExpression; -import org.apache.qpid.server.model.ConfiguredObject; /** Token Manager. */ public class ConfiguredObjectFilterParserTokenManager implements ConfiguredObjectFilterParserConstants Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java Tue Aug 2 16:46:10 2016 @@ -26,7 +26,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java Tue Aug 2 16:46:10 2016 @@ -25,7 +25,6 @@ import java.lang.reflect.ParameterizedTy import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; import java.lang.reflect.WildcardType; -import java.security.AccessControlException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandler.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandler.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandler.java Tue Aug 2 16:46:10 2016 @@ -23,7 +23,6 @@ import java.security.AccessController; import java.security.Principal; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashSet; Modified: qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java Tue Aug 2 16:46:10 2016 @@ -23,7 +23,6 @@ package org.apache.qpid.server.managemen import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; Modified: qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java (original) +++ qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java Tue Aug 2 16:46:10 2016 @@ -25,7 +25,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; -import java.util.HashSet; import java.util.Set; import java.util.TreeSet; @@ -40,7 +39,6 @@ import org.apache.qpid.configuration.Com import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.framing.ProtocolVersion; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.model.Protocol; import org.apache.qpid.server.plugin.ProtocolEngineCreator; Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQConnectionUnitTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQConnectionUnitTest.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQConnectionUnitTest.java (original) +++ qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQConnectionUnitTest.java Tue Aug 2 16:46:10 2016 @@ -32,7 +32,6 @@ import org.apache.qpid.AMQDisconnectedEx import org.apache.qpid.AMQInvalidArgumentException; import org.apache.qpid.configuration.ClientProperties; import org.apache.qpid.jms.ConnectionURL; -import org.apache.qpid.jms.Session; import org.apache.qpid.test.utils.QpidTestCase; public class AMQConnectionUnitTest extends QpidTestCase Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/client/security/oauth2/OAuth2SaslClientTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/security/oauth2/OAuth2SaslClientTest.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/client/src/test/java/org/apache/qpid/client/security/oauth2/OAuth2SaslClientTest.java (original) +++ qpid/java/trunk/client/src/test/java/org/apache/qpid/client/security/oauth2/OAuth2SaslClientTest.java Tue Aug 2 16:46:10 2016 @@ -21,9 +21,6 @@ package org.apache.qpid.client.security.oauth2; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import javax.security.sasl.SaslException; import org.junit.Assert; Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/codec/ClientDecoder.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/codec/ClientDecoder.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/codec/ClientDecoder.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/codec/ClientDecoder.java Tue Aug 2 16:46:10 2016 @@ -20,11 +20,7 @@ */ package org.apache.qpid.codec; -import java.io.IOException; import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; -import java.util.ListIterator; import org.apache.qpid.bytebuffer.QpidByteBuffer; import org.apache.qpid.framing.*; Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/selector/SelectorParserTokenManager.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/selector/SelectorParserTokenManager.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/selector/SelectorParserTokenManager.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/selector/SelectorParserTokenManager.java Tue Aug 2 16:46:10 2016 @@ -1,37 +1,26 @@ /* Generated By:JavaCC: Do not edit this line. SelectorParserTokenManager.java */ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * */ package org.apache.qpid.filter.selector; -import java.io.StringReader; -import java.util.ArrayList; -import org.apache.qpid.filter.ArithmeticExpression; -import org.apache.qpid.filter.BooleanExpression; -import org.apache.qpid.filter.ComparisonExpression; -import org.apache.qpid.filter.ConstantExpression; -import org.apache.qpid.filter.Expression; -import org.apache.qpid.filter.LogicExpression; -import org.apache.qpid.filter.PropertyExpression; -import org.apache.qpid.filter.PropertyExpressionFactory; -import org.apache.qpid.filter.UnaryExpression; /** Token Manager. */ public class SelectorParserTokenManager implements SelectorParserConstants Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java Tue Aug 2 16:46:10 2016 @@ -27,8 +27,6 @@ package org.apache.qpid.framing; -import java.io.IOException; - import org.apache.qpid.QpidException; import org.apache.qpid.bytebuffer.QpidByteBuffer; Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java Tue Aug 2 16:46:10 2016 @@ -27,8 +27,6 @@ package org.apache.qpid.framing; -import java.io.IOException; - import org.apache.qpid.QpidException; import org.apache.qpid.bytebuffer.QpidByteBuffer; Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java Tue Aug 2 16:46:10 2016 @@ -20,8 +20,6 @@ */ package org.apache.qpid.framing; -import java.io.IOException; - import org.apache.qpid.QpidException; import org.apache.qpid.bytebuffer.QpidByteBuffer; import org.apache.qpid.protocol.AMQConstant; Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java Tue Aug 2 16:46:10 2016 @@ -27,8 +27,6 @@ package org.apache.qpid.framing; -import java.io.IOException; - import org.apache.qpid.QpidException; import org.apache.qpid.bytebuffer.QpidByteBuffer; Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java Tue Aug 2 16:46:10 2016 @@ -27,8 +27,6 @@ package org.apache.qpid.framing; -import java.io.IOException; - import org.apache.qpid.QpidException; import org.apache.qpid.bytebuffer.QpidByteBuffer; Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java Tue Aug 2 16:46:10 2016 @@ -27,8 +27,6 @@ package org.apache.qpid.framing; -import java.io.IOException; - import org.apache.qpid.QpidException; import org.apache.qpid.bytebuffer.QpidByteBuffer; Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/MessageTransfer.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/MessageTransfer.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/MessageTransfer.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/MessageTransfer.java Tue Aug 2 16:46:10 2016 @@ -32,7 +32,6 @@ import org.apache.qpid.bytebuffer.QpidBy import org.apache.qpid.transport.codec.Decoder; import org.apache.qpid.transport.codec.Encoder; -import java.nio.ByteBuffer; import org.apache.qpid.util.Strings; import org.apache.qpid.transport.network.Frame; Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Method.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Method.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Method.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Method.java Tue Aug 2 16:46:10 2016 @@ -25,9 +25,7 @@ import org.apache.qpid.transport.network import static org.apache.qpid.transport.util.Functions.str; -import java.nio.ByteBuffer; import java.util.Collection; -import java.util.List; /** * Method Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java Tue Aug 2 16:46:10 2016 @@ -25,8 +25,6 @@ import org.apache.qpid.transport.network import org.apache.qpid.transport.network.NetworkDelegate; import org.apache.qpid.transport.network.NetworkEvent; -import java.nio.ByteBuffer; - /** * ProtocolHeader Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java Tue Aug 2 16:46:10 2016 @@ -20,7 +20,6 @@ */ package org.apache.qpid.transport.codec; -import java.nio.ByteBuffer; import java.util.List; import java.util.Map; import java.util.UUID; Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java Tue Aug 2 16:46:10 2016 @@ -19,11 +19,7 @@ */ package org.apache.qpid.transport.network.security.ssl; -import java.nio.ByteBuffer; -import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; -import java.util.List; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicBoolean; Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/util/Functions.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/util/Functions.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/util/Functions.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/util/Functions.java Tue Aug 2 16:46:10 2016 @@ -24,7 +24,6 @@ import static java.lang.Math.min; import java.nio.ByteBuffer; import java.util.Collection; -import java.util.Collections; import org.apache.qpid.bytebuffer.QpidByteBuffer; import org.apache.qpid.util.ByteBufferUtils; Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/bytebuffer/QpidByteBufferTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/bytebuffer/QpidByteBufferTest.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/test/java/org/apache/qpid/bytebuffer/QpidByteBufferTest.java (original) +++ qpid/java/trunk/common/src/test/java/org/apache/qpid/bytebuffer/QpidByteBufferTest.java Tue Aug 2 16:46:10 2016 @@ -24,7 +24,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import org.junit.Assert; Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java (original) +++ qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java Tue Aug 2 16:46:10 2016 @@ -23,12 +23,6 @@ package org.apache.qpid.framing; import org.apache.qpid.bytebuffer.QpidByteBuffer; import org.apache.qpid.test.utils.QpidTestCase; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - public class BasicContentHeaderPropertiesTest extends QpidTestCase { Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java (original) +++ qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java Tue Aug 2 16:46:10 2016 @@ -20,12 +20,7 @@ */ package org.apache.qpid.framing; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Collection; import java.util.Collections; Modified: qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java?rev=1754980&r1=1754979&r2=1754980&view=diff ============================================================================== --- qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java (original) +++ qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/AbstractRunner.java Tue Aug 2 16:46:10 2016 @@ -20,11 +20,9 @@ */ package org.apache.qpid.disttest; -import java.io.FileInputStream; import java.util.HashMap; import java.util.Hashtable; import java.util.Map; -import java.util.Properties; import javax.naming.Context; import javax.naming.InitialContext; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
