Simplify matchAfiSafi

Sonar is pointing out a boolean literal, remove it by using a
smarter expression.

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

diff --git a/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/registry/BgpAttributeConditionsUtil.java b/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/registry/BgpAttributeConditionsUtil.java
index e9601e948ec4c45f2af0b7a958f2253ff428ada2..4fcd2e0d8b2a82916cc6ac28efa7bbdf4c113905 100644 (file)
--- a/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/registry/BgpAttributeConditionsUtil.java
+++ b/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/registry/BgpAttributeConditionsUtil.java
@@ -53,10 +53,9 @@ final class BgpAttributeConditionsUtil {
             && matchLocalPref(attributes.getLocalPref(), conditions.getLocalPrefEq());
     }
 
-    private static boolean matchAfiSafi(
-            final Class<? extends AfiSafiType> afiSafi,
+    private static boolean matchAfiSafi(final Class<? extends AfiSafiType> afiSafi,
             final List<Class<? extends AfiSafiType>> afiSafiIn) {
-        return afiSafiIn == null ? true : afiSafiIn.contains(afiSafi);
+        return afiSafiIn == null || afiSafiIn.contains(afiSafi);
     }
 
     private static boolean matchMED(final MultiExitDisc multiExitDisc, final Uint32 med) {
@@ -72,7 +71,7 @@ final class BgpAttributeConditionsUtil {
             return true;
         }
 
-        final List<Segments> segments = asPath.getSegments();
+        final List<Segments> segments = asPath.nonnullSegments();
         int total = segments.stream().map(AsPathSegment::getAsSequence)
                 .filter(Objects::nonNull).mapToInt(List::size).sum();