Martin Mucha has uploaded a new change for review. Change subject: core: refactor: renamed methods of ObjectCounter ......................................................................
core: refactor: renamed methods of ObjectCounter Change-Id: I24e296de13fee757e109780f18e445887f6e856f Signed-off-by: Martin Mucha <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacsStorage.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ObjectCounter.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/Range.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/ObjectCounterTest.java 4 files changed, 31 insertions(+), 31 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/94/29594/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacsStorage.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacsStorage.java index dfaf926..963604a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacsStorage.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacsStorage.java @@ -28,7 +28,7 @@ private boolean useMac(long mac, boolean allowDuplicates) { Range range = findIncludingRange(mac); if (range == null) { - return customMacs.add(mac, allowDuplicates); + return customMacs.increase(mac, allowDuplicates); } else { return range.use(mac, allowDuplicates); } @@ -46,7 +46,7 @@ public void freeMac(long mac) { Range range = findIncludingRange(mac); if (range == null) { - customMacs.remove(mac); + customMacs.decrease(mac); } else { range.freeMac(mac); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ObjectCounter.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ObjectCounter.java index fc7c695..7d86dcd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ObjectCounter.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ObjectCounter.java @@ -15,17 +15,17 @@ this.allowDuplicate = allowDuplicate; } - public boolean add(T key) { - return add(key, allowDuplicate); + public boolean increase(T key) { + return increase(key, allowDuplicate); } - public boolean add(T key, boolean allowDuplicate) { + public boolean increase(T key, boolean allowDuplicate) { Counter counter = map.get(key); if (counter == null) { map.put(key, new Counter()); return true; } else if (allowDuplicate) { - counter.increment(); + counter.increase(); return true; } else { return false; @@ -33,13 +33,13 @@ } - public void remove(T key) { + public void decrease(T key) { Counter counter = map.get(key); if (counter == null) { return; } - int count = counter.decrement(); + int count = counter.decrease(); if (count == 0) { map.remove(key); } else if (count < 0) { @@ -77,11 +77,11 @@ this.count = count; } - public void increment() { + public void increase() { count++; } - public int decrement() { + public int decrease() { count--; return count; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/Range.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/Range.java index b519576..60536da 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/Range.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/Range.java @@ -52,7 +52,7 @@ } if (allowDuplicates) { - return macDuplicityCount.add(arrayIndex); + return macDuplicityCount.increase(arrayIndex); } else { return false; } @@ -77,7 +77,7 @@ final boolean duplicatesExist = macDuplicityCount.count(arrayIndex) != 0; if (duplicatesExist) { - macDuplicityCount.remove(arrayIndex); + macDuplicityCount.decrease(arrayIndex); } else { usedMacs.set(arrayIndex, false); availableMacsCount++; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/ObjectCounterTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/ObjectCounterTest.java index 27c3364..dde6887 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/ObjectCounterTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/ObjectCounterTest.java @@ -12,10 +12,10 @@ final ObjectCounter<Integer> objectCounter = new ObjectCounter<>(false); - assertThat(objectCounter.add(1), is(true)); - assertThat(objectCounter.add(1), is(false)); - assertThat(objectCounter.add(2), is(true)); - assertThat(objectCounter.add(-3), is(true)); + assertThat(objectCounter.increase(1), is(true)); + assertThat(objectCounter.increase(1), is(false)); + assertThat(objectCounter.increase(2), is(true)); + assertThat(objectCounter.increase(-3), is(true)); assertThat(objectCounter.contains(0), is(false)); assertThat(objectCounter.contains(1), is(true)); @@ -28,10 +28,10 @@ final ObjectCounter<Integer> objectCounter = new ObjectCounter<>(true); - assertThat(objectCounter.add(1), is(true)); - assertThat(objectCounter.add(1), is(true)); - assertThat(objectCounter.add(2), is(true)); - assertThat(objectCounter.add(-3), is(true)); + assertThat(objectCounter.increase(1), is(true)); + assertThat(objectCounter.increase(1), is(true)); + assertThat(objectCounter.increase(2), is(true)); + assertThat(objectCounter.increase(-3), is(true)); assertThat(objectCounter.contains(0), is(false)); assertThat(objectCounter.contains(1), is(true)); @@ -43,15 +43,15 @@ public void testRemoveNoDuplicates() throws Exception { final ObjectCounter<Integer> objectCounter = new ObjectCounter<>(false); - objectCounter.add(1); - objectCounter.add(2); + objectCounter.increase(1); + objectCounter.increase(2); assertThat(objectCounter.contains(0), is(false)); - objectCounter.remove(0); + objectCounter.decrease(0); assertThat(objectCounter.contains(0), is(false)); assertThat(objectCounter.contains(1), is(true)); - objectCounter.remove(1); + objectCounter.decrease(1); assertThat(objectCounter.contains(1), is(false)); } @@ -59,22 +59,22 @@ public void testRemoveWithDuplicates() throws Exception { final ObjectCounter<Integer> objectCounter = new ObjectCounter<>(true); - objectCounter.add(1); - objectCounter.add(1); - objectCounter.add(2); + objectCounter.increase(1); + objectCounter.increase(1); + objectCounter.increase(2); assertThat(objectCounter.contains(0), is(false)); - objectCounter.remove(0); + objectCounter.decrease(0); assertThat(objectCounter.contains(0), is(false)); assertThat(objectCounter.contains(1), is(true)); - objectCounter.remove(1); + objectCounter.decrease(1); assertThat(objectCounter.contains(1), is(true)); - objectCounter.remove(1); + objectCounter.decrease(1); assertThat(objectCounter.contains(1), is(false)); assertThat(objectCounter.contains(2), is(true)); - objectCounter.remove(2); + objectCounter.decrease(2); assertThat(objectCounter.contains(2), is(false)); } -- To view, visit http://gerrit.ovirt.org/29594 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24e296de13fee757e109780f18e445887f6e856f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
