From 826e9fd8de53fdf7bfe3a408d6ecba02e4359c7e Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Mon, 27 Nov 2017 07:50:49 +0100 Subject: Remove unnecessary boxing and unboxing Change-Id: I9f7cf7d7ecb97d7da449dac679f2d15438ac4970 Signed-off-by: Marek Gradzki --- .../write/factory/MultipathHopRequestFactory.java | 16 ++++++++-------- .../routing/helpers/RoutingRequestTestHelper.java | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'routing') diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactory.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactory.java index 599d450d2..bad51478d 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactory.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactory.java @@ -67,7 +67,7 @@ public class MultipathHopRequestFactory extends BasicHopRequestFactory implement route.getDestinationPrefix(), nextHopInterfaceIndex, hop.getAddress(), - toByte(hop.getWeight()), + hop.getWeight().byteValue(), getRoutingProtocolContext().getIndex(parentProtocolName, mappingContext), DEFAULT_VNI, classifyTableIndex(routingAttributes.getClassifyTable(), getVppClassifierContextManager(), @@ -78,7 +78,7 @@ public class MultipathHopRequestFactory extends BasicHopRequestFactory implement route.getDestinationPrefix(), nextHopInterfaceIndex, hop.getAddress(), - toByte(hop.getWeight()), + hop.getWeight().byteValue(), getRoutingProtocolContext().getIndex(parentProtocolName, mappingContext), DEFAULT_VNI, 0, @@ -102,7 +102,7 @@ public class MultipathHopRequestFactory extends BasicHopRequestFactory implement route.getDestinationPrefix(), nextHopInterfaceIndex, hop.getAddress(), - toByte(hop.getWeight()), + hop.getWeight().byteValue(), getRoutingProtocolContext().getIndex(parentProtocolName, mappingContext), DEFAULT_VNI, classifyTableIndex(routingAttributes.getClassifyTable(), getVppClassifierContextManager(), @@ -113,7 +113,7 @@ public class MultipathHopRequestFactory extends BasicHopRequestFactory implement route.getDestinationPrefix(), nextHopInterfaceIndex, hop.getAddress(), - toByte(hop.getWeight()), + hop.getWeight().byteValue(), getRoutingProtocolContext().getIndex(parentProtocolName, mappingContext), DEFAULT_VNI, 0, @@ -129,8 +129,8 @@ public class MultipathHopRequestFactory extends BasicHopRequestFactory implement final int primaryVrf, final int secondaryVrf, final int classifyTableIndex, final boolean classifyIndexSet) { return flaglessAddDelRouteRequest(booleanToByte(isAdd), nextHopInterfaceIndex, - ipv6AddressNoZoneToArray(nextHopAddress), nextHopWeight, toByte(1), - ipv6AddressPrefixToArray(destinationAddress), extractPrefix(destinationAddress.getValue()), toByte(1), + ipv6AddressNoZoneToArray(nextHopAddress), nextHopWeight, (byte)1, + ipv6AddressPrefixToArray(destinationAddress), extractPrefix(destinationAddress.getValue()), (byte)1, primaryVrf, secondaryVrf, classifyTableIndex, booleanToByte(classifyIndexSet)); } @@ -142,8 +142,8 @@ public class MultipathHopRequestFactory extends BasicHopRequestFactory implement final int primaryVrf, final int secondaryVrf, final int classifyTableIndex, final boolean classifyIndexSet) { return flaglessAddDelRouteRequest(booleanToByte(isAdd), nextHopInterfaceIndex, - ipv4AddressNoZoneToArray(nextHopAddress.getValue()), nextHopWeight, toByte(0), - ipv4AddressPrefixToArray(destinationAddress), extractPrefix(destinationAddress.getValue()), toByte(1), + ipv4AddressNoZoneToArray(nextHopAddress.getValue()), nextHopWeight, (byte)0, + ipv4AddressPrefixToArray(destinationAddress), extractPrefix(destinationAddress.getValue()), (byte)1, primaryVrf, secondaryVrf, classifyTableIndex, booleanToByte(classifyIndexSet)); } diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java index b1703be26..dd6ba37d2 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java @@ -97,25 +97,25 @@ public interface RoutingRequestTestHelper extends ByteDataTranslator, FutureProd final int isProhibit) { final IpAddDelRoute request = new IpAddDelRoute(); - request.isAdd = toByte(add); - request.isIpv6 = toByte(ipv6); - request.isMultipath = toByte(isMultipath); + request.isAdd = (byte)add; + request.isIpv6 = (byte)ipv6; + request.isMultipath = (byte)isMultipath; request.dstAddress = destinationAddress; - request.dstAddressLength = toByte(destinationPrefixLength); + request.dstAddressLength = (byte)destinationPrefixLength; request.nextHopAddress = nextHopAddr; request.nextHopSwIfIndex = nextHopIndex; - request.nextHopWeight = toByte(nextHopWeight); + request.nextHopWeight = (byte)nextHopWeight; request.classifyTableIndex = classifyTableIndexSet; request.tableId = vrfId; request.nextHopTableId = secondaryVrfId; - request.createVrfIfNeeded = toByte(createVrfIfNeeded); + request.createVrfIfNeeded = (byte)createVrfIfNeeded; request.classifyTableIndex = classifyTableIndex; - request.isClassify = toByte(classifyTableIndexSet); + request.isClassify = (byte)classifyTableIndexSet; // special hop flags - request.isDrop = toByte(isDrop); - request.isLocal = toByte(isLocal); - request.isUnreach = toByte(isUnreach); - request.isProhibit = toByte(isProhibit); + request.isDrop = (byte)isDrop; + request.isLocal = (byte)isLocal; + request.isUnreach = (byte)isUnreach; + request.isProhibit = (byte)isProhibit; request.nextHopViaLabel = RouteRequestProducer.MPLS_LABEL_INVALID; return request; } -- cgit 1.2.3-korg