Sync precommit config from main

.pre-commit-config.yaml

@@ -26,17 +26,18 @@ repos:
       - id: identity
       - id: check-hooks-apply
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.4.0
     hooks:
       #- id: check-added-large-files
-      #- id: check-case-conflict
+      - id: check-case-conflict
       #- id: check-executables-have-shebangs
       #- id: check-merge-conflict
-      #- id: check-vcs-permalinks
+      - id: check-vcs-permalinks
       #- id: check-yaml
       #- id: detect-private-key
-      #- id: end-of-file-fixer
+      - id: end-of-file-fixer
+        files: \.(java|md|py|txt|yaml|yml)$
       #- id: fix-byte-order-marker
       - id: mixed-line-ending
-        files: \.(java|py)$
+        files: \.(java|md|py|txt|yaml|yml)$
       # - id: trailing-whitespace

api/src/main/java/com/cloud/agent/api/Answer.java

@@ -81,4 +81,4 @@ public int hashCode() {
         result1 = 31 * result1 + (details != null ? details.hashCode() : 0);
         return result1;
     }
-}
+}

api/src/main/java/com/cloud/agent/api/to/DatadiskTO.java

@@ -110,4 +110,4 @@ public int getDiskNumber() {
     public String getConfiguration() {
         return configuration;
     }
-}
+}

api/src/main/java/com/cloud/agent/api/to/DpdkTO.java

@@ -42,4 +42,4 @@ public String getPort() {
     public String getMode() {
         return mode;
     }
-}
+}

api/src/main/java/com/cloud/agent/api/to/deployasis/OVFConfigurationTO.java

@@ -61,4 +61,4 @@ public List<OVFVirtualHardwareItemTO> getHardwareItems() {
     public int getIndex() {
         return index;
     }
-}
+}

api/src/main/java/com/cloud/agent/api/to/deployasis/OVFNetworkTO.java

@@ -121,4 +121,4 @@ public String getNetworkDescription() {
     public void setNetworkDescription(String networkDescription) {
         this.networkDescription = networkDescription;
     }
-}
+}

api/src/main/java/com/cloud/agent/api/to/deployasis/OVFVirtualHardwareItemTO.java

@@ -368,4 +368,4 @@ public int getWeight() {
     public void setWeight(int weight) {
         this.weight = weight;
     }
-}
+}

api/src/main/java/com/cloud/agent/api/to/deployasis/OVFVirtualHardwareSectionTO.java

@@ -47,4 +47,4 @@ public List<OVFVirtualHardwareItemTO> getCommonHardwareItems() {
     public String getMinimiumHardwareVersion() {
         return minimiumHardwareVersion;
     }
-}
+}

api/src/main/java/com/cloud/deploy/HAPlanner.java

@@ -18,4 +18,4 @@
 
 
 public interface HAPlanner extends DeploymentPlanner {
-}
+}

api/src/main/java/com/cloud/network/NetworkRuleApplier.java

@@ -25,4 +25,4 @@
 public interface NetworkRuleApplier {
     public boolean applyRules(Network network, FirewallRule.Purpose purpose, List<? extends FirewallRule> rules) throws ResourceUnavailableException;
 
-}
+}

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

@@ -19,4 +19,4 @@
 public interface StaticNatRule extends FirewallRule {
 
     String getDestIpAddress();
-}
+}

api/src/main/java/com/cloud/offering/DiskOfferingInfo.java

@@ -62,4 +62,4 @@ public void setMaxIops(Long maxIops) {
     public Long getMaxIops() {
         return _maxIops;
     }
-}
+}

api/src/main/java/com/cloud/resource/RollingMaintenanceManager.java

@@ -143,4 +143,4 @@ enum ResourceType {
      */
     Ternary<Boolean, String, Pair<List<HostUpdated>, List<HostSkipped>>> startRollingMaintenance(StartRollingMaintenanceCmd cmd);
     Pair<ResourceType, List<Long>> getResourceTypeIdPair(StartRollingMaintenanceCmd cmd);
-}
+}

api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupProcessor.java

@@ -85,4 +85,4 @@ public interface AffinityGroupProcessor extends Adapter {
 
     void handleDeleteGroup(AffinityGroup group);
 
-}
+}

api/src/main/java/org/apache/cloudstack/api/auth/PluggableAPIAuthenticator.java

@@ -22,4 +22,4 @@
 
 public interface PluggableAPIAuthenticator extends Adapter {
     public List<Class<?>> getAuthCommands();
-}
+}

api/src/main/java/org/apache/cloudstack/api/command/admin/address/AcquirePodIpCmdByAdmin.java

@@ -89,4 +89,4 @@ public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getAccountId();
     }
 
-}
+}

api/src/main/java/org/apache/cloudstack/api/command/admin/address/ReleasePodIpCmdByAdmin.java

