Arik Hadas has uploaded a new change for review.
Change subject: engine: remove castings
......................................................................
engine: remove castings
Change-Id: Ib7b8b9f5721e2efd23cbd92ff77c3d3b5d40d811
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetManagementInterfaceAddressByVmIdQueryTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/template/GetTemplateInterfacesByTemplateIdQueryTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetDeviceListQueryTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainByIdQueryTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByStoragePoolIdQueryTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQueryTest.java
M
backend/manager/modules/root/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
M
backend/manager/modules/root/src/main/java/org/ovirt/engine/core/validate/ValidateSession.java
12 files changed, 16 insertions(+), 22 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/18873/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java
index 95a0edc..296ae55 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java
@@ -50,7 +50,7 @@
SearchParameters searchParams = new SearchParameters("hosts:
cluster = "
+ vdsGroup.getName(), SearchType.VDS);
searchParams.setMaxCount(Integer.MAX_VALUE);
- List<VDS> vdsList = (List<VDS>) Backend.getInstance()
+ List<VDS> vdsList = Backend.getInstance()
.runInternalQuery(VdcQueryType.Search,
searchParams).getReturnValue();
if (networkCluster.isRequired()) {
@@ -58,8 +58,7 @@
if (vds.getStatus() != VDSStatus.Up) {
continue;
}
- List<VdsNetworkInterface> interfaces =
(List<VdsNetworkInterface>) Backend
- .getInstance()
+ List<VdsNetworkInterface> interfaces =
Backend.getInstance()
.runInternalQuery(VdcQueryType.GetVdsInterfacesByVdsId,
new
IdQueryParameters(vds.getId())).getReturnValue();
VdsNetworkInterface iface =
LinqUtils.firstOrNull(interfaces, new Predicate<VdsNetworkInterface>() {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
index 3d86d52..0109357 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
@@ -167,8 +167,7 @@
VdcQueryType.GetAllChildVlanInterfaces,
new InterfaceAndIdQueryParameters(params.getVdsId(), params
.getInterface()));
- @SuppressWarnings("unchecked")
- ArrayList<VdsNetworkInterface> vlanIfaces =
(ArrayList<VdsNetworkInterface>) ret.getReturnValue();
+ ArrayList<VdsNetworkInterface> vlanIfaces = ret.getReturnValue();
if (vlanIfaces.size() > 0) {
addCanDoActionMessage(VdcBllMessages.NETWORK_INTERFACE_CONNECT_TO_VLAN);
return false;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQuery.java
index c7d7604..a0d65cf 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQuery.java
@@ -30,8 +30,8 @@
// get all disks and snapshots
VdcQueryReturnValue queryReturnValue =
getAllDisksByStorageDomain(domainId);
if (queryReturnValue.getSucceeded()) {
- disksOfDomain = (List<DiskImage>)
queryReturnValue.getReturnValue();
- Map<String, VM> vmNameToVMMap = new HashMap();
+ disksOfDomain = queryReturnValue.getReturnValue();
+ Map<String, VM> vmNameToVMMap = new HashMap<>();
for (VM vm : vms) {
vmNameToVMMap.put(vm.getName(), vm);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
index 71f3958..7bd9877 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
@@ -153,14 +153,13 @@
return ValidationResult.VALID;
}
- @SuppressWarnings("unchecked")
private boolean isRepoImageExists(String repoImagePath, Guid
storageDomainId, ImageFileType imageFileType) {
VdcQueryReturnValue ret = getBackend().runInternalQuery(
VdcQueryType.GetImagesList,
new GetImagesListParameters(storageDomainId, imageFileType));
if (ret != null && ret.getReturnValue() != null && ret.getSucceeded())
{
- for (RepoImage isoFileMetaData : (List<RepoImage>)
ret.getReturnValue()) {
+ for (RepoImage isoFileMetaData :
ret.<List<RepoImage>>getReturnValue()) {
if (repoImagePath.equals(isoFileMetaData.getRepoImageId())) {
return true;
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetManagementInterfaceAddressByVmIdQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetManagementInterfaceAddressByVmIdQueryTest.java
index c401cd9..223fa3b 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetManagementInterfaceAddressByVmIdQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetManagementInterfaceAddressByVmIdQueryTest.java
@@ -39,7 +39,7 @@
getQuery().executeQueryCommand();
- String result = (String)
getQuery().getQueryReturnValue().getReturnValue();
+ String result = getQuery().getQueryReturnValue().getReturnValue();
assertEquals("Wrong address returned", "my_address", result);
}
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 3357b0a..d733888 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
@@ -33,8 +33,7 @@
getQuery().executeQueryCommand();
- @SuppressWarnings("unchecked")
- List<VmNetworkInterface> result = (List<VmNetworkInterface>)
getQuery().getQueryReturnValue().getReturnValue();
+ List<VmNetworkInterface> result =
getQuery().getQueryReturnValue().getReturnValue();
assertEquals("Wrong interfaces returned", expectedResult, result);
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetDeviceListQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetDeviceListQueryTest.java
index 5894c60..f149520 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetDeviceListQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetDeviceListQueryTest.java
@@ -101,8 +101,7 @@
getQuery().executeQueryCommand();
// Assert the query's results
- @SuppressWarnings("unchecked")
- List<LUNs> lunsActual = (List<LUNs>)
getQuery().getQueryReturnValue().getReturnValue();
+ List<LUNs> lunsActual =
getQuery().getQueryReturnValue().getReturnValue();
assertEquals(lunsExpected, lunsActual);
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainByIdQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainByIdQueryTest.java
index c5af478..6770ad7 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainByIdQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainByIdQueryTest.java
@@ -34,7 +34,7 @@
getQuery().executeQueryCommand();
// Assert we got the correct storage domain back
- StorageDomain actual = (StorageDomain)
getQuery().getQueryReturnValue().getReturnValue();
+ StorageDomain actual =
getQuery().getQueryReturnValue().getReturnValue();
assertEquals("Wrong storage domain returned", expected, actual);
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByStoragePoolIdQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByStoragePoolIdQueryTest.java
index e27b348..91606fc 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByStoragePoolIdQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByStoragePoolIdQueryTest.java
@@ -37,8 +37,7 @@
getQuery().executeQueryCommand();
- @SuppressWarnings("unchecked")
- List<StorageDomain> result = (List<StorageDomain>)
getQuery().getQueryReturnValue().getReturnValue();
+ List<StorageDomain> result =
getQuery().getQueryReturnValue().getReturnValue();
assertEquals("Wrong number of domains returned", 1, result.size());
assertEquals("Wrong domain returned", domain, result.get(0));
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQueryTest.java
index 7d2ff57..413fcbe 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetVmsByStorageDomainQueryTest.java
@@ -51,7 +51,7 @@
doReturn(returnValue).when(query).getAllDisksByStorageDomain(domainId);
query.executeQueryCommand();
- List<VM> vms = (List<VM>) query.getQueryReturnValue().getReturnValue();
+ List<VM> vms = query.getQueryReturnValue().getReturnValue();
assertEquals(2,vms.size());
}
@@ -70,7 +70,7 @@
doReturn(returnValue).when(query).getAllDisksByStorageDomain(domainId);
query.executeQueryCommand();
- List<VM> vms = (List<VM>) query.getQueryReturnValue().getReturnValue();
+ List<VM> vms = query.getQueryReturnValue().getReturnValue();
assertEquals(0,vms.size());
}
@@ -110,7 +110,7 @@
doReturn(returnValue).when(query).getAllDisksByStorageDomain(domainId);
query.executeQueryCommand();
- List<VM> vms = (List<VM>) query.getQueryReturnValue().getReturnValue();
+ List<VM> vms = query.getQueryReturnValue().getReturnValue();
assertEquals(2,vms.size());
assertEquals(1,vms.get(0).getDiskList().size());
assertEquals(1,vms.get(1).getDiskList().size());
diff --git
a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
index 17699cb..61fa5ba 100644
---
a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
+++
b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
@@ -94,7 +94,7 @@
ServletException {
request.setAttribute(LOCALE_KEYS, LocaleFilter.getLocaleKeys());
request.setAttribute(APPLICATION_TYPE,
BrandingTheme.ApplicationType.WELCOME);
- String oVirtVersion = (String)
backend.RunPublicQuery(VdcQueryType.GetConfigurationValue,
+ String oVirtVersion =
backend.RunPublicQuery(VdcQueryType.GetConfigurationValue,
new
GetConfigurationValueParameters(ConfigurationValues.ProductRPMVersion,
ConfigCommon.defaultConfigurationVersion)).getReturnValue();
request.setAttribute(VERSION, oVirtVersion != null ? oVirtVersion :
"myVersion");
diff --git
a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/validate/ValidateSession.java
b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/validate/ValidateSession.java
index 7f046e3..bb9ebac 100644
---
a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/validate/ValidateSession.java
+++
b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/validate/ValidateSession.java
@@ -68,7 +68,7 @@
returnValue = queryReturnValue.getSucceeded();
if (returnValue) {
- VdcUser vdcUser = (VdcUser) queryReturnValue.getReturnValue();
+ VdcUser vdcUser = queryReturnValue.getReturnValue();
// We get the user name only in case the validation succeeded,
and the user is an administrator
if (vdcUser.isAdmin()) {
--
To view, visit http://gerrit.ovirt.org/18873
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7b8b9f5721e2efd23cbd92ff77c3d3b5d40d811
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
