QPID-7531: [Java Broker, AMQP 1.0] Tidy up imports and redundant type declarations
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/a352423f Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/a352423f Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/a352423f Branch: refs/heads/master Commit: a352423fa50aa59e34d9c5c551dbd8261b0e1135 Parents: d84509a Author: Lorenz Quack <lqu...@apache.org> Authored: Mon Sep 25 12:08:19 2017 +0100 Committer: Lorenz Quack <lqu...@apache.org> Committed: Thu Sep 28 14:30:17 2017 +0100 ---------------------------------------------------------------------- .../qpid/server/protocol/v1_0/MessageConverter_to_1_0.java | 5 +++-- .../apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java | 3 +-- .../apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java | 2 +- .../java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java | 4 ++-- .../qpid/server/protocol/v1_0/codec/SymbolTypeConstructor.java | 2 +- .../server/protocol/v1_0/messaging/SectionDecoderImpl.java | 1 - .../java/org/apache/qpid/server/protocol/v1_0/type/Symbol.java | 2 +- .../protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java | 6 +++--- .../type/messaging/codec/DescribedMapSectionConstructor.java | 1 - 9 files changed, 12 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a352423f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java index eab7093..3ad1500 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java @@ -21,7 +21,9 @@ package org.apache.qpid.server.protocol.v1_0; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.qpid.server.message.mimecontentconverter.ConversionUtils.*; +import static org.apache.qpid.server.message.mimecontentconverter.ConversionUtils.BYTES_MESSAGE_CONTENT_TYPES; +import static org.apache.qpid.server.message.mimecontentconverter.ConversionUtils.LIST_MESSAGE_CONTENT_TYPES; +import static org.apache.qpid.server.message.mimecontentconverter.ConversionUtils.MAP_MESSAGE_CONTENT_TYPES; import static org.apache.qpid.server.message.mimecontentconverter.ConversionUtils.OBJECT_MESSAGE_CONTENT_TYPES; import static org.apache.qpid.server.message.mimecontentconverter.ConversionUtils.TEXT_CONTENT_TYPES; import static org.apache.qpid.server.protocol.v1_0.JmsMessageTypeAnnotation.BYTES_MESSAGE; @@ -45,7 +47,6 @@ import java.util.Map; import org.apache.qpid.server.bytebuffer.QpidByteBuffer; import org.apache.qpid.server.message.ServerMessage; -import org.apache.qpid.server.message.mimecontentconverter.ConversionUtils; import org.apache.qpid.server.message.mimecontentconverter.MimeContentConverterRegistry; import org.apache.qpid.server.message.mimecontentconverter.MimeContentToObjectConverter; import org.apache.qpid.server.model.NamedAddressSpace; http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a352423f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java index 1564fb1..5b6d6b8 100755 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java @@ -23,7 +23,6 @@ package org.apache.qpid.server.protocol.v1_0; import java.nio.charset.StandardCharsets; import java.util.Collection; import java.util.Collections; -import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -698,7 +697,7 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData public Map<String, Object> getHeadersAsMap() { - return _applicationPropertiesSection == null ? new HashMap<String, Object>() : new HashMap<>( + return _applicationPropertiesSection == null ? new HashMap<>() : new HashMap<>( _applicationPropertiesSection.getValue()); } } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a352423f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java index cac4c8a..fe3a629 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java @@ -133,7 +133,7 @@ public class SendingLinkEndpoint extends AbstractLinkEndpoint<Source, Target> Map<Symbol,Filter> filters = source.getFilter(); - Map<Symbol,Filter> actualFilters = new HashMap<Symbol,Filter>(); + Map<Symbol,Filter> actualFilters = new HashMap<>(); if(filters != null) { http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a352423f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java index d0d24d7..46718fb 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java @@ -154,7 +154,7 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget "Force detach the link because the session is remotely ended."); private final String _primaryDomain; - private final Set<Object> _blockingEntities = Collections.newSetFromMap(new ConcurrentHashMap<Object,Boolean>()); + private final Set<Object> _blockingEntities = Collections.newSetFromMap(new ConcurrentHashMap<>()); private volatile long _startedTransactions; private volatile long _committedTransactions; private volatile long _rolledBackTransactions; @@ -944,7 +944,7 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget if(_closed.compareAndSet(false, true)) { - List<Action<? super Session_1_0>> taskList = new ArrayList<Action<? super Session_1_0>>(_taskList); + List<Action<? super Session_1_0>> taskList = new ArrayList<>(_taskList); _taskList.clear(); for(Action<? super Session_1_0> task : taskList) { http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a352423f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolTypeConstructor.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolTypeConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolTypeConstructor.java index 07a7aac..c58a52f 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolTypeConstructor.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolTypeConstructor.java @@ -37,7 +37,7 @@ public class SymbolTypeConstructor extends VariableWidthTypeConstructor<Symbol> private static final Charset ASCII = Charset.forName("US-ASCII"); private static final ConcurrentMap<BinaryString, Symbol> SYMBOL_MAP = - new ConcurrentHashMap<BinaryString, Symbol>(2048); + new ConcurrentHashMap<>(2048); public static SymbolTypeConstructor getInstance(int i) { http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a352423f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoderImpl.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoderImpl.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoderImpl.java index 982a242..7b9f742 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoderImpl.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoderImpl.java @@ -29,7 +29,6 @@ import org.apache.qpid.server.protocol.v1_0.codec.ValueHandler; import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; import org.apache.qpid.server.protocol.v1_0.type.messaging.EncodingRetainingSection; import org.apache.qpid.server.protocol.v1_0.type.transport.AmqpError; -import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError; public class SectionDecoderImpl implements SectionDecoder { http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a352423f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Symbol.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Symbol.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Symbol.java index 94d57de..21cbaf2 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Symbol.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Symbol.java @@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentMap; public final class Symbol implements Comparable<Symbol>, CharSequence { private final String _underlying; - private static final ConcurrentMap<String, Symbol> _symbols = new ConcurrentHashMap<String, Symbol>(2048); + private static final ConcurrentMap<String, Symbol> _symbols = new ConcurrentHashMap<>(2048); private Symbol(String underlying) { http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a352423f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java index 67ccb83..29c136c 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java @@ -70,8 +70,8 @@ import org.apache.qpid.server.protocol.v1_0.type.transport.codec.*; public class AMQPDescribedTypeRegistry implements DescribedTypeConstructorRegistry, ValueWriter.Registry { - private final Map<Object, DescribedTypeConstructor> _constructorRegistry = new HashMap<Object, DescribedTypeConstructor>(); - private final Map<Object, DescribedTypeConstructor> _sectionDecoderRegistryMap = new HashMap<Object, DescribedTypeConstructor>(); + private final Map<Object, DescribedTypeConstructor> _constructorRegistry = new HashMap<>(); + private final Map<Object, DescribedTypeConstructor> _sectionDecoderRegistryMap = new HashMap<>(); @@ -320,7 +320,7 @@ public class AMQPDescribedTypeRegistry implements DescribedTypeConstructorRegist } - private final Map<Class, ValueWriter.Factory> _writerMap = new HashMap<Class, ValueWriter.Factory>(); + private final Map<Class, ValueWriter.Factory> _writerMap = new HashMap<>(); @Override http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a352423f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedMapSectionConstructor.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedMapSectionConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedMapSectionConstructor.java index fb1f545..9c58321 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedMapSectionConstructor.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedMapSectionConstructor.java @@ -23,7 +23,6 @@ package org.apache.qpid.server.protocol.v1_0.type.messaging.codec; -import java.util.ArrayList; import java.util.List; import org.apache.qpid.server.bytebuffer.QpidByteBuffer; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
