From 57ba77d668ba8c9069df0164a287ddf890eea0ef Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 7 Aug 2014 18:07:18 +0200 Subject: [PATCH] Fix potential performance problems reported by findbugs Reported things are inefficient number instatiantions, so this is very safe. Change-Id: If865d3748f79a046b3546249facc29968dd25d2d Signed-off-by: Robert Varga --- .../openflow/md/core/sal/convertor/ActionConvertor.java | 4 ++-- .../openflow/md/core/sal/convertor/FlowConvertor.java | 8 ++++---- .../openflow/md/core/sal/convertor/GroupConvertor.java | 2 +- .../md/core/sal/convertor/match/MatchConvertorImpl.java | 2 +- .../md/core/translator/MultipartReplyTranslator.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java index c1773eb06f..027203bc34 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java @@ -458,7 +458,7 @@ public final class ActionConvertor { matchEntriesBuilder.setOxmMatchField(VlanVid.class); VlanVidMatchEntryBuilder vlanVidBuilder = new VlanVidMatchEntryBuilder(); vlanVidBuilder.setCfiBit(true); - vlanVidBuilder.setVlanVid(new Integer(0x0000)); + vlanVidBuilder.setVlanVid(0x0000); matchEntriesBuilder.addAugmentation(VlanVidMatchEntry.class, vlanVidBuilder.build()); matchEntriesBuilder.setHasMask(false); matchEntriesList.add(matchEntriesBuilder.build()); @@ -704,7 +704,7 @@ public final class ActionConvertor { if (outputAction.getMaxLength() != null) { maxLenActionBuilder.setMaxLength(outputAction.getMaxLength()); } else { - maxLenActionBuilder.setMaxLength(new Integer(0)); + maxLenActionBuilder.setMaxLength(0); } actionBuilder.addAugmentation(MaxLengthAction.class, maxLenActionBuilder.build()); diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/FlowConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/FlowConvertor.java index c709080232..1ab6b6c34c 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/FlowConvertor.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/FlowConvertor.java @@ -64,9 +64,9 @@ public class FlowConvertor { // Default values for when things are null private static final BigInteger DEFAULT_COOKIE = BigInteger.ZERO; private static final BigInteger DEFAULT_COOKIE_MASK = BigInteger.ZERO; - private static final TableId DEFAULT_TABLE_ID = new TableId(new Long(0)); - private static final Integer DEFAULT_IDLE_TIMEOUT = new Integer(5 * 60); - private static final Integer DEFAULT_HARD_TIMEOUT = new Integer(10 * 60); + private static final TableId DEFAULT_TABLE_ID = new TableId(0L); + private static final Integer DEFAULT_IDLE_TIMEOUT = 5 * 60; + private static final Integer DEFAULT_HARD_TIMEOUT = 10 * 60; private static final Integer DEFAULT_PRIORITY = Integer.parseInt("8000", 16); private static final Long DEFAULT_BUFFER_ID = Long.parseLong("ffffffff", 16); private static final Long OFPP_ANY = Long.parseLong("ffffffff", 16); @@ -274,4 +274,4 @@ public class FlowConvertor { } return null; } -} \ No newline at end of file +} diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertor.java index 765363a8db..5647d16e4f 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertor.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertor.java @@ -41,7 +41,7 @@ public final class GroupConvertor { private static final Logger logger = LoggerFactory.getLogger(GroupConvertor.class); private static final String PREFIX_SEPARATOR = "/"; - private static final Integer DEFAULT_WEIGHT = new Integer(0); + private static final Integer DEFAULT_WEIGHT = 0; private static final Long OFPP_ANY = Long.parseLong("ffffffff", 16); private static final Long DEFAULT_WATCH_PORT = OFPP_ANY; private static final Long OFPG_ANY = Long.parseLong("ffffffff", 16); diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java index addc33a461..6fe518e618 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java @@ -892,7 +892,7 @@ public class MatchConvertorImpl implements MatchConvertor> { ipv6LabelBuilder.setIpv6Flabel(new Ipv6FlowLabel(ipv6FlabelMatchEntry.getIpv6Flabel())); MaskMatchEntry maskMatchEntry = ofMatch.getAugmentation(MaskMatchEntry.class); if (maskMatchEntry != null) { - ipv6LabelBuilder.setFlabelMask(new Ipv6FlowLabel(new Long(ByteUtil + ipv6LabelBuilder.setFlabelMask(new Ipv6FlowLabel(Long.valueOf(ByteUtil .bytesToUnsignedInt(maskMatchEntry.getMask())))); } ipv6MatchBuilder.setIpv6Label(ipv6LabelBuilder.build()); diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslator.java index 1a430be7af..33c7fb5535 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslator.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslator.java @@ -487,7 +487,7 @@ public class MultipartReplyTranslator implements IMDMessageTranslator