apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-763: Removed unused methods

Browse Source
This commit is contained in:
Kishan Kavala 2013-05-07 11:43:56 +05:30
parent 49fbff21fa
commit 14e992e953
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/network/vpc/NetworkACL.java
View File

@ -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;

8
server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
View File

@ -76,8 +76,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
@Inject
NetworkACLItemDao _networkACLItemDao;
@Inject
List<NetworkACLServiceProvider> _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);

11
server/src/com/cloud/network/vpc/NetworkACLVO.java
View File

@ -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.
}
}