You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/01/09 14:26:48 UTC
[29/50] [abbrv] git commit: ApiXmlDocWriter: Reuse methods from
ReflectUtil
ApiXmlDocWriter: Reuse methods from ReflectUtil
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/539d94b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/539d94b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/539d94b4
Branch: refs/heads/javelin
Commit: 539d94b4a68b1a161ac2ea3cf633b50d9299013b
Parents: db297a3
Author: Rohit Yadav <bh...@apache.org>
Authored: Tue Jan 8 18:37:54 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Tue Jan 8 18:54:29 2013 -0800
----------------------------------------------------------------------
server/src/com/cloud/api/doc/ApiXmlDocWriter.java | 47 +++++----------
1 files changed, 16 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/539d94b4/server/src/com/cloud/api/doc/ApiXmlDocWriter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/doc/ApiXmlDocWriter.java b/server/src/com/cloud/api/doc/ApiXmlDocWriter.java
index b493ec4..84851c3 100644
--- a/server/src/com/cloud/api/doc/ApiXmlDocWriter.java
+++ b/server/src/com/cloud/api/doc/ApiXmlDocWriter.java
@@ -28,6 +28,7 @@ import java.util.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
+import com.cloud.utils.ReflectUtil;
import org.apache.cloudstack.api.*;
import org.apache.log4j.Logger;
@@ -79,13 +80,15 @@ public class ApiXmlDocWriter {
}
public static void main(String[] args) {
- // Populate api name and cmd class mappings
- Reflections reflections = new Reflections("org.apache.cloudstack.api");
- Set<Class<?>> cmdClasses = reflections.getTypesAnnotatedWith(APICommand.class);
- reflections = new Reflections("com.cloud.api");
- cmdClasses.addAll(reflections.getTypesAnnotatedWith(APICommand.class));
+
+ Set<Class<?>> cmdClasses = ReflectUtil.getClassesWithAnnotation(APICommand.class, new String[]{"org.apache.cloudstack.api", "com.cloud.api"});
+
for(Class<?> cmdClass: cmdClasses) {
String apiName = cmdClass.getAnnotation(APICommand.class).name();
+ if (_apiNameCmdClassMap.containsKey(apiName)) {
+ System.out.println("Warning, API Cmd class " + cmdClass.getName() + " has non-unique apiname" + apiName);
+ continue;
+ }
_apiNameCmdClassMap.put(apiName, cmdClass);
}
@@ -340,33 +343,15 @@ public class ApiXmlDocWriter {
if(!impl.since().isEmpty()){
apiCommand.setSinceVersion(impl.since());
}
-
- // Set request parameters
- Field[] fields = clas.getDeclaredFields();
-
- // Get fields from superclass
- Class<?> superClass = clas.getSuperclass();
- boolean isAsync = false;
- while (superClass != null && superClass != Object.class) {
- String superName = superClass.getName();
- if (!superName.equals(BaseCmd.class.getName()) && !superName.equals(BaseAsyncCmd.class.getName()) && !superName.equals(BaseAsyncCreateCmd.class.getName())) {
- Field[] superClassFields = superClass.getDeclaredFields();
- if (superClassFields != null) {
- Field[] tmpFields = new Field[fields.length + superClassFields.length];
- System.arraycopy(fields, 0, tmpFields, 0, fields.length);
- System.arraycopy(superClassFields, 0, tmpFields, fields.length, superClassFields.length);
- fields = tmpFields;
- }
- }
- superClass = superClass.getSuperclass();
- // Set Async information for the command
- if (superName.equals(BaseAsyncCmd.class.getName()) || superName.equals(BaseAsyncCreateCmd.class.getName())) {
- isAsync = true;
- }
- }
-
+
+ boolean isAsync = ReflectUtil.isCmdClassAsync(clas,
+ new Class<?>[] {BaseAsyncCmd.class, BaseAsyncCreateCmd.class});
+
apiCommand.setAsync(isAsync);
-
+
+ Field[] fields = ReflectUtil.getAllFieldsForClass(clas,
+ new Class<?>[] {BaseCmd.class, BaseAsyncCmd.class, BaseAsyncCreateCmd.class});
+
request = setRequestFields(fields);
// Get response parameters