From 37039138afcddedb1af4035aae5fb6c603c4c4e1 Mon Sep 17 00:00:00 2001
From: Michal Cmarada <mcmarada@cisco.com>
Date: Thu, 11 Apr 2019 04:18:16 -0400
Subject: HC2VPP-397: add support for java 11

- dependency updates
- compilation error fixes
- javadoc fixes

Change-Id: Ic7371931b0728c888a39350a77c959121afb9786
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
---
 .../interfacesstate/InterfaceDataTranslator.java   | 30 ++++++++++++++--------
 .../InterfaceChangeNotificationProducer.java       |  2 +-
 2 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'v3po/v3po2vpp/src/main')

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java
index 5e025c5cc..659a7feb2 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java
@@ -71,7 +71,7 @@ public interface InterfaceDataTranslator extends ByteDataTranslator, JvppReplyCo
      * @param vppPhysAddress byte array of bytes in big endian order, constructing the network IF physical address.
      * @return String like "aa:bb:cc:dd:ee:ff"
      * @throws NullPointerException     if vppPhysAddress is null
-     * @throws IllegalArgumentException if vppPhysAddress.length < 6
+     * @throws IllegalArgumentException if vppPhysAddress.length &lt; 6
      */
     default String vppPhysAddrToYang(@Nonnull final byte[] vppPhysAddress) {
         Objects.requireNonNull(vppPhysAddress, "Empty physical address bytes");
@@ -171,11 +171,15 @@ public interface InterfaceDataTranslator extends ByteDataTranslator, JvppReplyCo
     }
 
     /**
-     * Checks whether provided {@link SwInterfaceDetails} is detail of sub-interface<br> <li>subId == unique number of
-     * sub-interface within set of sub-interfaces of single interface <li>swIfIndex == unique index of
-     * interface/sub-interface within all interfaces <li>supSwIfIndex == unique index of parent interface <li>in case of
-     * interface , swIfIndex value equals supSwIfIndex <li>in case of subinterface, supSwIfIndex equals index of parent
-     * interface, swIfIndex is index of subinterface itselt
+     * Checks whether provided {@link SwInterfaceDetails} is detail of sub-interface<br>
+     *     <ul>
+     *         <li>subId == unique number of sub-interface within set of sub-interfaces of single interface</li>
+     *         <li>swIfIndex == unique index of interface/sub-interface within all interfaces</li>
+     *         <li>supSwIfIndex == unique index of parent interface</li>
+     *         <li>in case of interface , swIfIndex value equals supSwIfIndex</li>
+     *         <li>in case of subinterface, supSwIfIndex equals index of parent interface, swIfIndex is index of
+     *             subinterface itselt</li>
+     *     </ul>
      */
     default boolean isSubInterface(@Nonnull final SwInterfaceDetails elt) {
         //cant check by subId != 0, because you can pick 0 as value
@@ -183,11 +187,15 @@ public interface InterfaceDataTranslator extends ByteDataTranslator, JvppReplyCo
     }
 
     /**
-     * Checks whether provided {@link SwInterfaceDetails} is detail of interface<br> <li>subId == unique number of
-     * subinterface within set of subinterfaces of single interface <li>swIfIndex == unique index of
-     * interface/subinterface within all interfaces <li>supSwIfIndex == unique index of parent interface <li>in case of
-     * interface , swIfIndex value equals supSwIfIndex <li>in case of subinterface, supSwIfIndex equals index of parent
-     * interface, swIfIndex is index of subinterface itselt
+     * Checks whether provided {@link SwInterfaceDetails} is detail of interface<br>
+     *     <ul>
+     *         <li>subId == unique number of subinterface within set of subinterfaces of single interface</li>
+     *         <li>swIfIndex == unique index of interface/subinterface within all interfaces</li>
+     *         <li>supSwIfIndex == unique index of parent interface</li>
+     *         <li>in case of interface , swIfIndex value equals supSwIfIndex</li>
+     *         <li>in case of subinterface, supSwIfIndex equals index of parent interface, swIfIndex is index
+     *             of subinterface itselt</li>
+     *     </ul>
      */
     default boolean isRegularInterface(@Nonnull final SwInterfaceDetails elt) {
         return !isSubInterface(elt);
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java
index baf321a1c..8d4b93a8e 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/notification/InterfaceChangeNotificationProducer.java
@@ -121,7 +121,7 @@ final class InterfaceChangeNotificationProducer implements ManagedNotificationPr
      * Get mapped name for the interface. Best effort only! The mapping might not yet be stored in context data tree
      * (write transaction is still in progress and context changes have not been committed yet, or VPP sends the
      * notification before it returns create request(that would store mapping)).
-     * <p/>
+     *
      * In case mapping is not available, index is used as name.
      */
     private InterfaceNameOrIndex getIfcName(final SwInterfaceEvent swInterfaceEventNotification) {
-- 
cgit 1.2.3-korg