From a5aa2de02539c48bdda2424eff603ff30c48f16d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 29 Sep 2020 12:51:02 +0200 Subject: [PATCH] Use uint types in itm-impl Fix most warnings coming from use of widened types by adopting uint types. Change-Id: Ib6d0bc78798c5605f136827c19d60ca40d728f34 Signed-off-by: Robert Varga --- .../ItmMonitorIntervalWorker.java | 19 ++++++----- .../genius/itm/impl/ItmUtils.java | 7 ++-- .../ovs/utilities/DirectTunnelUtils.java | 3 +- .../TunnelMonitorIntervalListener.java | 6 ++-- .../impl/ItmTepInstanceRecoveryHandler.java | 7 ++-- .../genius/itm/rpc/ItmManagerRpcService.java | 33 ++++++++----------- .../genius/itm/tests/ItmTestModule.java | 3 +- 7 files changed, 40 insertions(+), 38 deletions(-) diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorIntervalWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorIntervalWorker.java index 39c535a4d..418d920ef 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorIntervalWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorIntervalWorker.java @@ -7,6 +7,8 @@ */ package org.opendaylight.genius.itm.confighelpers; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.ListenableFuture; import java.util.ArrayList; import java.util.List; @@ -21,6 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.config.rev160406.TunnelMonitorInterval; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.config.rev160406.TunnelMonitorIntervalBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Uint16; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,28 +32,28 @@ public class ItmMonitorIntervalWorker implements Callable> call() { - LOG.debug("Invoking Tunnel Monitor Worker tzone = {} Interval= {}",tzone,interval); + LOG.debug("Invoking Tunnel Monitor Worker tzone = {} Interval= {}", tzone, interval); return toggleTunnelMonitoring(); } private List> toggleTunnelMonitoring() { List> futures = new ArrayList<>(); List tunnelList = ItmUtils.getInternalTunnelInterfaces(dataBroker); - LOG.debug("ItmMonitorIntervalWorker toggleTunnelMonitoring: List of tunnel interfaces: {}" , tunnelList); + LOG.debug("ItmMonitorIntervalWorker toggleTunnelMonitoring: List of tunnel interfaces: {}", tunnelList); InstanceIdentifier iid = InstanceIdentifier.create(TunnelMonitorInterval.class); TunnelMonitorInterval monitorInterval = new TunnelMonitorIntervalBuilder().setInterval(interval).build(); futures.add(txRunner.callWithNewWriteOnlyTransactionAndSubmit(Datastore.OPERATIONAL, @@ -64,7 +67,7 @@ public class ItmMonitorIntervalWorker implements Callable> @@ -325,12 +326,12 @@ public final class ItmUtils { .setDatapathNodeIdentifier(dpn) .setParentInterface(parentIfaceName) .build()); - Long monitoringInterval = null; + Uint32 monitoringInterval = null; LOG.debug("buildTunnelInterface: monitorProtocol = {} and monitorInterval = {}", monitorProtocol.getName(), monitorInterval); if (monitorInterval != null) { - monitoringInterval = monitorInterval.longValue(); + monitoringInterval = Uint32.valueOf(monitorInterval); } return builder.addAugmentation(new IfTunnelBuilder() diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/renderer/ovs/utilities/DirectTunnelUtils.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/renderer/ovs/utilities/DirectTunnelUtils.java index de0ca44ed..4e5375d86 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/renderer/ovs/utilities/DirectTunnelUtils.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/renderer/ovs/utilities/DirectTunnelUtils.java @@ -127,6 +127,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.OperationFailedException; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -525,7 +526,7 @@ public final class DirectTunnelUtils { if (vlanId != 0) { tpAugmentationBuilder.setVlanMode(OvsdbPortInterfaceAttributes.VlanMode.Access); - tpAugmentationBuilder.setVlanTag(new VlanId(vlanId)); + tpAugmentationBuilder.setVlanTag(new VlanId(Uint16.valueOf(vlanId))); } if (itmConfig.isUseOfTunnels()) { diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/listeners/TunnelMonitorIntervalListener.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/listeners/TunnelMonitorIntervalListener.java index 8ba821d78..d6e9ff59d 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/listeners/TunnelMonitorIntervalListener.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/listeners/TunnelMonitorIntervalListener.java @@ -78,7 +78,7 @@ public class TunnelMonitorIntervalListener extends AbstractSyncDataTreeChangeLis ovsBridgeRefEntryCache)); } else { ItmMonitorIntervalWorker toggleWorker = new ItmMonitorIntervalWorker(tzone.getZoneName(), - dataObjectModification.getInterval().toJava(), broker); + dataObjectModification.getInterval(), broker); jobCoordinator.enqueueJob(tzone.getZoneName(), toggleWorker); } } @@ -104,7 +104,7 @@ public class TunnelMonitorIntervalListener extends AbstractSyncDataTreeChangeLis jobCoordinator.enqueueJob(tzone.getZoneName(), monitorWorker); } else { ItmMonitorIntervalWorker intervalWorker = new ItmMonitorIntervalWorker(tzone.getZoneName(), - dataObjectModificationAfter.getInterval().toJava(), broker); + dataObjectModificationAfter.getInterval(), broker); jobCoordinator.enqueueJob(tzone.getZoneName(), intervalWorker); } } @@ -129,7 +129,7 @@ public class TunnelMonitorIntervalListener extends AbstractSyncDataTreeChangeLis jobCoordinator.enqueueJob(tzone.getZoneName(), toggleWorker); } else { ItmMonitorIntervalWorker intervalWorker = new ItmMonitorIntervalWorker(tzone.getZoneName(), - dataObjectModification.getInterval().toJava(), broker); + dataObjectModification.getInterval(), broker); //conversion to milliseconds done while writing to i/f-mgr config DS jobCoordinator.enqueueJob(tzone.getZoneName(), intervalWorker); } diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/recovery/impl/ItmTepInstanceRecoveryHandler.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/recovery/impl/ItmTepInstanceRecoveryHandler.java index 6c5ff6169..306bc9574 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/recovery/impl/ItmTepInstanceRecoveryHandler.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/recovery/impl/ItmTepInstanceRecoveryHandler.java @@ -194,12 +194,12 @@ public class ItmTepInstanceRecoveryHandler implements ServiceRecoveryInterface { StateTunnelListKey tlKey = new StateTunnelListKey(interfaceName); LOG.trace("TunnelStateKey: {} for interface: {}", tlKey, interfaceName); InstanceIdentifier stListId = ItmUtils.buildStateTunnelListId(tlKey); - eventCallbacks.onRemove(LogicalDatastoreType.OPERATIONAL, stListId, (unused) -> { + eventCallbacks.onRemove(LogicalDatastoreType.OPERATIONAL, stListId, unused -> { LOG.trace("callback event for a delete {} interface instance....", stListId); // recreating the transportZone recreateTEP(tzName, tepsToRecover, eventCallbackCount, interfaceListToRecover.size()); return DataTreeEventCallbackRegistrar.NextAction.UNREGISTER; - }, Duration.ofMillis(5000), (id) -> { + }, Duration.ofMillis(5000), id -> { LOG.trace("event callback timed out for {} tunnel interface ", interfaceName); recreateTEP(tzName, tepsToRecover, eventCallbackCount, interfaceListToRecover.size()); }); @@ -211,7 +211,8 @@ public class ItmTepInstanceRecoveryHandler implements ServiceRecoveryInterface { } } - private void recreateTEP(String tzName, List tepts, AtomicInteger eventCallbackCount, int registeredEventSize) { + private void recreateTEP(String tzName, List tepts, AtomicInteger eventCallbackCount, + int registeredEventSize) { eventCallbackCount.incrementAndGet(); if (eventCallbackCount.intValue() == registeredEventSize || registeredEventSize == 0) { LOG.info("Re-creating TEP {}", tzName); diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java index d2f901ccd..cbee6578b 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java @@ -172,6 +172,7 @@ import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -401,8 +402,8 @@ public class ItmManagerRpcService implements ItmRpcService { LOG.debug("setBfdParamOnTunnel srcDpnId: {}, destDpnId: {}", srcDpnId, destDpnId); final SettableFuture> result = SettableFuture.create(); FluentFuture future = txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> { - enableBFD(tx, srcDpnId, destDpnId, input.isMonitoringEnabled(), input.getMonitoringInterval().toJava()); - enableBFD(tx, destDpnId, srcDpnId, input.isMonitoringEnabled(), input.getMonitoringInterval().toJava()); + enableBFD(tx, srcDpnId, destDpnId, input.isMonitoringEnabled(), input.getMonitoringInterval()); + enableBFD(tx, destDpnId, srcDpnId, input.isMonitoringEnabled(), input.getMonitoringInterval()); }); future.addCallback(new FutureCallback() { @@ -423,7 +424,7 @@ public class ItmManagerRpcService implements ItmRpcService { } private void enableBFD(TypedWriteTransaction tx, Uint64 srcDpnId, Uint64 destDpnId, - final Boolean enabled, final Integer interval) throws ReadFailedException { + final Boolean enabled, final Uint16 interval) throws ReadFailedException { DpnTepInterfaceInfo dpnTepInterfaceInfo = dpnTepStateCache.getDpnTepInterface(srcDpnId, destDpnId); RemoteDpnsBuilder remoteDpnsBuilder = new RemoteDpnsBuilder(); remoteDpnsBuilder.withKey(new RemoteDpnsKey(destDpnId)).setDestinationDpnId(destDpnId) @@ -1109,21 +1110,18 @@ public class ItmManagerRpcService implements ItmRpcService { @Override public ListenableFuture> isTunnelInternalOrExternal( IsTunnelInternalOrExternalInput input) { - RpcResultBuilder resultBld; String tunIfName = input.getTunnelInterfaceName(); - long tunVal = 0; - IsTunnelInternalOrExternalOutputBuilder output = new IsTunnelInternalOrExternalOutputBuilder() - .setTunnelType(tunVal); - + final Uint32 tunVal; if (ItmUtils.ITM_CACHE.getInternalTunnel(tunIfName) != null) { - tunVal = 1; + tunVal = Uint32.ONE; } else if (ItmUtils.ITM_CACHE.getExternalTunnel(tunIfName) != null) { - tunVal = 2; + tunVal = Uint32.TWO; + } else { + tunVal = Uint32.ZERO; } - output.setTunnelType(tunVal); - resultBld = RpcResultBuilder.success(); - resultBld.withResult(output.build()); - return Futures.immediateFuture(resultBld.build()); + + return RpcResultBuilder.success(new IsTunnelInternalOrExternalOutputBuilder().setTunnelType(tunVal).build()) + .buildFuture(); } @Override @@ -1135,18 +1133,15 @@ public class ItmManagerRpcService implements ItmRpcService { tx -> dcGatewayIpList.putAll(getDcGatewayIpList(tx))).isDone(); String dcgwIpStr = input.getDcgwIp(); IpAddress dcgwIpAddr = IpAddressBuilder.getDefaultInstance(dcgwIpStr); - long retVal; if (!dcGatewayIpList.isEmpty() && dcGatewayIpList.values().stream().anyMatch(gwIp -> dcgwIpAddr.equals(gwIp.getIpAddress()))) { //Match found - retVal = 1; - IsDcgwPresentOutputBuilder output = new IsDcgwPresentOutputBuilder().setRetVal(retVal); + IsDcgwPresentOutputBuilder output = new IsDcgwPresentOutputBuilder().setRetVal(Uint32.ONE); resultBld.withResult(output.build()); } else { //Match not found - retVal = 2; - IsDcgwPresentOutputBuilder output = new IsDcgwPresentOutputBuilder().setRetVal(retVal); + IsDcgwPresentOutputBuilder output = new IsDcgwPresentOutputBuilder().setRetVal(Uint32.TWO); resultBld.withResult(output.build()); } return Futures.immediateFuture(resultBld.build()); diff --git a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/ItmTestModule.java b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/ItmTestModule.java index 377f11c9f..a9a8d3bc9 100644 --- a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/ItmTestModule.java +++ b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/ItmTestModule.java @@ -55,6 +55,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.config.rev160406 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.config.rev160406.ItmConfigBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rpcs.rev160406.ItmRpcService; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.LockManagerService; +import org.opendaylight.yangtools.yang.common.Uint16; /** * Dependency Injection Wiring for {@link ItmTest}. @@ -74,7 +75,7 @@ public class ItmTestModule extends AbstractGuiceJsr250Module { .setDefTzTunnelType(ITMConstants.TUNNEL_TYPE_VXLAN) .setGpeExtensionEnabled(false) .setPortname("") - .setVlanId(0) + .setVlanId(Uint16.ZERO) .setUseOfTunnels(true) .build(); bind(ItmConfig.class).toInstance(itmConfigObj); -- 2.36.6