Cleanups and formatting

Author: rafaelweingartner

plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java

@@ -2271,16 +2271,11 @@ public HostStatsEntry getHostStats(final Connection conn, final GetHostStatsComm
     }
 
     protected HashMap<String, HostVmStateReportEntry> getHostVmStateReport(final Connection conn) {
-
-        // TODO : new VM sync model does not require a cluster-scope report, we
-        // need to optimize
-        // the report accordingly
         final HashMap<String, HostVmStateReportEntry> vmStates = new HashMap<String, HostVmStateReportEntry>();
         Map<VM, VM.Record> vm_map = null;
         for (int i = 0; i < 2; i++) {
             try {
-                vm_map = VM.getAllRecords(conn); // USE THIS TO GET ALL VMS FROM
-                // A CLUSTER
+                vm_map = VM.getAllRecords(conn);
                 break;
             } catch (final Throwable e) {
                 s_logger.warn("Unable to get vms", e);

plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java

@@ -75,7 +75,7 @@ private void mountNfs(Connection conn, String remoteDir, String localDir) {
         }
         String result = hypervisorResource.callHostPluginAsync(conn, "cloud-plugin-storage", "mountNfsSecondaryStorage", 100 * 1000, "localDir", localDir, "remoteDir", remoteDir);
         if (StringUtils.isBlank(result)) {
-            final String errMsg = "Could not mount secondary storage " + remoteDir + " on host " + localDir;
+            String errMsg = "Could not mount secondary storage " + remoteDir + " on host " + localDir;
             s_logger.warn(errMsg);
             throw new CloudRuntimeException(errMsg);
         }

plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java

@@ -181,7 +181,7 @@ public void actualIsoTemplateTestXenServer71() throws XenAPIException, XmlRpcExc
 
         Assert.assertEquals("guest-tools.iso", returnedIsoTemplateName);
     }
-    
+
     @Test
     public void getAllLocalSrForTypeTest() throws Exception {
         String mockHostUuid = "hostUuid";
@@ -226,14 +226,14 @@ public void getAllLocalSrForTypeTest() throws Exception {
         Assert.assertEquals(expectedListOfSrs.size(), allLocalSrForType.size());
         Assert.assertEquals(expectedListOfSrs.get(0), allLocalSrForType.get(0));
     }
-    
+
     @Test
     public void getAllLocalSrForTypeNoSrsFoundTest() throws XenAPIException, XmlRpcException {
         Connection connectionMock = Mockito.mock(Connection.class);
         List<SR> allLocalSrForType = citrixResourceBase.getAllLocalSrForType(connectionMock, SRType.EXT);
         Assert.assertTrue(allLocalSrForType.isEmpty());
     }
-    
+
     @Test
     public void getAllLocalSrsTest() throws XenAPIException, XmlRpcException {
         Connection connectionMock = Mockito.mock(Connection.class);
@@ -259,7 +259,6 @@ public void getAllLocalSrsTest() throws XenAPIException, XmlRpcException {
         inOrder.verify(citrixResourceBase).getAllLocalSrForType(connectionMock, SRType.EXT);
     }
 
-
     @Test
     public void createStoragePoolInfoTest() throws XenAPIException, XmlRpcException {
         Connection connectionMock = Mockito.mock(Connection.class);
@@ -343,7 +342,7 @@ public void createStartUpStorageCommandTest() throws XenAPIException, XmlRpcExce
         Assert.assertEquals(citrixResourceBase._dcId + "", startUpStorageCommand.getDataCenter());
         Assert.assertEquals(StorageResourceType.STORAGE_POOL, startUpStorageCommand.getResourceType());
     }
-    
+
     @Test
     public void initializeLocalSrTest() throws XenAPIException, XmlRpcException {
         Connection connectionMock = Mockito.mock(Connection.class);

plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpOssResourceTest.java

@@ -42,12 +42,12 @@ public void testPatchFilePath() {
     }
 
     @Test(expected = CloudRuntimeException.class)
-    public void testGetFiles(){
+    public void testGetFiles() {
         testGetPathFilesExeption();
     }
 
     @Test
-    public void testGetFilesListReturned(){
+    public void testGetFilesListReturned() {
         testGetPathFilesListReturned();
     }
 }

plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpServerResourceTest.java

@@ -42,12 +42,12 @@ public void testPatchFilePath() {
     }
 
     @Test(expected = CloudRuntimeException.class)
-    public void testGetFilesExeption(){
+    public void testGetFilesExeption() {
         testGetPathFilesExeption();
     }
 
     @Test
-    public void testGetFilesListReturned(){
+    public void testGetFilesListReturned() {
         testGetPathFilesListReturned();
     }
 }

plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56FP1ResourceTest.java

@@ -42,12 +42,12 @@ public void testPatchFilePath() {
     }
 
     @Test(expected = CloudRuntimeException.class)
-    public void testGetFiles(){
+    public void testGetFiles() {
         testGetPathFilesExeption();
     }
 
     @Test
-    public void testGetFilesListReturned(){
+    public void testGetFilesListReturned() {
         testGetPathFilesListReturned();
     }
 }

plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56ResourceTest.java

@@ -42,12 +42,12 @@ public void testPatchFilePath() {
     }
 
     @Test(expected = CloudRuntimeException.class)
-    public void testGetFiles(){
+    public void testGetFiles() {
         testGetPathFilesExeption();
     }
 
     @Test
-    public void testGetFilesListReturned(){
+    public void testGetFilesListReturned() {
         testGetPathFilesListReturned();
     }
 }