Change in ovirt-engine[master]: core: Don't use anyMapOf(Class, Class)

Code Review gerrit at ovirt.org
Mon Jan 23 07:17:34 UTC 2017


>From Allon Mureinik <amureini at redhat.com>:

Allon Mureinik has submitted this change and it was merged.

Change subject: core: Don't use anyMapOf(Class, Class)
......................................................................


core: Don't use anyMapOf(Class, Class)

Mockito 1.x's anyMap() returned a raw Map, which would cause
unchecked assignment warning when it was used in a generic context.
Mockito 2.x fixed this to return a Map<T, S>, and uses Java 8's
capabilities to infer the generic type. As a result,
anyMapOf(Class, Class) was deprecated, and will be removed in the near
future.

This patch removes all usages of anyMapOf(Class, Class) and replaces
them with the recommended anyMap().

Change-Id: Iec2032f642430b4cde15a3d8b29e00cd6becd047
Signed-off-by: Allon Mureinik <amureini at redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJobTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StopRebalanceGlusterVolumeCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/RunVmValidatorTest.java
5 files changed, 20 insertions(+), 32 deletions(-)

Approvals:
  Allon Mureinik: Verified; Passed CI tests
  Moti Asayag: Looks good to me, approved

Objections:
  Jenkins CI: Failed CI tests



-- 
To view, visit https://gerrit.ovirt.org/70301
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec2032f642430b4cde15a3d8b29e00cd6becd047
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: Arik Hadas <ahadas at redhat.com>
Gerrit-Reviewer: Daniel Erez <derez at redhat.com>
Gerrit-Reviewer: Denis Chaplygin <dchaplyg at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Betak <mbetak at redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag at redhat.com>
Gerrit-Reviewer: Sahina Bose <sabose at redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>


More information about the Engine-commits mailing list