Martin Peřina has uploaded a new change for review. Change subject: restapi: Prepare to rename Permissions to Permission ......................................................................
restapi: Prepare to rename Permissions to Permission Prepares to rename business entity Permissions to Permission by changing references to restapi model Permission to complete references. Change-Id: Iea16b570410a2c74e1ba79231f1c583445826096 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/AssignedPermissionsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAssignedPermissionsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermissionMapper.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/PermissionMapperTest.java 7 files changed, 52 insertions(+), 47 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/38646/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/AssignedPermissionsResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/AssignedPermissionsResource.java index bf1bc02..a79898c 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/AssignedPermissionsResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/AssignedPermissionsResource.java @@ -25,7 +25,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Response; -import org.ovirt.engine.api.model.Permission; import org.ovirt.engine.api.model.Permissions; /** @@ -39,7 +38,7 @@ @POST @Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) - public Response add(Permission permission); + public Response add(org.ovirt.engine.api.model.Permission permission); @DELETE @Path("{id}") diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java index 0bc2ea1..27f2824 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java @@ -12,7 +12,6 @@ import org.ovirt.engine.api.model.BaseResource; import org.ovirt.engine.api.model.Group; -import org.ovirt.engine.api.model.Permission; import org.ovirt.engine.api.model.User; import org.ovirt.engine.api.resource.AssignedPermissionsResource; import org.ovirt.engine.api.resource.PermissionResource; @@ -32,7 +31,7 @@ import org.ovirt.engine.core.compat.Guid; public class BackendAssignedPermissionsResource - extends AbstractBackendCollectionResource<Permission, Permissions> + extends AbstractBackendCollectionResource<org.ovirt.engine.api.model.Permission, Permissions> implements AssignedPermissionsResource { private Guid targetId; @@ -53,7 +52,7 @@ VdcQueryParametersBase queryParams, Class<? extends BaseResource> suggestedParentType, VdcObjectType objectType) { - super(Permission.class, Permissions.class); + super(org.ovirt.engine.api.model.Permission.class, Permissions.class); this.targetId = targetId; this.queryType = queryType; this.queryParams = queryParams; @@ -95,7 +94,7 @@ } @Override - public Response add(Permission permission) { + public Response add(org.ovirt.engine.api.model.Permission permission) { validateParameters(permission, isPrincipalSubCollection() ? new String[] {"role.id", "dataCenter|cluster|host|storageDomain|vm|vmpool|template.id"} @@ -120,7 +119,7 @@ org.ovirt.engine.api.model.Permissions collection = new org.ovirt.engine.api.model.Permissions(); for (Permissions entity : entities) { castEveryonePermissionsToUser(entity); - Permission permission = map(entity, getUserById(entity.getAdElementId())); + org.ovirt.engine.api.model.Permission permission = map(entity, getUserById(entity.getAdElementId())); collection.getPermissions().add(addLinks(permission, permission.getUser() != null ? suggestedParentType : Group.class)); } return collection; @@ -166,8 +165,8 @@ * @param user the permission owner * @return permission */ - public Permission map(Permissions entity, DbUser user) { - Permission template = new Permission(); + public org.ovirt.engine.api.model.Permission map(Permissions entity, DbUser user) { + org.ovirt.engine.api.model.Permission template = new org.ovirt.engine.api.model.Permission(); if (entity.getAdElementId() != null) { if (isUser(user)) { template.setUser(new User()); @@ -191,7 +190,7 @@ * @param permission the incoming permission model * @return the user or group that the permission applies to */ - private Object getPrincipal(Permission permission) { + private Object getPrincipal(org.ovirt.engine.api.model.Permission permission) { if (isUserSubCollection()) { DbUser dbUser = new DbUser(); dbUser.setId(targetId); @@ -227,7 +226,7 @@ * @param model the incoming permission * @return the parameters for the operation */ - private PermissionsOperationsParameters getParameters(Permission model) { + private PermissionsOperationsParameters getParameters(org.ovirt.engine.api.model.Permission model) { Permissions entity = map(model, null); if (!isPrincipalSubCollection()) { entity.setObjectId(targetId); @@ -250,7 +249,7 @@ } @Override - public Permission addParents(Permission permission) { + public org.ovirt.engine.api.model.Permission addParents(org.ovirt.engine.api.model.Permission permission) { // REVISIT for entity-level permissions we need an isUser // flag on the permissions entity in order to distinguish // between the user and group cases @@ -282,7 +281,9 @@ } @Override - protected Permission doPopulate(Permission model, Permissions entity) { + protected org.ovirt.engine.api.model.Permission doPopulate( + org.ovirt.engine.api.model.Permission model, + Permissions entity) { return model; } } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResource.java index 1b4f685..a83dc50 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResource.java @@ -4,7 +4,6 @@ import org.ovirt.engine.api.model.BaseResource; import org.ovirt.engine.api.model.Group; -import org.ovirt.engine.api.model.Permission; import org.ovirt.engine.api.resource.PermissionResource; import org.ovirt.engine.core.common.businessentities.Permissions; import org.ovirt.engine.core.common.businessentities.aaa.DbUser; @@ -13,7 +12,7 @@ import org.ovirt.engine.core.compat.Guid; public class BackendPermissionResource - extends AbstractBackendSubResource<Permission, Permissions> + extends AbstractBackendSubResource<org.ovirt.engine.api.model.Permission, Permissions> implements PermissionResource { protected BackendAssignedPermissionsResource parent; @@ -22,36 +21,43 @@ protected BackendPermissionResource(String id, BackendAssignedPermissionsResource parent, Class<? extends BaseResource> suggestedParentType) { - super(id, Permission.class, Permissions.class); + super(id, org.ovirt.engine.api.model.Permission.class, Permissions.class); this.parent = parent; this.suggestedParentType = suggestedParentType; } @Override - public Permission get() { + public org.ovirt.engine.api.model.Permission get() { return performGet(VdcQueryType.GetPermissionById, new IdQueryParameters(guid), suggestedParentType); } @Override - protected Permission addParents(Permission permission) { + protected org.ovirt.engine.api.model.Permission addParents(org.ovirt.engine.api.model.Permission permission) { return parent.addParents(permission); } @Override - protected Permission map(Permissions entity, Permission template) { + protected org.ovirt.engine.api.model.Permission map( + Permissions entity, + org.ovirt.engine.api.model.Permission template) { Map<Guid, DbUser> users = parent.getUsers(); return parent.map(entity, users.containsKey(entity.getAdElementId()) ? users.get(entity.getAdElementId()) : null); } @Override - protected Permission addLinks(Permission model, Class<? extends BaseResource> suggestedParent, String... subCollectionMembersToExclude) { + protected org.ovirt.engine.api.model.Permission addLinks( + org.ovirt.engine.api.model.Permission model, + Class<? extends BaseResource> suggestedParent, + String... subCollectionMembersToExclude) { return super.addLinks(model, model.getUser() != null ? suggestedParentType : Group.class); } @Override - protected Permission doPopulate(Permission model, Permissions entity) { + protected org.ovirt.engine.api.model.Permission doPopulate( + org.ovirt.engine.api.model.Permission model, + Permissions entity) { return model; } } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAssignedPermissionsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAssignedPermissionsResourceTest.java index 75af455..d02779c 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAssignedPermissionsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAssignedPermissionsResourceTest.java @@ -10,7 +10,6 @@ import org.junit.Test; import org.ovirt.engine.api.model.BaseResource; import org.ovirt.engine.api.model.Group; -import org.ovirt.engine.api.model.Permission; import org.ovirt.engine.api.model.User; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.PermissionsOperationsParameters; @@ -23,7 +22,7 @@ import org.ovirt.engine.core.compat.Guid; public abstract class AbstractBackendAssignedPermissionsResourceTest - extends AbstractBackendCollectionResourceTest<Permission, Permissions, BackendAssignedPermissionsResource> { + extends AbstractBackendCollectionResourceTest<org.ovirt.engine.api.model.Permission, Permissions, BackendAssignedPermissionsResource> { private Guid targetId; private Class<? extends BaseResource> targetType; @@ -145,12 +144,12 @@ new String[] { "Id" }, new Object[] { GUIDS[0] }, getEntity(0)); - Permission model = getModel(); + org.ovirt.engine.api.model.Permission model = getModel(); Response response = collection.add(model); assertEquals(201, response.getStatus()); - assertTrue(response.getEntity() instanceof Permission); - verifyModel((Permission) response.getEntity(), 0); + assertTrue(response.getEntity() instanceof org.ovirt.engine.api.model.Permission); + verifyModel((org.ovirt.engine.api.model.Permission) response.getEntity(), 0); } /** @@ -193,10 +192,10 @@ return user; } - protected abstract Permission getModel(); + protected abstract org.ovirt.engine.api.model.Permission getModel(); @Override - protected List<Permission> getCollection() { + protected List<org.ovirt.engine.api.model.Permission> getCollection() { return collection.list().getPermissions(); } @@ -268,7 +267,7 @@ } @Override - protected void verifyModel(Permission model, int index) { + protected void verifyModel(org.ovirt.engine.api.model.Permission model, int index) { assertEquals(GUIDS[index].toString(), model.getId()); assertTrue(model.isSetDataCenter()); assertEquals(GUIDS[2].toString(), model.getDataCenter().getId()); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResourceTest.java index 8e23c28..540ba1c 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResourceTest.java @@ -7,7 +7,6 @@ import org.junit.Before; import org.junit.Test; import org.ovirt.engine.api.model.Cluster; -import org.ovirt.engine.api.model.Permission; import org.ovirt.engine.api.model.User; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.businessentities.Permissions; @@ -18,7 +17,7 @@ import org.ovirt.engine.core.common.queries.VdcQueryType; public class BackendPermissionResourceTest - extends AbstractBackendSubResourceTest<Permission, Permissions, BackendPermissionResource> { + extends AbstractBackendSubResourceTest<org.ovirt.engine.api.model.Permission, Permissions, BackendPermissionResource> { public BackendPermissionResourceTest() { super(new BackendPermissionResource(GUIDS[0].toString(), @@ -99,7 +98,7 @@ } @Override - protected void verifyModel(Permission model, int index) { + protected void verifyModel(org.ovirt.engine.api.model.Permission model, int index) { assertEquals(GUIDS[index].toString(), model.getId()); assertTrue(model.isSetUser()); assertEquals(GUIDS[1].toString(), model.getUser().getId()); diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermissionMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermissionMapper.java index f57f90d..5da07fc 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermissionMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermissionMapper.java @@ -4,7 +4,6 @@ import org.ovirt.engine.api.model.DataCenter; import org.ovirt.engine.api.model.Disk; import org.ovirt.engine.api.model.Host; -import org.ovirt.engine.api.model.Permission; import org.ovirt.engine.api.model.Role; import org.ovirt.engine.api.model.StorageDomain; import org.ovirt.engine.api.model.Template; @@ -18,8 +17,8 @@ public class PermissionMapper { - @Mapping(from = Permission.class, to = Permissions.class) - public static Permissions map(Permission model, Permissions template) { + @Mapping(from = org.ovirt.engine.api.model.Permission.class, to = Permissions.class) + public static Permissions map(org.ovirt.engine.api.model.Permission model, Permissions template) { Permissions entity = template != null ? template : new Permissions(); if (model.isSetId()) { entity.setId(GuidUtils.asGuid(model.getId())); @@ -40,9 +39,12 @@ return model; } - @Mapping(from = Permissions.class, to = Permission.class) - public static Permission map(Permissions entity, Permission template) { - Permission model = template != null ? template : new Permission(); + @Mapping(from = Permissions.class, to = org.ovirt.engine.api.model.Permission.class) + public static org.ovirt.engine.api.model.Permission map( + Permissions entity, + org.ovirt.engine.api.model.Permission template) { + org.ovirt.engine.api.model.Permission model = + template != null ? template : new org.ovirt.engine.api.model.Permission(); model.setId(entity.getId().toString()); if (entity.getRoleId() != null) { model.setRole(new Role()); @@ -58,8 +60,8 @@ return model; } - @Mapping(from = Permission.class, to = Guid.class) - public static Guid map(Permission p, Guid template) { + @Mapping(from = org.ovirt.engine.api.model.Permission.class, to = Guid.class) + public static Guid map(org.ovirt.engine.api.model.Permission p, Guid template) { return p.isSetDataCenter() && p.getDataCenter().isSetId() ? GuidUtils.asGuid(p.getDataCenter().getId()) : p.isSetCluster() && p.getCluster().isSetId() @@ -77,8 +79,8 @@ : template; } - @Mapping(from = Permission.class, to = VdcObjectType.class) - public static VdcObjectType map(Permission p, VdcObjectType template) { + @Mapping(from = org.ovirt.engine.api.model.Permission.class, to = VdcObjectType.class) + public static VdcObjectType map(org.ovirt.engine.api.model.Permission p, VdcObjectType template) { return p.isSetDataCenter() && p.getDataCenter().isSetId() ? VdcObjectType.StoragePool : p.isSetCluster() && p.getCluster().isSetId() @@ -99,7 +101,7 @@ /** * @pre completeness of "{entityType}.id" already validated */ - private static void setObjectId(Permission model, Permissions entity) { + private static void setObjectId(org.ovirt.engine.api.model.Permission model, Permissions entity) { String id = entity.getObjectId().toString(); switch (entity.getObjectType()) { case System: diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/PermissionMapperTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/PermissionMapperTest.java index 8382653..e74201a 100644 --- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/PermissionMapperTest.java +++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/PermissionMapperTest.java @@ -1,16 +1,15 @@ package org.ovirt.engine.api.restapi.types; -import org.ovirt.engine.api.model.Permission; import org.ovirt.engine.core.common.businessentities.Permissions; -public class PermissionMapperTest extends AbstractInvertibleMappingTest<Permission, Permissions, Permissions> { +public class PermissionMapperTest extends AbstractInvertibleMappingTest<org.ovirt.engine.api.model.Permission, Permissions, Permissions> { public PermissionMapperTest() { - super(Permission.class, Permissions.class, Permissions.class); + super(org.ovirt.engine.api.model.Permission.class, Permissions.class, Permissions.class); } @Override - protected void verify(Permission model, Permission transform) { + protected void verify(org.ovirt.engine.api.model.Permission model, org.ovirt.engine.api.model.Permission transform) { assertNotNull(transform); assertTrue(transform.isSetId()); assertEquals(model.getId(), transform.getId()); -- To view, visit https://gerrit.ovirt.org/38646 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea16b570410a2c74e1ba79231f1c583445826096 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
