more log refactoring

klaus.freitas.scclouds · klaus.freitas.scclouds · commit 3ea0aa3a7683 · 2024-02-28T09:54:27.000-03:00
diff --git a/api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java b/api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java
@@ -37,6 +37,7 @@
 
 import org.apache.cloudstack.utils.security.ParserUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
@@ -119,8 +120,7 @@ protected OVFPropertyTO createOVFPropertyFromNode(Node node, int index, String c
         boolean password = StringUtils.isNotBlank(passStr) && passStr.equalsIgnoreCase("true");
         String label = ovfParser.getChildNodeValue(node, "Label");
         String description = ovfParser.getChildNodeValue(node, "Description");
-        logger.debug("Creating OVF property index " + index + (category == null ? "" : " for category " + category)
-                + " with key = " + key);
+        logger.debug("Creating OVF property index {} with key = {}", ObjectUtils.defaultIfNull(index + " for category" + category, index), key);
         return new OVFPropertyTO(key, type, value, qualifiers, userConfigurable,
                 label, description, password, index, category);
     }
@@ -250,7 +250,7 @@ private List<DatadiskTO> matchHardwareItemsToDiskAndFilesInformation(List<OVFVir
         int diskNumber = 0;
         for (OVFVirtualHardwareItemTO diskItem : diskHardwareItems) {
             if (StringUtils.isBlank(diskItem.getHostResource())) {
-                logger.error("Missing disk information for hardware item {} {}", () -> diskItem.getElementName(), () -> diskItem.getInstanceId());
+                logger.error("Missing disk information for hardware item {} {}", diskItem.getElementName(), diskItem.getInstanceId());
                 continue;
             }
             String diskId = extractDiskIdFromDiskHostResource(diskItem.getHostResource());
@@ -334,7 +334,7 @@ protected List<OVFDisk> extractDisksFromOvfDocumentTree(Document doc) {
             od._controller = getControllerType(items, od._diskId);
             vd.add(od);
         }
-        logger.trace("found {} disk definitions", () -> vd.size());
+        logger.trace("Found {} disk definitions", vd.size());
         return vd;
     }
 
@@ -364,7 +364,7 @@ protected List<OVFFile> extractFilesFromOvfDocumentTree(File ovfFile, Document d
                 vf.add(of);
             }
         }
-        logger.trace("found %d file definitions in {}", ()-> vf.size(), () -> ovfFile.getPath());
+        logger.trace("Found {} file definitions in {}", vf.size(), ovfFile.getPath());
         return vf;
     }
 
@@ -502,7 +502,7 @@ private void writeDocumentToFile(String newOvfFilePath, Document doc) {
             outfile.write(writer.toString());
             outfile.close();
         } catch (IOException | TransformerException e) {
-            logger.info("Unexpected exception caught while rewriting OVF:" + e.getMessage(), e);
+            logger.info("Unexpected exception caught while rewriting OVF:{}", e.getMessage(), e);
             throw new CloudRuntimeException(e);
         }
     }
