Juan Hernandez has uploaded a new change for review.
Change subject: restapi: Remove "performRemove" method
......................................................................
restapi: Remove "performRemove" method
Now that the remove methods have been moved from the collection to the
entity interfaces this method is no longer needed, except for an edge
case in the device resource tests. This patch removes it except from
almost all places, except those where the tests need it. Later patches
will change the tests so that the method can be completely removed.
Change-Id: Ic2eaec165059e9501940cb427edcaeabb6366ed2
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendReadOnlyDevicesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendExternalProviderCertificatesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendFilesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNumaNodesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostStorageResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendJobsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendOperatingSystemsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQuotasResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotCdRomsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotNicsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStatisticsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainImagesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmGraphicsConsolesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDevicesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalComputeResourcesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalDiscoveredHostsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendHostKatelloErrataResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendSystemKatelloErrataResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendVmKatelloErrataResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImagesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworksResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeTypesResource.java
31 files changed, 3 insertions(+), 204 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/42277/1
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendReadOnlyDevicesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendReadOnlyDevicesResource.java
index 8654607..c60b4d7 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendReadOnlyDevicesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendReadOnlyDevicesResource.java
@@ -3,8 +3,6 @@
import java.lang.reflect.Method;
import java.util.List;
-import javax.ws.rs.core.Response;
-
import org.ovirt.engine.api.model.BaseDevice;
import org.ovirt.engine.api.model.BaseDevices;
import org.ovirt.engine.api.model.VM;
@@ -105,9 +103,4 @@
}
protected abstract <T> boolean matchEntity(Q entity, T id);
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
- }
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java
index 3dee4ae..a3e52f7 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java
@@ -2,9 +2,6 @@
import java.util.List;
-import javax.ws.rs.core.Response;
-
-import org.apache.commons.lang.NotImplementedException;
import org.ovirt.engine.api.model.Role;
import org.ovirt.engine.api.model.Roles;
import org.ovirt.engine.api.model.User;
@@ -40,11 +37,6 @@
public Roles list() {
return
mapCollection(getBackendCollection(VdcQueryType.GetPermissionsByAdElementId,
new
IdQueryParameters(principalId)));
- }
-
- @Override
- public Response performRemove(String id) {
- throw new NotImplementedException();
}
protected Roles mapCollection(List<Permission> entities) {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResource.java
index 0a81c88..0fac95d 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResource.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.api.restapi.resource;
import java.util.Set;
-import javax.ws.rs.core.Response;
import org.ovirt.engine.api.model.Disk;
import org.ovirt.engine.api.model.Disks;
import org.ovirt.engine.api.resource.StorageDomainContentDiskResource;
@@ -50,10 +49,4 @@
protected Disk doPopulate(Disk model,
org.ovirt.engine.core.common.businessentities.storage.Disk entity) {
return model;
}
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException("Not supported.");
- }
-
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendExternalProviderCertificatesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendExternalProviderCertificatesResource.java
index 6e503f0..04b70bf 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendExternalProviderCertificatesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendExternalProviderCertificatesResource.java
@@ -16,7 +16,6 @@
package org.ovirt.engine.api.restapi.resource;
-import javax.ws.rs.core.Response;
import java.util.List;
import org.ovirt.engine.api.model.Certificate;
@@ -65,11 +64,6 @@
}
}
return collection;
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendFilesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendFilesResource.java
index 350b6ee..0e7f9a0 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendFilesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendFilesResource.java
@@ -5,8 +5,6 @@
import java.util.LinkedList;
import java.util.List;
-import javax.ws.rs.core.Response;
-
import org.ovirt.engine.api.model.File;
import org.ovirt.engine.api.model.Files;
import org.ovirt.engine.api.model.StorageDomain;
@@ -81,11 +79,6 @@
fileNames.add(file.getRepoImageId());
}
return fileNames;
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java
index 9d4a5b7..c028963 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java
@@ -4,7 +4,6 @@
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
import org.ovirt.engine.api.model.Hook;
import org.ovirt.engine.api.model.Hooks;
@@ -57,10 +56,5 @@
@Override
protected Hook doPopulate(Hook model, Object entity) {
return model;
- }
-
- @Override
- protected Response performRemove(String id) {
- return null;
}
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNumaNodesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNumaNodesResource.java
index e9d2c21..ad0b900 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNumaNodesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNumaNodesResource.java
@@ -2,8 +2,6 @@
import java.util.List;
-import javax.ws.rs.core.Response;
-
import org.ovirt.engine.api.model.Host;
import org.ovirt.engine.api.model.NumaNode;
import org.ovirt.engine.api.model.NumaNodes;
@@ -51,11 +49,6 @@
@Override
protected NumaNode doPopulate(NumaNode model, VdsNumaNode entity) {
return model;
- }
-
- @Override
- protected Response performRemove(String id) {
- return null;
}
protected List<VdsNumaNode> getCollection() {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostStorageResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostStorageResource.java
index dc42cfc..6c9187a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostStorageResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostStorageResource.java
@@ -2,7 +2,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.ws.rs.core.Response;
import org.ovirt.engine.api.model.Host;
import org.ovirt.engine.api.model.HostStorage;
@@ -85,11 +84,6 @@
storage.setHost(new Host());
storage.getHost().setId(hostId);
return storage;
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendJobsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendJobsResource.java
index f5a4f1f..2fdfc18 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendJobsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendJobsResource.java
@@ -5,7 +5,6 @@
import javax.ws.rs.PathParam;
import javax.ws.rs.core.Response;
-import org.apache.commons.lang.NotImplementedException;
import org.ovirt.engine.api.model.Job;
import org.ovirt.engine.api.model.Jobs;
import org.ovirt.engine.api.resource.JobResource;
@@ -16,7 +15,6 @@
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
-
public class BackendJobsResource extends
AbstractBackendCollectionResource<Job, org.ovirt.engine.core.common.job.Job>
implements JobsResource {
@@ -43,11 +41,6 @@
@Override
public JobResource getJobSubResource(@PathParam("id") String id) {
return inject(new BackendJobResource(id));
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new NotImplementedException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendOperatingSystemsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendOperatingSystemsResource.java
index cc7a824..bf45a7a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendOperatingSystemsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendOperatingSystemsResource.java
@@ -16,7 +16,6 @@
package org.ovirt.engine.api.restapi.resource;
-import org.apache.commons.lang.NotImplementedException;
import org.ovirt.engine.api.model.OperatingSystemInfo;
import org.ovirt.engine.api.model.OperatingSystemInfos;
import org.ovirt.engine.api.resource.OperatingSystemResource;
@@ -24,10 +23,8 @@
import org.ovirt.engine.core.common.osinfo.OsRepository;
import org.ovirt.engine.core.common.utils.SimpleDependecyInjector;
-import javax.ws.rs.core.Response;
import java.util.ArrayList;
import java.util.HashMap;
-
public class BackendOperatingSystemsResource
extends AbstractBackendCollectionResource<OperatingSystemInfo, Integer>
@@ -68,10 +65,5 @@
@Override
protected OperatingSystemInfo doPopulate(OperatingSystemInfo model,
Integer entity) {
return model;
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new NotImplementedException();
}
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQuotasResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQuotasResource.java
index 4c2ad03..2c26604 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQuotasResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQuotasResource.java
@@ -2,8 +2,6 @@
import java.util.List;
-import javax.ws.rs.core.Response;
-
import org.ovirt.engine.api.model.DataCenter;
import org.ovirt.engine.api.model.Quota;
import org.ovirt.engine.api.model.Quotas;
@@ -26,11 +24,6 @@
public Quotas list() {
IdQueryParameters params = new IdQueryParameters(dataCenterId);
return
mapCollection(getBackendCollection(VdcQueryType.GetQuotaByStoragePoolId,
params));
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotCdRomsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotCdRomsResource.java
index 78dbd85..12889ff 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotCdRomsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotCdRomsResource.java
@@ -8,8 +8,6 @@
import org.ovirt.engine.api.restapi.types.CdRomMapper;
import org.ovirt.engine.core.common.businessentities.VM;
-import javax.ws.rs.core.Response;
-
public class BackendSnapshotCdRomsResource extends
AbstractBackendCollectionResource<CdRom, Snapshot> implements
SnapshotCdRomsResource {
protected BackendSnapshotResource parent;
@@ -34,10 +32,6 @@
return new BackendSnapshotCdRomResource(id, this);
}
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
- }
@Override
protected CdRom doPopulate(CdRom model, Snapshot entity) {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotNicsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotNicsResource.java
index 6eac376..0d9523a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotNicsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotNicsResource.java
@@ -9,8 +9,6 @@
import org.ovirt.engine.core.common.businessentities.VM;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
-import javax.ws.rs.core.Response;
-
public class BackendSnapshotNicsResource extends
AbstractBackendCollectionResource<NIC, Snapshot> implements
SnapshotNicsResource {
protected BackendSnapshotResource parent;
@@ -35,11 +33,6 @@
@Override
public SnapshotNicResource getNicSubResource(String id) {
return new BackendSnapshotNicResource(id, this);
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStatisticsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStatisticsResource.java
index 89ec702..f3f6622 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStatisticsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStatisticsResource.java
@@ -2,8 +2,6 @@
import java.util.List;
-import javax.ws.rs.core.Response;
-
import org.ovirt.engine.api.model.BaseResource;
import org.ovirt.engine.api.model.Statistic;
import org.ovirt.engine.api.model.Statistics;
@@ -54,11 +52,6 @@
} catch (Exception e) {
return handleError(e, false);
}
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepsResource.java
index 3eba79e..125ad2a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepsResource.java
@@ -5,7 +5,6 @@
import javax.ws.rs.PathParam;
import javax.ws.rs.core.Response;
-import org.apache.commons.lang.NotImplementedException;
import org.ovirt.engine.api.model.BaseResource;
import org.ovirt.engine.api.model.Job;
import org.ovirt.engine.api.model.Step;
@@ -59,11 +58,6 @@
@SingleEntityResource
public StepResource getStepSubResource(@PathParam("id") String id) {
return inject(new BackendStepResource(id, this));
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new NotImplementedException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainImagesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainImagesResource.java
index 7a26b50..599e993 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainImagesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainImagesResource.java
@@ -1,7 +1,5 @@
package org.ovirt.engine.api.restapi.resource;
-import javax.ws.rs.core.Response;
-
import org.ovirt.engine.api.model.Image;
import org.ovirt.engine.api.model.Images;
import org.ovirt.engine.api.model.StorageDomain;
@@ -14,7 +12,6 @@
import org.ovirt.engine.core.compat.Guid;
import java.util.List;
-
public class BackendStorageDomainImagesResource
extends AbstractBackendCollectionResource<Image, RepoImage>
@@ -42,11 +39,6 @@
protected Guid getStorageDomainId() {
return storageDomainId;
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException(); // TODO: removal is not
implemented yet
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResource.java
index cfa2f43..7353f9b 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResource.java
@@ -15,6 +15,7 @@
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.ExportRepoImageParameters;
import org.ovirt.engine.core.common.action.HotPlugDiskToVmParameters;
+import org.ovirt.engine.core.common.action.IdParameters;
import org.ovirt.engine.core.common.action.MoveDiskParameters;
import org.ovirt.engine.core.common.action.MoveDisksParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
@@ -141,10 +142,9 @@
return super.update(resource);//explicit call solves REST-Easy
confusion
}
- // The code to remove the disk should be here, but moving it from the
collection resource requires too many
- // changes, so it is temporarily kept there.
@Override
public Response remove(Action action) {
- return ((BackendVmDisksResource) collection).deprecatedRemove(id,
action);
+ get();
+ return performAction(VdcActionType.RemoveDisk, new IdParameters(guid));
}
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmGraphicsConsolesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmGraphicsConsolesResource.java
index 4d55924..7e08097 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmGraphicsConsolesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmGraphicsConsolesResource.java
@@ -13,7 +13,6 @@
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
-import javax.ws.rs.core.Response;
import java.util.Map;
public class BackendVmGraphicsConsolesResource
@@ -44,11 +43,6 @@
@Override
public VmGraphicsConsoleResource getVmGraphicsConsoleResource(String id) {
return inject(new BackendVmGraphicsConsoleResource(this, guid, id));
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDevicesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDevicesResource.java
index be2b440..a9d8edd 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDevicesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmReportedDevicesResource.java
@@ -4,7 +4,6 @@
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
import org.ovirt.engine.api.model.ReportedDevice;
import org.ovirt.engine.api.model.ReportedDevices;
@@ -50,11 +49,6 @@
@Path("{id}")
public VmReportedDeviceResource
getVmReportedDeviceSubResource(@PathParam("id") String id) {
return inject(new BackendVmReportedDeviceResource(id, this));
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException(); // will never be called
}
protected List<VmGuestAgentInterface> getCollection() {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResource.java
index 0adb122..aec6f49 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResource.java
@@ -2,7 +2,6 @@
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
import org.ovirt.engine.api.model.Domain;
import org.ovirt.engine.api.model.Session;
@@ -112,11 +111,6 @@
@Path("{iden}")
public VmSessionResource getSessionSubResource(@PathParam("iden") String
id) {
return inject(new BackendVmSessionResource(this, id));
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException("Remove of sessions not
currently possible");
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainsResource.java
index a6770df..58481ed 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainsResource.java
@@ -5,8 +5,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.ws.rs.core.Response;
-
import org.ovirt.engine.api.model.Domain;
import org.ovirt.engine.api.model.Domains;
import org.ovirt.engine.api.resource.aaa.DomainResource;
@@ -98,11 +96,6 @@
assignChildModel(domain, Domain.class).setId(id);
}
return domain;
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalComputeResourcesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalComputeResourcesResource.java
index 0e5b666..2b00805 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalComputeResourcesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalComputeResourcesResource.java
@@ -16,7 +16,6 @@
package org.ovirt.engine.api.restapi.resource.externalhostproviders;
-import javax.ws.rs.core.Response;
import java.util.List;
import org.ovirt.engine.api.model.ExternalComputeResource;
@@ -70,11 +69,6 @@
provider.setId(providerId);
model.setExternalHostProvider(provider);
return super.addParents(model);
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalDiscoveredHostsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalDiscoveredHostsResource.java
index aebf239..c295ecd 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalDiscoveredHostsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalDiscoveredHostsResource.java
@@ -28,7 +28,6 @@
import org.ovirt.engine.core.common.queries.ProviderQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
-import javax.ws.rs.core.Response;
import java.util.List;
public class BackendExternalDiscoveredHostsResource
@@ -70,11 +69,6 @@
provider.setId(providerId);
image.setExternalHostProvider(provider);
return super.addParents(image);
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupsResource.java
index 383cac0..34de715 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupsResource.java
@@ -16,7 +16,6 @@
package org.ovirt.engine.api.restapi.resource.externalhostproviders;
-import javax.ws.rs.core.Response;
import java.util.List;
import org.ovirt.engine.api.model.ExternalHostGroup;
@@ -70,11 +69,6 @@
provider.setId(providerId);
model.setExternalHostProvider(provider);
return super.addParents(model);
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostsResource.java
index 21f9aa1..690695c 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostsResource.java
@@ -16,7 +16,6 @@
package org.ovirt.engine.api.restapi.resource.externalhostproviders;
-import javax.ws.rs.core.Response;
import java.util.List;
import org.ovirt.engine.api.model.ExternalHost;
@@ -67,11 +66,6 @@
provider.setId(providerId);
entity.setExternalHostProvider(provider);
return super.addParents(entity);
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendHostKatelloErrataResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendHostKatelloErrataResource.java
index 1f4dafe..55c6e1d 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendHostKatelloErrataResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendHostKatelloErrataResource.java
@@ -2,9 +2,6 @@
import java.util.List;
-import javax.ws.rs.core.Response;
-
-import org.apache.commons.lang.NotImplementedException;
import org.ovirt.engine.api.model.Host;
import org.ovirt.engine.api.model.KatelloErrata;
import org.ovirt.engine.api.model.KatelloErratum;
@@ -43,11 +40,6 @@
@Override
public KatelloErratumResource getKatelloErratumSubResource(String id) {
return inject(new BackendHostKatelloErratumResource(id, hostId));
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new NotImplementedException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendSystemKatelloErrataResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendSystemKatelloErrataResource.java
index 7a5afa7..8f2cccb 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendSystemKatelloErrataResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendSystemKatelloErrataResource.java
@@ -2,9 +2,6 @@
import java.util.List;
-import javax.ws.rs.core.Response;
-
-import org.apache.commons.lang.NotImplementedException;
import org.ovirt.engine.api.model.KatelloErrata;
import org.ovirt.engine.api.model.KatelloErratum;
import
org.ovirt.engine.api.resource.externalhostproviders.KatelloErratumResource;
@@ -39,11 +36,6 @@
@Override
public KatelloErratumResource getKatelloErratumSubResource(String id) {
return inject(new BackendSystemKatelloErratumResource(id));
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new NotImplementedException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendVmKatelloErrataResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendVmKatelloErrataResource.java
index 6e91ee2..c8aeaf8 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendVmKatelloErrataResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendVmKatelloErrataResource.java
@@ -2,9 +2,6 @@
import java.util.List;
-import javax.ws.rs.core.Response;
-
-import org.apache.commons.lang.NotImplementedException;
import org.ovirt.engine.api.model.KatelloErrata;
import org.ovirt.engine.api.model.KatelloErratum;
import org.ovirt.engine.api.model.VM;
@@ -43,11 +40,6 @@
@Override
public KatelloErratumResource getKatelloErratumSubResource(String id) {
return inject(new BackendVmKatelloErratumResource(id, vmId));
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new NotImplementedException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImagesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImagesResource.java
index 858e4c3..d33cd2e 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImagesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImagesResource.java
@@ -16,7 +16,6 @@
package org.ovirt.engine.api.restapi.resource.openstack;
-import javax.ws.rs.core.Response;
import java.util.List;
import org.ovirt.engine.api.model.OpenStackImage;
@@ -68,11 +67,6 @@
provider.setId(providerId);
image.setOpenstackImageProvider(provider);
return super.addParents(image);
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworksResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworksResource.java
index 858ec09..5240193 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworksResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworksResource.java
@@ -16,7 +16,6 @@
package org.ovirt.engine.api.restapi.resource.openstack;
-import javax.ws.rs.core.Response;
import java.util.Map;
import java.util.Set;
@@ -88,11 +87,6 @@
provider.setId(providerId);
image.setOpenstackNetworkProvider(provider);
return super.addParents(image);
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeTypesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeTypesResource.java
index 5fc0860..a240949 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeTypesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeTypesResource.java
@@ -28,7 +28,6 @@
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
-import javax.ws.rs.core.Response;
import java.util.List;
public class BackendOpenStackVolumeTypesResource
@@ -68,11 +67,6 @@
provider.setId(providerId);
volumeType.setOpenstackVolumeProvider(provider);
return super.addParents(volumeType);
- }
-
- @Override
- protected Response performRemove(String id) {
- throw new UnsupportedOperationException();
}
@Override
--
To view, visit https://gerrit.ovirt.org/42277
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2eaec165059e9501940cb427edcaeabb6366ed2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
