Alissa Bonas has uploaded a new change for review.
Change subject: engine: add checkstyle NoWhitespaceBefore check
......................................................................
engine: add checkstyle NoWhitespaceBefore check
Add to checkstyle NoWhitespaceBefore check configured
to check no whitespace before semicolons.
Also fixed code in all places that failed following this check addition.
Change-Id: Id78dbdf179c3d8c8b8cad0e31d71b3bc5f87da90
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DisconnectStorageServerConnectionCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageServerConnectionCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeBricksActionParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterAsyncTaskStatus.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterTaskType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NonOperationalReason.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServiceStatus.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/ServiceType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
M
backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/DetailHelperTest.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/MessageBundle.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStepsResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
M
backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/GlusterBrickDetailMapperTest.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/dns/DnsSRVLocator.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReapedMapTest.java
M
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java
M
backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageBody.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/hosts/HostListModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java
31 files changed, 37 insertions(+), 45 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/20337/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DisconnectStorageServerConnectionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DisconnectStorageServerConnectionCommand.java
index 3c947eb..1e2876e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DisconnectStorageServerConnectionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DisconnectStorageServerConnectionCommand.java
@@ -31,7 +31,7 @@
new
StorageServerConnectionManagementVDSParameters(getParameters().getVdsId(),
Guid.Empty,
getParameters().getStorageServerConnection().getstorage_type(),
new ArrayList<>(Arrays
- .asList(new StorageServerConnections[]
{ getConnection() })))).getSucceeded() ;
+ .asList(new StorageServerConnections[]
{ getConnection() })))).getSucceeded();
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageServerConnectionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageServerConnectionCommand.java
index 31dec16..7f9216e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageServerConnectionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageServerConnectionCommand.java
@@ -77,7 +77,7 @@
// Build domain names list to display in the error
domainNamesForMessage =
prepareEntityNamesForMessage(domainNames);
if (diskNames.isEmpty()) {
- return
prepareFailureMessageForDomains(domainNamesForMessage) ;
+ return
prepareFailureMessageForDomains(domainNamesForMessage);
}
else {
String diskNamesForMessage =
prepareEntityNamesForMessage(diskNames);
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
index 1f43262..12a2a94 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
@@ -831,8 +831,7 @@
//mom policies
USER_UPDATED_MOM_POLICIES(10200),
- USER_FAILED_TO_UPDATE_MOM_POLICIES(10201),
- ;
+ USER_FAILED_TO_UPDATE_MOM_POLICIES(10201);
private int intValue;
// indicates time interval in seconds on which identical events from same
instance are supressed.
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java
index 935e3d7..a9df9b1 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java
@@ -34,8 +34,7 @@
PROVIDER(24, "Provider"),
GlusterService(25, "GlusterService"),
ExternalTask(26, "ExternalTask"),
- VnicProfile(27, "Vnic Profile")
- ;
+ VnicProfile(27, "Vnic Profile");
private int value;
private String vdcObjectTranslationVal;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeBricksActionParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeBricksActionParameters.java
index 3af4acd..5eed361 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeBricksActionParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeBricksActionParameters.java
@@ -9,7 +9,7 @@
private static final long serialVersionUID = -2254020786236387303L;
private int replicaCount;
- private int stripeCount ;
+ private int stripeCount;
public GlusterVolumeBricksActionParameters() {
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterAsyncTaskStatus.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterAsyncTaskStatus.java
index 3a20145..52403c5 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterAsyncTaskStatus.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterAsyncTaskStatus.java
@@ -12,8 +12,7 @@
FAILED("FAILED"),
UNKNOWN("UNKNOWN"),
NOT_STARTED("NOT_STARTED"),
- IN_PROGRESS("IN_PROGRESS"),
- ;
+ IN_PROGRESS("IN_PROGRESS");
private String statusMsg;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterTaskType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterTaskType.java
index 8ca0fe7..c1bca5c 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterTaskType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterTaskType.java
@@ -7,8 +7,7 @@
public enum GlusterTaskType {
REBALANCE(StepEnum.REBALANCING_VOLUME),
- REMOVE_BRICK(StepEnum.REMOVING_BRICKS),
- ;
+ REMOVE_BRICK(StepEnum.REMOVING_BRICKS);
private StepEnum step;
private static Map<StepEnum, GlusterTaskType> mappings;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NonOperationalReason.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NonOperationalReason.java
index ef4c7b8..d872e6d 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NonOperationalReason.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NonOperationalReason.java
@@ -19,8 +19,7 @@
EMULATED_MACHINES_INCOMPATIBLE_WITH_CLUSTER(11),
UNTRUSTED(12),
UNINITIALIZED(13),
- CLUSTER_VERSION_INCOMPATIBLE_WITH_CLUSTER(14),
- ;
+ CLUSTER_VERSION_INCOMPATIBLE_WITH_CLUSTER(14);
private final int value;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
index 5275592..c463ca9 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
@@ -44,7 +44,7 @@
private Integer vm_migrating;
- private Integer reserved_mem ;
+ private Integer reserved_mem;
private Integer guest_overhead;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
index 8feda45..2d65f23 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
@@ -153,7 +153,7 @@
disksUsage = value;
}
- private Integer usage_network_percentField ;
+ private Integer usage_network_percentField;
public Integer getusage_network_percent() {
return this.usage_network_percentField;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServiceStatus.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServiceStatus.java
index 7d330ac..58bc063 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServiceStatus.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServiceStatus.java
@@ -10,8 +10,7 @@
STOPPED(4 /* 0100 */, "Down"),
NOT_AVAILABLE(2 /* 0010 */, "Not Installed"), // service is not installed
in the host
UNKNOWN(1 /* 0001 */, "Unknown"), // Couldn't fetch status
- MIXED(12 /* 1100 */, "Partially Up"), // cluster-wide status, few up, few
down
- ;
+ MIXED(12 /* 1100 */, "Partially Up"); // cluster-wide status, few up, few
down
private int statusCode;
private String statusMsg;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/ServiceType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/ServiceType.java
index 2b68b30..48476dc 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/ServiceType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/ServiceType.java
@@ -11,6 +11,5 @@
SHD,
GLUSTER,
GLUSTER_SWIFT,
- SMB,
- ;
+ SMB;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
index 86ce33f..422af2d 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
@@ -433,7 +433,7 @@
// migration cancel failed, VM doesn't exist
MIGRATION_CANCEL_ERROR_NO_VM(5100),
- SESSION_ERROR(9999), ;
+ SESSION_ERROR(9999);
private int intValue;
private static final java.util.HashMap<Integer, VdcBllErrors> mappings =
new HashMap<Integer, VdcBllErrors>();
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
index d91b78f..77f9381 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
@@ -108,8 +108,7 @@
MaxVmNameLengthNonWindows(ConfigAuthType.User),
AttestationServer,
DefaultGeneralTimeZone,
- DefaultWindowsTimeZone
- ;
+ DefaultWindowsTimeZone;
public static enum ConfigAuthType {
Admin,
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
index 8d3397a..4e937d4 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
@@ -153,8 +153,7 @@
GetGlusterVolumeRebalanceStatus("org.ovirt.engine.core.vdsbroker.gluster"),
GetDiskAlignment("org.ovirt.engine.core.vdsbroker.vdsbroker"),
GlusterTasksList("org.ovirt.engine.core.vdsbroker.gluster"),
-
GetGlusterVolumeRemoveBricksStatus("org.ovirt.engine.core.vdsbroker.gluster"),
- ;
+
GetGlusterVolumeRemoveBricksStatus("org.ovirt.engine.core.vdsbroker.gluster");
String packageName;
diff --git
a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/DetailHelperTest.java
b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/DetailHelperTest.java
index b676b06..52940bf 100644
---
a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/DetailHelperTest.java
+++
b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/DetailHelperTest.java
@@ -106,7 +106,7 @@
replay(httpheaders);
- for (int i = 0 ; i < rels.length ; i++) {
+ for (int i = 0; i < rels.length; i++) {
assertEquals(expected[i], DetailHelper.include(httpheaders,
rels[i]));
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/MessageBundle.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/MessageBundle.java
index 99a8928..c29a61f 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/MessageBundle.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/MessageBundle.java
@@ -4,7 +4,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.HashMap;
-import java.util.ResourceBundle ;
+import java.util.ResourceBundle;
public class MessageBundle {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java
index 8bf696a..13a1de2 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java
@@ -101,7 +101,7 @@
}
public static synchronized boolean
isIsoDomain(org.ovirt.engine.core.common.businessentities.StorageDomain
storageDomain) {
- org.ovirt.engine.core.common.businessentities.StorageDomainType type =
storageDomain.getStorageDomainType() ;
+ org.ovirt.engine.core.common.businessentities.StorageDomainType type =
storageDomain.getStorageDomainType();
return type != null && type ==
org.ovirt.engine.core.common.businessentities.StorageDomainType.ISO ? true :
false;
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResourceTest.java
index 49a7b4e..a8f7b22 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResourceTest.java
@@ -114,7 +114,7 @@
for (Statistic statistic : statistics) {
assertTrue(statistic.isSetValues());
boolean found = false;
- for (int i = 0 ; i < names.length ; i++) {
+ for (int i = 0; i < names.length; i++) {
if (names[i].equals(statistic.getName())) {
assertEquals("unexpected value for: " + names[i],
values[i], getDatum(statistic));
found = true;
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java
index 5316f30..ea5bf7a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java
@@ -460,7 +460,7 @@
return nicSpeed == 0 ?
null
:
- nicSpeed * 1000L * 1000 ;
+ nicSpeed * 1000L * 1000;
}
protected NicStatus map(InterfaceStatus interfaceStatus, NicStatus params)
{
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStepsResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStepsResourceTest.java
index df41eaa..cd82d64 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStepsResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStepsResourceTest.java
@@ -50,7 +50,7 @@
@Override
protected org.ovirt.engine.core.common.job.Step getEntity(int index) {
- int jobIndex = index == 0 ? 1 : index -1 ;
+ int jobIndex = index == 0 ? 1 : index -1;
org.ovirt.engine.core.common.job.Step step = new
org.ovirt.engine.core.common.job.Step();
step.setId(GUIDS[index]);
step.setJobId(GUIDS[jobIndex]);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserResourceTest.java
index f7e1c8a..d10dbe5 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserResourceTest.java
@@ -86,7 +86,7 @@
assertNotNull(model.getDomain());
assertTrue(model.isSetGroups());
assertEquals(PARSED_GROUPS.length,
model.getGroups().getGroups().size());
- for (int i = 0 ; i < PARSED_GROUPS.length ; i++) {
+ for (int i = 0; i < PARSED_GROUPS.length; i++) {
Group group = model.getGroups().getGroups().get(i);
assertEquals(PARSED_GROUPS[i], group.getName());
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
index b8a4d4d..b50f541 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
@@ -31,8 +31,7 @@
static final String GROUPS =
"Schema Admins@Maghreb/Users," +
"Group Policy Creator Owners@Maghreb/Users," +
- "Enterprise Admins@Maghreb/Users"
- ;
+ "Enterprise Admins@Maghreb/Users";
static final String[] PARSED_GROUPS = {
"Schema Admins@Maghreb/Users",
@@ -230,7 +229,7 @@
assertEquals(new Guid(DOMAIN.getBytes(), true).toString(),
model.getDomain().getId());
assertTrue(model.isSetGroups());
assertEquals(PARSED_GROUPS.length,
model.getGroups().getGroups().size());
- for (int i = 0 ; i < PARSED_GROUPS.length ; i++) {
+ for (int i = 0; i < PARSED_GROUPS.length; i++) {
Group group = model.getGroups().getGroups().get(i);
assertEquals(PARSED_GROUPS[i], group.getName());
}
diff --git
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/GlusterBrickDetailMapperTest.java
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/GlusterBrickDetailMapperTest.java
index 4ccac73..41ffde7 100644
---
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/GlusterBrickDetailMapperTest.java
+++
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/GlusterBrickDetailMapperTest.java
@@ -77,7 +77,7 @@
private List<BrickDetails> getBrickDetails(int size, int clientListSize,
int memPoolSize) {
ArrayList<BrickDetails> list = new ArrayList<BrickDetails>();
- for(int i=0; i < size ; i++) {
+ for(int i=0; i < size; i++) {
BrickDetails details = new BrickDetails();
BrickProperties props = new BrickProperties();
props.setBlockSize(14556);
@@ -98,7 +98,7 @@
memStatus.getMallInfo().setArena(RandomUtils.instance().nextInt());
memStatus.getMallInfo().setUordblks(RandomUtils.instance().nextInt());
ArrayList<Mempool> memPoolsList = new ArrayList<Mempool>();
- for(int i=0; i < listSize ; i++) {
+ for(int i=0; i < listSize; i++) {
Mempool pool = new Mempool();
pool.setAllocCount(RandomUtils.instance().nextInt());
pool.setHotCount(0);
@@ -111,7 +111,7 @@
private List<GlusterClientInfo> getClientList(int listSize) {
ArrayList<GlusterClientInfo> list = new ArrayList<GlusterClientInfo>();
- for(int i=0; i < listSize ; i++) {
+ for(int i=0; i < listSize; i++) {
GlusterClientInfo clientInfo = new GlusterClientInfo();
clientInfo.setBytesRead(RandomUtils.instance().nextInt());
clientInfo.setBytesWritten(RandomUtils.instance().nextInt());
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/dns/DnsSRVLocator.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/dns/DnsSRVLocator.java
index a292be7..769fa43 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/dns/DnsSRVLocator.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/dns/DnsSRVLocator.java
@@ -397,7 +397,7 @@
if (result == null) {
return null;
}
- for (int counter = 0 ; counter <result.getNumOfValidAddresses();
counter++) {
+ for (int counter = 0; counter <result.getNumOfValidAddresses();
counter++) {
results.add(result.getAddresses()[counter]);
}
return results;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReapedMapTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReapedMapTest.java
index d78c127..b132702 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReapedMapTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReapedMapTest.java
@@ -84,7 +84,7 @@
map.reapable("one");
map.reapable("three");
assertSizes(1, 2);
- for (int i = 0 ; i < 6 ; i++) {
+ for (int i = 0; i < 6; i++) {
Thread.sleep(250);
assertExpected(i == 0 ? 1 : 3);
}
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java
index 8f8faa3..267b9f0 100644
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java
@@ -83,7 +83,7 @@
}
// Attempt additional 3 retries in case of failure
- for (int i=0 ; i < 3 && shouldRetry ; ++i){
+ for (int i=0; i < 3 && shouldRetry; ++i){
shouldRetry = false;
try {
// hold the next send attempt for 30 seconds in case of a busy
mail server
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageBody.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageBody.java
index 43c7294..80456b6 100644
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageBody.java
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageBody.java
@@ -5,7 +5,7 @@
*/
public class MessageBody{
private String userInfo;
- private String vmInfo ;
+ private String vmInfo;
private String hostInfo;
private String templateInfo;
private String datacenterInfo;
diff --git a/build-tools-root/checkstyles/src/main/resources/checkstyle.xml
b/build-tools-root/checkstyles/src/main/resources/checkstyle.xml
index 77fc4a6..d87dfa9 100644
--- a/build-tools-root/checkstyles/src/main/resources/checkstyle.xml
+++ b/build-tools-root/checkstyles/src/main/resources/checkstyle.xml
@@ -28,5 +28,8 @@
<module name="checks.NoMemberInitializationCheck">
<property name="run" value="${disallowMemberInit}" default="false"/>
</module>
+ <module name="NoWhitespaceBefore">
+ <property name="tokens" value="SEMI"/>
+ </module>
</module>
</module>
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
index f233904..2e69b5d 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
@@ -897,7 +897,7 @@
parameters.setPassword((String)
model.getUserPassword().getEntity());
}
parameters.setOverrideFirewall((Boolean)
model.getOverrideIpTables().getEntity());
- parameters.setRebootAfterInstallation(isVirt) ;
+ parameters.setRebootAfterInstallation(isVirt);
parameters.setAuthMethod(model.getAuthenticationMethod());
Provider networkProvider = (Provider)
model.getNetworkProviders().getSelectedItem();
@@ -926,7 +926,7 @@
parameters.setVdsId(host.getId());
parameters.setPassword(""); //$NON-NLS-1$
parameters.setInstallVds(false);
- parameters.setRebootAfterInstallation(isVirt) ;
+ parameters.setRebootAfterInstallation(isVirt);
parameters.setAuthMethod(model.getAuthenticationMethod());
if (!oldClusterId.equals(newClusterId))
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java
index f4d4ec6..6526a0c 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java
@@ -86,8 +86,7 @@
public String getTooltip(CommonApplicationConstants constants) {
return ""; //$NON-NLS-1$
}
- },
- ;
+ };
private final VmType vmType;
private final boolean stateless;
--
To view, visit http://gerrit.ovirt.org/20337
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id78dbdf179c3d8c8b8cad0e31d71b3bc5f87da90
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
