removed code in comments

agent/src/main/java/com/cloud/agent/Agent.java

@@ -1321,7 +1321,6 @@ public void doTask(final Task task) throws TaskExecutionException {
                         processResponse((Response)request, task.getLink());
                     } else {
                         //put the requests from mgt server into another thread pool, as the request may take a longer time to finish. Don't block the NIO main thread pool
-                        //processRequest(request, task.getLink());
                         requestHandler.submit(new AgentRequestHandler(getType(), getLink(), request));
                     }
                 } catch (final ClassNotFoundException e) {

api/src/main/java/com/cloud/host/HostStats.java

@@ -36,5 +36,4 @@ public interface HostStats {
     public HostStats getHostStats();
 
     public double getLoadAverage();
-    // public double getXapiMemoryUsageKBs();
 }

api/src/main/java/com/cloud/network/rules/LbStickinessMethod.java

@@ -108,8 +108,7 @@ public LbStickinessMethod(StickinessMethodType methodType, String description) {
     }
 
     public void addParam(String name, Boolean required, String description, Boolean isFlag) {
-        /* FIXME : UI is breaking if the capability string length is larger , temporarily description is commented out */
-        // LbStickinessMethodParam param = new LbStickinessMethodParam(name, required, description);
+        /* is this still a valid comment: FIXME : UI is breaking if the capability string length is larger , temporarily description is commented out */
         LbStickinessMethodParam param = new LbStickinessMethodParam(name, required, " ", isFlag);
         _paramList.add(param);
         return;
@@ -133,7 +132,6 @@ public String getDescription() {
 
     public void setDescription(String description) {
         /* FIXME : UI is breaking if the capability string length is larger , temporarily description is commented out */
-        //this.description = description;
         this._description = " ";
     }
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java

@@ -1,4 +1,4 @@
-// Licensedname = "listIsoPermissions",  to the Apache Software Foundation (ASF) under one
+// Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
 // regarding copyright ownership.  The ASF licenses this file

api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java

@@ -1,4 +1,4 @@
-// Licensedname = "listTemplatePermissions",  to the Apache Software Foundation (ASF) under one
+// Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
 // regarding copyright ownership.  The ASF licenses this file

api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java

@@ -1,4 +1,4 @@
-// Licensedname = "listIsoPermissions",  to the Apache Software Foundation (ASF) under one
+// Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
 // regarding copyright ownership.  The ASF licenses this file

api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java

@@ -1,4 +1,4 @@
-// Licensedname = "listTemplatePermissions",  to the Apache Software Foundation (ASF) under one
+// Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
 // regarding copyright ownership.  The ASF licenses this file

api/src/main/java/org/apache/cloudstack/api/response/SslCertResponse.java

@@ -27,8 +27,6 @@
 import org.apache.cloudstack.network.tls.SslCert;
 import com.cloud.serializer.Param;
 
-//import org.apache.cloudstack.api.EntityReference;
-
 @EntityReference(value = SslCert.class)
 public class SslCertResponse extends BaseResponse {
 

api/src/test/java/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java

@@ -78,10 +78,6 @@ public void testCreateSuccess() {
         scaleVMCmd._responseGenerator = responseGenerator;
 
         UserVmResponse userVmResponse = Mockito.mock(UserVmResponse.class);
-        //List<UserVmResponse> list = Mockito.mock(UserVmResponse.class);
-        //list.add(userVmResponse);
-        //LinkedList<UserVmResponse> mockedList = Mockito.mock(LinkedList.class);
-        //Mockito.when(mockedList.get(0)).thenReturn(userVmResponse);
 
         List<UserVmResponse> list = new LinkedList<UserVmResponse>();
         list.add(userVmResponse);

core/src/main/java/com/cloud/network/HAProxyConfigurator.java

@@ -597,9 +597,6 @@ public String[] generateConfiguration(final LoadBalancerConfigCommand lbCmd) {
             }
         }
         result.addAll(gSection);
-        // TODO decide under what circumstances these options are needed
-        //        result.add("\tnokqueue");
-        //        result.add("\tnopoll");
 
         result.add(blankLine);
         final List<String> dSection = Arrays.asList(defaultsSection);

core/src/test/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java

@@ -417,8 +417,6 @@ private void verifyArgs(final SetNetworkACLCommand cmd, final String script, fin
             // FIXME Check the json content
             assertEquals(VRScripts.UPDATE_CONFIG, script);
             assertEquals(VRScripts.NETWORK_ACL_CONFIG, args);
-            // assertEquals(args, " -d eth3 -M 01:23:45:67:89:AB -i 192.168.1.1 -m 24 -a Egress:ALL:0:0:192.168.0.1/24-192.168.0.2/24:ACCEPT:," +
-            //        "Ingress:ICMP:0:0:192.168.0.1/24-192.168.0.2/24:DROP:,Ingress:TCP:20:80:192.168.0.1/24-192.168.0.2/24:ACCEPT:,");
             break;
         case 2:
             assertEquals(VRScripts.UPDATE_CONFIG, script);
@@ -464,8 +462,6 @@ protected SetupGuestNetworkCommand generateSetupGuestNetworkCommand() {
 
     private void verifyArgs(final SetupGuestNetworkCommand cmd, final String script, final String args) {
         // TODO Check the contents of the json file
-        //assertEquals(script, VRScripts.VPC_GUEST_NETWORK);
-        //assertEquals(args, " -C -M 01:23:45:67:89:AB -d eth4 -i 10.1.1.2 -g 10.1.1.1 -m 24 -n 10.1.1.0 -s 8.8.8.8,8.8.4.4 -e cloud.test");
     }
 
     @Test

engine/components-api/src/main/java/com/cloud/vm/VmWorkSerializer.java

@@ -61,14 +61,12 @@ public static String serialize(VmWork work) {
         // use java binary serialization instead
         //
         return JobSerializerHelper.toObjectSerializedString(work);
-        // return s_gson.toJson(work);
     }
 
     public static <T extends VmWork> T deserialize(Class<?> clazz, String workInJsonText) {
         // TODO: there are way many generics, too tedious to get serialization work under GSON
         // use java binary serialization instead
         //
         return (T)JobSerializerHelper.fromObjectSerializedString(workInJsonText);
-        // return (T)s_gson.fromJson(workInJsonText, clazz);
     }
 }

engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java

@@ -1627,7 +1627,6 @@ protected void processRequest(final Link link, final Request request) {
                         final String reason = shutdown.getReason();
                         logger.info("Host {} has informed us that it is shutting down with reason {} and detail {}", attache, reason, shutdown.getDetail());
                         if (reason.equals(ShutdownCommand.Update)) {
-                            // disconnectWithoutInvestigation(attache, Event.UpdateNeeded);
                             throw new CloudRuntimeException("Agent update not implemented");
                         } else if (reason.equals(ShutdownCommand.Requested)) {
                             disconnectWithoutInvestigation(attache, Event.ShutdownRequested);
@@ -1728,7 +1727,6 @@ protected void doTask(final Task task) throws TaskExecutionException {
                         }
                     } catch (final UnsupportedVersionException e) {
                         logger.warn(e.getMessage());
-                        // upgradeAgent(task.getLink(), data, e.getReason());
                     } catch (final ClassNotFoundException e) {
                         final String message = String.format("Exception occurred when executing tasks! Error '%s'", e.getMessage());
                         logger.error(message);

engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java

@@ -962,7 +962,6 @@ protected void runInContext() {
                     synchronized (_agentToTransferIds) {
                         if (!_agentToTransferIds.isEmpty()) {
                             logger.debug("Found {} agents to transfer", _agentToTransferIds.size());
-                            // for (Long hostId : _agentToTransferIds) {
                             for (final Iterator<Long> iterator = _agentToTransferIds.iterator(); iterator.hasNext(); ) {
                                 final Long hostId = iterator.next();
                                 final AgentAttache attache = findAttache(hostId);

engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java

@@ -213,7 +213,6 @@ public EngineHostDaoImpl() {
 
         SequenceSearch = createSearchBuilder();
         SequenceSearch.and("id", SequenceSearch.entity().getId(), SearchCriteria.Op.EQ);
-        // SequenceSearch.addRetrieve("sequence", SequenceSearch.entity().getSequence());
         SequenceSearch.done();
 
         DirectlyConnectedSearch = createSearchBuilder();

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java

@@ -1523,12 +1523,8 @@ public void prepareForMigration(VirtualMachineProfile vm, DeployDestination dest
             vm.addDisk(disk);
         }
 
-        //if (vm.getType() == VirtualMachine.Type.User && vm.getTemplate().getFormat() == ImageFormat.ISO) {
         if (vm.getType() == VirtualMachine.Type.User) {
             _tmpltMgr.prepareIsoForVmProfile(vm, dest);
-            //DataTO dataTO = tmplFactory.getTemplate(vm.getTemplate().getId(), DataStoreRole.Image, vm.getVirtualMachine().getDataCenterId()).getTO();
-            //DiskTO iso = new DiskTO(dataTO, 3L, null, Volume.Type.ISO);
-            //vm.addDisk(iso);
         }
     }
 

engine/orchestration/src/main/java/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java

@@ -140,20 +140,12 @@ public List<Host> listHosts() {
 
     @Override
     public List<PodEntity> listPods() {
-        /*
-         * Not in use now, just commented out.
-         */
-        //List<PodEntity> pods = new ArrayList<PodEntity>();
-        //pods.add(new PodEntityImpl("pod-uuid-1", "pod1"));
-        //pods.add(new PodEntityImpl("pod-uuid-2", "pod2"));
         return null;
     }
 
     @Override
     public List<ZoneEntity> listZones() {
         List<ZoneEntity> zones = new ArrayList<ZoneEntity>();
-        //zones.add(new ZoneEntityImpl("zone-uuid-1"));
-        //zones.add(new ZoneEntityImpl("zone-uuid-2"));
         return zones;
     }
 

engine/schema/src/main/java/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java

@@ -36,7 +36,6 @@ public class ClusterVSMMapDaoImpl extends GenericDaoBase<ClusterVSMMapVO, Long>
     final SearchBuilder<ClusterVSMMapVO> VsmSearch;
 
     public ClusterVSMMapDaoImpl() {
-        //super();
 
         ClusterSearch = createSearchBuilder();
         ClusterSearch.and("clusterId", ClusterSearch.entity().getClusterId(), SearchCriteria.Op.EQ);
@@ -82,8 +81,6 @@ public boolean remove(Long id) {
         TransactionLegacy txn = TransactionLegacy.currentTxn();
         txn.start();
         ClusterVSMMapVO cluster = createForUpdate();
-        //cluster.setClusterId(null);
-        //cluster.setVsmId(null);
 
         update(id, cluster);
 

engine/schema/src/main/java/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java

@@ -76,7 +76,6 @@ public VmRulesetLogVO findByVmId(long vmId) {
 
     @Override
     public int createOrUpdate(Set<Long> workItems) {
-        //return createOrUpdateUsingBatch(workItems);
         return createOrUpdateUsingMultiInsert(workItems);
     }
 

engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java

@@ -99,7 +99,6 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
     private SearchBuilder<VMTemplateVO> PublicIsoSearch;
     private SearchBuilder<VMTemplateVO> UserIsoSearch;
     private GenericSearchBuilder<VMTemplateVO, Long> CountTemplatesByAccount;
-    // private SearchBuilder<VMTemplateVO> updateStateSearch;
     private SearchBuilder<VMTemplateVO> AllFieldsSearch;
     protected SearchBuilder<VMTemplateVO> ParentTemplateIdSearch;
     private SearchBuilder<VMTemplateVO> InactiveUnremovedTmpltSearch;
@@ -403,12 +402,6 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
         CountTemplatesByAccount.and("state", CountTemplatesByAccount.entity().getState(), SearchCriteria.Op.EQ);
         CountTemplatesByAccount.done();
 
-        //        updateStateSearch = this.createSearchBuilder();
-        //        updateStateSearch.and("id", updateStateSearch.entity().getId(), Op.EQ);
-        //        updateStateSearch.and("state", updateStateSearch.entity().getState(), Op.EQ);
-        //        updateStateSearch.and("updatedCount", updateStateSearch.entity().getUpdatedCount(), Op.EQ);
-        //        updateStateSearch.done();
-
         AllFieldsSearch = createSearchBuilder();
         AllFieldsSearch.and("state", AllFieldsSearch.entity().getState(), SearchCriteria.Op.EQ);
         AllFieldsSearch.and("accountId", AllFieldsSearch.entity().getAccountId(), SearchCriteria.Op.EQ);

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2214to30.java

@@ -77,8 +77,6 @@ public void performDataMigration(Connection conn) {
         encryptData(conn);
         // drop keys
         dropKeysIfExist(conn);
-        //update template ID for system Vms
-        //updateSystemVms(conn); This is not required as system template update is handled during 4.2 upgrade
         // update domain network ref
         updateDomainNetworkRef(conn);
         // update networks that use redundant routers to the new network offering

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade302to40.java

@@ -62,7 +62,6 @@ public InputStream[] getPrepareScripts() {
 
     @Override
     public void performDataMigration(Connection conn) {
-        //updateVmWareSystemVms(conn); This is not required as system template update is handled during 4.2 upgrade
         correctVRProviders(conn);
         correctMultiplePhysicaNetworkSetups(conn);
         addHostDetailsUniqueKey(conn);

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade304to305.java

@@ -65,7 +65,6 @@ public void performDataMigration(Connection conn) {
         addVpcProvider(conn);
         updateRouterNetworkRef(conn);
         fixZoneUsingExternalDevices(conn);
-//        updateSystemVms(conn);
         fixForeignKeys(conn);
         encryptClusterDetails(conn);
     }
@@ -81,54 +80,6 @@ public InputStream[] getCleanupScripts() {
         return new InputStream[] {script};
     }
 
-    private void updateSystemVms(Connection conn) {
-        PreparedStatement pstmt = null;
-        ResultSet rs = null;
-        boolean VMware = false;
-        try {
-            pstmt = conn.prepareStatement("select distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
-            rs = pstmt.executeQuery();
-            while (rs.next()) {
-                if ("VMware".equals(rs.getString(1))) {
-                    VMware = true;
-                }
-            }
-        } catch (SQLException e) {
-            throw new CloudRuntimeException("Error while iterating through list of hypervisors in use", e);
-        }
-        // Just update the VMware system template. Other hypervisor templates are unchanged from previous 3.0.x versions.
-        logger.debug("Updating VMware System Vms");
-        try {
-            //Get 3.0.5 VMware system Vm template Id
-            pstmt = conn.prepareStatement("select id from `cloud`.`vm_template` where name = 'systemvm-vmware-3.0.5' and removed is null");
-            rs = pstmt.executeQuery();
-            if (rs.next()) {
-                long templateId = rs.getLong(1);
-                rs.close();
-                pstmt.close();
-                // change template type to SYSTEM
-                pstmt = conn.prepareStatement("update `cloud`.`vm_template` set type='SYSTEM' where id = ?");
-                pstmt.setLong(1, templateId);
-                pstmt.executeUpdate();
-                pstmt.close();
-                // update template ID of system Vms
-                pstmt = conn.prepareStatement("update `cloud`.`vm_instance` set vm_template_id = ? where type <> 'User' and hypervisor_type = 'VMware'");
-                pstmt.setLong(1, templateId);
-                pstmt.executeUpdate();
-                pstmt.close();
-            } else {
-                if (VMware) {
-                    throw new CloudRuntimeException("3.0.5 VMware SystemVm template not found. Cannot upgrade system Vms");
-                } else {
-                    logger.warn("3.0.5 VMware SystemVm template not found. VMware hypervisor is not used, so not failing upgrade");
-                }
-            }
-        } catch (SQLException e) {
-            throw new CloudRuntimeException("Error while updating VMware systemVm template", e);
-        }
-        logger.debug("Updating System Vm Template IDs Complete");
-    }
-
     private void addVpcProvider(Connection conn) {
         //Encrypt config params and change category to Hidden
         logger.debug("Adding vpc provider to all physical networks in the system");

engine/schema/src/main/java/com/cloud/user/UserAccountVO.java

@@ -226,10 +226,6 @@ public Date getCreated() {
         return created;
     }
 
-//    public void setCreated(Date created) {
-//        this.created = created;
-//    }
-
     @Override
     public Date getRemoved() {
         return removed;

engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java

@@ -209,10 +209,8 @@ public VolumeDataStoreVO(long hostId, long volumeId) {
 
     public VolumeDataStoreVO(long hostId, long volumeId, Date lastUpdated, int downloadPercent, Status downloadState, String localDownloadPath, String errorString,
             String jobId, String installPath, String downloadUrl, String checksum) {
-        // super();
         dataStoreId = hostId;
         this.volumeId = volumeId;
-        // this.zoneId = zoneId;
         this.lastUpdated = lastUpdated;
         this.downloadPercent = downloadPercent;
         this.downloadState = downloadState;

engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java

@@ -62,7 +62,6 @@ public void initialize() {
         /* Avoid using configDao at this time, we can't be sure that the database is already upgraded
          * and there might be fatal errors when using a dao.
          */
-        //unusedTimeInterval = NumbersUtil.parseInt(configDao.getValue(Config.StorageCacheReplacementLRUTimeInterval.key()), 30);
     }
 
     public void setUnusedTimeInterval(Integer interval) {