Reduce use of newArrayList()/newHashSet()

These methods are not needed with modern java, do not use them.

Change-Id: If6cb8780f2277c80ef84d72daa89f92833677e84
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PEDistinguisherLabelsAttributeHandler.java b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PEDistinguisherLabelsAttributeHandler.java
index 6b58ca572f7999e581e0902125414b9d1d4aea14..f63f1c04908dcfd9ef25a33088594191f33fe1fd 100644 (file)
--- a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PEDistinguisherLabelsAttributeHandler.java
+++ b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PEDistinguisherLabelsAttributeHandler.java
@@ -11,9 +11,9 @@ package org.opendaylight.protocol.bgp.mvpn.impl.attributes;
 import static org.opendaylight.protocol.bgp.parser.spi.AttributeUtil.formatAttribute;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import java.util.ArrayList;
 import java.util.List;
 import org.opendaylight.protocol.bgp.parser.spi.AttributeParser;
 import org.opendaylight.protocol.bgp.parser.spi.AttributeSerializer;
@@ -55,7 +55,7 @@ public final class PEDistinguisherLabelsAttributeHandler implements AttributePar
         Preconditions.checkArgument(isIpv4 || isIpv6,
                 "Length of byte array should be multiple of 7 or multiple of 19");
 
-        final List<PeDistinguisherLabelAttribute> list = Lists.newArrayList();
+        final List<PeDistinguisherLabelAttribute> list = new ArrayList<>();
         while (buffer.isReadable()) {
             final PeDistinguisherLabelAttributeBuilder attribute = new PeDistinguisherLabelAttributeBuilder();
             if (isIpv4) {

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java
index 68a920a02dcebb7aa151cbb50dfc828b1a252f3d..b7217390effd37fabf54f40f2da649b15b4e1f1a 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java
@@ -10,10 +10,10 @@ package org.opendaylight.protocol.bgp.parser.impl.message.open;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
@@ -52,7 +52,7 @@ public final class CapabilityParameterParser implements ParameterParser, Paramet
             LOG.trace("Started parsing of BGP Capabilities: {}", Arrays.toString(ByteArray.getAllBytes(buffer)));
         }
 
-        final List<OptionalCapabilities> optionalCapas = Lists.newArrayList();
+        final List<OptionalCapabilities> optionalCapas = new ArrayList<>();
         while (buffer.isReadable()) {
             final OptionalCapabilities optionalCapa = parseOptionalCapability(buffer);
             if (optionalCapa != null) {

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ClusterIdAttributeParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ClusterIdAttributeParser.java
index f1a21501b9b6cca6b939354f314342a8285cac28..4a6cb9e64042947727adb399eace17d6e6e5ec05 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ClusterIdAttributeParser.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ClusterIdAttributeParser.java
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.protocol.bgp.parser.impl.message.update;
 
-import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import java.util.ArrayList;
 import java.util.List;
 import org.opendaylight.protocol.bgp.parser.spi.AttributeParser;
 import org.opendaylight.protocol.bgp.parser.spi.AttributeSerializer;
@@ -27,7 +27,7 @@ public final class ClusterIdAttributeParser implements AttributeParser, Attribut
 
     @Override
     public void parseAttribute(final ByteBuf buffer, final AttributesBuilder builder) {
-        final List<ClusterIdentifier> list = Lists.newArrayList();
+        final List<ClusterIdentifier> list = new ArrayList<>();
         while (buffer.isReadable()) {
             list.add(new ClusterIdentifier(Ipv4Util.addressForByteBuf(buffer)));
         }

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/CommunitiesAttributeParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/CommunitiesAttributeParser.java
index de197f89a1d3d393a6fae00c1e18829c058b3611..253de931d0fb1286c5f23f2c4da242a8a75daab6 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/CommunitiesAttributeParser.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/CommunitiesAttributeParser.java
@@ -9,9 +9,9 @@ package org.opendaylight.protocol.bgp.parser.impl.message.update;
 
 import static java.util.Objects.requireNonNull;
 
-import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
@@ -46,7 +46,7 @@ public final class CommunitiesAttributeParser implements AttributeParser, Attrib
 
     @Override
     public void parseAttribute(final ByteBuf buffer, final AttributesBuilder builder) throws BGPDocumentedException {
-        final List<Communities> set = Lists.newArrayList();
+        final List<Communities> set = new ArrayList<>();
         while (buffer.isReadable()) {
             set.add((Communities) parseCommunity(this.refCache, buffer.readSlice(COMMUNITY_LENGTH)));
         }

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java
index 122f624621daa48de8c4433736418d2032a344d7..3bfbb7949476080e28fd7480237b802ef72617f2 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java
@@ -13,8 +13,6 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -24,8 +22,10 @@ import io.netty.channel.ChannelPipeline;
 import io.netty.channel.SimpleChannelInboundHandler;
 import java.io.IOException;
 import java.nio.channels.NonWritableChannelException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -136,9 +136,9 @@ public class BGPSessionImpl extends SimpleChannelInboundHandler<Notification> im
         this.peerRegistry = peerRegistry;
         this.sessionState = new BGPSessionStateImpl();
 
-        final Set<TablesKey> tts = Sets.newHashSet();
-        final Set<BgpTableType> tats = Sets.newHashSet();
-        final List<AddressFamilies> addPathCapabilitiesList = Lists.newArrayList();
+        final Set<TablesKey> tts = new HashSet<>();
+        final Set<BgpTableType> tats = new HashSet<>();
+        final List<AddressFamilies> addPathCapabilitiesList = new ArrayList<>();
         if (remoteOpen.getBgpParameters() != null) {
             for (final BgpParameters param : remoteOpen.getBgpParameters()) {
                 for (final OptionalCapabilities optCapa : param.getOptionalCapabilities()) {

diff --git a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/EventBusRegistration.java b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/EventBusRegistration.java
index 82bf6e97779381de03383b37f4509853d9f979db..d03181c21569454f6585420144dc98983dc0c725 100644 (file)
--- a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/EventBusRegistration.java
+++ b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/EventBusRegistration.java
@@ -7,12 +7,12 @@
  */
 package org.opendaylight.protocol.bgp.rib.mock;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 import io.netty.channel.ChannelHandlerContext;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
@@ -78,8 +78,8 @@ final class EventBusRegistration extends AbstractListenerRegistration<BGPSession
         if (BGPMock.CONNECTION_LOST_MAGIC_MSG.equals(message)) {
             listener.onSessionTerminated(null, new BGPTerminationReason(BGPError.CEASE));
         } else if (message instanceof Open) {
-            final Set<BgpTableType> tts = Sets.newHashSet();
-            final List<AddressFamilies> addPathCapabilitiesList = Lists.newArrayList();
+            final Set<BgpTableType> tts = new HashSet<>();
+            final List<AddressFamilies> addPathCapabilitiesList = new ArrayList<>();
             for (final BgpParameters param : ((Open) message).getBgpParameters()) {
                 for (final OptionalCapabilities capa : param.getOptionalCapabilities()) {
                     final CParameters cParam = capa.getCParameters();
@@ -98,7 +98,7 @@ final class EventBusRegistration extends AbstractListenerRegistration<BGPSession
                     }
                 }
             }
-            listener.onSessionUp(new MockBGPSession(tts));
+            listener.onSessionUp(new MockBGPSession(tts, addPathCapabilitiesList));
         } else if (!(message instanceof Keepalive)) {
             try {
                 listener.onMessage(new MockBGPSession(), message);
@@ -110,14 +110,17 @@ final class EventBusRegistration extends AbstractListenerRegistration<BGPSession
 
     private static class MockBGPSession implements BGPSession {
         private static final long AS = 30L;
+
+        private final List<AddressFamilies> addPathAfis;
         private final Set<BgpTableType> tts;
 
-        MockBGPSession(final Set<BgpTableType> tts) {
+        MockBGPSession(final Set<BgpTableType> tts, final List<AddressFamilies> addPathAfis) {
             this.tts = tts;
+            this.addPathAfis = addPathAfis;
         }
 
         MockBGPSession() {
-            this.tts = Collections.emptySet();
+            this(Collections.emptySet(), Collections.emptyList());
         }
 
         @Override
@@ -189,7 +192,7 @@ final class EventBusRegistration extends AbstractListenerRegistration<BGPSession
 
         @Override
         public List<AddressFamilies> getAdvertisedAddPathTableTypes() {
-            return Collections.emptyList();
+            return addPathAfis;
         }
 
         @Override