Change in ovirt-engine[master]: core, restapi: Remove double ReapedMaps

amureini at redhat.com amureini at redhat.com
Tue Mar 5 14:03:09 UTC 2013


Allon Mureinik has submitted this change and it was merged.

Change subject: core, restapi: Remove double ReapedMaps
......................................................................


core, restapi: Remove double ReapedMaps

There are two almost identical (except for whitespaces and the
occasional formatting difference) classes called ReadpedMap in oVirt
Engine:
1. org.ovirt.engine.api.common.util.ReapedMap
2. org.ovirt.engine.core.utils.ReapedMap

This patch removes the api class, and leaves only the core one.
It includes:
1. Removal of the redundant class and deferring all usages to the
   correct class.
2. Moving the test from the rest package to the core package.
3. Translating the test from EasyMock to Mockito, as used in the rest of
   the core package tests.

Change-Id: I924355a495945a063b8e15f233188fc236df2432
Signed-off-by: Allon Mureinik <amureini at redhat.com>
---
M backend/manager/modules/restapi/interface/common/jaxrs/pom.xml
M backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/resource/AbstractActionableResource.java
D backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/ReapedMap.java
R backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReapedMapTest.java
4 files changed, 32 insertions(+), 301 deletions(-)

Approvals:
  Allon Mureinik: Verified; Looks good to me, approved


--
To view, visit http://gerrit.ovirt.org/12722
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I924355a495945a063b8e15f233188fc236df2432
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Michael Pasternak <mpastern at redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni at redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs at redhat.com>



More information about the Engine-commits mailing list