@@ -75,4 +75,4 @@ public void execute() {
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to release  Pod ip ");
         }
     }
-}
+}

api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java

@@ -113,5 +113,3 @@ public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
     }
 }
-
-

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

@@ -24,4 +24,3 @@
 @APICommand(name = "copyTemplate", description = "Copies a template from one zone to another.", responseObject = TemplateResponse.class, responseView = ResponseView.Full,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class CopyTemplateCmdByAdmin extends CopyTemplateCmd {}
-

api/src/main/java/org/apache/cloudstack/api/command/user/firewall/IListFirewallRulesCmd.java

@@ -28,4 +28,4 @@ public interface IListFirewallRulesCmd extends IBaseListTaggedResourcesCmd {
     Long getId();
 
     Long getNetworkId();
-}
+}

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

@@ -158,4 +158,4 @@ public long getEntityOwnerId() {
         }
         return accountId;
     }
-}
+}

api/src/main/java/org/apache/cloudstack/api/command/user/network/MoveNetworkAclItemCmd.java

@@ -106,4 +106,4 @@ public String getAclConsistencyHash() {
     public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.NetworkAclItem;
     }
-}
+}

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

@@ -110,4 +110,4 @@ public void setId(long id) {
         this.id = id;
     }
 
-}
+}

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

@@ -57,4 +57,4 @@ public String getName() {
     public void setName(String name) {
         this.name = name;
     }
-}
+}

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

@@ -156,4 +156,4 @@ public void setDiskSizeTotal(Long diskSizeTotal) {
     public void setDiskSizeUsed(Long diskSizeUsed) {
         this.diskSizeUsed = diskSizeUsed;
     }
-}
+}

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

@@ -61,4 +61,4 @@ public String getRoleName() {
     public void setRoleName(String roleName) {
         this.roleName = roleName;
     }
-}
+}

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

@@ -76,4 +76,4 @@ public List<RollingMaintenanceHostSkippedResponse> getSkippedHosts() {
     public void setSkippedHosts(List<RollingMaintenanceHostSkippedResponse> skippedHosts) {
         this.skippedHosts = skippedHosts;
     }
-}
+}

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

@@ -231,4 +231,4 @@ public void setOsDisplayName(String osDisplayName) {
     public void setVirtualSize(long virtualSize) {
         this.virtualSize = virtualSize;
     }
-}
+}

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

@@ -144,4 +144,4 @@ protected void accumulateDiskIopsTotal(Long diskIo) {
             this.diskIopsTotal += diskIo;
         }
     }
-}
+}

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

@@ -55,4 +55,4 @@ public String getDetails() {
     public void setDetails(String details) {
         this.details = details;
     }
-}
+}

api/src/main/java/org/apache/cloudstack/context/LogContext.java

@@ -299,4 +299,4 @@ public String toString() {
                 .append("]")
                 .toString();
     }
-}
+}

api/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsService.java

@@ -30,4 +30,4 @@ public interface DiagnosticsService {
     Map<String, String> runDiagnosticsCommand(RunDiagnosticsCmd cmd);
 
     String getDiagnosticsDataCommand(GetDiagnosticsDataCmd getDiagnosticsDataCmd);
-}
+}

api/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsType.java

@@ -39,4 +39,4 @@ public static DiagnosticsType getCommand(String cmd) {
         }
         return null;
     }
-}
+}

api/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadCertificate.java

@@ -27,4 +27,4 @@ public interface DirectDownloadCertificate extends InternalIdentity, Identity {
     Hypervisor.HypervisorType getHypervisorType();
     Long getZoneId();
 
-}
+}

api/src/main/java/org/apache/cloudstack/management/ManagementServerHostPeer.java

@@ -27,4 +27,4 @@ public interface ManagementServerHostPeer extends InternalIdentity {
     long getPeerRunid();
     ManagementServerHost.State getPeerState();
     Date getLastUpdateTime();
-}
+}

api/src/main/java/org/apache/cloudstack/network/tls/CertService.java

@@ -33,4 +33,4 @@ public interface CertService {
     public List<SslCertResponse> listSslCerts(ListSslCertsCmd listSslCertCmd);
 
     public Certificate parseCertificate(final String cert);
-}
+}

api/src/main/java/org/apache/cloudstack/vm/UnmanageVMService.java

@@ -24,4 +24,4 @@ public interface UnmanageVMService {
      * @return true if the VM is successfully unmanaged, false if not.
      */
     boolean unmanageVMInstance(long vmId);
-}
+}

api/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManager.java

