api_refactoring: Fix build issue with api_refactoring branch.

minchen07 · yadvr · commit eba353099ec0 · 2012-12-06T15:00:48.000-08:00
Signed-off-by: Rohit Yadav &lt;bhaisaab@apache.org&gt;
diff --git a/api/src/com/cloud/api/response/UserVmResponse.java b/api/src/com/cloud/api/response/UserVmResponse.java
@@ -336,6 +336,10 @@ public void setSecurityGroupList(Set<SecurityGroupResponse> securityGroups) {
         this.securityGroupList = securityGroups;
     }
 
+    public void addSecurityGroup(SecurityGroupResponse securityGroup){
+        this.securityGroupList.add(securityGroup);
+    }
+
     public void setProjectId(String projectId) {
         this.projectId = projectId;
     }
diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
@@ -473,58 +473,61 @@ public static void setupParameters(BaseCmd cmd, Map<String, String> params, List
 	            	//for maps, specify access to be checkd on key or value.
 	            	
 	            	if(parameterAnnotation.resourceType() != null){
-	            		 Class<?>[] entity = parameterAnnotation.resourceType();
-	            				 
-	            		 if(ControlledEntity.class.isAssignableFrom(entity)){
-	                         if (s_logger.isDebugEnabled()) {
-	                             s_logger.debug("entity name is:" + entity.getName());
-	                         }
-	                         
-	                         if(s_instance._daoNameMap.containsKey(entity.getName())){
-	                        	 Class<? extends GenericDao> daoClass = s_instance._daoNameMap.get(entity.getName());
-	                        	 GenericDao daoClassInstance =  s_instance._locator.getDao(daoClass);
-	                        	 
-	                        	 //Check if the parameter type is a single Id or list of id's/name's
-	                        	 switch (fieldType) {                        	 
-			                         case LIST:
-		                                 CommandType listType = parameterAnnotation.collectionType();
-		                                 switch (listType) {
-    		                                 case LONG: 
-    		                                	 List<Long> listParam = new ArrayList<Long>();
-     											 listParam = (List)field.get(cmd);
-    
-    		                                	 for(Long entityId : listParam){
-    			    	                        	 ControlledEntity entityObj = (ControlledEntity)daoClassInstance.findById(entityId);
-    			    	                        	 entitiesToAccess.add(entityObj);
-    		                                	 }
-    			    	                     break;
-    		                                 /*case STRING:
-    		                                	 List<String> listParam = new ArrayList<String>();
-    		                                	 listParam = (List)field.get(cmd);
-    		                                	 for(String entityName: listParam){
-    			    	                        	 ControlledEntity entityObj = (ControlledEntity)daoClassInstance(entityId);
-    			    	                        	 entitiesToAccess.add(entityObj);
-    		                                	 }
-    		                                     break;
-    		                                  */
-    		                                 default:
-    		                                 break;
-		                                 }
-			                             break;
-			                         case LONG:
-			                        	 Long entityId = (Long)field.get(cmd);
-			                        	 ControlledEntity entityObj = (ControlledEntity)daoClassInstance.findById(entityId);
-			                        	 entitiesToAccess.add(entityObj);
-			                        	 break;
-			                         default:
-			                        	 break;
-	                        	 }
-	                             
-	                        	 
-	                         }
-	            			 
-	            		 }
-	            		 
+				 Class<?>[] entityList = parameterAnnotation.resourceType();
+				 for (Class entity : entityList){
+                            if (ControlledEntity.class.isAssignableFrom(entity)) {
+                                if (s_logger.isDebugEnabled()) {
+                                    s_logger.debug("entity name is:" + entity.getName());
+                                }
+
+                                if (s_instance._daoNameMap.containsKey(entity.getName())) {
+                                    Class<? extends GenericDao> daoClass = s_instance._daoNameMap.get(entity.getName());
+                                    GenericDao daoClassInstance = s_instance._locator.getDao(daoClass);
+
+                                    // Check if the parameter type is a single
+                                    // Id or list of id's/name's
+                                    switch (fieldType) {
+                                    case LIST:
+                                        CommandType listType = parameterAnnotation.collectionType();
+                                        switch (listType) {
+                                        case LONG:
+                                            List<Long> listParam = new ArrayList<Long>();
+                                            listParam = (List) field.get(cmd);
+
+                                            for (Long entityId : listParam) {
+                                                ControlledEntity entityObj = (ControlledEntity) daoClassInstance.findById(entityId);
+                                                entitiesToAccess.add(entityObj);
+                                            }
+                                            break;
+                                        /*
+                                         * case STRING: List<String> listParam =
+                                         * new ArrayList<String>(); listParam =
+                                         * (List)field.get(cmd); for(String
+                                         * entityName: listParam){
+                                         * ControlledEntity entityObj =
+                                         * (ControlledEntity
+                                         * )daoClassInstance(entityId);
+                                         * entitiesToAccess.add(entityObj); }
+                                         * break;
+                                         */
+                                        default:
+                                            break;
+                                        }
+                                        break;
+                                    case LONG:
+                                        Long entityId = (Long) field.get(cmd);
+                                        ControlledEntity entityObj = (ControlledEntity) daoClassInstance.findById(entityId);
+                                        entitiesToAccess.add(entityObj);
+                                        break;
+                                    default:
+                                        break;
+                                    }
+
+                                }
+
+                            }
+                        }
+
 	            	}
 	            	
 	            }
diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -353,7 +353,7 @@ public AutoScaleVmProfile createAutoScaleVmProfile(CreateAutoScaleVmProfileCmd c
          * For ex. if projectId is given as a string instead of an long value, this
          * will be throwing an error.
          */
-        ApiDispatcher.setupParameters(new DeployVMCmd(), deployParams);
+        ApiDispatcher.setupParameters(new DeployVMCmd(), deployParams, new ArrayList<ControlledEntity>());
 
         if (autoscaleUserId == null) {
             autoscaleUserId = UserContext.current().getCallerUserId();

Original file line number	Diff line number	Diff line change
`@@ -336,6 +336,10 @@ public void setSecurityGroupList(Set<SecurityGroupResponse> securityGroups) {`
`336`	`336`	`this.securityGroupList = securityGroups;`
`337`	`337`	`}`
`338`	`338`
	`339`	`+ public void addSecurityGroup(SecurityGroupResponse securityGroup){`
	`340`	`+ this.securityGroupList.add(securityGroup);`
	`341`	`+ }`
	`342`	`+`
`339`	`343`	`public void setProjectId(String projectId) {`
`340`	`344`	`this.projectId = projectId;`
`341`	`345`	`}`