Migrate isFoo() callers 81/94481/1
authorRobert Varga <robert.varga@pantheon.tech>
Thu, 7 Jan 2021 16:44:36 +0000 (17:44 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Thu, 7 Jan 2021 16:54:59 +0000 (17:54 +0100)
Change-Id: I2752f947945ad50677ef7e110662a7cf0956f4fa
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
16 files changed:
northbound-api/src/main/java/org/opendaylight/neutron/northbound/impl/PortStatusUpdateInitializer.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractTranscriberInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronBgpvpnInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelRuleInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronQosPolicyInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java

index b738ca6c6c9812c06a4aec1652d8748b35fc8058..985469f5bfd77c393a4c0884d63bab05eda68f6b 100644 (file)
@@ -39,9 +39,7 @@ public class PortStatusUpdateInitializer {
         this.cfg = neutronNorthboundApiConfig;
         this.jsonRestconfService = jsonRestconfService;
 
-        boolean preRegister = cfg.isPreRegisterPortStatusWebsocket() == null || cfg.isPreRegisterPortStatusWebsocket();
-
-        if (preRegister) {
+        if (!Boolean.FALSE.equals(cfg.getPreRegisterPortStatusWebsocket())) {
             subscribeWebsocket();
         } else {
             LOG.info("PortStatusUpdateInitializer: Skipping pre-register of websockets");
index a8a844911518fa93ca55186ea067066a0ee9c235..1ecccbe89050f0fb0dbf424401ae9cf54d03bc4a 100644 (file)
@@ -287,10 +287,10 @@ public abstract class AbstractTranscriberInterface<
         }
     }
 
-    protected <M extends AdminAttributes, S1 extends INeutronAdminAttributes<S1>>
-        void fromMdAdminAttributes(M attr, S1 answer) {
-        if (attr.isAdminStateUp() != null) {
-            answer.setAdminStateUp(attr.isAdminStateUp());
+    protected <M extends AdminAttributes, S1 extends INeutronAdminAttributes<S1>> void fromMdAdminAttributes(M attr,
+            S1 answer) {
+        if (attr.getAdminStateUp() != null) {
+            answer.setAdminStateUp(attr.getAdminStateUp());
         }
         if (attr.getStatus() != null) {
             answer.setStatus(attr.getStatus());
index 6918e8f6ad44124892fe156a7ba7738612d12e5a..1df10064622a77dc0d1d1acbe11d8ac66cb5c86d 100644 (file)
@@ -50,7 +50,7 @@ public final class NeutronBgpvpnInterface extends AbstractNeutronInterface<Bgpvp
         final NeutronBgpvpn result = new NeutronBgpvpn();
         fromMdBaseAttributes(bgpvpn, result);
         fromMdAdminAttributes(bgpvpn, result);
-        result.setAutoAggregate(bgpvpn.isAutoAggregate());
+        result.setAutoAggregate(bgpvpn.getAutoAggregate());
         if (bgpvpn.getVni() != null) {
             result.setVni(bgpvpn.getVni().toJava());
         }
index ec4b87bce19be18404a92cb86d31f175aaa86506..7732abc45917c7fe327e4ac856554bdc72bd3c19 100644 (file)
@@ -40,9 +40,9 @@ public final class NeutronFirewallInterface
     protected NeutronFirewall fromMd(Firewall firewall) {
         final NeutronFirewall answer = new NeutronFirewall();
         fromMdBaseAttributes(firewall, answer);
-        answer.setFirewallAdminStateIsUp(firewall.isAdminStateUp());
-        if (firewall.isShared() != null) {
-            answer.setFirewallIsShared(firewall.isShared());
+        answer.setFirewallAdminStateIsUp(firewall.getAdminStateUp());
+        if (firewall.getShared() != null) {
+            answer.setFirewallIsShared(firewall.getShared());
         }
         if (firewall.getFirewallPolicyId() != null) {
             answer.setFirewallPolicyID(firewall.getFirewallPolicyId().getValue());
index ec63996ccefa59231dc5aa82b8e72cff52b0c4aa..6e2d9ef890a7f67d2a16c4197150ef04a02960be 100644 (file)
@@ -39,11 +39,11 @@ public final class NeutronFirewallPolicyInterface
     protected NeutronFirewallPolicy fromMd(FirewallPolicy policy) {
         final NeutronFirewallPolicy answer = new NeutronFirewallPolicy();
         fromMdBaseAttributes(policy, answer);
-        if (policy.isShared() != null) {
-            answer.setFirewallPolicyIsShared(policy.isShared());
+        if (policy.getShared() != null) {
+            answer.setFirewallPolicyIsShared(policy.getShared());
         }
-        if (policy.isAudited() != null) {
-            answer.setFirewallPolicyIsAudited(policy.isAudited());
+        if (policy.getAudited() != null) {
+            answer.setFirewallPolicyIsAudited(policy.getAudited());
         }
         return answer;
     }
index 589f73aca04302189ee59be1d6c44c322b2eeff5..91ad68274e45ab89375865383cfac2a7ed514aa8 100644 (file)
@@ -44,7 +44,7 @@ public final class NeutronFirewallRuleInterface
 
     private static final ImmutableBiMap<Class<? extends IpVersionBase>,
             Integer> IP_VERSION_MAP = new ImmutableBiMap.Builder<Class<? extends IpVersionBase>, Integer>()
-                    .put(IpVersionV4.class, Integer.valueOf(4)).put(IpVersionV6.class, Integer.valueOf(6)).build();
+                    .put(IpVersionV4.class, 4).put(IpVersionV6.class, 6).build();
 
     @Inject
     public NeutronFirewallRuleInterface(DataBroker db) {
@@ -60,11 +60,11 @@ public final class NeutronFirewallRuleInterface
     protected NeutronFirewallRule fromMd(FirewallRule rule) {
         final NeutronFirewallRule answer = new NeutronFirewallRule();
         fromMdBaseAttributes(rule, answer);
-        if (rule.isShared() != null) {
-            answer.setFirewallRuleIsShared(rule.isShared());
+        if (rule.getShared() != null) {
+            answer.setFirewallRuleIsShared(rule.getShared());
         }
-        if (rule.isEnabled() != null) {
-            answer.setFirewallRuleIsEnabled(rule.isEnabled());
+        if (rule.getEnabled() != null) {
+            answer.setFirewallRuleIsEnabled(rule.getEnabled());
         }
         if (rule.getFirewallPolicyId() != null) {
             answer.setFirewallRulePolicyID(rule.getFirewallPolicyId().getValue());
@@ -101,7 +101,7 @@ public final class NeutronFirewallRuleInterface
             answer.setFirewallRuleDstPortRangeMax(rule.getDestinationPortRangeMax().toJava());
         }
         if (rule.getPosition() != null) {
-            answer.setFirewallRulePosition(Integer.valueOf(rule.getPosition().intValue()));
+            answer.setFirewallRulePosition(rule.getPosition().intValue());
         }
         if (rule.getAction() != null) {
             answer.setFirewallRuleAction(ACTION_MAP.get(rule.getAction()));
index d78aee3e89da1c4a1b6b2f045b607b8263b67aed..89f6c3e3df70c1e771997634d23f7a580d0f9edc 100644 (file)
@@ -94,8 +94,8 @@ public final class NeutronLoadBalancerHealthMonitorInterface
     protected NeutronLoadBalancerHealthMonitor fromMd(Healthmonitor healthMonitor) {
         final NeutronLoadBalancerHealthMonitor answer = new NeutronLoadBalancerHealthMonitor();
         fromMdIds(healthMonitor, answer);
-        if (healthMonitor.isAdminStateUp() != null) {
-            answer.setLoadBalancerHealthMonitorAdminStateIsUp(healthMonitor.isAdminStateUp());
+        if (healthMonitor.getAdminStateUp() != null) {
+            answer.setLoadBalancerHealthMonitorAdminStateIsUp(healthMonitor.getAdminStateUp());
         }
         if (healthMonitor.getDelay() != null) {
             answer.setLoadBalancerHealthMonitorDelay(healthMonitor.getDelay().intValue());
index 872a2f666bed6488a36fd76e54f759893c6fe5b3..45f20f3073475e5b9c46d0f0694ddbb0bf763c92 100644 (file)
@@ -90,8 +90,8 @@ public final class NeutronLoadBalancerListenerInterface
     protected NeutronLoadBalancerListener fromMd(Listener listener) {
         final NeutronLoadBalancerListener answer = new NeutronLoadBalancerListener();
         fromMdBaseAttributes(listener, answer);
-        if (listener.isAdminStateUp() != null) {
-            answer.setLoadBalancerListenerAdminStateIsUp(listener.isAdminStateUp());
+        if (listener.getAdminStateUp() != null) {
+            answer.setLoadBalancerListenerAdminStateIsUp(listener.getAdminStateUp());
         }
         if (listener.getConnectionLimit() != null) {
             answer.setNeutronLoadBalancerListenerConnectionLimit(listener.getConnectionLimit());
index 2a2931b9e792bb3c4b9be65e35bb713d545a4a9b..c77026c728305ef5f42e82becb007a7ed5888fe9 100644 (file)
@@ -110,8 +110,8 @@ public final class NeutronLoadBalancerPoolInterface
     protected NeutronLoadBalancerPool fromMd(Pool pool) {
         final NeutronLoadBalancerPool answer = new NeutronLoadBalancerPool();
         fromMdBaseAttributes(pool, answer);
-        if (pool.isAdminStateUp() != null) {
-            answer.setLoadBalancerPoolAdminStateIsUp(pool.isAdminStateUp());
+        if (pool.getAdminStateUp() != null) {
+            answer.setLoadBalancerPoolAdminStateIsUp(pool.getAdminStateUp());
         }
         if (pool.getHealthmonitorId() != null) {
             answer.setLoadBalancerPoolHealthMonitorID(pool.getHealthmonitorId().getValue());
@@ -230,8 +230,8 @@ public final class NeutronLoadBalancerPoolInterface
     protected NeutronLoadBalancerPoolMember fromMemberMd(Member member) {
         final NeutronLoadBalancerPoolMember answer = new NeutronLoadBalancerPoolMember();
         fromMdIds(member, answer);
-        if (member.isAdminStateUp() != null) {
-            answer.setPoolMemberAdminStateIsUp(member.isAdminStateUp());
+        if (member.getAdminStateUp() != null) {
+            answer.setPoolMemberAdminStateIsUp(member.getAdminStateUp());
         }
         if (member.getAddress() != null) {
             answer.setPoolMemberAddress(member.getAddress().stringValue());
index e1d002d01eea1fe808ce9ef8a9db31d3a8e58523..bea1f61acb523a70a5d2e9c14cacea80a9883d96 100644 (file)
@@ -50,8 +50,8 @@ public final class NeutronMeteringLabelInterface
     protected NeutronMeteringLabel fromMd(MeteringLabel label) {
         final NeutronMeteringLabel answer = new NeutronMeteringLabel();
         fromMdBaseAttributes(label, answer);
-        if (label.isShared() != null) {
-            answer.setMeteringLabelShared(label.isShared());
+        if (label.getShared() != null) {
+            answer.setMeteringLabelShared(label.getShared());
         }
         return answer;
     }
index 1d1fac80c607733536a1475ab83a5d3286b95ab3..e1829b516e3cbf9de150b4c97333af6c62929069 100644 (file)
@@ -72,7 +72,7 @@ public final class NeutronMeteringLabelRuleInterface
         if (rule.getRemoteIpPrefix() != null) {
             answer.setMeteringLabelRuleRemoteIpPrefix(rule.getRemoteIpPrefix().stringValue());
         }
-        answer.setMeteringLabelRuleExcluded(rule.isExcluded());
+        answer.setMeteringLabelRuleExcluded(rule.getExcluded());
         return answer;
     }
 }
index dca8f6aba1f8a4efe8bbeae43aaa83af9f77d703..38164e1f4c6b02c593b5ccc9900c933185526ed2 100644 (file)
@@ -72,11 +72,11 @@ public final class NeutronNetworkInterface
         result.initDefaults();
         fromMdBaseAttributes(network, result);
         fromMdAdminAttributes(network, result);
-        result.setShared(network.isShared());
-        result.setVlanTransparent(network.isVlanTransparent());
+        result.setShared(network.getShared());
+        result.setVlanTransparent(network.getVlanTransparent());
 
         final NetworkL3Extension l3Extension = network.augmentation(NetworkL3Extension.class);
-        result.setRouterExternal(l3Extension.isExternal());
+        result.setRouterExternal(l3Extension.getExternal());
 
         final NetworkProviderExtension providerExtension = network.augmentation(NetworkProviderExtension.class);
         result.setProviderPhysicalNetwork(providerExtension.getPhysicalNetwork());
index b89bb3563adfb614a4795845dfe803c2c140643c..a63eac5ae2a8db3866e5a93e7c21c1650546c45f 100644 (file)
@@ -60,7 +60,7 @@ public final class NeutronPortInterface extends AbstractNeutronInterface<Port, P
     // TODO: consolidate this map with NeutronSubnetInterface.IPV_MAP
     private static final ImmutableBiMap<Class<? extends IpVersionBase>,
             Integer> IPV_MAP = new ImmutableBiMap.Builder<Class<? extends IpVersionBase>, Integer>()
-                    .put(IpVersionV4.class, Integer.valueOf(4)).put(IpVersionV6.class, Integer.valueOf(6)).build();
+                    .put(IpVersionV4.class, 4).put(IpVersionV6.class, 6).build();
 
     @Inject
     public NeutronPortInterface(DataBroker db) {
@@ -90,14 +90,14 @@ public final class NeutronPortInterface extends AbstractNeutronInterface<Port, P
         result.setBindingvnicType(binding.getVnicType());
     }
 
-    private void portSecurityExtension(Port port, NeutronPort result) {
+    private static void portSecurityExtension(Port port, NeutronPort result) {
         final PortSecurityExtension portSecurity = port.augmentation(PortSecurityExtension.class);
-        if (portSecurity != null && portSecurity.isPortSecurityEnabled() != null) {
-            result.setPortSecurityEnabled(portSecurity.isPortSecurityEnabled());
+        if (portSecurity != null && portSecurity.getPortSecurityEnabled() != null) {
+            result.setPortSecurityEnabled(portSecurity.getPortSecurityEnabled());
         }
     }
 
-    private void qosExtension(Port port, NeutronPort result) {
+    private static void qosExtension(Port port, NeutronPort result) {
         final QosPortExtension qos = port.augmentation(QosPortExtension.class);
         if (qos != null && qos.getQosPolicyId() != null) {
             result.setQosPolicyId(qos.getQosPolicyId().getValue());
index 96cecbe04300d3a66203bdebe813ed04970fb6d4..af5d3580ccb5a0c8b0c1a0f47e7fe18065eeef28 100644 (file)
@@ -97,8 +97,8 @@ public final class NeutronQosPolicyInterface
     protected NeutronQosPolicy fromMd(QosPolicy qosPolicy) {
         final NeutronQosPolicy result = new NeutronQosPolicy();
         fromMdBaseAttributes(qosPolicy, result);
-        if (qosPolicy.isShared() != null) {
-            result.setPolicyIsShared(qosPolicy.isShared());
+        if (qosPolicy.getShared() != null) {
+            result.setPolicyIsShared(qosPolicy.getShared());
         }
         if (qosPolicy.getBandwidthLimitRules() != null) {
             final List<NeutronQosBandwidthLimitRule> bandwidthLimitRules = new ArrayList<>();
index 6c6cbb85bb638fb9886321a99d64f9e79ae910ed..69fb53c6946754f9989f2a3248d10d811115b0e0 100644 (file)
@@ -99,7 +99,7 @@ public final class NeutronRouterInterface extends AbstractNeutronInterface<Route
         final NeutronRouter result = new NeutronRouter();
         fromMdBaseAttributes(router, result);
         fromMdAdminAttributes(router, result);
-        result.setDistributed(router.isDistributed());
+        result.setDistributed(router.getDistributed());
         if (router.getGatewayPortId() != null) {
             result.setGatewayPortId(String.valueOf(router.getGatewayPortId().getValue()));
         }
@@ -117,7 +117,7 @@ public final class NeutronRouterInterface extends AbstractNeutronInterface<Route
         if (router.getExternalGatewayInfo() != null) {
             final NeutronRouterNetworkReference extGwInfo = new NeutronRouterNetworkReference();
             extGwInfo.setNetworkID(String.valueOf(router.getExternalGatewayInfo().getExternalNetworkId().getValue()));
-            extGwInfo.setEnableSNAT(router.getExternalGatewayInfo().isEnableSnat());
+            extGwInfo.setEnableSNAT(router.getExternalGatewayInfo().getEnableSnat());
             if (router.getExternalGatewayInfo().getExternalFixedIps() != null) {
                 final List<NeutronIps> fixedIps = new ArrayList<>();
                 for (final ExternalFixedIps mdFixedIp
index 659388a9cc8311c3e02399ffbb59a5c64878f3bf..f751197a759c720ec700ecd2073e19153463d0c1 100644 (file)
@@ -50,8 +50,8 @@ public final class NeutronSubnetInterface extends AbstractNeutronInterface<Subne
 
     private static final ImmutableBiMap<Class<? extends IpVersionBase>,
             Integer> IPV_MAP = new ImmutableBiMap.Builder<Class<? extends IpVersionBase>, Integer>()
-                    .put(IpVersionV4.class, Integer.valueOf(IPV4_VERSION))
-                    .put(IpVersionV6.class, Integer.valueOf(IPV6_VERSION)).build();
+                    .put(IpVersionV4.class, IPV4_VERSION)
+                    .put(IpVersionV6.class, IPV6_VERSION).build();
 
     private static final ImmutableBiMap<Class<? extends Dhcpv6Base>,
             String> DHCPV6_MAP = new ImmutableBiMap.Builder<Class<? extends Dhcpv6Base>, String>()
@@ -86,7 +86,7 @@ public final class NeutronSubnetInterface extends AbstractNeutronInterface<Subne
         if (subnet.getIpv6AddressMode() != null) {
             result.setIpV6AddressMode(DHCPV6_MAP.get(subnet.getIpv6AddressMode()));
         }
-        result.setEnableDHCP(subnet.isEnableDhcp());
+        result.setEnableDHCP(subnet.getEnableDhcp());
         if (subnet.getAllocationPools() != null) {
             final List<NeutronSubnetIpAllocationPool> allocationPools = new ArrayList<>();
             for (final AllocationPools allocationPool : subnet.getAllocationPools().values()) {