From 14e992e95365ffefc8df37db63db9c76c92ff69f Mon Sep 17 00:00:00 2001 From: Kishan Kavala Date: Tue, 7 May 2013 11:43:56 +0530 Subject: [PATCH] CLOUDSTACK-763: Removed unused methods --- api/src/com/cloud/network/vpc/NetworkACL.java | 2 +- .../com/cloud/network/vpc/NetworkACLServiceImpl.java | 8 -------- server/src/com/cloud/network/vpc/NetworkACLVO.java | 11 +---------- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/api/src/com/cloud/network/vpc/NetworkACL.java b/api/src/com/cloud/network/vpc/NetworkACL.java index c5a0d6db1da..8bde7c2142f 100644 --- a/api/src/com/cloud/network/vpc/NetworkACL.java +++ b/api/src/com/cloud/network/vpc/NetworkACL.java @@ -20,7 +20,7 @@ package com.cloud.network.vpc; import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.api.InternalIdentity; -public interface NetworkACL extends InternalIdentity, ControlledEntity{ +public interface NetworkACL extends InternalIdentity{ public static final long DEFAULT_DENY = 1; public static final long DEFAULT_ALLOW = 2; diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java index ae9b8f985ec..570ba2bc288 100644 --- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java +++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java @@ -76,8 +76,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ @Inject NetworkACLItemDao _networkACLItemDao; @Inject - List _networkAclElements; - @Inject NetworkModel _networkModel; @Inject NetworkDao _networkDao; @@ -221,9 +219,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ } _accountMgr.checkAccess(caller, null, true, vpc); - Account aclOwner = _accountMgr.getAccount(vpc.getAccountId()); - _accountMgr.checkAccess(aclOwner, SecurityChecker.AccessType.ModifyEntry, false, acl); - if(aclItemCmd.getNumber() != null){ if(_networkACLItemDao.findByAclAndNumber(aclId, aclItemCmd.getNumber()) != null){ throw new InvalidParameterValueException("ACL item with number "+aclItemCmd.getNumber()+" already exists in ACL: "+acl.getUuid()); @@ -435,9 +430,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ _accountMgr.checkAccess(caller, null, true, vpc); - Account aclOwner = _accountMgr.getAccount(vpc.getAccountId()); - _accountMgr.checkAccess(aclOwner, SecurityChecker.AccessType.ModifyEntry, false, acl); - if(number != null){ //Check if ACL Item with specified number already exists NetworkACLItemVO aclNumber = _networkACLItemDao.findByAclAndNumber(acl.getId(), number); diff --git a/server/src/com/cloud/network/vpc/NetworkACLVO.java b/server/src/com/cloud/network/vpc/NetworkACLVO.java index 374ba15142b..ad2ffbfb55b 100644 --- a/server/src/com/cloud/network/vpc/NetworkACLVO.java +++ b/server/src/com/cloud/network/vpc/NetworkACLVO.java @@ -41,7 +41,7 @@ public class NetworkACLVO implements NetworkACL{ @Column(name="description") private String description; - protected NetworkACLVO(){ + public NetworkACLVO(){ } protected NetworkACLVO(String name, String description, long vpcId){ @@ -76,13 +76,4 @@ public class NetworkACLVO implements NetworkACL{ return name; } - @Override - public long getAccountId() { - return 0; //To change body of implemented methods use File | Settings | File Templates. - } - - @Override - public long getDomainId() { - return 0; //To change body of implemented methods use File | Settings | File Templates. - } }