Migrate some old Java constructs

- Replace lambdas to method references
- Remove some redundancies

Change-Id: I81f2f1ebdce7e37ab529682c0eb3377be35b1ae3
Signed-off-by: David Suarez <david.suarez.fuentes@gmail.com>

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java
index fa31b01df9eb5aeac8f314a5d527bb34a89249d6..c27ac30b854ce263841bcf290de58c21a1c0dc17 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java
@@ -332,7 +332,8 @@ public class EgressAclServiceImpl extends AbstractAclServiceImpl {
         }
         BigInteger dpId = port.getDpId();
         int lportTag = port.getLPortTag();
-        Set<MacAddress> macs = filteredAAPs.stream().map(aap -> aap.getMacAddress()).collect(Collectors.toSet());
+        Set<MacAddress> macs = filteredAAPs.stream().map(AllowedAddressPairs::getMacAddress)
+                .collect(Collectors.toSet());
         for (MacAddress mac : macs) {
             List<MatchInfoBase> matches = new ArrayList<>();
             matches.add(new MatchEthernetSource(mac));
@@ -355,7 +356,8 @@ public class EgressAclServiceImpl extends AbstractAclServiceImpl {
         //exclude filteredAAP entries from port's AAP's before comparison
         List<AllowedAddressPairs> filteredAllowedAddressed = allowedAddresses.stream().filter(
             aap -> !filteredAAPs.contains(aap)).collect(Collectors.toList());
-        Set<MacAddress> macs = filteredAAPs.stream().map(aap -> aap.getMacAddress()).collect(Collectors.toSet());
+        Set<MacAddress> macs = filteredAAPs.stream().map(AllowedAddressPairs::getMacAddress)
+                .collect(Collectors.toSet());
         List<AllowedAddressPairs> aapWithDuplicateMac = filteredAllowedAddressed.stream()
             .filter(entry -> macs.contains(entry.getMacAddress())).collect(Collectors.toList());
         return !aapWithDuplicateMac.isEmpty();

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/recovery/AclServiceRecoveryHandler.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/recovery/AclServiceRecoveryHandler.java
index ee493eb3e38a057b54259ef2d9817eb85c4c2fd6..0f61d86782bfaea5d0d1c37bc5eae55bafc04190 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/recovery/AclServiceRecoveryHandler.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/recovery/AclServiceRecoveryHandler.java
@@ -35,13 +35,13 @@ public class AclServiceRecoveryHandler implements ServiceRecoveryInterface {
     private void deregisterListeners() {
         Queue<RecoverableListener> recoverableListeners =
                 serviceRecoveryRegistry.getRecoverableListeners(AclServiceUtils.getRecoverServiceRegistryKey());
-        recoverableListeners.forEach((recoverableListener -> recoverableListener.deregisterListener()));
+        recoverableListeners.forEach((RecoverableListener::deregisterListener));
     }
 
     private void registerListeners() {
         Queue<RecoverableListener> recoverableListeners =
                 serviceRecoveryRegistry.getRecoverableListeners(AclServiceUtils.getRecoverServiceRegistryKey());
-        recoverableListeners.forEach((recoverableListener -> recoverableListener.registerListener()));
+        recoverableListeners.forEach((RecoverableListener::registerListener));
     }
 
     @Override

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclNodeDefaultFlowsTxBuilder.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclNodeDefaultFlowsTxBuilder.java
index 0aa1e20176e88b87c37641618fe67db84bb04982..a1edf107b9c78784c14149aff179307e9fce20a2 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclNodeDefaultFlowsTxBuilder.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclNodeDefaultFlowsTxBuilder.java
@@ -403,14 +403,13 @@ public class AclNodeDefaultFlowsTxBuilder {
 
     private void addFlowToTx(short tableId, String flowId, int priority, List<? extends MatchInfoBase> matches,
             List<InstructionInfo> instructions) {
-        String flowName = flowId;
         int idleTimeOut = 0;
         int hardTimeOut = 0;
         BigInteger cookie = AclConstants.COOKIE_ACL_BASE;
-        FlowEntity flowEntity = MDSALUtil.buildFlowEntity(this.dpId, tableId, flowId, priority, flowName, idleTimeOut,
-                hardTimeOut, cookie, matches, instructions);
+        FlowEntity flowEntity = MDSALUtil.buildFlowEntity(this.dpId, tableId, flowId, priority, flowId, idleTimeOut,
+                                                          hardTimeOut, cookie, matches, instructions);
         LOG.trace("Installing Acl default Flow:: DpnId: {}, flowId: {}, flowName: {}, tableId: {}", dpId, flowId,
-                flowName, tableId);
+                  flowId, tableId);
         mdsalManager.addFlowToTx(flowEntity, tx);
     }
 

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java
index 4efba82e0687ca3f684b76178735072b2b50c3bd..477cdef448076a30f3d1d139c12a92cd2800a31b 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java
@@ -968,9 +968,8 @@ public final class AclServiceUtils {
      * @return the integer
      */
     public Integer allocateAclTag(String aclName) {
-        Integer aclTag = AclServiceUtils.allocateId(this.idManager, AclConstants.ACL_TAG_POOL_NAME, aclName,
-                AclConstants.INVALID_ACL_TAG);
-        return aclTag;
+        return AclServiceUtils.allocateId(this.idManager, AclConstants.ACL_TAG_POOL_NAME, aclName,
+                                          AclConstants.INVALID_ACL_TAG);
     }
 
     /**