You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/01/16 00:55:11 UTC

[11/43] git commit: ApiDispatcher: Remove helper method that proxies via ApiResponseHelper to get entity by IdentityDao

ApiDispatcher: Remove helper method that proxies via ApiResponseHelper to get entity by IdentityDao

Signed-off-by: Rohit Yadav <bh...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8eba0ee0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8eba0ee0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8eba0ee0

Branch: refs/heads/api_limit
Commit: 8eba0ee0bbb2dbdb97aee8e672405b5e174b510d
Parents: a35db97
Author: Rohit Yadav <bh...@apache.org>
Authored: Fri Jan 11 15:31:03 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Fri Jan 11 18:44:20 2013 -0800

----------------------------------------------------------------------
 server/src/com/cloud/api/ApiDispatcher.java     |    6 ------
 server/src/com/cloud/api/ApiResponseHelper.java |    5 -----
 2 files changed, 0 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8eba0ee0/server/src/com/cloud/api/ApiDispatcher.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
index 7bc3271..55d7f42 100755
--- a/server/src/com/cloud/api/ApiDispatcher.java
+++ b/server/src/com/cloud/api/ApiDispatcher.java
@@ -64,7 +64,6 @@ import com.cloud.utils.component.PluggableService;
 import com.cloud.utils.db.GenericDao;
 import com.cloud.utils.exception.CSExceptionErrorCode;
 import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.uuididentity.dao.IdentityDao;
 
 // ApiDispatcher: A class that dispatches API commands to the appropriate manager for execution.
 public class ApiDispatcher {
@@ -75,7 +74,6 @@ public class ApiDispatcher {
     @Inject private AsyncJobManager _asyncMgr = null;
     @Inject private AccountManager _accountMgr = null;
     @Inject EntityManager _entityMgr = null;
-    @Inject IdentityDao _identityDao = null;
 
     Map<String, Class<? extends GenericDao>> _daoNameMap = new HashMap<String, Class<? extends GenericDao>>();
     // singleton class
@@ -708,8 +706,4 @@ public class ApiDispatcher {
             throw new CloudRuntimeException("Internal error at plugService for command " + cmd.getCommandName() + " [field " + field.getName() + " is not accessible]");
         }
     }
-
-    public static Long getIdentiyId(String tableName, String token) {
-        return s_instance._identityDao.getIdentityId(tableName, token);
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8eba0ee0/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index edb798b..c346a6b 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2792,11 +2792,6 @@ public class ApiResponseHelper implements ResponseGenerator {
     }
 
     @Override
-    public Long getIdentiyId(String tableName, String token) {
-        return ApiDispatcher.getIdentiyId(tableName, token);
-    }
-
-    @Override
     public ResourceTagResponse createResourceTagResponse(ResourceTag resourceTag, boolean keyValueOnly) {
         ResourceTagJoinVO rto = ApiDBUtils.newResourceTagView(resourceTag);
         return ApiDBUtils.newResourceTagResponse(rto, keyValueOnly);