Moti Asayag has submitted this change and it was merged. Change subject: core: Cleanup SetupNetworksHelper part 2.5 ...................................................................... core: Cleanup SetupNetworksHelper part 2.5 Change lazy initialization to be on the Maps, since the Lists are not really used afterwards. This also required to change all calls to the Maps to go through getter methods. In turn, it is no longer necessary to pass the map around, as it is now a state within the class, so removed it from all the calls (tests were fixed accordingly). Change-Id: I0453bdae390f1c5d543f5ff6423eec130ed8f60d Signed-off-by: Mike Kolesnik <mkolesni(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetupNetworksHelper.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksHelperTest.java 2 files changed, 37 insertions(+), 40 deletions(-) Approvals: Moti Asayag: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/4598 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0453bdae390f1c5d543f5ff6423eec130ed8f60d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <mkolesni(a)redhat.com&gt; Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com&gt;