HC2VPP-38 / HONEYCOMB-336 - removed mandatory from ace-ip-version

Removed mandatory statements
Fixed multiple NPE

Change-Id: I30af417b0594d9634a9352f7721285257fbcee1e
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/acl/AclDataExtractor.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/acl/AclDataExtractor.java
index 77e58fe0c..8c6cdcfef 100644
--- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/acl/AclDataExtractor.java
+++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/acl/AclDataExtractor.java
@@ -18,6 +18,7 @@ package io.fd.hc2vpp.acl.util.acl;
 
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Optional;
 import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.Ace;
@@ -56,13 +57,16 @@ public interface AclDataExtractor {
     }
 
     default List<Ace> getAces(@Nonnull final Acl acl) {
-        return acl.getAccessListEntries().getAce();
+        return Optional.ofNullable(acl.getAccessListEntries()).orElseThrow(() ->
+                new IllegalArgumentException(String.format("Unable to extract aces from %s", acl))).getAce();
     }
 
     /**
      * Convert {@link Acl} name to byte array as UTF_8
      */
     default byte[] getAclNameAsBytes(@Nonnull final Acl acl) {
-        return acl.getAclName().getBytes(StandardCharsets.UTF_8);
+        return Optional.ofNullable(acl.getAclName())
+                .orElseThrow(() -> new IllegalArgumentException("Unable to extract bytes for null"))
+                .getBytes(StandardCharsets.UTF_8);
     }
 }