merge fixes

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

api/src/main/java/org/apache/cloudstack/api/command/admin/backup/CreateImageTransferCmd.java

@@ -81,7 +81,7 @@ public ImageTransfer.Direction getDirection() {
     }
 
     public ImageTransfer.Format getFormat() {
-        return EnumUtils.fromString(ImageTransfer.Format.class, format);
+        return EnumUtils.getEnum(ImageTransfer.Format.class, format);
     }
 
    @Override

plugins/integrations/veeam-control-service/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloudstack-plugins</artifactId>
-        <version>4.22.1.0-SNAPSHOT</version>
+        <version>4.23.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <dependencies>

plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/adapter/ServerAdapter.java

@@ -1447,11 +1447,11 @@ public ImageTransfer createImageTransfer(ImageTransfer request) {
         }
         accountService.checkAccess(CallContext.current().getCallingAccount(), null, false,
                 volumeVO);
-        Direction direction = EnumUtils.fromString(Direction.class, request.getDirection());
+        Direction direction = EnumUtils.getEnum(Direction.class, request.getDirection());
         if (direction == null) {
             throw new InvalidParameterValueException("Invalid or missing direction");
         }
-        Format format = EnumUtils.fromString(Format.class, request.getFormat());
+        Format format = EnumUtils.getEnum(Format.class, request.getFormat());
         Long backupId = null;
         if (request.getBackup() != null && StringUtils.isNotBlank(request.getBackup().getId())) {
             BackupVO backupVO = backupDao.findByUuid(request.getBackup().getId());

plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/dto/Vm.java

@@ -348,7 +348,7 @@ public String getType() {
 
         @JsonIgnore
         public int getTypeOrdinal() {
-            Type enumType = EnumUtils.fromString(Type.class, type, Type.q35_sea_bios);
+            Type enumType = EnumUtils.getEnum(Type.class, type, Type.q35_sea_bios);
             return enumType.ordinal();
         }
 

plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java

@@ -597,6 +597,10 @@ public void validateUserPasswordAndUpdateIfNeeded(String newPassword, UserVO use
     public void checkApiAccess(Account account, String command, String apiKey) throws PermissionDeniedException {
     }
 
+    @Override
+    public void checkApiAccess(Account caller, String command) throws PermissionDeniedException {
+    }
+
     @Override
     public UserAccount clearUserTwoFactorAuthenticationInSetupStateOnLogin(UserAccount user) {
         return null;

server/src/main/java/com/cloud/user/AccountManager.java

@@ -204,6 +204,8 @@ void buildACLViewSearchCriteria(SearchCriteria<? extends ControlledViewEntity> s
 
     void checkApiAccess(Account caller, String command, String apiKey);
 
+    void checkApiAccess(Account caller, String command);
+
     UserAccount clearUserTwoFactorAuthenticationInSetupStateOnLogin(UserAccount user);
 
     void verifyCallerPrivilegeForUserOrAccountOperations(Account userAccount);

server/src/main/java/com/cloud/user/AccountManagerImpl.java

@@ -1535,6 +1535,12 @@ public void checkApiAccess(Account caller, String command, String apiKey) {
         checkApiAccess(apiCheckers, caller, command, keyPairPermissions.toArray(new ApiKeyPairPermission[0]));
     }
 
+    @Override
+    public void checkApiAccess(Account caller, String command) {
+        List<APIChecker> apiCheckers = getEnabledApiCheckers();
+        checkApiAccess(apiCheckers, caller, command);
+    }
+
     @NotNull
     private List<APIChecker> getEnabledApiCheckers() {
         // we are really only interested in the dynamic access checker