Mike Kolesnik has uploaded a new change for review. Change subject: core: GetTemplateInterfacesByTemplateId use IdQueryParameters ......................................................................
core: GetTemplateInterfacesByTemplateId use IdQueryParameters No need for specific parameters class, use the generic one instead. Change-Id: I715d02a062b47701a21642df7a1b935839e5480a Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/GetTemplateInterfacesByTemplateIdQuery.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/template/GetTemplateInterfacesByTemplateIdQueryTest.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyNicResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyNicsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicsResourceTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateInterfaceListModel.java 7 files changed, 21 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/10666/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/GetTemplateInterfacesByTemplateIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/GetTemplateInterfacesByTemplateIdQuery.java index 0b8c268..231731a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/GetTemplateInterfacesByTemplateIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/GetTemplateInterfacesByTemplateIdQuery.java @@ -1,9 +1,9 @@ package org.ovirt.engine.core.bll.network.template; import org.ovirt.engine.core.bll.QueriesCommandBase; -import org.ovirt.engine.core.common.queries.GetVmTemplateParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; -public class GetTemplateInterfacesByTemplateIdQuery<P extends GetVmTemplateParameters> extends QueriesCommandBase<P> { +public class GetTemplateInterfacesByTemplateIdQuery<P extends IdQueryParameters> extends QueriesCommandBase<P> { public GetTemplateInterfacesByTemplateIdQuery(P parameters) { super(parameters); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/template/GetTemplateInterfacesByTemplateIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/template/GetTemplateInterfacesByTemplateIdQueryTest.java index 1c3427b..c236c93 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/template/GetTemplateInterfacesByTemplateIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/template/GetTemplateInterfacesByTemplateIdQueryTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import org.ovirt.engine.core.bll.AbstractUserQueryTest; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; -import org.ovirt.engine.core.common.queries.GetVmTemplateParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dao.network.VmNetworkInterfaceDao; @@ -18,13 +18,13 @@ * A test case for {@link GetTemplateInterfacesByTemplateIdQuery}. * It does not test database implementation, but rather tests that the right delegations to the DAO occur. */ -public class GetTemplateInterfacesByTemplateIdQueryTest extends AbstractUserQueryTest<GetVmTemplateParameters, GetTemplateInterfacesByTemplateIdQuery<GetVmTemplateParameters>> { +public class GetTemplateInterfacesByTemplateIdQueryTest extends AbstractUserQueryTest<IdQueryParameters, GetTemplateInterfacesByTemplateIdQuery<IdQueryParameters>> { @Test public void testExecuteQuery() { Guid templateID = Guid.NewGuid(); List<VmNetworkInterface> expectedResult = Collections.singletonList(new VmNetworkInterface()); - GetVmTemplateParameters paramsMock = getQueryParameters(); + IdQueryParameters paramsMock = getQueryParameters(); when(paramsMock.getId()).thenReturn(templateID); VmNetworkInterfaceDao vmNetworkInterfaceDAOMock = mock(VmNetworkInterfaceDao.class); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicsResource.java index 4c11aef..e04277d 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicsResource.java @@ -14,6 +14,7 @@ import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.queries.GetVmTemplateParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; @@ -24,7 +25,7 @@ public BackendTemplateNicsResource(Guid parentId) { super(parentId, VdcQueryType.GetTemplateInterfacesByTemplateId, - new GetVmTemplateParameters(parentId), + new IdQueryParameters(parentId), VdcActionType.AddVmTemplateInterface, VdcActionType.RemoveVmTemplateInterface, VdcActionType.UpdateVmTemplateInterface); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyNicResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyNicResourceTest.java index 9ad6724..d752ba9 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyNicResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyNicResourceTest.java @@ -16,7 +16,7 @@ import org.ovirt.engine.api.model.Nics; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.businessentities.network.VmNetworkStatistics; -import org.ovirt.engine.core.common.queries.GetVmTemplateParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; public class BackendReadOnlyNicResourceTest @@ -32,7 +32,7 @@ protected static BackendReadOnlyNicsResource getCollection() { return new BackendReadOnlyNicsResource(PARENT_ID, VdcQueryType.GetTemplateInterfacesByTemplateId, - new GetVmTemplateParameters(PARENT_ID)); + new IdQueryParameters(PARENT_ID)); } @Override @@ -45,7 +45,7 @@ public void testGetNotFound() throws Exception { setUriInfo(setUpBasicUriExpectations()); setUpEntityQueryExpectations(VdcQueryType.GetTemplateInterfacesByTemplateId, - GetVmTemplateParameters.class, + IdQueryParameters.class, new String[] { "Id" }, new Object[] { PARENT_ID }, new ArrayList<VmNetworkInterface>()); @@ -89,7 +89,7 @@ protected void setUpEntityQueryExpectations(int times) throws Exception { while (times-- > 0) { setUpEntityQueryExpectations(VdcQueryType.GetTemplateInterfacesByTemplateId, - GetVmTemplateParameters.class, + IdQueryParameters.class, new String[] { "Id" }, new Object[] { PARENT_ID }, getEntityList()); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyNicsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyNicsResourceTest.java index bee3279..8f32e6f 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyNicsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyNicsResourceTest.java @@ -8,7 +8,7 @@ import org.ovirt.engine.api.resource.DeviceResource; import org.ovirt.engine.api.resource.ReadOnlyDeviceResource; -import org.ovirt.engine.core.common.queries.GetVmTemplateParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; public class BackendReadOnlyNicsResourceTest @@ -17,9 +17,9 @@ public BackendReadOnlyNicsResourceTest() { super(new BackendReadOnlyNicsResource(PARENT_ID, VdcQueryType.GetTemplateInterfacesByTemplateId, - new GetVmTemplateParameters(PARENT_ID)), + new IdQueryParameters(PARENT_ID)), VdcQueryType.GetTemplateInterfacesByTemplateId, - new GetVmTemplateParameters(PARENT_ID), + new IdQueryParameters(PARENT_ID), "Id"); } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicsResourceTest.java index 49521c7..e0c76ac 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicsResourceTest.java @@ -15,6 +15,7 @@ import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.queries.GetVmTemplateParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; public class BackendTemplateNicsResourceTest @@ -23,7 +24,7 @@ public BackendTemplateNicsResourceTest() { super(new BackendTemplateNicsResource(PARENT_ID), VdcQueryType.GetTemplateInterfacesByTemplateId, - new GetVmTemplateParameters(PARENT_ID), + new IdQueryParameters(PARENT_ID), "Id"); } @@ -51,7 +52,7 @@ protected void setUpGetEntityQueryExpectations(int times, Object failure) throws Exception { while (times-- > 0) { setUpEntityQueryExpectations(VdcQueryType.GetTemplateInterfacesByTemplateId, - GetVmTemplateParameters.class, + IdQueryParameters.class, new String[] { "Id" }, new Object[] { PARENT_ID }, asList(getInterface(0, null)), @@ -100,7 +101,7 @@ true, null, VdcQueryType.GetTemplateInterfacesByTemplateId, - GetVmTemplateParameters.class, + IdQueryParameters.class, new String[] { "Id" }, new Object[] { PARENT_ID }, asList(getEntity(0))); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateInterfaceListModel.java index 6901811..ecc3dce 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateInterfaceListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateInterfaceListModel.java @@ -6,7 +6,7 @@ import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.queries.ConfigurationValues; -import org.ovirt.engine.core.common.queries.GetVmTemplateParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.frontend.AsyncQuery; @@ -110,7 +110,7 @@ } super.SyncSearch(VdcQueryType.GetTemplateInterfacesByTemplateId, - new GetVmTemplateParameters(getEntityStronglyTyped().getId())); + new IdQueryParameters(getEntityStronglyTyped().getId())); } @Override @@ -119,7 +119,7 @@ super.AsyncSearch(); setAsyncResult(Frontend.RegisterQuery(VdcQueryType.GetTemplateInterfacesByTemplateId, - new GetVmTemplateParameters(getEntityStronglyTyped().getId()))); + new IdQueryParameters(getEntityStronglyTyped().getId()))); setItems(getAsyncResult().getData()); } -- To view, visit http://gerrit.ovirt.org/10666 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I715d02a062b47701a21642df7a1b935839e5480a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
