Address comments

vishesh92 · vishesh92 · commit f0ee8840f1b4 · 2025-01-02T14:03:45.000+05:30
diff --git a/plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/NetworkerBackupProvider.java b/plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/NetworkerBackupProvider.java
@@ -359,7 +359,7 @@ public boolean restoreVMFromBackup(VirtualMachine vm, Backup backup) {
             script.add("-v");
 
         Date restoreJobStart = new Date();
-        LOG.debug(String.format("Starting Restore for VM ID %s and  %s at %s", vm, SSID, restoreJobStart));
+        LOG.debug(String.format("Starting Restore for VM %s and %s at %s", vm, SSID, restoreJobStart));
 
         if ( executeRestoreCommand(hostVO, credentials.first(), credentials.second(), script.toString()) ) {
             Date restoreJobEnd = new Date();
diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java
@@ -302,7 +302,7 @@ public List<DedicatedResourceVO> dedicatePod(final Long podId, final Long domain
                 if (dedicatedZoneOfPod.getAccountId() != null || (accountId == null && !domainIdInChildreanList) ||
                     (accountId != null && !(dedicatedZoneOfPod.getDomainId().equals(domainId) || domainIdInChildreanList))) {
                     DataCenterVO zone = _zoneDao.findById(pod.getDataCenterId());
-                    logger.error(String.format("Cannot dedicate Pod. Its zone%s is already dedicated", zone));
+                    logger.error(String.format("Cannot dedicate Pod. Its zone %s is already dedicated", zone));
                     throw new CloudRuntimeException("Pod's Zone " + zone.getName() + " is already dedicated");
                 }
             }
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StopKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StopKubernetesClusterCmd.java
@@ -101,7 +101,7 @@ public void execute() throws ServerApiException, ConcurrentOperationException {
         try {
             if (!kubernetesClusterService.stopKubernetesCluster(this)) {
                 KubernetesCluster cluster = kubernetesClusterService.findById(getId());
-                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to start Kubernetes cluster %s with id %d", cluster, getId()));
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to stop Kubernetes cluster %s with id %d", cluster, getId()));
             }
             final SuccessResponse response = new SuccessResponse(getCommandName());
             setResponseObject(response);
diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/OpenDaylightControllerResourceManagerImpl.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/OpenDaylightControllerResourceManagerImpl.java
@@ -106,10 +106,10 @@ public OpenDaylightControllerVO addController(AddOpenDaylightControllerCmd cmd)
         final PhysicalNetworkServiceProviderVO ntwkSvcProvider = physicalNetworkServiceProviderDao.findByServiceProvider(physicalNetwork.getId(),
                 networkDevice.getNetworkServiceProvder());
         if (ntwkSvcProvider == null) {
-            throw new CloudRuntimeException(String.format("Network Service Provider: %s is not enabled in the physical network: %sto add this device",
+            throw new CloudRuntimeException(String.format("Network Service Provider: %s is not enabled in the physical network: %s to add this device",
                     networkDevice.getNetworkServiceProvder(), physicalNetwork));
         } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) {
-            throw new CloudRuntimeException(String.format("Network Service Provider: %s is in shutdown state in the physical network: %sto add this device",
+            throw new CloudRuntimeException(String.format("Network Service Provider: %s is in shutdown state in the physical network: %s to add this device",
                     ntwkSvcProvider.getProviderName(), physicalNetwork));
         }
 
diff --git a/plugins/storage/volume/adaptive/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/AdaptiveDataStoreLifeCycleImpl.java b/plugins/storage/volume/adaptive/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/AdaptiveDataStoreLifeCycleImpl.java
@@ -278,19 +278,19 @@ public boolean attachCluster(DataStore store, ClusterScope scope) {
 
         if (dataStoreVO.isManaged()) {
             //boolean success = false;
-            for (HostVO h : allHosts) {
-                logger.debug("adding host {} to storage pool {}", h, store);
+            for (HostVO host : allHosts) {
+                logger.debug("adding host {} to storage pool {}", host, store);
             }
         }
 
         logger.debug("In createPool Adding the pool to each of the hosts");
         List<HostVO> poolHosts = new ArrayList<HostVO>();
-        for (HostVO h : allHosts) {
+        for (HostVO host : allHosts) {
             try {
-                _storageMgr.connectHostToSharedPool(h, primarystore.getId());
-                poolHosts.add(h);
+                _storageMgr.connectHostToSharedPool(host, primarystore.getId());
+                poolHosts.add(host);
             } catch (Exception e) {
-                logger.warn("Unable to establish a connection between " + h + " and " + primarystore, e);
+                logger.warn("Unable to establish a connection between {} and {}", host, primarystore, e);
             }
         }
 
diff --git a/server/src/main/java/com/cloud/ha/AbstractInvestigatorImpl.java b/server/src/main/java/com/cloud/ha/AbstractInvestigatorImpl.java
@@ -72,11 +72,11 @@ protected List<HostVO> findHostByPod(long podId, Long excludeHostId) {
         List<HostVO> hosts = sc.list();
 
         List<HostVO> hostList = new ArrayList<>(hosts.size());
-        for (HostVO h : hosts) {
-            if (excludeHostId != null && h.getId() == excludeHostId) {
+        for (HostVO host : hosts) {
+            if (excludeHostId != null && host.getId() == excludeHostId) {
                 continue;
             }
-            hostList.add(h);
+            hostList.add(host);
         }
 
         return hostList;
diff --git a/server/src/main/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java b/server/src/main/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
@@ -244,9 +244,9 @@ public ExternalLoadBalancerDeviceVO addExternalLoadBalancer(long physicalNetwork
 
         ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), ntwkDevice.getNetworkServiceProvder());
         if (ntwkSvcProvider == null) {
-            throw new CloudRuntimeException(String.format("Network Service Provider: %s is not enabled in the physical network: %sto add this device", ntwkDevice.getNetworkServiceProvder(), pNetwork));
+            throw new CloudRuntimeException(String.format("Network Service Provider: %s is not enabled in the physical network: %s to add this device", ntwkDevice.getNetworkServiceProvder(), pNetwork));
         } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) {
-            throw new CloudRuntimeException(String.format("Network Service Provider: %s is in shutdown state in the physical network: %sto add this device", ntwkSvcProvider.getProviderName(), pNetwork));
+            throw new CloudRuntimeException(String.format("Network Service Provider: %s is in shutdown state in the physical network: %s to add this device", ntwkSvcProvider.getProviderName(), pNetwork));
         }
 
         if (gslbProvider) {
diff --git a/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java
@@ -214,7 +214,7 @@ public boolean replaceNetworkACL(final NetworkACL acl, final NetworkVO network)
         network.setNetworkACLId(acl.getId());
         //Update Network ACL
         if (_networkDao.update(network.getId(), network)) {
-            logger.debug("Updated network: {} with Network ACL Id: {}, Applying ACL items", network, acl);
+            logger.debug("Updated network: {} with Network ACL: {}, Applying ACL items", network, acl);
             //Apply ACL to network
             final Boolean result = applyACLToNetwork(network.getId());
             if (result) {
diff --git a/server/src/main/java/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/main/java/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -527,7 +527,7 @@ private boolean removeVpnUserWithoutRemoteAccessVpn(Account vpnOwner, String use
             return false;
         }
         if (!State.Revoke.equals(vpnUser.getState())) {
-            logger.error("VPN user with ownerId: {} and username: {} is not in revoked state, current state: {}", vpnOwner, userName, vpnUser.getState());
+            logger.error("VPN user with owner: {} and username: {} is not in revoked state, current state: {}", vpnOwner, userName, vpnUser.getState());
             return false;
         }
         return _vpnUsersDao.remove(vpnUser.getId());
diff --git a/server/src/main/java/com/cloud/projects/ProjectManagerImpl.java b/server/src/main/java/com/cloud/projects/ProjectManagerImpl.java
@@ -1269,7 +1269,7 @@ public Boolean doInTransaction(TransactionStatus status) {
                 });
             }
         } else {
-            throw new InvalidParameterValueException(String.format("Unable to find invitation for account name=%s to the project id=%s", accountName, project));
+            throw new InvalidParameterValueException(String.format("Unable to find invitation for account name=%s to the project=%s", accountName, project));
         }
 
         return result;
diff --git a/server/src/main/java/com/cloud/server/StatsCollector.java b/server/src/main/java/com/cloud/server/StatsCollector.java
@@ -1251,7 +1251,7 @@ protected void runInContext() {
                             metrics.clear();
                         }
                     } catch (Exception e) {
-                        logger.debug("Failed to get VM stats for host with ID: {}", host);
+                        logger.debug("Failed to get VM stats for host: {}", host);
                         continue;
                     }
                 }
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -922,7 +922,7 @@ public VolumeVO allocVolume(CreateVolumeCmd cmd) throws ResourceAllocationExcept
 
         // Check if zone is disabled
         if (Grouping.AllocationState.Disabled == zone.getAllocationState() && !_accountMgr.isRootAdmin(caller.getId())) {
-            throw new PermissionDeniedException(String.format("Cannot perform this operation, Zone is currently disabled: %s", zone));
+            throw new PermissionDeniedException(String.format("Cannot perform this operation, Zone: %s is currently disabled", zone));
         }
 
         // If local storage is disabled then creation of volume with local disk
@@ -3808,7 +3808,7 @@ private Snapshot orchestrateTakeVolumeSnapshot(Long volumeId, Long policyId, Lon
         }
 
         if (volume.getState() != Volume.State.Ready) {
-            throw new InvalidParameterValueException(String.format("VolumeId: %s is not in %s state but %s. Cannot take snapshot.", volume.getVolume(), Volume.State.Ready, volume.getState()));
+            throw new InvalidParameterValueException(String.format("Volume: %s is not in %s state but %s. Cannot take snapshot.", volume.getVolume(), Volume.State.Ready, volume.getState()));
         }
 
         boolean isSnapshotOnStorPoolOnly = volume.getStoragePoolType() == StoragePoolType.StorPool && BooleanUtils.toBoolean(_configDao.getValue("sp.bypass.secondary.storage"));
diff --git a/server/src/main/java/com/cloud/usage/UsageServiceImpl.java b/server/src/main/java/com/cloud/usage/UsageServiceImpl.java
@@ -190,7 +190,7 @@ public Pair<List<? extends Usage>, Integer> getUsageRecords(ListUsageRecordsCmd
             //List records for all the accounts if the caller account is of type admin.
             //If account_id or account_name is explicitly mentioned, list records for the specified account only even if the caller is of type admin
             ignoreAccountId = _accountService.isRootAdmin(caller.getId());
-            logger.debug("Account details not available. Using userContext accountId: {}", caller);
+            logger.debug("Account details not available. Using userContext account: {}", caller);
         }
 
         // Check if a domain admin is allowed to access the requested domain id
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -767,7 +767,7 @@ protected void runInContext() {
 
             NicVO nic = _nicDao.findById(nicId);
             try {
-                logger.debug("Trying IP retrieval [id: {}, uuid: {}, name: {}], nic {}", vmId, vmUuid, vmName, nic);
+                logger.debug("Trying IP retrieval for VM [id: {}, uuid: {}, name: {}], nic {}", vmId, vmUuid, vmName, nic);
                 Answer answer = _agentMgr.send(hostId, cmd);
                 if (answer.getResult()) {
                     String vmIp = answer.getDetails();
diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -191,7 +191,7 @@ public List<BackupOffering> listBackupProviderOfferings(final Long zoneId) {
             throw new PermissionDeniedException("Parameter external can only be specified by a Root Admin, permission denied");
         }
         final BackupProvider backupProvider = getBackupProvider(zoneId);
-        logger.debug("Listing external backup offerings for the backup provider configured for zone ID {}", dataCenterDao.findById(zoneId));
+        logger.debug("Listing external backup offerings for the backup provider configured for zone {}", dataCenterDao.findById(zoneId));
         return backupProvider.listBackupOfferings(zoneId);
     }
 
diff --git a/server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java b/server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java
@@ -288,7 +288,7 @@ public void downloadTemplate(long templateId, long poolId, long hostId) {
         VMTemplateStoragePoolVO sPoolRef = vmTemplatePoolDao.findByPoolTemplate(poolId, templateId, null);
         if (sPoolRef == null) {
             if (logger.isDebugEnabled()) {
-                logger.debug("Not found (template:{} pool: {}) in template_spool_ref, persisting it", template, pool);
+                logger.debug("Not found (template: {} pool: {}) in template_spool_ref, persisting it", template, pool);
             }
             DirectDownloadAnswer ans = (DirectDownloadAnswer) answer;
             sPoolRef = new VMTemplateStoragePoolVO(poolId, templateId, null);
diff --git a/server/src/main/java/org/apache/cloudstack/ha/task/BaseHATask.java b/server/src/main/java/org/apache/cloudstack/ha/task/BaseHATask.java
@@ -100,7 +100,7 @@ public Boolean call() throws HACheckerException, HAFenceException, HARecoveryExc
             logger.warn("Exception occurred while running " + getTaskType() + " on a resource: " + e.getMessage(), e.getCause());
             throwable = e.getCause();
         } catch (TimeoutException e) {
-            logger.trace("{} operation timed out for resource id:{}", getTaskType(), resource);
+            logger.trace("{} operation timed out for resource: {}", getTaskType(), resource);
         }
         processResult(result, throwable);
         return result;
diff --git a/server/src/main/java/org/apache/cloudstack/network/RoutedIpv4ManagerImpl.java b/server/src/main/java/org/apache/cloudstack/network/RoutedIpv4ManagerImpl.java
@@ -965,7 +965,7 @@ public boolean applyRoutingFirewallRule(long id) {
             logger.error("Cannot apply routing firewall rule: {} as purpose {} is not {}", rule, rule.getPurpose(), FirewallRule.Purpose.Firewall);
             return false;
         }
-        logger.debug("Applying routing firewall rules for rule with ID: {}", rule);
+        logger.debug("Applying routing firewall rules for rule: {}", rule);
         List<FirewallRuleVO> rules = new ArrayList<>();
         rules.addAll(firewallDao.listByNetworkPurposeTrafficType(rule.getNetworkId(), rule.getPurpose(), FirewallRule.TrafficType.Egress));
         rules.addAll(firewallDao.listByNetworkPurposeTrafficType(rule.getNetworkId(), rule.getPurpose(), FirewallRule.TrafficType.Ingress));
diff --git a/server/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java b/server/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
@@ -287,7 +287,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
 
             // apply the gslb rule on to the back end gslb service providers on zones participating in gslb
             if (!applyGlobalLoadBalancerRuleConfig(gslbRuleId, false)) {
-                logger.warn("Failed to add load balancer rules {} to global load balancer rule id {}", newLbRuleIds, gslbRule);
+                logger.warn("Failed to add load balancer rules {} to global load balancer rule {}", newLbRuleIds, gslbRule);
                 CloudRuntimeException ex = new CloudRuntimeException("Failed to add load balancer rules to GSLB rule ");
                 throw ex;
             }
@@ -390,7 +390,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
 
             // apply the gslb rule on to the back end gslb service providers
             if (!applyGlobalLoadBalancerRuleConfig(gslbRuleId, false)) {
-                logger.warn("Failed to remove load balancer rules {} from global load balancer rule id {}", lbRuleIdsToremove, gslbRule);
+                logger.warn("Failed to remove load balancer rules {} from global load balancer rule {}", lbRuleIdsToremove, gslbRule);
                 CloudRuntimeException ex = new CloudRuntimeException("Failed to remove load balancer rule ids from GSLB rule ");
                 throw ex;
             }
@@ -545,7 +545,7 @@ public GlobalLoadBalancerRule updateGlobalLoadBalancerRule(UpdateGlobalLoadBalan
         _gslbRuleDao.update(gslbRule.getId(), gslbRule);
 
         try {
-            logger.debug("Updating global load balancer with id {}", gslbRule);
+            logger.debug("Updating global load balancer {}", gslbRule);
 
             // apply the gslb rule on to the back end gslb service providers on zones participating in gslb
             applyGlobalLoadBalancerRuleConfig(gslbRuleId, false);
diff --git a/server/src/main/java/org/apache/cloudstack/storage/template/VnfTemplateManagerImpl.java b/server/src/main/java/org/apache/cloudstack/storage/template/VnfTemplateManagerImpl.java
@@ -268,17 +268,17 @@ protected Map<Network, String> getManagementNetworkAndIp(VirtualMachineTemplate
                     continue;
                 }
                 if (!networkModel.areServicesSupportedInNetwork(network.getId(), Network.Service.StaticNat)) {
-                    logger.info("Network ID: {} does not support static nat, " +
+                    logger.info("Network: {} does not support static nat, " +
                             "skipping this network configuration for VNF appliance", network);
                     continue;
                 }
                 if (network.getVpcId() != null) {
-                    logger.info("Network ID: {} is a VPC tier, " +
+                    logger.info("Network: {} is a VPC tier, " +
                             "skipping this network configuration for VNF appliance", network);
                     continue;
                 }
                 if (!networkModel.areServicesSupportedInNetwork(network.getId(), Network.Service.Firewall)) {
-                    logger.info("Network ID: {} does not support firewall, " +
+                    logger.info("Network: {} does not support firewall, " +
                             "skipping this network configuration for VNF appliance", network);
                     continue;
                 }

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ public List<DedicatedResourceVO> dedicatePod(final Long podId, final Long domain`
`302`	`302`	`if (dedicatedZoneOfPod.getAccountId() != null \|\| (accountId == null && !domainIdInChildreanList) \|\|`
`303`	`303`	`(accountId != null && !(dedicatedZoneOfPod.getDomainId().equals(domainId) \|\| domainIdInChildreanList))) {`
`304`	`304`	`DataCenterVO zone = _zoneDao.findById(pod.getDataCenterId());`
`305`		`- logger.error(String.format("Cannot dedicate Pod. Its zone%s is already dedicated", zone));`
	`305`	`+ logger.error(String.format("Cannot dedicate Pod. Its zone %s is already dedicated", zone));`
`306`	`306`	`throw new CloudRuntimeException("Pod's Zone " + zone.getName() + " is already dedicated");`
`307`	`307`	`}`
`308`	`308`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public void execute() throws ServerApiException, ConcurrentOperationException {`
`101`	`101`	`try {`
`102`	`102`	`if (!kubernetesClusterService.stopKubernetesCluster(this)) {`
`103`	`103`	`KubernetesCluster cluster = kubernetesClusterService.findById(getId());`
`104`		`- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to start Kubernetes cluster %s with id %d", cluster, getId()));`
	`104`	`+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to stop Kubernetes cluster %s with id %d", cluster, getId()));`
`105`	`105`	`}`
`106`	`106`	`final SuccessResponse response = new SuccessResponse(getCommandName());`
`107`	`107`	`setResponseObject(response);`
Original file line number	Diff line number	Diff line change
`@@ -278,19 +278,19 @@ public boolean attachCluster(DataStore store, ClusterScope scope) {`
`278`	`278`
`279`	`279`	`if (dataStoreVO.isManaged()) {`
`280`	`280`	`//boolean success = false;`
`281`		`- for (HostVO h : allHosts) {`
`282`		`- logger.debug("adding host {} to storage pool {}", h, store);`
	`281`	`+ for (HostVO host : allHosts) {`
	`282`	`+ logger.debug("adding host {} to storage pool {}", host, store);`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`logger.debug("In createPool Adding the pool to each of the hosts");`
`287`	`287`	`List<HostVO> poolHosts = new ArrayList<HostVO>();`
`288`		`- for (HostVO h : allHosts) {`
	`288`	`+ for (HostVO host : allHosts) {`
`289`	`289`	`try {`
`290`		`- _storageMgr.connectHostToSharedPool(h, primarystore.getId());`
`291`		`- poolHosts.add(h);`
	`290`	`+ _storageMgr.connectHostToSharedPool(host, primarystore.getId());`
	`291`	`+ poolHosts.add(host);`
`292`	`292`	`} catch (Exception e) {`
`293`		`- logger.warn("Unable to establish a connection between " + h + " and " + primarystore, e);`
	`293`	`+ logger.warn("Unable to establish a connection between {} and {}", host, primarystore, e);`
`294`	`294`	`}`
`295`	`295`	`}`
`296`	`296`
Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,11 @@ protected List<HostVO> findHostByPod(long podId, Long excludeHostId) {`
`72`	`72`	`List<HostVO> hosts = sc.list();`
`73`	`73`
`74`	`74`	`List<HostVO> hostList = new ArrayList<>(hosts.size());`
`75`		`- for (HostVO h : hosts) {`
`76`		`- if (excludeHostId != null && h.getId() == excludeHostId) {`
	`75`	`+ for (HostVO host : hosts) {`
	`76`	`+ if (excludeHostId != null && host.getId() == excludeHostId) {`
`77`	`77`	`continue;`
`78`	`78`	`}`
`79`		`- hostList.add(h);`
	`79`	`+ hostList.add(host);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`return hostList;`
Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ private boolean removeVpnUserWithoutRemoteAccessVpn(Account vpnOwner, String use`
`527`	`527`	`return false;`
`528`	`528`	`}`
`529`	`529`	`if (!State.Revoke.equals(vpnUser.getState())) {`
`530`		`- logger.error("VPN user with ownerId: {} and username: {} is not in revoked state, current state: {}", vpnOwner, userName, vpnUser.getState());`
	`530`	`+ logger.error("VPN user with owner: {} and username: {} is not in revoked state, current state: {}", vpnOwner, userName, vpnUser.getState());`
`531`	`531`	`return false;`
`532`	`532`	`}`
`533`	`533`	`return _vpnUsersDao.remove(vpnUser.getId());`
Original file line number	Diff line number	Diff line change
`@@ -1269,7 +1269,7 @@ public Boolean doInTransaction(TransactionStatus status) {`
`1269`	`1269`	`});`
`1270`	`1270`	`}`
`1271`	`1271`	`} else {`
`1272`		`- throw new InvalidParameterValueException(String.format("Unable to find invitation for account name=%s to the project id=%s", accountName, project));`
	`1272`	`+ throw new InvalidParameterValueException(String.format("Unable to find invitation for account name=%s to the project=%s", accountName, project));`
`1273`	`1273`	`}`
`1274`	`1274`
`1275`	`1275`	`return result;`