Moti Asayag has uploaded a new change for review. Change subject: restapi: Organize imports ......................................................................
restapi: Organize imports The patch organizes the imports of the files about to be modified by the following patches. Change-Id: Ie8bcf4004a823b6e813427dd52dc8a912174df3b Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNicResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNicsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicResource.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/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResource.java 7 files changed, 30 insertions(+), 33 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/10407/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmResource.java index 5c65f97..96a478b 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmResource.java @@ -17,15 +17,15 @@ package org.ovirt.engine.api.resource; import javax.ws.rs.Consumes; -import javax.ws.rs.Path; import javax.ws.rs.POST; +import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; -import org.jboss.resteasy.annotations.providers.jaxb.Formatted; import javax.ws.rs.core.Response; -import org.ovirt.engine.api.model.Actionable; +import org.jboss.resteasy.annotations.providers.jaxb.Formatted; import org.ovirt.engine.api.model.Action; +import org.ovirt.engine.api.model.Actionable; import org.ovirt.engine.api.model.CdRom; import org.ovirt.engine.api.model.CdRoms; import org.ovirt.engine.api.model.VM; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNicResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNicResource.java index 4decc56..d13916e 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNicResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNicResource.java @@ -7,8 +7,8 @@ import org.ovirt.engine.api.resource.NicResource; import org.ovirt.engine.api.resource.StatisticsResource; import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; import org.ovirt.engine.core.common.businessentities.Network; +import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; import org.ovirt.engine.core.compat.Guid; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNicsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNicsResource.java index 05f66a4..793aa9a 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNicsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNicsResource.java @@ -6,9 +6,9 @@ import javax.ws.rs.core.Response; import org.ovirt.engine.api.model.NIC; -import org.ovirt.engine.api.model.Nics; import org.ovirt.engine.api.model.Network; import org.ovirt.engine.api.model.Networks; +import org.ovirt.engine.api.model.Nics; import org.ovirt.engine.api.model.PortMirroring; import org.ovirt.engine.api.resource.DevicesResource; import org.ovirt.engine.core.common.action.VdcActionType; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicResource.java index ebe6b53..6bb417e 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateNicResource.java @@ -4,8 +4,8 @@ import org.ovirt.engine.api.model.Nics; import org.ovirt.engine.api.resource.NicResource; import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; import org.ovirt.engine.core.common.businessentities.Network; +import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; public class BackendTemplateNicResource extends BackendNicResource implements NicResource { 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 28f9c73..e8b45c4 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 @@ -1,22 +1,21 @@ package org.ovirt.engine.api.restapi.resource; -import org.ovirt.engine.core.common.action.AddVmTemplateInterfaceParameters; -import org.ovirt.engine.core.common.action.RemoveVmTemplateInterfaceParameters; -import org.ovirt.engine.core.common.action.VdcActionParametersBase; -import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; -import org.ovirt.engine.core.common.businessentities.VmTemplate; -import org.ovirt.engine.core.common.businessentities.Network; -import org.ovirt.engine.core.common.queries.GetVmTemplateParameters; -import org.ovirt.engine.core.common.queries.VdcQueryType; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource.ParametersProvider; - import org.ovirt.engine.api.model.NIC; import org.ovirt.engine.api.model.Nics; import org.ovirt.engine.api.model.Template; import org.ovirt.engine.api.resource.DeviceResource; import org.ovirt.engine.api.resource.DevicesResource; +import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource.ParametersProvider; +import org.ovirt.engine.core.common.action.AddVmTemplateInterfaceParameters; +import org.ovirt.engine.core.common.action.RemoveVmTemplateInterfaceParameters; +import org.ovirt.engine.core.common.action.VdcActionParametersBase; +import org.ovirt.engine.core.common.action.VdcActionType; +import org.ovirt.engine.core.common.businessentities.Network; +import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; +import org.ovirt.engine.core.common.businessentities.VmTemplate; +import org.ovirt.engine.core.common.queries.GetVmTemplateParameters; +import org.ovirt.engine.core.common.queries.VdcQueryType; +import org.ovirt.engine.core.compat.Guid; public class BackendTemplateNicsResource extends BackendNicsResource diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResource.java index fae39a3..9a7b617 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResource.java @@ -6,7 +6,10 @@ import org.ovirt.engine.api.model.Action; import org.ovirt.engine.api.model.Fault; import org.ovirt.engine.api.model.NIC; +import org.ovirt.engine.api.model.Network; +import org.ovirt.engine.api.model.Networks; import org.ovirt.engine.api.model.Nics; +import org.ovirt.engine.api.model.PortMirroring; import org.ovirt.engine.api.resource.ActionResource; import org.ovirt.engine.api.resource.VmNicResource; import org.ovirt.engine.core.common.action.ActivateDeactivateVmNicParameters; @@ -14,9 +17,6 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.api.model.Network; -import org.ovirt.engine.api.model.Networks; -import org.ovirt.engine.api.model.PortMirroring; public class BackendVmNicResource extends BackendNicResource implements VmNicResource { diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResource.java index 89ef3d4..29322b5 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResource.java @@ -7,6 +7,15 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.ovirt.engine.api.common.util.DetailHelper; +import org.ovirt.engine.api.common.util.LinkHelper; +import org.ovirt.engine.api.model.Fault; +import org.ovirt.engine.api.model.NIC; +import org.ovirt.engine.api.model.Statistic; +import org.ovirt.engine.api.model.Statistics; +import org.ovirt.engine.api.resource.VmNicResource; +import org.ovirt.engine.api.resource.VmNicsResource; +import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource.ParametersProvider; import org.ovirt.engine.core.common.action.AddVmInterfaceParameters; import org.ovirt.engine.core.common.action.RemoveVmInterfaceParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; @@ -17,20 +26,9 @@ import org.ovirt.engine.core.common.queries.GetVmByVmIdParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource.ParametersProvider; -import org.ovirt.engine.api.common.util.DetailHelper; -import org.ovirt.engine.api.common.util.LinkHelper; -import org.ovirt.engine.api.model.Fault; -import org.ovirt.engine.api.model.NIC; -import org.ovirt.engine.api.model.Statistic; -import org.ovirt.engine.api.model.Statistics; -import org.ovirt.engine.api.resource.VmNicResource; -import org.ovirt.engine.api.resource.VmNicsResource; +public class BackendVmNicsResource extends BackendNicsResource implements VmNicsResource { -public class BackendVmNicsResource - extends BackendNicsResource - implements VmNicsResource { public BackendVmNicsResource(Guid parentId) { super(parentId, -- To view, visit http://gerrit.ovirt.org/10407 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8bcf4004a823b6e813427dd52dc8a912174df3b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
