Allon Mureinik has uploaded a new change for review.
Change subject: restapi: Remove BaseBackendResource.asGuid(Guid)
......................................................................
restapi: Remove BaseBackendResource.asGuid(Guid)
This the unification of Guid and NGuid, this method is meaningless, and
thus should be removed.
Change-Id: Ifbc773fcc57ae182dc6b16091eb2662f688b706f
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResource.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/BaseBackendResource.java
6 files changed, 5 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/15695/1
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java
index 0303bfb..7c681b0 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java
@@ -128,7 +128,7 @@
VdcQueryType.GetVdsGroupById,
new IdQueryParameters(asGuid(clusterId)),
null).getStoragePoolId();
- IdQueryParameters params = new IdQueryParameters(asGuid(dataCenterId));
+ IdQueryParameters params = new IdQueryParameters(dataCenterId);
return getBackendCollection(VdcQueryType.GetAllNetworks, params);
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java
index 3287082..3658d6a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java
@@ -156,7 +156,7 @@
return lookupAtachedNetwork(originalInter.getNetworkName());
} else {
InterfaceAndIdQueryParameters params = new
InterfaceAndIdQueryParameters(
-
asGuid(originalInter.getVdsId()),
+
originalInter.getVdsId(),
originalInter);
List<VdsNetworkInterface> vlans =
getBackendCollection(VdsNetworkInterface.class,
VdcQueryType.GetAllChildVlanInterfaces, params);
if (vlans!=null && !vlans.isEmpty()) {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResource.java
index 331003a..0cbfc2c 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResource.java
@@ -136,7 +136,7 @@
} else if (isFiltered()) {
Guid dataCenterId = null;
if (cluster != null && cluster.getStoragePoolId() != null) {
- dataCenterId = asGuid(cluster.getStoragePoolId());
+ dataCenterId = cluster.getStoragePoolId();
}
vm =
getEntity(org.ovirt.engine.core.common.businessentities.VM.class,
VdcQueryType.GetVmByVmNameForDataCenter,
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 91eaff7..1459473 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
@@ -165,7 +165,7 @@
private List<VmGuestAgentInterface> getDevicesCollection(Guid vmId) {
return getBackendCollection(VmGuestAgentInterface.class,
VdcQueryType.GetVmGuestAgentInterfacesByVmId,
- new IdQueryParameters(asGuid(vmId)));
+ new IdQueryParameters(vmId));
}
@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 bfa47d1..be2b440 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
@@ -58,7 +58,7 @@
}
protected List<VmGuestAgentInterface> getCollection() {
- return
getBackendCollection(VdcQueryType.GetVmGuestAgentInterfacesByVmId, new
IdQueryParameters(asGuid(vmId)));
+ return
getBackendCollection(VdcQueryType.GetVmGuestAgentInterfacesByVmId, new
IdQueryParameters(vmId));
}
public ReportedDevice lookupReportedDevice(Guid deviceId) {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java
index e4cacf7..d78599f 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java
@@ -261,10 +261,6 @@
}
}
- protected Guid asGuid(Guid guid) {
- return guid;
- }
-
protected Long asLong(String id) {
try {
return new Long(id);
--
To view, visit http://gerrit.ovirt.org/15695
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbc773fcc57ae182dc6b16091eb2662f688b706f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
