Code clean up

replace asList by singletonList

Change-Id: Ie3235ce8e7c7df527765e69183a52a1d56f30d70
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java
index 53db1d1dabf1eb7d7e72f5c2f9af646c9c0634c5..4a56635b0a11264082de51265fc8b2880d8df086 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.protocol.pcep.impl.spi;
 
-import java.util.Arrays;
+import java.util.Collections;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.PcerrBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message;
@@ -34,11 +34,11 @@ public final class Util {
         final ErrorObject err = new ErrorObjectBuilder().setType(e.getErrorType()).setValue(e.getErrorValue()).build();
         if (t == null) {
             return errMessageBuilder.setPcerrMessage(
-                    new PcerrMessageBuilder().setErrors(Arrays.asList(new ErrorsBuilder().setErrorObject(err).build())).build()).build();
+                    new PcerrMessageBuilder().setErrors(Collections.singletonList(new ErrorsBuilder().setErrorObject(err).build())).build()).build();
         } else {
             final ErrorType type = new SessionCaseBuilder().setSession(new SessionBuilder().setOpen(t).build()).build();
             return errMessageBuilder.setPcerrMessage(
-                    new PcerrMessageBuilder().setErrors(Arrays.asList(new ErrorsBuilder().setErrorObject(err).build())).setErrorType(type).build()).build();
+                    new PcerrMessageBuilder().setErrors(Collections.singletonList(new ErrorsBuilder().setErrorObject(err).build())).setErrorType(type).build()).build();
         }
     }
 }

diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/spi/MsgBuilderUtil.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/spi/MsgBuilderUtil.java
index 1187ed9fe486de98769c8d107a77a55a465efc79..9f018b3f818f2daad6c1dbefa4d75658750ee09f 100644 (file)
--- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/spi/MsgBuilderUtil.java
+++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/spi/MsgBuilderUtil.java
@@ -12,7 +12,7 @@ import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nonnull;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
@@ -165,18 +165,18 @@ public final class MsgBuilderUtil {
     public static Pcerr createErrorMsg(@Nonnull final PCEPErrors e, @Nonnull final long srpId) {
         final PcerrMessageBuilder msgBuilder = new PcerrMessageBuilder();
         return new PcerrBuilder().setPcerrMessage(
-                msgBuilder
-                        .setErrorType(
-                                new StatefulCaseBuilder().setStateful(
-                                        new StatefulBuilder().setSrps(
-                                                Lists.newArrayList(new SrpsBuilder().setSrp(
-                                                        new SrpBuilder().setProcessingRule(false).setIgnore(false)
-                                                                .setOperationId(new SrpIdNumber(srpId)).build())
-                                                        .build())).build()).build())
-                        .setErrors(
-                                Arrays.asList(new ErrorsBuilder().setErrorObject(
-                                        new ErrorObjectBuilder().setType(e.getErrorType()).setValue(e.getErrorValue())
-                                                .build()).build())).build()).build();
+            msgBuilder
+                .setErrorType(
+                    new StatefulCaseBuilder().setStateful(
+                        new StatefulBuilder().setSrps(
+                            Lists.newArrayList(new SrpsBuilder().setSrp(
+                                new SrpBuilder().setProcessingRule(false).setIgnore(false)
+                                    .setOperationId(new SrpIdNumber(srpId)).build())
+                                .build())).build()).build())
+                .setErrors(
+                    Collections.singletonList(new ErrorsBuilder().setErrorObject(
+                        new ErrorObjectBuilder().setType(e.getErrorType()).setValue(e.getErrorValue())
+                            .build()).build())).build()).build();
     }
 
     public static byte[] getDefaultPathName(final String address, final long lspId) {

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
index ba0cc4e6bed9fdf042efc482292849521f1ccad0..16e6ad5b8d37db42204d25a6d9163c9aa2cd997d 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
@@ -12,7 +12,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.primitives.UnsignedBytes;
 import io.netty.buffer.ByteBuf;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -114,9 +113,9 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer
                     rp.get()).build())).build()).build();
         }
         return new PcerrBuilder().setPcerrMessage(
-                msgBuilder.setErrors(Arrays.asList(new ErrorsBuilder().setErrorObject(
-                        new ErrorObjectBuilder().setType(e.getErrorType()).setValue(
-                                e.getErrorValue()).build()).build())).build()).build();
+                msgBuilder.setErrors(Collections.singletonList(new ErrorsBuilder().setErrorObject(
+                    new ErrorObjectBuilder().setType(e.getErrorType()).setValue(
+                        e.getErrorValue()).build()).build())).build()).build();
     }
 
     protected abstract Message validate(final List<Object> objects, final List<Message> errors) throws PCEPDeserializerException;

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java
index 61db86914d155e0552d7dffa0992d6b0da674b6a..de9de6f6e3b248d4a87842df27b5369c2180aaae 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java
@@ -8,7 +8,7 @@
 package org.opendaylight.protocol.pcep.spi;
 
 import com.google.common.base.Preconditions;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcep.error.object.ErrorObjectBuilder;
