From 69f03171e9870f0e86d44a0d58d92dbd6cfcbb8b Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Wed, 10 Jun 2015 13:14:15 -0700 Subject: [PATCH] Eliminate code duplication in initialization Change-Id: I067f2e0bb22bc24c3e3ac6ba24920c7ceebeee1e --- .../onosproject/net/group/DefaultGroup.java | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/core/api/src/main/java/org/onosproject/net/group/DefaultGroup.java b/core/api/src/main/java/org/onosproject/net/group/DefaultGroup.java index c52f771d9f..546a451306 100644 --- a/core/api/src/main/java/org/onosproject/net/group/DefaultGroup.java +++ b/core/api/src/main/java/org/onosproject/net/group/DefaultGroup.java @@ -36,6 +36,20 @@ public class DefaultGroup extends DefaultGroupDescription private long referenceCount; private GroupId id; + /** + * Initializes default values. + * + * @param newId group id for new group + */ + private void initialize(GroupId newId) { + id = newId; + state = GroupState.PENDING_ADD; + life = 0; + packets = 0; + bytes = 0; + referenceCount = 0; + } + /** * Default group object constructor with the parameters. * @@ -44,12 +58,7 @@ public class DefaultGroup extends DefaultGroupDescription */ public DefaultGroup(GroupId id, GroupDescription groupDesc) { super(groupDesc); - this.id = id; - this.state = GroupState.PENDING_ADD; - this.life = 0; - this.packets = 0; - this.bytes = 0; - this.referenceCount = 0; + initialize(id); } /** @@ -66,12 +75,7 @@ public class DefaultGroup extends DefaultGroupDescription GroupDescription.Type type, GroupBuckets buckets) { super(deviceId, type, buckets); - this.id = id; - this.state = GroupState.PENDING_ADD; - this.life = 0; - this.packets = 0; - this.bytes = 0; - this.referenceCount = 0; + initialize(id); } /**