@@ -26,4 +26,4 @@ public interface UnmanagedVMsManager extends VmImportService, UnmanageVMService,
     ConfigKey<Boolean> UnmanageVMPreserveNic = new ConfigKey<>("Advanced", Boolean.class, "unmanage.vm.preserve.nics", "false",
             "If set to true, do not remove VM nics (and its MAC addresses) when unmanaging a VM, leaving them allocated but not reserved. " +
                     "If set to false, nics are removed and MAC addresses can be reassigned", true, ConfigKey.Scope.Zone);
-}
+}

api/src/test/java/com/cloud/agent/api/to/LoadBalancerTOTest.java

@@ -173,4 +173,4 @@ public void testAutoScaleVmGroupTO() {
         List<LoadBalancerTO.AutoScalePolicyTO> policies = vmGroup.getPolicies();
         Assert.assertEquals(2, policies.size());
     }
-}
+}

api/src/test/java/com/cloud/network/as/AutoScalePolicyTest.java

@@ -52,4 +52,4 @@ public void testBlankAction() {
     public void testInvalidAction() {
         AutoScalePolicy.Action action = AutoScalePolicy.Action.fromValue("invalid");
     }
-}
+}

api/src/test/java/com/cloud/network/as/AutoScaleVmGroupTest.java

@@ -48,4 +48,4 @@ public void testBlankStates() {
     public void testInvalidState() {
         testAutoScaleVmGroupState("invalid");
     }
-}
+}

api/src/test/java/org/apache/cloudstack/acl/RoleTypeTest.java

@@ -97,4 +97,4 @@ public void testGetAccountTypeByRole() {
         Mockito.when(role.getId()).thenReturn(100L);
         Assert.assertEquals(RoleType.getAccountTypeByRole(role, null), RoleType.Admin.getAccountType());
     }
-}
+}

api/src/test/java/org/apache/cloudstack/acl/RuleTest.java

@@ -95,4 +95,4 @@ public void testValidateRuleWithInvalidData() throws Exception {
             }
         }
     }
-}
+}

api/src/test/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmdTest.java

@@ -60,4 +60,4 @@ public void sortPoolsBySuitability() {
 
     }
 
-}
+}

api/src/test/java/org/apache/cloudstack/api/command/admin/vlan/UpdateVlanIpRangeCmdTest.java

@@ -75,4 +75,4 @@ public void testUpdateFailure() throws ResourceAllocationException, ResourceUnav
         }
 
     }
-}
+}

api/src/test/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmdTest.java

@@ -32,4 +32,4 @@ public void isEdge() {
         ReflectionTestUtils.setField(createZoneCmd, "isEdge", true);
         Assert.assertTrue("true value for isedge param value for API should return true", createZoneCmd.isEdge());
     }
-}
+}

api/src/test/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmdTest.java

@@ -334,4 +334,4 @@ public void testExecute() throws InsufficientCapacityException, ResourceAllocati
             Assert.fail("Should successfully create the network");
         }
     }
-}
+}

api/src/test/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmdTest.java

@@ -189,4 +189,4 @@ public void testExecute() throws InsufficientCapacityException {
 
         Assert.assertEquals(response, actualResponse);
     }
-}
+}

api/src/test/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmdTest.java

@@ -43,4 +43,4 @@ public void testParsingTags() {
         ReflectionTestUtils.setField(createSnapshotPolicyCmd, "tags", tagsParams);
         Assert.assertEquals(createSnapshotPolicyCmd.getTags(), expectedTags);
     }
-}
+}

api/src/test/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdByAdminTest.java

@@ -74,4 +74,3 @@ public void testDestZoneidAndDestZoneIdListBothPresent() throws ResourceAllocati
 
 
 }
-

api/src/test/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdTest.java

@@ -72,4 +72,3 @@ public void testDestZoneidAndDestZoneIdListBothPresent() throws ResourceAllocati
 
 
 }
-

api/src/test/java/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmdTest.java

@@ -162,4 +162,4 @@ public void testExecute() throws ResourceUnavailableException, InsufficientCapac
         cmd.execute();
         Mockito.verify(_vpcService, Mockito.times(1)).startVpc(Mockito.anyLong(), Mockito.anyBoolean());
     }
-}
+}

api/src/test/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmdTest.java

@@ -91,4 +91,4 @@ public void testExecute() {
                 Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
 
     }
-}
+}

api/src/test/java/org/apache/cloudstack/api/response/StatsResponseTest.java

@@ -132,4 +132,4 @@ public void setNetworkKbsWriteTestWithInputNotNull() {
         Assert.assertEquals(expectedNetworkKbsWrite, statsResponseMock.networkKbsWrite);
         Assert.assertEquals(expectedNetworkWrite, statsResponseMock.networkWrite);
     }
-}
+}

api/src/test/java/org/apache/cloudstack/context/CallContextTest.java

@@ -80,4 +80,4 @@ public void testGetContextParameter() {
         Assert.assertEquals("current context map should have exactly three entries", 3, currentContext.getContextParameters().size());
     }
 
-}
+}