remove code in comments

Daan Hoogland · Daan Hoogland · commit 0f7bb73f1974 · 2025-07-04T15:31:48.000+02:00
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java b/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
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java b/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
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java b/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
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java b/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
diff --git a/engine/schema/src/main/java/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java b/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);
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java b/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;
diff --git a/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
@@ -136,7 +136,6 @@ private String getXml(String filename) {
                 String xml = "";
                 String line;
                 while ((line = br.readLine()) != null) {
-                    //xml += line.replaceAll("\n"," ");
                     xml += line;
                 }
 
diff --git a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java
@@ -239,8 +239,7 @@ public Object answer(InvocationOnMock invocation) {
         try {
             _vmMgr.addVmToNetwork(vm, network, profile);
         } catch (Exception ex) {
-            // TODO Auto-generated catch block
-            //ex.printStackTrace();
+            // ignored
         }
         return vm;
     }
diff --git a/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/driver/NexentaPrimaryDataStoreDriver.java b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/driver/NexentaPrimaryDataStoreDriver.java
@@ -187,9 +187,6 @@ public void deleteAsync(DataStore store, DataObject data, AsyncCompletionCallbac
             NexentaStorAppliance appliance = getNexentaStorAppliance(storagePoolId);
             StoragePoolVO storagePool = _storagePoolDao.findById(storagePoolId);
 
-
-
-//            _storagePoolDao.update(stoagePoolId);
         } else {
             errorMessage = String.format(
                     "Invalid DataObjectType(%s) passed to deleteAsync",
diff --git a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/util/StorPoolHelper.java b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/util/StorPoolHelper.java
@@ -175,32 +175,6 @@ public static Map<String, String> addStorPoolTags(String name, String vmUuid, St
         return tags;
     }
 
-    // Initialize custom logger for updated volume and snapshots
-//    public static void appendLogger(Logger log, String filePath, String kindOfLog) {
-//        Appender appender = null;
-//        PatternLayout patternLayout = new PatternLayout();
-//        patternLayout.setConversionPattern("%d{YYYY-MM-dd HH:mm:ss.SSS}  %m%n");
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-//        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
-//        String path = filePath + "-" + sdf.format(timestamp) + ".log";
-//        try {
-//            appender = new RollingFileAppender(patternLayout, path);
-//            log.setAdditivity(false);
-//            log.addAppender(appender);
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-//        if (kindOfLog.equals("update")) {
-//            StorPoolUtil.spLog(
-//                    "You can find information about volumes and snapshots, which will be updated in Database with their globalIs in %s log file",
-//                    path);
-//        } else if (kindOfLog.equals("abandon")) {
-//            StorPoolUtil.spLog(
-//                    "You can find information about volumes and snapshots, for which CloudStack doesn't have information in %s log file",
-//                    path);
-//        }
-//    }
-
     public static void setSpClusterIdIfNeeded(long hostId, String clusterId, ClusterDao clusterDao, HostDao hostDao,
             ClusterDetailsDao clusterDetails) {
         HostVO host = hostDao.findById(hostId);
diff --git a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientConfirmActivePDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientConfirmActivePDU.java
@@ -27,7 +27,7 @@
 import common.ScreenDescription;
 
 /**
- * @see http://msdn.microsoft.com/en-us/library/cc240488.aspx
+ * @see <a href="http://msdn.microsoft.com/en-us/library/cc240488.aspx">microsoft msdn explanation</a>
  */
 public class ClientConfirmActivePDU extends BaseElement {
 
diff --git a/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Hello.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Hello.java
@@ -82,9 +82,7 @@ public String toString() {
      * Example.
      */
     public static void main(String args[]) {
-        // System.setProperty("streamer.Link.debug", "true");
         System.setProperty("streamer.Element.debug", "true");
-        // System.setProperty("streamer.Pipeline.debug", "true");
 
         InputStream is = new ByteArrayInputStream("RFB 003.007\ntest".getBytes(RfbConstants.US_ASCII_CHARSET));
         ByteArrayOutputStream initOS = new ByteArrayOutputStream();
diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -2222,8 +2222,6 @@ Map<String, TemplateProp> s3ListTemplate(S3TO s3) {
         Map<String, TemplateProp> tmpltInfos = new HashMap<String, TemplateProp>();
         for (S3ObjectSummary objectSummary : objectSummaries) {
             String key = objectSummary.getKey();
-            // String installPath = StringUtils.substringBeforeLast(key,
-            // S3Utils.SEPARATOR);
             String uniqueName = determineS3TemplateNameFromKey(key);
             // TODO: isPublic value, where to get?
             TemplateProp tInfo = new TemplateProp(uniqueName, key, objectSummary.getSize(), objectSummary.getSize(), true, false);
@@ -2243,8 +2241,6 @@ Map<Long, TemplateProp> s3ListVolume(S3TO s3) {
         Map<Long, TemplateProp> tmpltInfos = new HashMap<Long, TemplateProp>();
         for (S3ObjectSummary objectSummary : objectSummaries) {
             String key = objectSummary.getKey();
-            // String installPath = StringUtils.substringBeforeLast(key,
-            // S3Utils.SEPARATOR);
             Long id = determineS3VolumeIdFromKey(key);
             // TODO: how to get volume template name
             TemplateProp tInfo = new TemplateProp(id.toString(), key, objectSummary.getSize(), objectSummary.getSize(), true, false);
diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadManagerImpl.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadManagerImpl.java
@@ -415,7 +415,6 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
         if (inSystemVM != null && "true".equalsIgnoreCase(inSystemVM)) {
             logger.info("UploadManager: starting additional services since we are inside system vm");
             startAdditionalServices();
-            //blockOutgoingOnPrivate();
         }
 
         value = (String)params.get("install.numthreads");
diff --git a/utils/src/main/java/com/cloud/utils/xmlobject/XmlObject.java b/utils/src/main/java/com/cloud/utils/xmlobject/XmlObject.java
@@ -55,14 +55,11 @@ public XmlObject putElement(String key, Object e) {
         }
         Object old = elements.get(key);
         if (old == null) {
-            //System.out.println(String.format("no %s, add new", key));
             elements.put(key, e);
         } else {
             if (old instanceof List) {
-                //System.out.println(String.format("already list %s, add", key));
                 ((List)old).add(e);
             } else {
-                //System.out.println(String.format("not list list %s, add list", key));
                 List lst = new ArrayList();
                 lst.add(old);
                 lst.add(e);
diff --git a/utils/src/main/java/com/cloud/utils/xmlobject/XmlObjectParser.java b/utils/src/main/java/com/cloud/utils/xmlobject/XmlObjectParser.java
@@ -49,7 +49,6 @@ private class XmlHandler extends DefaultHandler {
 
         @Override
         public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
-            //System.out.println(String.format("startElement: namespaceURI:%s, localName:%s, qName:%s", namespaceURI, localName, qName));
             currentValue = null;
             XmlObject obj = new XmlObject();
             for (int i = 0; i < atts.getLength(); i++) {
@@ -73,16 +72,13 @@ public void endElement(String namespaceURI, String localName, String qName) thro
             if (stack.isEmpty()) {
                 root = currObj;
             }
-
-            //System.out.println(String.format("endElement: namespaceURI:%s, localName:%s, qName:%s", namespaceURI, localName, qName));
         }
 
         @Override
         public void characters(char[] ch, int start, int length) throws SAXException {
             StringBuilder str = new StringBuilder();
             str.append(ch, start, length);
             currentValue = str.toString();
-            //System.out.println(String.format("characters: %s", str.toString()));
         }
 
         XmlObject getRoot() {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Licensedname = "listIsoPermissions", to the Apache Software Foundation (ASF) under one`
	`1`	`+// Licensed to the Apache Software Foundation (ASF) under one`
`2`	`2`	`// or more contributor license agreements. See the NOTICE file`
`3`	`3`	`// distributed with this work for additional information`
`4`	`4`	`// regarding copyright ownership. The ASF licenses this file`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Licensedname = "listTemplatePermissions", to the Apache Software Foundation (ASF) under one`
	`1`	`+// Licensed to the Apache Software Foundation (ASF) under one`
`2`	`2`	`// or more contributor license agreements. See the NOTICE file`
`3`	`3`	`// distributed with this work for additional information`
`4`	`4`	`// regarding copyright ownership. The ASF licenses this file`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,6 @@ private String getXml(String filename) {`
`136`	`136`	`String xml = "";`
`137`	`137`	`String line;`
`138`	`138`	`while ((line = br.readLine()) != null) {`
`139`		`- //xml += line.replaceAll("\n"," ");`
`140`	`139`	`xml += line;`
`141`	`140`	`}`
`142`	`141`
Original file line number	Diff line number	Diff line change
`@@ -239,8 +239,7 @@ public Object answer(InvocationOnMock invocation) {`
`239`	`239`	`try {`
`240`	`240`	`_vmMgr.addVmToNetwork(vm, network, profile);`
`241`	`241`	`} catch (Exception ex) {`
`242`		`- // TODO Auto-generated catch block`
`243`		`- //ex.printStackTrace();`
	`242`	`+ // ignored`
`244`	`243`	`}`
`245`	`244`	`return vm;`
`246`	`245`	`}`