Allon Mureinik has uploaded a new change for review.
Change subject: engine: Avoid empty statements
......................................................................
engine: Avoid empty statements
Cleared the code of empty statements (";" with nothing else) and enabled
the checkstyle validation to make sure they don't re-occur.
Change-Id: I4c2a9bc60b17796fcb0bd2a3b0f0f076f2117f4d
Signed-off-by: Allon Mureinik <[email protected]>
---
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmAndTemplatesGenerationsDaoTest.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReapedMap.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java
M build-tools-root/checkstyles/src/main/resources/checkstyle.xml
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java
6 files changed, 8 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/15006/1
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmAndTemplatesGenerationsDaoTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmAndTemplatesGenerationsDaoTest.java
index 1846bbe..442d810 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmAndTemplatesGenerationsDaoTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmAndTemplatesGenerationsDaoTest.java
@@ -197,7 +197,6 @@
// POOL : STORAGE_POOL_NFS_2
toUpdate.add(FixturesTool.VM_TEMPLATE_RHEL6_1);
- ;
toUpdate.add(FixturesTool.VM_RHEL5_POOL_60);
List<Long> values = new LinkedList<Long>();
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
index 72e4d8e..fb5308a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
@@ -345,7 +345,7 @@
try {
if (baos != null) baos.close();
if (is != null) is.close();
- } catch (IOException e) {;}
+ } catch (IOException ignored) {}
}
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReapedMap.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReapedMap.java
index a8cd5ede..ed619ec 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReapedMap.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReapedMap.java
@@ -134,8 +134,9 @@
public synchronized void clear() {
super.clear();
reapableMap.clear();
- while (queue.poll() != null)
- ;
+ while (queue.poll() != null) {
+ // do nothing
+ }
}
/**
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java
index 615e6e1..da965c1 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarTest.java
@@ -60,7 +60,9 @@
is = new DigestInputStream(fis, fmd);
byte buf[] = new byte[1024];
int n;
- while ((n = is.read(buf)) != -1);
+ while ((n = is.read(buf)) != -1) {
+ // do nothing
+ }
md.update(fmd.digest());
}
finally {
diff --git a/build-tools-root/checkstyles/src/main/resources/checkstyle.xml
b/build-tools-root/checkstyles/src/main/resources/checkstyle.xml
index a9db716..68be13f 100644
--- a/build-tools-root/checkstyles/src/main/resources/checkstyle.xml
+++ b/build-tools-root/checkstyles/src/main/resources/checkstyle.xml
@@ -14,6 +14,7 @@
</module>
<module name="TreeWalker">
<property name="cacheFile" value="${checkstyle.cache.file}"/>
+ <module name="EmptyStatement"/>
<module name="RedundantImport"/>
<module name="UnusedImports"/>
<module name="AvoidStarImport"/>
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java
index bcbcb97..32c37cc 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java
@@ -77,7 +77,6 @@
public void onSuccess(Object target, Object returnValue) {
ClusterGuideModel clusterGuideModel =
(ClusterGuideModel) target;
ArrayList<VDS> hosts = (ArrayList<VDS>) returnValue;
- ;
clusterGuideModel.hosts = hosts;
clusterGuideModel.updateOptionsNonLocalFS();
}
@@ -89,7 +88,6 @@
public void onSuccess(Object target, Object returnValue) {
ClusterGuideModel clusterGuideModel =
(ClusterGuideModel) target;
ArrayList<VDS> hosts = (ArrayList<VDS>) returnValue;
- ;
clusterGuideModel.allHosts = hosts;
clusterGuideModel.updateOptionsNonLocalFS();
}
@@ -114,7 +112,6 @@
public void onSuccess(Object target, Object returnValue) {
ClusterGuideModel clusterGuideModel =
(ClusterGuideModel) target;
VDS localStorageHost = (VDS) returnValue;
- ;
clusterGuideModel.localStorageHost = localStorageHost;
clusterGuideModel.updateOptionsLocalFS();
}
@@ -394,7 +391,6 @@
HostModel model = (HostModel)
clusterGuideModel.getWindow();
ArrayList<StoragePool> dataCenters =
(ArrayList<StoragePool>) returnValue;
- ;
model.getDataCenter().setItems(dataCenters);
if (getEntity().getStoragePoolId() != null)
{
--
To view, visit http://gerrit.ovirt.org/15006
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c2a9bc60b17796fcb0bd2a3b0f0f076f2117f4d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