@@ -518,7 +518,7 @@ OVFFile getFileDefinitionFromDiskDefinition(String fileRef, List<OVFFile> files)
 
     public List<OVFNetworkTO> getNetPrerequisitesFromDocument(Document doc) throws InternalErrorException {
         if (doc == null) {
-            logger.trace("no document to parse; returning no prerequisite networks");
+            logger.trace("No document to parse; returning no prerequisite networks");
             return Collections.emptyList();
         }
 
@@ -534,15 +534,15 @@ public List<OVFNetworkTO> getNetPrerequisitesFromDocument(Document doc) throws I
     private void matchNicsToNets(Map<String, OVFNetworkTO> nets, Node systemElement) {
         final DocumentTraversal traversal = (DocumentTraversal) systemElement;
         final NodeIterator iterator = traversal.createNodeIterator(systemElement, NodeFilter.SHOW_ELEMENT, null, true);
-        logger.trace("starting out with {} network-prerequisites, parsing hardware", () -> nets.size());
+        logger.trace("Starting out with {} network-prerequisites, parsing hardware", nets.size());
         int nicCount = 0;
         for (Node n = iterator.nextNode(); n != null; n = iterator.nextNode()) {
             final Element e = (Element) n;
             if ("rasd:Connection".equals(e.getTagName())) {
                 nicCount++;
                 String name = e.getTextContent(); // should be in our nets
                 if(nets.get(name) == null) {
-                    logger.info("found a nic definition without a network definition byname {}, adding it to the list.", name);
+                    logger.info("Found a nic definition without a network definition byname {}, adding it to the list.", name);
                     nets.put(name, new OVFNetworkTO());
                 }
                 OVFNetworkTO thisNet = nets.get(name);
@@ -551,7 +551,7 @@ private void matchNicsToNets(Map<String, OVFNetworkTO> nets, Node systemElement)
                 }
             }
         }
-        logger.trace("ending up with %d network-prerequisites, parsed {} nics", () -> nets.size(), () -> nicCount);
+        logger.trace("Ending up with {} network-prerequisites, parsed {} nics", nets.size(), nicCount);
     }
 
     /**
@@ -618,7 +618,7 @@ private Map<String, OVFNetworkTO> getNetworksFromDocumentTree(Document doc) {
 
             nets.put(networkName,network);
         }
-        logger.trace("found {} networks in template", () -> nets.size());
+        logger.trace("Found {} networks in template", nets.size());
         return nets;
     }
 
diff --git a/api/src/main/java/com/cloud/agent/api/storage/OVFParser.java b/api/src/main/java/com/cloud/agent/api/storage/OVFParser.java
@@ -54,7 +54,7 @@ public OVFParser() {
             documentBuilderFactory.setNamespaceAware(true);
             documentBuilder = documentBuilderFactory.newDocumentBuilder();
         } catch (ParserConfigurationException e) {
-            logger.error("Cannot start the OVF parser: {}", () -> e.getMessage(), () -> e);
+            logger.error("Cannot start the OVF parser: {}", e.getMessage(), e);
         }
     }
 
@@ -70,7 +70,7 @@ public Document parseOVFFile(String ovfFilePath) {
         try {
             return documentBuilder.parse(new File(ovfFilePath));
         } catch (SAXException | IOException e) {
-            logger.error("Error parsing {} {}", () -> e.getMessage(), () -> e);
+            logger.error("Error parsing {} {}", e.getMessage(), e);
             return null;
         }
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/UpdateBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/UpdateBackupOfferingCmd.java
@@ -98,7 +98,7 @@ public void execute() {
             this.setResponseObject(response);
         } catch (CloudRuntimeException e) {
             ApiErrorCode paramError = e instanceof InvalidParameterValueException ? ApiErrorCode.PARAM_ERROR : ApiErrorCode.INTERNAL_ERROR;
-            logger.error(String.format("Failed to update Backup Offering [id: %s] due to: [%s].", id, e.getMessage()), e);
+            logger.error("Failed to update Backup Offering [id: {}] due to: [{}].", id, e.getMessage(), e);
             throw new ServerApiException(paramError, e.getMessage());
         }
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java
@@ -95,7 +95,7 @@ public void execute() {
         }
 
         try {
-            logger.debug("Uploading certificate " + name + " to agents for Direct Download");
+            logger.debug("Uploading certificate {} to agents for Direct Download", name);
             Pair<DirectDownloadCertificate, List<HostCertificateStatus>> uploadStatus =
                     directDownloadManager.uploadCertificateToHosts(certificate, name, hypervisor, zoneId, hostId);
             DirectDownloadCertificate certificate = uploadStatus.first();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
@@ -125,7 +125,7 @@ public void execute() {
             hostResponse.setResponseName(getCommandName());
             this.setResponseObject(hostResponse);
         } catch (Exception e) {
-            logger.debug("Failed to update host:" + getId(), e);
+            logger.debug("Failed to update host:{}", getId(), e);
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update host:" + getId() + "," + e.getMessage());
         }
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java
@@ -116,7 +116,7 @@ public void execute() {
             logger.warn("Exception: ", ex);
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
         } catch (Exception e) {
-            logger.warn("Failed to delete management ip range from {} to {} of Pod: {}", () -> getStartIp(), () -> getEndIp(), () -> getPodId(), () -> e);
+            logger.warn("Failed to delete management ip range from {} to {} of Pod: {}", getStartIp(), getEndIp(), getPodId(), e);
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
         }
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
@@ -75,7 +75,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
             SuccessResponse response = new SuccessResponse(getCommandName());
             this.setResponseObject(response);
         } catch (Exception e) {
-            logger.warn("Failed to delete storage network ip range {}", () -> getId(), () -> e);
+            logger.warn("Failed to delete storage network ip range {}", getId(), e);
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
         }
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
@@ -97,7 +97,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
             response.setResponseName(getCommandName());
             this.setResponseObject(response);
         } catch (Exception e) {
-            logger.warn("Failed to list storage network ip range for rangeId={} podId={} zoneId={}", () -> getRangeId(), () -> getPodId(), () -> getZoneId());
+            logger.warn("Failed to list storage network ip range for rangeId={} podId={} zoneId={}", getRangeId(), getPodId(), getZoneId());
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
         }
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePodManagementNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePodManagementNetworkIpRangeCmd.java
@@ -139,7 +139,7 @@ public void execute() {
             logger.warn("Exception: ", ex);
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
         } catch (Exception e) {
-            logger.warn("Failed to update pod management IP range {}-{} of Pod: {}", () -> getNewStartIP(), () -> getNewEndIP(), () -> getPodId(), () -> e);
+            logger.warn("Failed to update pod management IP range {}-{} of Pod: {}", getNewStartIP(), getNewEndIP(), getPodId(), e);
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
         }
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java
@@ -201,7 +201,7 @@ public Map<String, Long> getNicNetworkList() {
             for (Map<String, String> entry : (Collection<Map<String, String>>)nicNetworkList.values()) {
                 String nic = entry.get(VmDetailConstants.NIC);
                 String networkUuid = entry.get(VmDetailConstants.NETWORK);
-                logger.trace(String.format("nic, '{}', goes on net, '{}'", nic, networkUuid));
+                logger.trace("nic, '{}', goes on net, '{}'", nic, networkUuid);
                 if (StringUtils.isAnyEmpty(nic, networkUuid) || _entityMgr.findByUuid(Network.class, networkUuid) == null) {
                     throw new InvalidParameterValueException(String.format("Network ID: %s for NIC ID: %s is invalid", networkUuid, nic));
                 }
@@ -217,7 +217,7 @@ public Map<String, Network.IpAddresses> getNicIpAddressList() {
             for (Map<String, String> entry : (Collection<Map<String, String>>)nicIpAddressList.values()) {
                 String nic = entry.get(VmDetailConstants.NIC);
                 String ipAddress = StringUtils.defaultIfEmpty(entry.get(VmDetailConstants.IP4_ADDRESS), null);
-                logger.trace(String.format("nic, '{}', gets ip, '{}'", nic, ipAddress));
+                logger.trace("nic, '{}', gets ip, '{}'", nic, ipAddress);
                 if (StringUtils.isEmpty(nic)) {
                     throw new InvalidParameterValueException(String.format("NIC ID: '%s' is invalid for IP address mapping", nic));
                 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java
@@ -186,7 +186,7 @@ public void execute() {
                 try {
                     _snapshotService.deleteSnapshot(getEntityId(), null);
                 } catch (Exception e) {
-                    logger.debug("Failed to clean failed snapshot{}", getEntityId());
+                    logger.debug("Failed to clean failed snapshot {}", getEntityId());
                 }
             }
         }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
@@ -347,7 +347,7 @@ private Long findAccountIdToUse(Account callingAccount) {
             accountIdToUse = _accountService.finalyzeAccountId(accountName, domainId, projectId, true);
         } catch (InvalidParameterValueException | PermissionDeniedException ex) {
             logger.debug("An exception occurred while finalizing account id with accountName, domainId and projectId" +
-                  "using callingAccountId={}", () -> callingAccount.getUuid(), () -> ex);
+                  "using callingAccountId={}", callingAccount.getUuid(), ex);
             logger.warn("Unable to find accountId associated with accountName={} and domainId={} or projectId={}" +
                     ", using callingAccountId={}", accountName, domainId, projectId, callingAccount.getUuid());
         }
diff --git a/api/src/main/java/org/apache/cloudstack/context/CallContext.java b/api/src/main/java/org/apache/cloudstack/context/CallContext.java
@@ -285,7 +285,7 @@ public static CallContext unregister() {
             if (sessionIdOnStack.isEmpty() || sessionIdPushedToNDC.equals(sessionIdOnStack)) {
                 break;
             }
-            LOGGER.trace("Popping from NDC: {}", () -> contextId);
+            LOGGER.trace("Popping from NDC: {}", contextId);
         }
 
         Stack<CallContext> stack = s_currentContextStack.get();

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`
`38`	`38`	`import org.apache.cloudstack.utils.security.ParserUtils;`
`39`	`39`	`import org.apache.commons.collections.CollectionUtils;`
	`40`	`+import org.apache.commons.lang.ObjectUtils;`
`40`	`41`	`import org.apache.commons.lang.math.NumberUtils;`
`41`	`42`	`import org.apache.commons.lang3.StringUtils;`
`42`	`43`	`import org.apache.logging.log4j.Logger;`
`@@ -119,8 +120,7 @@ protected OVFPropertyTO createOVFPropertyFromNode(Node node, int index, String c`
`119`	`120`	`boolean password = StringUtils.isNotBlank(passStr) && passStr.equalsIgnoreCase("true");`
`120`	`121`	`String label = ovfParser.getChildNodeValue(node, "Label");`
`121`	`122`	`String description = ovfParser.getChildNodeValue(node, "Description");`
`122`		`- logger.debug("Creating OVF property index " + index + (category == null ? "" : " for category " + category)`
`123`		`- + " with key = " + key);`
	`123`	`+ logger.debug("Creating OVF property index {} with key = {}", ObjectUtils.defaultIfNull(index + " for category" + category, index), key);`
`124`	`124`	`return new OVFPropertyTO(key, type, value, qualifiers, userConfigurable,`
`125`	`125`	`label, description, password, index, category);`
`126`	`126`	`}`
`@@ -250,7 +250,7 @@ private List<DatadiskTO> matchHardwareItemsToDiskAndFilesInformation(List<OVFVir`
`250`	`250`	`int diskNumber = 0;`
`251`	`251`	`for (OVFVirtualHardwareItemTO diskItem : diskHardwareItems) {`
`252`	`252`	`if (StringUtils.isBlank(diskItem.getHostResource())) {`
`253`		`- logger.error("Missing disk information for hardware item {} {}", () -> diskItem.getElementName(), () -> diskItem.getInstanceId());`
	`253`	`+ logger.error("Missing disk information for hardware item {} {}", diskItem.getElementName(), diskItem.getInstanceId());`
`254`	`254`	`continue;`
`255`	`255`	`}`
`256`	`256`	`String diskId = extractDiskIdFromDiskHostResource(diskItem.getHostResource());`
`@@ -334,7 +334,7 @@ protected List<OVFDisk> extractDisksFromOvfDocumentTree(Document doc) {`
`334`	`334`	`od._controller = getControllerType(items, od._diskId);`
`335`	`335`	`vd.add(od);`
`336`	`336`	`}`
`337`		`- logger.trace("found {} disk definitions", () -> vd.size());`
	`337`	`+ logger.trace("Found {} disk definitions", vd.size());`
`338`	`338`	`return vd;`
`339`	`339`	`}`
`340`	`340`
`@@ -364,7 +364,7 @@ protected List<OVFFile> extractFilesFromOvfDocumentTree(File ovfFile, Document d`
`364`	`364`	`vf.add(of);`
`365`	`365`	`}`
`366`	`366`	`}`
`367`		`- logger.trace("found %d file definitions in {}", ()-> vf.size(), () -> ovfFile.getPath());`
	`367`	`+ logger.trace("Found {} file definitions in {}", vf.size(), ovfFile.getPath());`
`368`	`368`	`return vf;`
`369`	`369`	`}`
`370`	`370`
`@@ -502,7 +502,7 @@ private void writeDocumentToFile(String newOvfFilePath, Document doc) {`
`502`	`502`	`outfile.write(writer.toString());`
`503`	`503`	`outfile.close();`
`504`	`504`	`} catch (IOException \| TransformerException e) {`
`505`		`- logger.info("Unexpected exception caught while rewriting OVF:" + e.getMessage(), e);`
	`505`	`+ logger.info("Unexpected exception caught while rewriting OVF:{}", e.getMessage(), e);`
`506`	`506`	`throw new CloudRuntimeException(e);`
`507`	`507`	`}`
`508`	`508`	`}`
`@@ -518,7 +518,7 @@ OVFFile getFileDefinitionFromDiskDefinition(String fileRef, List<OVFFile> files)`
`518`	`518`
`519`	`519`	`public List<OVFNetworkTO> getNetPrerequisitesFromDocument(Document doc) throws InternalErrorException {`
`520`	`520`	`if (doc == null) {`
`521`		`- logger.trace("no document to parse; returning no prerequisite networks");`
	`521`	`+ logger.trace("No document to parse; returning no prerequisite networks");`
`522`	`522`	`return Collections.emptyList();`
`523`	`523`	`}`
`524`	`524`
`@@ -534,15 +534,15 @@ public List<OVFNetworkTO> getNetPrerequisitesFromDocument(Document doc) throws I`
`534`	`534`	`private void matchNicsToNets(Map<String, OVFNetworkTO> nets, Node systemElement) {`
`535`	`535`	`final DocumentTraversal traversal = (DocumentTraversal) systemElement;`
`536`	`536`	`final NodeIterator iterator = traversal.createNodeIterator(systemElement, NodeFilter.SHOW_ELEMENT, null, true);`
`537`		`- logger.trace("starting out with {} network-prerequisites, parsing hardware", () -> nets.size());`
	`537`	`+ logger.trace("Starting out with {} network-prerequisites, parsing hardware", nets.size());`
`538`	`538`	`int nicCount = 0;`
`539`	`539`	`for (Node n = iterator.nextNode(); n != null; n = iterator.nextNode()) {`
`540`	`540`	`final Element e = (Element) n;`
`541`	`541`	`if ("rasd:Connection".equals(e.getTagName())) {`
`542`	`542`	`nicCount++;`
`543`	`543`	`String name = e.getTextContent(); // should be in our nets`
`544`	`544`	`if(nets.get(name) == null) {`
`545`		`- logger.info("found a nic definition without a network definition byname {}, adding it to the list.", name);`
	`545`	`+ logger.info("Found a nic definition without a network definition byname {}, adding it to the list.", name);`
`546`	`546`	`nets.put(name, new OVFNetworkTO());`
`547`	`547`	`}`
`548`	`548`	`OVFNetworkTO thisNet = nets.get(name);`
`@@ -551,7 +551,7 @@ private void matchNicsToNets(Map<String, OVFNetworkTO> nets, Node systemElement)`
`551`	`551`	`}`
`552`	`552`	`}`
`553`	`553`	`}`
`554`		`- logger.trace("ending up with %d network-prerequisites, parsed {} nics", () -> nets.size(), () -> nicCount);`
	`554`	`+ logger.trace("Ending up with {} network-prerequisites, parsed {} nics", nets.size(), nicCount);`
`555`	`555`	`}`
`556`	`556`
`557`	`557`	`/**`
`@@ -618,7 +618,7 @@ private Map<String, OVFNetworkTO> getNetworksFromDocumentTree(Document doc) {`
`618`	`618`
`619`	`619`	`nets.put(networkName,network);`
`620`	`620`	`}`
`621`		`- logger.trace("found {} networks in template", () -> nets.size());`
	`621`	`+ logger.trace("Found {} networks in template", nets.size());`
`622`	`622`	`return nets;`
`623`	`623`	`}`
`624`	`624`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public OVFParser() {`
`54`	`54`	`documentBuilderFactory.setNamespaceAware(true);`
`55`	`55`	`documentBuilder = documentBuilderFactory.newDocumentBuilder();`
`56`	`56`	`} catch (ParserConfigurationException e) {`
`57`		`- logger.error("Cannot start the OVF parser: {}", () -> e.getMessage(), () -> e);`
	`57`	`+ logger.error("Cannot start the OVF parser: {}", e.getMessage(), e);`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`@@ -70,7 +70,7 @@ public Document parseOVFFile(String ovfFilePath) {`
`70`	`70`	`try {`
`71`	`71`	`return documentBuilder.parse(new File(ovfFilePath));`
`72`	`72`	`} catch (SAXException \| IOException e) {`
`73`		`- logger.error("Error parsing {} {}", () -> e.getMessage(), () -> e);`
	`73`	`+ logger.error("Error parsing {} {}", e.getMessage(), e);`
`74`	`74`	`return null;`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public void execute() {`
`98`	`98`	`this.setResponseObject(response);`
`99`	`99`	`} catch (CloudRuntimeException e) {`
`100`	`100`	`ApiErrorCode paramError = e instanceof InvalidParameterValueException ? ApiErrorCode.PARAM_ERROR : ApiErrorCode.INTERNAL_ERROR;`
`101`		`- logger.error(String.format("Failed to update Backup Offering [id: %s] due to: [%s].", id, e.getMessage()), e);`
	`101`	`+ logger.error("Failed to update Backup Offering [id: {}] due to: [{}].", id, e.getMessage(), e);`
`102`	`102`	`throw new ServerApiException(paramError, e.getMessage());`
`103`	`103`	`}`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public void execute() {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`try {`
`98`		`- logger.debug("Uploading certificate " + name + " to agents for Direct Download");`
	`98`	`+ logger.debug("Uploading certificate {} to agents for Direct Download", name);`
`99`	`99`	`Pair<DirectDownloadCertificate, List<HostCertificateStatus>> uploadStatus =`
`100`	`100`	`directDownloadManager.uploadCertificateToHosts(certificate, name, hypervisor, zoneId, hostId);`
`101`	`101`	`DirectDownloadCertificate certificate = uploadStatus.first();`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public void execute() {`
`125`	`125`	`hostResponse.setResponseName(getCommandName());`
`126`	`126`	`this.setResponseObject(hostResponse);`
`127`	`127`	`} catch (Exception e) {`
`128`		`- logger.debug("Failed to update host:" + getId(), e);`
	`128`	`+ logger.debug("Failed to update host:{}", getId(), e);`
`129`	`129`	`throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update host:" + getId() + "," + e.getMessage());`
`130`	`130`	`}`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public void execute() {`
`116`	`116`	`logger.warn("Exception: ", ex);`
`117`	`117`	`throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());`
`118`	`118`	`} catch (Exception e) {`
`119`		`- logger.warn("Failed to delete management ip range from {} to {} of Pod: {}", () -> getStartIp(), () -> getEndIp(), () -> getPodId(), () -> e);`
	`119`	`+ logger.warn("Failed to delete management ip range from {} to {} of Pod: {}", getStartIp(), getEndIp(), getPodId(), e);`
`120`	`120`	`throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE`
`75`	`75`	`SuccessResponse response = new SuccessResponse(getCommandName());`
`76`	`76`	`this.setResponseObject(response);`
`77`	`77`	`} catch (Exception e) {`
`78`		`- logger.warn("Failed to delete storage network ip range {}", () -> getId(), () -> e);`
	`78`	`+ logger.warn("Failed to delete storage network ip range {}", getId(), e);`
`79`	`79`	`throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());`
`80`	`80`	`}`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE`
`97`	`97`	`response.setResponseName(getCommandName());`
`98`	`98`	`this.setResponseObject(response);`
`99`	`99`	`} catch (Exception e) {`
`100`		`- logger.warn("Failed to list storage network ip range for rangeId={} podId={} zoneId={}", () -> getRangeId(), () -> getPodId(), () -> getZoneId());`
	`100`	`+ logger.warn("Failed to list storage network ip range for rangeId={} podId={} zoneId={}", getRangeId(), getPodId(), getZoneId());`
`101`	`101`	`throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());`
`102`	`102`	`}`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public void execute() {`
`139`	`139`	`logger.warn("Exception: ", ex);`
`140`	`140`	`throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());`
`141`	`141`	`} catch (Exception e) {`
`142`		`- logger.warn("Failed to update pod management IP range {}-{} of Pod: {}", () -> getNewStartIP(), () -> getNewEndIP(), () -> getPodId(), () -> e);`
	`142`	`+ logger.warn("Failed to update pod management IP range {}-{} of Pod: {}", getNewStartIP(), getNewEndIP(), getPodId(), e);`
`143`	`143`	`throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());`
`144`	`144`	`}`
`145`	`145`	`}`