APIChecker: add default implementation for methods

Author: weizhouapache

api/src/main/java/org/apache/cloudstack/acl/APIChecker.java

@@ -45,6 +45,6 @@ public interface APIChecker extends Adapter {
     List<String> getApisAllowedToUser(Role role, User user, List<String> apiNames) throws PermissionDeniedException;
     boolean isEnabled();
 
-    Pair<Role, List<RolePermission>> getRolePermissions(long roleId);
-    boolean checkAccess(Account account, String commandName, Role accountRole, List<RolePermission> allPermissions);
+    default Pair<Role, List<RolePermission>> getRolePermissions(long roleId) { return null; }
+    default boolean checkAccess(Account account, String commandName, Role accountRole, List<RolePermission> allPermissions) { return false; }
 }

plugins/acl/project-role-based/src/main/java/org/apache/cloudstack/acl/ProjectRoleBasedApiAccessChecker.java

@@ -21,8 +21,8 @@
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
-
 import org.apache.cloudstack.acl.RolePermissionEntity.Permission;
+
 import org.apache.cloudstack.context.CallContext;
 
 import com.cloud.exception.PermissionDeniedException;
@@ -33,7 +33,6 @@
 import com.cloud.user.Account;
 import com.cloud.user.AccountService;
 import com.cloud.user.User;
-import com.cloud.utils.Pair;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.utils.component.PluggableService;
 
@@ -196,14 +195,4 @@ public List<PluggableService> getServices() {
     public void setServices(List<PluggableService> services) {
         this.services = services;
     }
-
-    @Override
-    public Pair<Role, List<RolePermission>> getRolePermissions(long roleId) {
-        return null;
-    }
-
-    @Override
-    public boolean checkAccess(Account account, String commandName, Role accountRole, List<RolePermission> allPermissions) {
-        return false;
-    }
 }

plugins/acl/static-role-based/src/main/java/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java

@@ -33,7 +33,6 @@
 import com.cloud.user.Account;
 import com.cloud.user.AccountService;
 import com.cloud.user.User;
-import com.cloud.utils.Pair;
 import com.cloud.utils.PropertiesUtil;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.utils.component.PluggableService;
@@ -201,13 +200,4 @@ public void setCommandPropertyFiles(Set<String> commandPropertyFiles) {
         this.commandPropertyFiles = commandPropertyFiles;
     }
 
-    @Override
-    public Pair<Role, List<RolePermission>> getRolePermissions(long roleId) {
-        return null;
-    }
-
-    @Override
-    public boolean checkAccess(Account account, String commandName, Role accountRole, List<RolePermission> allPermissions) {
-        return false;
-    }
 }

plugins/api/rate-limit/src/main/java/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java

@@ -27,7 +27,6 @@
 import net.sf.ehcache.CacheManager;
 
 import org.apache.cloudstack.acl.Role;
-import org.apache.cloudstack.acl.RolePermission;
 import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 import org.springframework.stereotype.Component;
 
@@ -43,7 +42,6 @@
 import com.cloud.user.Account;
 import com.cloud.user.AccountService;
 import com.cloud.user.User;
-import com.cloud.utils.Pair;
 import com.cloud.utils.component.AdapterBase;
 
 @Component
@@ -258,14 +256,4 @@ public void setEnabled(boolean enabled) {
         this.enabled = enabled;
 
     }
-
-    @Override
-    public Pair<Role, List<RolePermission>> getRolePermissions(long roleId) {
-        return null;
-    }
-
-    @Override
-    public boolean checkAccess(Account account, String commandName, Role accountRole, List<RolePermission> allPermissions) {
-        return false;
-    }
 }