Fix odlparent 3 Checkstyle issues

Change-Id: I2a653b371ddfe54080bdb5ad5d4c3e9590c83a5a
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>

diff --git a/domain-extensions/l2-l3/src/main/java/org/opendaylight/groupbasedpolicy/domain_extension/l2_l3/util/L2L3IidFactory.java b/domain-extensions/l2-l3/src/main/java/org/opendaylight/groupbasedpolicy/domain_extension/l2_l3/util/L2L3IidFactory.java
index c5672cf83314d0cbfd76f3acd81beaf64adf8544..39bf0f8ace3ea3c8cf4dac87ed9de0a6be3bb31e 100644 (file)
--- a/domain-extensions/l2-l3/src/main/java/org/opendaylight/groupbasedpolicy/domain_extension/l2_l3/util/L2L3IidFactory.java
+++ b/domain-extensions/l2-l3/src/main/java/org/opendaylight/groupbasedpolicy/domain_extension/l2_l3/util/L2L3IidFactory.java
@@ -22,7 +22,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding.rev160427.forwarding.forwarding.by.tenant.NetworkDomainKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-public class L2L3IidFactory {
+public final class L2L3IidFactory {
+
+    private L2L3IidFactory() {
+    }
 
     public static InstanceIdentifier<NetworkDomain> subnetIid(TenantId tenantId, NetworkDomainId id) {
         NetworkDomainKey domainKey = new NetworkDomainKey(id, Subnet.class);

diff --git a/location-providers/ne-location-provider/src/test/java/org/opendaylight/groupbasedpolicy/ne/location/provider/NeLocationProviderTest.java b/location-providers/ne-location-provider/src/test/java/org/opendaylight/groupbasedpolicy/ne/location/provider/NeLocationProviderTest.java
index 5267f5592992c980283dbc372d9784932da7a91b..496c37a3b4ea9b7aa3ca645da1f017603ff76ddc 100644 (file)
--- a/location-providers/ne-location-provider/src/test/java/org/opendaylight/groupbasedpolicy/ne/location/provider/NeLocationProviderTest.java
+++ b/location-providers/ne-location-provider/src/test/java/org/opendaylight/groupbasedpolicy/ne/location/provider/NeLocationProviderTest.java
@@ -22,11 +22,9 @@ import static org.mockito.Mockito.when;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.CheckedFuture;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@@ -113,17 +111,18 @@ public class NeLocationProviderTest extends CustomDataBrokerTest {
 
     @Test
     public void test_NetworkElementsListenerRegistration() {
-        DataBroker dataBroker = mock(DataBroker.class);
-        NeLocationProvider provider = new NeLocationProvider(dataBroker);
-        verify(dataBroker).registerDataTreeChangeListener(new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION,
+        DataBroker mockDataBroker = mock(DataBroker.class);
+        NeLocationProvider provider = new NeLocationProvider(mockDataBroker);
+        verify(mockDataBroker).registerDataTreeChangeListener(
+                new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION,
                 InstanceIdentifier.builder(NetworkElements.class).build()), provider);
     }
 
     @Test
     public void test_EndpointsListenerRegistration() {
-        DataBroker dataBroker = mock(DataBroker.class);
-        new NeLocationProvider(dataBroker);
-        verify(dataBroker)
+        DataBroker mockDataBroker = mock(DataBroker.class);
+        new NeLocationProvider(mockDataBroker);
+        verify(mockDataBroker)
             .registerDataTreeChangeListener(eq(new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL,
                     InstanceIdentifier.builder(Endpoints.class).child(AddressEndpoints.class)
                     .child(AddressEndpoint.class).build())), isA(EndpointsListener.class));
@@ -131,14 +130,14 @@ public class NeLocationProviderTest extends CustomDataBrokerTest {
 
     @Test
     public void test_ListenersUnregistration() {
-        DataBroker dataBroker = mock(DataBroker.class);
+        DataBroker mockDataBroker = mock(DataBroker.class);
         ListenerRegistration<EndpointsListener> endpointsListenerRegistration = mock(ListenerRegistration.class);
-        when(dataBroker.registerDataTreeChangeListener(any(), isA(EndpointsListener.class)))
+        when(mockDataBroker.registerDataTreeChangeListener(any(), isA(EndpointsListener.class)))
             .thenReturn(endpointsListenerRegistration);
         ListenerRegistration<NeLocationProvider> nelistenerregistration = mock(ListenerRegistration.class);
-        when(dataBroker.registerDataTreeChangeListener(any(), isA(NeLocationProvider.class)))
+        when(mockDataBroker.registerDataTreeChangeListener(any(), isA(NeLocationProvider.class)))
             .thenReturn(nelistenerregistration);
-        NeLocationProvider provider = new NeLocationProvider(dataBroker);
+        NeLocationProvider provider = new NeLocationProvider(mockDataBroker);
         provider.close();
         verify(endpointsListenerRegistration).close();
         verify(nelistenerregistration).close();

diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/gbp/util/NeutronGbpIidFactory.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/gbp/util/NeutronGbpIidFactory.java
index 0a84688b32b46427e9090da83a6a14c668e1e45e..9e925e709fe75883c7eb40e4af77af20e5cfc11e 100644 (file)
--- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/gbp/util/NeutronGbpIidFactory.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/gbp/util/NeutronGbpIidFactory.java
@@ -46,7 +46,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gb
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.neutron.by.gbp.mappings.provider.networks.as.l2.flood.domains.ProviderPhysicalNetworkAsL2FloodDomainKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-public class NeutronGbpIidFactory {
+public final class NeutronGbpIidFactory {
+
+    private NeutronGbpIidFactory() {
+    }
 
     public static InstanceIdentifier<BaseEndpointByPort> baseEndpointByPortIid(UniqueId portId) {
         return InstanceIdentifier.builder(Mappings.class)

diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/infrastructure/ServiceUtil.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/infrastructure/ServiceUtil.java
index 31c6c5423e563d99e3fed61f0f1054020196efd9..9c5ff55626e97995af7dcb905e301cd69592bb98 100644 (file)
--- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/infrastructure/ServiceUtil.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/infrastructure/ServiceUtil.java
@@ -9,12 +9,9 @@
 package org.opendaylight.groupbasedpolicy.neutron.mapper.infrastructure;
 
 import com.google.common.collect.ImmutableList;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.annotation.Nullable;
-
 import org.opendaylight.groupbasedpolicy.api.sf.EtherTypeClassifierDefinition;
 import org.opendaylight.groupbasedpolicy.api.sf.IpProtoClassifierDefinition;
 import org.opendaylight.groupbasedpolicy.api.sf.L4ClassifierDefinition;
@@ -61,8 +58,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.subject.feature.instances.ClassifierInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.subject.feature.instances.ClassifierInstanceBuilder;
 
+// This is sub-classed
+@SuppressWarnings("checkstyle:HideUtilityClassConstructor")
 public class ServiceUtil {
-
     protected static Contract createContract(ContractId cid, List<Subject> subjects, Description description) {
         return new ContractBuilder().setId(cid).setSubject(subjects).setDescription(description).build();
     }

diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/MappingFactory.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/MappingFactory.java
index f1112f4b95d331d7ad1fc1b6ed3193bf70c262bb..3dda9f79368dda60b926e349d615b71a3d714ce2 100644 (file)
--- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/MappingFactory.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/MappingFactory.java
@@ -31,7 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gb
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.neutron.by.gbp.mappings.ports.by.endpoints.PortByEndpointBuilder;
 
 
-public class MappingFactory {
+public final class MappingFactory {
 
     private MappingFactory() {
         throw new UnsupportedOperationException("cannot create an instance");

diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/SecRuleEntityDecoder.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/SecRuleEntityDecoder.java
index 6fe1d1ebe5e9971ca83c48dd11ebd77e06b2b932..d798032ccbbc1b78d7ba7436695c5d4eb90bdcbc 100755 (executable)
--- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/SecRuleEntityDecoder.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/SecRuleEntityDecoder.java
@@ -11,10 +11,8 @@ package org.opendaylight.groupbasedpolicy.neutron.mapper.mapping.rule;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.collect.ImmutableList;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import org.opendaylight.groupbasedpolicy.api.sf.EtherTypeClassifierDefinition;
 import org.opendaylight.groupbasedpolicy.api.sf.IpProtoClassifierDefinition;
 import org.opendaylight.groupbasedpolicy.api.sf.L4ClassifierDefinition;
@@ -59,7 +57,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.SecurityRuleAttributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRule;
 
-public class SecRuleEntityDecoder {
+public final class SecRuleEntityDecoder {
 
     private SecRuleEntityDecoder() {
         throw new UnsupportedOperationException("Cannot create an instance.");
@@ -217,8 +215,8 @@ public class SecRuleEntityDecoder {
         if (twoPortMin == null && twoPortMax == null) {
             return true;
         }
-        if ((onePortMin != null && twoPortMin != null && onePortMin >= twoPortMin)
-                && (onePortMax != null && twoPortMax != null && onePortMax <= twoPortMax)) {
+        if (onePortMin != null && twoPortMin != null && onePortMin >= twoPortMin
+                && onePortMax != null && twoPortMax != null && onePortMax <= twoPortMax) {
             return true;
         }
         return false;

diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/SecRuleNameDecoder.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/SecRuleNameDecoder.java
index 8ceafab886558a597e587d7475e83afe5528cd13..f94abb6852130ff7895556ffed4c1e2b8c59e4a6 100644 (file)
--- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/SecRuleNameDecoder.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/SecRuleNameDecoder.java
@@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.SecurityRuleAttributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRule;
 
-public class SecRuleNameDecoder {
+public final class SecRuleNameDecoder {
 
     static final String MIN_PORT = "_min";
     static final String MAX_PORT = "_max";

diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/NetworkUtils.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/NetworkUtils.java
index c8ccfafcd651afcbf2090b08f80e764ad90634f4..de7de3f94a844c16ceadc2a061cbb97eb74c1dd1 100644 (file)
--- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/NetworkUtils.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/NetworkUtils.java
@@ -10,21 +10,21 @@ package org.opendaylight.groupbasedpolicy.neutron.mapper.util;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Strings;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.ext.rev150712.NetworkL3Extension;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.Networks;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.provider.ext.rev150712.NetworkProviderExtension;
 
-public class NetworkUtils {
+public final class NetworkUtils {
+
+    private NetworkUtils() {
+    }
 
     public static List<Network> findRouterExternalNetworks(@Nullable Networks networks) {
         if (networks == null || networks.getNetwork() == null) {
@@ -56,7 +56,7 @@ public class NetworkUtils {
     }
 
     public static boolean isProviderPhysicalNetwork(Network network) {
-        return (!isRouterExternal(network) && !getPhysicalNetwork(network).isEmpty());
+        return !isRouterExternal(network) && !getPhysicalNetwork(network).isEmpty();
     }
 
     public static boolean isRouterExternal(Network network) {

diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/PortUtils.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/PortUtils.java
index fc53e315bc046c832212987d60a193c4f82ee0ed..86a3e771337583daf996d147a8a82d748f6ec316 100644 (file)
--- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/PortUtils.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/PortUtils.java
@@ -9,14 +9,11 @@
 package org.opendaylight.groupbasedpolicy.neutron.mapper.util;
 
 import com.google.common.base.Optional;
-
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import javax.annotation.Nullable;
-
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.NetworkDomainId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.binding.rev150712.PortBindingExtension;
@@ -24,7 +21,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.por
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.Ports;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;
 
-public class PortUtils {
+public final class PortUtils {
+    private PortUtils() {
+    }
 
     public static final String DEVICE_OWNER_DHCP = "network:dhcp";
     public static final String DEVICE_OWNER_ROUTER_IFACE = "network:router_interface";

diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/RouterUtils.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/RouterUtils.java
index c81cb7baf265d27b1a6fd941fb2a054e2198127a..d9992e2bf71fcbb36d630be4d6b018ba1c5b7a8f 100644 (file)
--- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/RouterUtils.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/RouterUtils.java
@@ -9,14 +9,14 @@
 package org.opendaylight.groupbasedpolicy.neutron.mapper.util;
 
 import com.google.common.base.Optional;
-
 import javax.annotation.Nullable;
-
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.Routers;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.routers.Router;
 
-public class RouterUtils {
+public final class RouterUtils {
+    private RouterUtils() {
+    }
 
     public static Optional<Router> findRouter(Uuid uuid, @Nullable Routers routers) {
         if (routers == null || routers.getRouter() == null) {

diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/SecurityGroupUtils.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/SecurityGroupUtils.java
index 0c2a4e02a8a9f6eba928f2d05e664198309ce52b..f731cdfbb79f80eca7b9c4165e4a01c6d46af46d 100644 (file)
--- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/SecurityGroupUtils.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/SecurityGroupUtils.java
@@ -11,14 +11,14 @@ package org.opendaylight.groupbasedpolicy.neutron.mapper.util;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
-
 import javax.annotation.Nullable;
-
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.SecurityGroups;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.security.groups.SecurityGroup;
 
-public class SecurityGroupUtils {
+public final class SecurityGroupUtils {
+    private SecurityGroupUtils() {
+    }
 
     public static Optional<SecurityGroup> findSecurityGroup(Uuid secGrpUuid, @Nullable SecurityGroups securityGroups) {
         Preconditions.checkNotNull(secGrpUuid);

diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/SecurityRuleUtils.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/SecurityRuleUtils.java
index f672a9791b9e3ec89c564afaed996a962ecb62a9..beedf8bc2fec53c41f6a062d154be744311df2d9 100644 (file)
--- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/SecurityRuleUtils.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/SecurityRuleUtils.java
@@ -8,25 +8,22 @@
 
 package org.opendaylight.groupbasedpolicy.neutron.mapper.util;
 
-import com.google.common.base.Function;
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-
 import javax.annotation.Nullable;
-
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.SecurityRules;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRule;
 
-public class SecurityRuleUtils {
+public final class SecurityRuleUtils {
+    private SecurityRuleUtils() {
+    }
 
     public static Optional<SecurityRule> findSecurityRule(Uuid uuid, @Nullable SecurityRules securityRules) {
         if (securityRules == null || securityRules.getSecurityRule() == null) {
@@ -43,24 +40,14 @@ public class SecurityRuleUtils {
     public static Set<SecurityRule> findSecurityRulesBySecGroupAndRemoteSecGroup(Uuid secGroup,
             @Nullable Uuid remoteSecGroup, Neutron neutron) {
         Preconditions.checkNotNull(secGroup);
-        return FluentIterable.from(findAllSecurityRules(neutron)).filter(new Predicate<SecurityRule>() {
-
-            @Override
-            public boolean apply(SecurityRule secRule) {
-                return (secRule.getSecurityGroupId().equals(secGroup)
-                        && Objects.equal(secRule.getRemoteGroupId(), remoteSecGroup));
-            }
-        }).toSet();
+        return FluentIterable.from(findAllSecurityRules(neutron)).filter(
+            secRule -> (secRule.getSecurityGroupId().equals(secGroup)
+                && Objects.equal(secRule.getRemoteGroupId(), remoteSecGroup))).toSet();
     }
 
     public static Set<Uuid> findSecurityGroupsHavingSecurityRules(Neutron neutron) {
-        return FluentIterable.from(findAllSecurityRules(neutron)).transform(new Function<SecurityRule, Uuid>() {
-
-            @Override
-            public Uuid apply(SecurityRule secRule) {
-                return secRule.getSecurityGroupId();
-            }
-        }).toSet();
+        return FluentIterable.from(findAllSecurityRules(neutron)).transform(
+            secRule -> secRule.getSecurityGroupId()).toSet();
     }
 
     public static List<SecurityRule> findAllSecurityRules(Neutron neutron) {

diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/SubnetUtils.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/SubnetUtils.java
index 5bef2bb1a8340bb70da514a65ad072c42cc8303d..51ba635fd37cdd6927937d9184598ac813bd9cf4 100644 (file)
--- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/SubnetUtils.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/SubnetUtils.java
@@ -9,14 +9,14 @@
 package org.opendaylight.groupbasedpolicy.neutron.mapper.util;
 
 import com.google.common.base.Optional;
-
 import javax.annotation.Nullable;
-
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.Subnets;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.Subnet;
 
-public class SubnetUtils {
+public final class SubnetUtils {
+    private SubnetUtils() {
+    }
 
     public static Optional<Subnet> findSubnet(Uuid uuid, @Nullable Subnets subnets) {
         if (subnets == null || subnets.getSubnet() == null) {

diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/Utils.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/Utils.java
index 4f3bb1faf02fefc2235a378462b6c5d1b2ce8ace..3ce66dc58f3a19a4743869774c9f553f59b1a984 100644 (file)
--- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/Utils.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/util/Utils.java
@@ -12,10 +12,8 @@ import static com.google.common.base.Preconditions.checkArgument;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.net.InetAddresses;
-
 import java.net.Inet4Address;
 import java.net.InetAddress;
-
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.groupbasedpolicy.util.IidFactory;
@@ -35,7 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.floati
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class Utils {
+public final class Utils {
 
     private static final String MASK_32 = "/32";
     private static final Logger LOG = LoggerFactory.getLogger(Utils.class);

diff --git a/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronNetworkAwareDataStoreTest.java b/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronNetworkAwareDataStoreTest.java
index e81d7134f5324b10ef4af17eb657e62e1d309922..aa5b37c3caa80805c5e3edd10501b78ce1d8ac51 100644 (file)
--- a/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronNetworkAwareDataStoreTest.java
+++ b/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronNetworkAwareDataStoreTest.java
@@ -15,10 +15,8 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.common.base.Optional;
-
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -55,7 +53,6 @@ public class NeutronNetworkAwareDataStoreTest extends NeutronMapperDataBrokerTes
     private Future<RpcResult<Void>> futureRpcFail;
     private RpcResult<Void> rpcResult;
     private RpcResult<Void> rpcFail;
-    private Network network;
     private NetworkProviderExtension providerExtension;
 
     @Before
@@ -76,12 +73,6 @@ public class NeutronNetworkAwareDataStoreTest extends NeutronMapperDataBrokerTes
             .setSegmentationId("segmentationId")
             .build();
 
-        network = new NetworkBuilder().setTenantId(tenantUuid)
-            .setUuid(networkUuid)
-            .setName("networkName")
-            .addAugmentation(NetworkProviderExtension.class, providerExtension)
-            .build();
-
         networkAware = new NeutronNetworkAware(dataBroker, METADATA_IPV4_SERVER_PORT);
     }
 
@@ -96,6 +87,11 @@ public class NeutronNetworkAwareDataStoreTest extends NeutronMapperDataBrokerTes
 
     @Test
     public void testOnCreated() {
+        Network network = new NetworkBuilder().setTenantId(tenantUuid)
+                .setUuid(networkUuid)
+                .setName("networkName")
+                .addAugmentation(NetworkProviderExtension.class, providerExtension)
+                .build();
 
         networkAware.onCreated(network, neutron);
 

diff --git a/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/NeutronMapperAssert.java b/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/NeutronMapperAssert.java
index 356027ca7cb6079259132842e9e0136e2f0275e4..de382c6b3b5506aa8bcaed9318c80c8dc7a1a660 100644 (file)
--- a/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/NeutronMapperAssert.java
+++ b/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/NeutronMapperAssert.java
@@ -12,7 +12,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.base.Optional;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -31,7 +30,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.Subnet;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-public class NeutronMapperAssert {
+public final class NeutronMapperAssert {
+    private NeutronMapperAssert() {
+    }
 
     // asserts for port
 

diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TerminationPointDataChangeListener.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TerminationPointDataChangeListener.java
index a86073f28fde66163985252e712ff15ba35e75ac..2cf2b78dfd96d2367b493c7c89e1109dc4e4e867 100755 (executable)
--- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TerminationPointDataChangeListener.java
+++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TerminationPointDataChangeListener.java
@@ -29,7 +29,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
@@ -191,7 +190,7 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene
                  * Check to see if we need to create a
                  * tunnel port on the parent node
                  */
-                createTunnelPorts(nodeIid, dataBroker);
+                createTunnelPorts(nodeIid);
             }
         } else {
             LOG.debug("TerminationPoint {} had no external ID, not processing for external ID.", ovsdbTp);
@@ -287,7 +286,7 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene
      *
      * @return true if it's a required tunnel port, false if it isn't
      */
-    private boolean isTunnelPort(OvsdbTerminationPointAugmentation ovsdbTp,
+    private static boolean isTunnelPort(OvsdbTerminationPointAugmentation ovsdbTp,
             List<AbstractTunnelType> requiredTunnelTypes) {
         if (ovsdbTp.getInterfaceType() != null) {
             for (AbstractTunnelType tunnelType : requiredTunnelTypes) {
@@ -326,9 +325,8 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene
      * create them.
      *
      * @param nodeIid {@link InstanceIdentifier}
-     * @param dataBroker {@link DataBroker}
      */
-    private void createTunnelPorts(InstanceIdentifier<Node> nodeIid, DataBroker dataBroker) {
+    private void createTunnelPorts(InstanceIdentifier<Node> nodeIid) {
 
         Node node = getTopologyNode(nodeIid, dataBroker);
         checkNotNull(node);

diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/EndpointHelper.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/EndpointHelper.java
index 979c11717fbfba6ef333ae53af28aa7a9f32bff8..abf16694df6532b5cc655d44cc3c59773e6f8983 100755 (executable)
--- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/EndpointHelper.java
+++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/EndpointHelper.java
@@ -11,7 +11,6 @@ import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.readFromDs;
 import static org.opendaylight.groupbasedpolicy.util.IidFactory.endpointIid;
 
 import com.google.common.base.Optional;
-
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -26,7 +25,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeCon
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 
 
-public class EndpointHelper {
+public final class EndpointHelper {
+    private EndpointHelper() {
+    }
 
     /**
      * Look up the {@link Endpoint} from the Endpoint Registry.

diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java
index 807ad1c8e84ce101ab1741db3a9d7281a108448d..173d2e1430e9a29c5765eb414cab9267a496629d 100755 (executable)
--- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java
+++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java
@@ -13,12 +13,10 @@ import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.readFromDs;
 import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.submitToDs;
 
 import com.google.common.base.Optional;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import org.apache.commons.lang3.StringUtils;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
@@ -46,11 +44,14 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class InventoryHelper {
+public final class InventoryHelper {
 
     private static final Logger LOG = LoggerFactory.getLogger(InventoryHelper.class);
     private static final String HEX = "0x";
 
+    private InventoryHelper() {
+    }
+
     /**
      * Convert an OpenFlow Datapath ID to a Long.
      *
@@ -59,9 +60,9 @@ public class InventoryHelper {
      */
     public static Long getLongFromDpid(String dpid) {
         String[] addressInBytes = dpid.split(":");
-        Long address = (Long.decode(HEX + addressInBytes[2]) << 40) | (Long.decode(HEX + addressInBytes[3]) << 32)
-                | (Long.decode(HEX + addressInBytes[4]) << 24) | (Long.decode(HEX + addressInBytes[5]) << 16)
-                | (Long.decode(HEX + addressInBytes[6]) << 8) | (Long.decode(HEX + addressInBytes[7]));
+        Long address = Long.decode(HEX + addressInBytes[2]) << 40 | Long.decode(HEX + addressInBytes[3]) << 32
+                | Long.decode(HEX + addressInBytes[4]) << 24 | Long.decode(HEX + addressInBytes[5]) << 16
+                | Long.decode(HEX + addressInBytes[6]) << 8 | Long.decode(HEX + addressInBytes[7]);
         return address;
     }
 
@@ -220,7 +221,7 @@ public class InventoryHelper {
     public static void updateOfOverlayConfig(IpAddress ip, String nodeIdString, String nodeConnectorIdString,
             AbstractTunnelType tunnelType, DataBroker dataBroker) {
 
-        if ((ip == null) || (nodeIdString == null) || (nodeConnectorIdString == null)) {
+        if (ip == null || nodeIdString == null || nodeConnectorIdString == null) {
             LOG.debug("Can't update OfOverlay: requisite information not present");
             return;
         }
@@ -232,7 +233,7 @@ public class InventoryHelper {
 
         // If it exists, use it in new augmentation constructor, else new augmentation
         OfOverlayNodeConfigBuilder ofOverlayNodeConfigBuilder;
-        Set<Tunnel> existingTunnels = new HashSet<Tunnel>();
+        Set<Tunnel> existingTunnels = new HashSet<>();
         if (ofConfig != null) {
             ofOverlayNodeConfigBuilder = new OfOverlayNodeConfigBuilder(ofConfig);
             if (ofConfig.getTunnel() != null) {
@@ -277,7 +278,7 @@ public class InventoryHelper {
 
         // Update the OfOverlayNodeConfig with the new tunnel information
         if (!existingTunnels.isEmpty()) {
-            ofOverlayNodeConfigBuilder.setTunnel(new ArrayList<Tunnel>(existingTunnels));
+            ofOverlayNodeConfigBuilder.setTunnel(new ArrayList<>(existingTunnels));
         }
         OfOverlayNodeConfig newConfig = ofOverlayNodeConfigBuilder.build();
         if (addOfOverlayConfig(newConfig, new NodeId(nodeIdString), dataBroker)) {

diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronHelper.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronHelper.java
index 6c7de96f041966db8b8323f6c0a53c60895f23f9..ff8b92c3a55ccfcedef909826045a55a1307057f 100644 (file)
--- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronHelper.java
+++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronHelper.java
@@ -11,7 +11,6 @@ package org.opendaylight.groupbasedpolicy.neutron.ovsdb.util;
 import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.readFromDs;
 
 import com.google.common.base.Optional;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -24,7 +23,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gb
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.gbp.by.neutron.mappings.endpoints.by.ports.EndpointByPortKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-public class NeutronHelper {
+public final class NeutronHelper {
+    private NeutronHelper() {
+    }
 
     /**
      * This looks up the Endpoint L2 key from an

diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronOvsdbIidFactory.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronOvsdbIidFactory.java
index ce0d3b007178eb5fd698c8e6f5168b51af99c1ab..44c16c73ff7e261bf0f4f337f36a5a81fdaa0a21 100644 (file)
--- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronOvsdbIidFactory.java
+++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronOvsdbIidFactory.java
@@ -27,7 +27,9 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-public class NeutronOvsdbIidFactory {
+public final class NeutronOvsdbIidFactory {
+    private NeutronOvsdbIidFactory() {
+    }
 
     public static InstanceIdentifier<Topology> topologyIid(TopologyId ovsdbTopologyId) {
         return InstanceIdentifier.create(NetworkTopology.class)

diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelper.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelper.java
index d4354bc9451b7d2c48422d683dc5efa980343148..66881965d90d81d5569a094cd739c6895f16e568 100755 (executable)
--- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelper.java
+++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelper.java
@@ -12,10 +12,8 @@ import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.readFromDs;
 import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.submitToDs;
 
 import com.google.common.base.Optional;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
@@ -44,7 +42,10 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class OvsdbHelper {
+public final class OvsdbHelper {
+    private OvsdbHelper() {
+    }
+
     private static final Logger LOG = LoggerFactory.getLogger(OvsdbHelper.class);
     private static final String OF_PORT = "6653";
 
@@ -128,7 +129,7 @@ public class OvsdbHelper {
         tpBuilder.setTpId(new TpId(new Uri(generateTpName(bridge, tunnelType))));
         tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, ovsdbTp);
 
-        List<TerminationPoint> tps = new ArrayList<TerminationPoint>();
+        List<TerminationPoint> tps = new ArrayList<>();
         tps.add(tpBuilder.build());
         return tps;
     }
@@ -168,7 +169,7 @@ public class OvsdbHelper {
     }
 
     public static List<ControllerEntry> buildControllerEntries(IpAddress ip) {
-        List<ControllerEntry> result = new ArrayList<ControllerEntry>();
+        List<ControllerEntry> result = new ArrayList<>();
 
         if (ip != null) {
             ControllerEntryBuilder controllerBuilder = new ControllerEntryBuilder();

diff --git a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelperTest.java b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelperTest.java
index e907996ed34e5fefa1ea96e4f16de6ba305dc13a..eb13aa8c52fc969d8fbebab5df681ed0cfada4d7 100644 (file)
--- a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelperTest.java
+++ b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelperTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.when;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@@ -218,15 +216,15 @@ public class OvsdbHelperTest {
         OvsdbBridgeAugmentationBuilder augmentationBuilder = new OvsdbBridgeAugmentationBuilder();
         augmentationBuilder.setBridgeName(new OvsdbBridgeName("bridgeName"));
 
-        Node node = OvsdbHelper.getNode(nodeBuilder.build(), Collections.singletonList(tpBuilder.build()),
+        Node tpNode = OvsdbHelper.getNode(nodeBuilder.build(), Collections.singletonList(tpBuilder.build()),
                 augmentationBuilder.build());
-        assertNotNull(node);
-        assertEquals("nodeId", node.getKey().getNodeId().getValue());
-        assertEquals(1, node.getTerminationPoint().size());
-        TerminationPoint terminationPoint = node.getTerminationPoint().get(0);
+        assertNotNull(tpNode);
+        assertEquals("nodeId", tpNode.getKey().getNodeId().getValue());
+        assertEquals(1, tpNode.getTerminationPoint().size());
+        TerminationPoint terminationPoint = tpNode.getTerminationPoint().get(0);
         assertNotNull(terminationPoint);
         assertEquals("tpId", terminationPoint.getKey().getTpId().getValue());
-        assertEquals("bridgeName", node.getAugmentation(OvsdbBridgeAugmentation.class).getBridgeName().getValue());
+        assertEquals("bridgeName", tpNode.getAugmentation(OvsdbBridgeAugmentation.class).getBridgeName().getValue());
     }
 
     @Test

diff --git a/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/util/ServiceChainingUtilTest.java b/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/util/ServiceChainingUtilTest.java
index 6e9f6746ccd44d4b38fc813bd0c69909195e887b..27e73d6e799a86de712868b0d1bd74584defb02f 100644 (file)
--- a/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/util/ServiceChainingUtilTest.java
+++ b/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/util/ServiceChainingUtilTest.java
@@ -181,7 +181,8 @@ public class ServiceChainingUtilTest {
         final Action action = actionBuilder(Collections.singletonList(parameterValue));
         final PolicyConfigurationContext context = policyConfigurationContextBuilder();
 
-        stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(pathsBuilder.build());
+        stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths"))
+            .toReturn(pathsBuilder.build());
         stub(method(PolicyManagerUtil.class, "getTenantId")).toReturn(null);
 
         ServiceChainingUtil.newChainAction(peerEndpoint, sgtBuilder(10), sgtBuilder(20),
@@ -492,7 +493,8 @@ public class ServiceChainingUtilTest {
         final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
         rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
 
-        stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder")).toReturn(forwarderBuilder.build());
+        stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder"))
+            .toReturn(forwarderBuilder.build());
 
         boolean result = ServiceChainingUtil.resolveRemoteSfcComponents(rspBuilder.build(), context);
         assertFalse(result);
@@ -513,7 +515,8 @@ public class ServiceChainingUtilTest {
         final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
         rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
 
-        stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder")).toReturn(forwarderBuilder.build());
+        stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder"))
+            .toReturn(forwarderBuilder.build());
 
         boolean result = ServiceChainingUtil.resolveRemoteSfcComponents(rspBuilder.build(), context);
         assertFalse(result);
@@ -535,7 +538,8 @@ public class ServiceChainingUtilTest {
         final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
         rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
 
-        stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder")).toReturn(forwarderBuilder.build());
+        stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder"))
+            .toReturn(forwarderBuilder.build());
 
         boolean result = ServiceChainingUtil.resolveRemoteSfcComponents(rspBuilder.build(), context);
         assertFalse(result);
@@ -557,7 +561,8 @@ public class ServiceChainingUtilTest {
         final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
         rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
 
-        stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder")).toReturn(forwarderBuilder.build());
+        stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder"))
+            .toReturn(forwarderBuilder.build());
 
         boolean result = ServiceChainingUtil.resolveRemoteSfcComponents(rspBuilder.build(), context);
         assertFalse(result);
@@ -580,7 +585,8 @@ public class ServiceChainingUtilTest {
         final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
         rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
 
-        stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder")).toReturn(forwarderBuilder.build());
+        stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder"))
+            .toReturn(forwarderBuilder.build());
         stub(method(PolicyWriterUtil.class, "writeServicePath")).toReturn(true);
         stub(method(PolicyWriterUtil.class, "writeRemote")).toReturn(true);
 
@@ -593,7 +599,8 @@ public class ServiceChainingUtilTest {
 
     @Test
     public void testFindServicePathFromParameterValues_noParams() {
-        final ServiceFunctionPath result = ServiceChainingUtil.findServicePathFromParameterValues(Collections.emptyList());
+        final ServiceFunctionPath result =
+            ServiceChainingUtil.findServicePathFromParameterValues(Collections.emptyList());
         assertNull(result);
     }
 
@@ -656,7 +663,8 @@ public class ServiceChainingUtilTest {
     public void findServiceFunctionPathFromServiceChainName_noPaths() {
         stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(null);
 
-        final ServiceFunctionPath result = ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(SFC_CHAIN_NAME));
+        final ServiceFunctionPath result =
+            ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(SFC_CHAIN_NAME));
         assertNull(result);
     }
 
@@ -664,11 +672,14 @@ public class ServiceChainingUtilTest {
     public void findServiceFunctionPathFromServiceChainName_noPathFound() {
         final ServiceFunctionPathBuilder serviceFunctionPathBuilder = new ServiceFunctionPathBuilder();
         final ServiceFunctionPathsBuilder serviceFunctionPathsBuilder = new ServiceFunctionPathsBuilder();
-        serviceFunctionPathsBuilder.setServiceFunctionPath(Collections.singletonList(serviceFunctionPathBuilder.build()));
+        serviceFunctionPathsBuilder
+            .setServiceFunctionPath(Collections.singletonList(serviceFunctionPathBuilder.build()));
 
-        stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(serviceFunctionPathsBuilder.build());
+        stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths"))
+            .toReturn(serviceFunctionPathsBuilder.build());
 
-        final ServiceFunctionPath result = ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(SFC_CHAIN_NAME));
+        final ServiceFunctionPath result =
+            ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(SFC_CHAIN_NAME));
         assertNull(result);
     }
 
@@ -678,11 +689,14 @@ public class ServiceChainingUtilTest {
         serviceFunctionPathBuilder.setName(new SfpName(SFC_PATH_NAME))
                 .setServiceChainName(new SfcName(SFC_CHAIN_NAME));
         final ServiceFunctionPathsBuilder serviceFunctionPathsBuilder = new ServiceFunctionPathsBuilder();
-        serviceFunctionPathsBuilder.setServiceFunctionPath(Collections.singletonList(serviceFunctionPathBuilder.build()));
+        serviceFunctionPathsBuilder
+            .setServiceFunctionPath(Collections.singletonList(serviceFunctionPathBuilder.build()));
 
-        stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(serviceFunctionPathsBuilder.build());
+        stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths"))
+            .toReturn(serviceFunctionPathsBuilder.build());
 
-        final ServiceFunctionPath result = ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(SFC_CHAIN_NAME));
+        final ServiceFunctionPath result =
+            ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(SFC_CHAIN_NAME));
         assertNotNull(result);
     }
 
@@ -698,7 +712,8 @@ public class ServiceChainingUtilTest {
         final ServiceFunctionPath serviceFunctionPath = serviceFunctionPathBuilder.build();
         final TenantId tenantId = new TenantId(TENANT_ID);
 
-        stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath")).toReturn(new RenderedServicePathBuilder().build());
+        stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath",RspName.class))
+            .toReturn(new RenderedServicePathBuilder().build());
 
         final RenderedServicePath result = ServiceChainingUtil.resolveRenderedServicePath(serviceFunctionPath, tenantId,
                 dataBroker, sourceSgt, destinationSgt, context);
@@ -718,7 +733,8 @@ public class ServiceChainingUtilTest {
         final ServiceFunctionPath serviceFunctionPath = serviceFunctionPathBuilder.build();
         final TenantId tenantId = new TenantId(TENANT_ID);
 
-        stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath")).toReturn(null);
+        stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath",RspName.class))
+            .toReturn(null);
         stub(method(SfcProviderRenderedPathAPI.class, "createRenderedServicePathAndState", ServiceFunctionPath.class,
                 CreateRenderedPathInput.class)).toReturn(new RenderedServicePathBuilder().build());
 
@@ -739,7 +755,8 @@ public class ServiceChainingUtilTest {
         final ServiceFunctionPath serviceFunctionPath = serviceFunctionPathBuilder.build();
         final TenantId tenantId = new TenantId(TENANT_ID);
 
-        stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath")).toReturn(new RenderedServicePathBuilder().build());
+        stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath",RspName.class))
+            .toReturn(new RenderedServicePathBuilder().build());
 
         final RenderedServicePath result = ServiceChainingUtil.resolveReversedRenderedServicePath(serviceFunctionPath,
                 tenantId, dataBroker, sourceSgt, destinationSgt, context);
@@ -759,7 +776,8 @@ public class ServiceChainingUtilTest {
         final ServiceFunctionPath serviceFunctionPath = serviceFunctionPathBuilder.build();
         final TenantId tenantId = new TenantId(TENANT_ID);
 
-        stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath")).toReturn(null);
+        stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath",RspName.class))
+            .toReturn(null);
         stub(method(SfcProviderRenderedPathAPI.class, "createReverseRenderedServicePathEntry"))
                 .toReturn(new RenderedServicePathBuilder().build());
 
@@ -791,9 +809,9 @@ public class ServiceChainingUtilTest {
 
         stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(sfcPaths);
 
-        final ServiceFunctionPath servicePath = ServiceChainingUtil.findServicePathFromParameterValues(Lists.newArrayList(
-                createParameterValue(sfcNameValue)
-        ));
+        final ServiceFunctionPath servicePath =
+            ServiceChainingUtil.findServicePathFromParameterValues(
+                Lists.newArrayList(createParameterValue(sfcNameValue)));
         assertEquals(sfcPath, servicePath);
     }
 
@@ -855,7 +873,8 @@ public class ServiceChainingUtilTest {
 
         stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(sfcPaths);
 
-        final ServiceFunctionPath servicePath = ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(sfcNameValue));
+        final ServiceFunctionPath servicePath =
+            ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(sfcNameValue));
         assertEquals(sfcPath, servicePath);
     }
 
@@ -893,7 +912,8 @@ public class ServiceChainingUtilTest {
         final PeerEndpointBuilder peerEndpointBuilder = new PeerEndpointBuilder();
         final RuleGroupWithRendererEndpointParticipationBuilder ruleGroupBuilder =
                 new RuleGroupWithRendererEndpointParticipationBuilder();
-        peerEndpointBuilder.setRuleGroupWithRendererEndpointParticipation(Collections.singletonList(ruleGroupBuilder.build()));
+        peerEndpointBuilder
+            .setRuleGroupWithRendererEndpointParticipation(Collections.singletonList(ruleGroupBuilder.build()));
         return peerEndpointBuilder.build();
     }
 
@@ -929,4 +949,4 @@ public class ServiceChainingUtilTest {
         final String IP_ADDRESS = "ip-address";
         return new PolicyManagerImpl.PolicyMapLocation(POLICY_MAP, INTERFACE, nodeId, IP_ADDRESS, dataBroker);
     }
-}
\ No newline at end of file
+}

diff --git a/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/commands/LoopbackCommandTest.java b/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/commands/LoopbackCommandTest.java
index 745ece86f6e6706b5be3d34ecc6722efe9ba722d..a69024c87f1e5ec467853c293ce1092bf92552ec 100644 (file)
--- a/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/commands/LoopbackCommandTest.java
+++ b/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/commands/LoopbackCommandTest.java
@@ -88,7 +88,8 @@ public class LoopbackCommandTest extends VppRendererDataBrokerTest {
         new Interface1Builder().setIpv4(new Ipv4Builder().setAddress(Collections.singletonList(
             new AddressBuilder()
                 .setIp(new Ipv4AddressNoZone(IP_ADDRESS.getIpv4Address()))
-                .setSubnet(new PrefixLengthBuilder().setPrefixLength((short) NetUtils.getMaskFromPrefix(IP_PREFIX.getIpv4Prefix().getValue())).build())
+                .setSubnet(new PrefixLengthBuilder()
+                    .setPrefixLength((short) NetUtils.getMaskFromPrefix(IP_PREFIX.getIpv4Prefix().getValue())).build())
                 .build()))
             .setEnabled(true)
             .setForwarding(false)
@@ -245,9 +246,8 @@ public class LoopbackCommandTest extends VppRendererDataBrokerTest {
         Assert.assertEquals(UPD_MAC_ADDRESS, augmentation.getLoopback().getMac());
         Interface1 interface1 = updatedInterface.getAugmentation(Interface1.class);
 
-        // merge operation will add new ip address to list so index is 1 for new ip
-        String ip = interface1.getIpv4().getAddress().get(1).getIp().getValue();
-        Subnet subnet = interface1.getIpv4().getAddress().get(1).getSubnet();
+        String ip = interface1.getIpv4().getAddress().get(0).getIp().getValue();
+        Subnet subnet = interface1.getIpv4().getAddress().get(0).getSubnet();
         String prefix = "";
 
         if ( subnet instanceof PrefixLength){