@@ -39,7 +39,7 @@ public final class UnknownObject implements Object {
     }
 
     public List<Errors> getErrors() {
-        return Arrays.asList(this.error);
+        return Collections.singletonList(this.error);
     }
 
     public PCEPErrors getError() {

diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java
index c18ccfa28bc0b48ed4e54286f2ba3ebcad3a1b88..b1e8490480fc7a6e6c85c791226b0d2785cea9ef 100644 (file)
--- a/pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java
+++ b/pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java
@@ -10,7 +10,7 @@ package org.opendaylight.controller.config.yang.pcep.topology.provider;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import io.netty.channel.nio.NioEventLoopGroup;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 import javax.management.ObjectName;
@@ -55,7 +55,7 @@ public class PCEPTopologyProviderModuleTest extends AbstractInstructionScheduler
         SimplePCEPExtensionProviderContext extContext = new SimplePCEPExtensionProviderContext();
         setupMockService(PCEPExtensionProviderContext.class, extContext);
         BasePCEPSessionProposalFactory proposalFactory = new BasePCEPSessionProposalFactory(120, 30,
-                Arrays.asList(new PCEPStatefulCapability(true, true, true, true, true, true, true)));
+            Collections.singletonList(new PCEPStatefulCapability(true, true, true, true, true, true, true)));
         setupMockService(PCEPSessionProposalFactory.class, proposalFactory);
         NioEventLoopGroup eventLoopGroup = new NioEventLoopGroup();
         setupMockService(PCEPDispatcher.class, new PCEPDispatcherImpl(extContext.getMessageHandlerRegistry(),
@@ -174,7 +174,7 @@ public class PCEPTopologyProviderModuleTest extends AbstractInstructionScheduler
             final Client client = new Client();
             client.setPassword(Rfc2385Key.getDefaultInstance("foo"));
             client.setAddress(new IpAddress("127.0.0.1".toCharArray()));
-            mxBean.setClient(Arrays.asList(client));
+            mxBean.setClient(Collections.singletonList(client));
         }
 
         mxBean.setListenAddress(listenAddress == null ? null : new IpAddress(listenAddress.toCharArray()));

diff --git a/pcep/tunnel-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java b/pcep/tunnel-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java
index b316753f73e2049d87fa0e3f917ebce0a98f2c70..453bd7b5b61c7e72d6c36588bdfd459ee18eb7df 100644 (file)
--- a/pcep/tunnel-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java
+++ b/pcep/tunnel-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java
@@ -9,8 +9,9 @@ package org.opendaylight.controller.config.yang.pcep.tunnel.provider;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+
 import io.netty.channel.nio.NioEventLoopGroup;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import javax.management.ObjectName;
 import org.junit.Before;
@@ -51,7 +52,7 @@ public class PCEPTunnelTopologyProviderModuleTest extends AbstractInstructionSch
         SimplePCEPExtensionProviderContext extContext = new SimplePCEPExtensionProviderContext();
         setupMockService(PCEPExtensionProviderContext.class, extContext);
         BasePCEPSessionProposalFactory proposalFactory = new BasePCEPSessionProposalFactory(120, 30,
-                Arrays.asList(new PCEPStatefulCapability(true, true, true, true, true, true, true)));
+            Collections.singletonList(new PCEPStatefulCapability(true, true, true, true, true, true, true)));
         setupMockService(PCEPSessionProposalFactory.class, proposalFactory);
         NioEventLoopGroup eventLoopGroup = new NioEventLoopGroup();
         setupMockService(PCEPDispatcher.class, new PCEPDispatcherImpl(extContext.getMessageHandlerRegistry(),