CLOUDSTACK-763: Removed unused methods

Kishan Kavala · Kishan Kavala · commit 14e992e95365 · 2013-05-13T12:03:39.000+05:30
diff --git a/api/src/com/cloud/network/vpc/NetworkACL.java b/api/src/com/cloud/network/vpc/NetworkACL.java
@@ -20,7 +20,7 @@
 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
@@ -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 NetworkACLItem createNetworkACLItem(CreateNetworkACLCmd aclItemCmd){
         }
         _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 NetworkACLItem updateNetworkACLItem(Long id, String protocol, List<String
 
         _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
@@ -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 String getName() {
         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.
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class NetworkACLVO implements NetworkACL{`
`41`	`41`	`@Column(name="description")`
`42`	`42`	`private String description;`
`43`	`43`
`44`		`- protected NetworkACLVO(){`
	`44`	`+ public NetworkACLVO(){`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`protected NetworkACLVO(String name, String description, long vpcId){`
`@@ -76,13 +76,4 @@ public String getName() {`
`76`	`76`	`return name;`
`77`	`77`	`}`
`78`	`78`
`79`		`- @Override`
`80`		`- public long getAccountId() {`
`81`		`- return 0; //To change body of implemented methods use File \| Settings \| File Templates.`
`82`		`- }`
`83`		`-`
`84`		`- @Override`
`85`		`- public long getDomainId() {`
`86`		`- return 0; //To change body of implemented methods use File \| Settings \| File Templates.`
`87`		`- }`
`88`	`79`	`}`