Modernize AbstractMessageParser

- use List.of(item) instead of Collections.singletonList()
- reuse requireNonNull()'s return
- reformat builder usage
- use Optional.ifPresent() to propagate present values

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

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 28252d038c6f71b717d4501f2c3de6f1be2217f0..e851c8d078a7ee9e65425b6d438e0b752d6116ad 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 static java.util.Objects.requireNonNull;
 import com.google.common.primitives.UnsignedBytes;
 import io.netty.buffer.ByteBuf;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.Nullable;
@@ -90,11 +89,7 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer
 
             if (VendorInformationUtil.isVendorInformationObject(objClass, objType)) {
                 final EnterpriseNumber enterpriseNumber = new EnterpriseNumber(ByteBufUtils.readUint32(bytesToPass));
-                final Optional<? extends Object> obj = this.registry.parseVendorInformationObject(enterpriseNumber,
-                    header, bytesToPass);
-                if (obj.isPresent()) {
-                    objs.add(obj.get());
-                }
+                this.registry.parseVendorInformationObject(enterpriseNumber, header, bytesToPass).ifPresent(objs::add);
             } else {
                 // parseObject is required to return null for P=0 errored objects
                 final Object o = this.registry.parseObject(objClass, objType, header, bytesToPass);
@@ -107,16 +102,22 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer
         return objs;
     }
 
-    public static Message createErrorMsg(final PCEPErrors err, final Optional<Rp> rp) {
+    public static Message createErrorMsg(final PCEPErrors err, final Optional<Rp> optRp) {
         final PcerrMessageBuilder msgBuilder = new PcerrMessageBuilder();
-        if (rp.isPresent()) {
-            msgBuilder.setErrorType(new RequestCaseBuilder().setRequest(new RequestBuilder().setRps(
-                Collections.singletonList(new RpsBuilder().setRp(rp.get()).build())).build()).build());
-        }
-        return new PcerrBuilder().setPcerrMessage(
-                msgBuilder.setErrors(Collections.singletonList(new ErrorsBuilder().setErrorObject(
-                    new ErrorObjectBuilder().setType(err.getErrorType()).setValue(
-                        err.getErrorValue()).build()).build())).build()).build();
+        optRp.ifPresent(rp -> {
+            msgBuilder.setErrorType(new RequestCaseBuilder()
+                .setRequest(new RequestBuilder().setRps(List.of(new RpsBuilder().setRp(rp).build())).build())
+                .build());
+        });
+        return new PcerrBuilder()
+            .setPcerrMessage(msgBuilder.setErrors(List.of(new ErrorsBuilder()
+                .setErrorObject(new ErrorObjectBuilder()
+                    .setType(err.getErrorType())
+                    .setValue(err.getErrorValue())
+                    .build())
+                .build()))
+                .build())
+            .build();
     }
 
     protected abstract Message validate(List<Object> objects, List<Message> errors) throws PCEPDeserializerException;
@@ -124,10 +125,8 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer
     @Override
     public final Message parseMessage(final ByteBuf buffer, final List<Message> errors)
             throws PCEPDeserializerException {
-        requireNonNull(buffer, "Buffer may not be null");
-
         // Parse objects first
-        final List<Object> objs = parseObjects(buffer);
+        final List<Object> objs = parseObjects(requireNonNull(buffer, "Buffer may not be null"));
 
         // Run validation
         return validate(objs, errors);