Fixed API doc problem

Alena Prokharchyk · Alena Prokharchyk · commit 3c3cf26f64e1 · 2011-11-09T13:27:35.000-08:00
diff --git a/server/src/com/cloud/api/doc/ApiXmlDocWriter.java b/server/src/com/cloud/api/doc/ApiXmlDocWriter.java
@@ -448,43 +448,45 @@ private static ArrayList<Argument> setResponseFields(Field[] responseFields) {
 
         for (Field responseField : responseFields) {
             SerializedName nameAnnotation = responseField.getAnnotation(SerializedName.class);
-            Param paramAnnotation = responseField.getAnnotation(Param.class);
-            Argument respArg = new Argument(nameAnnotation.value());
-
-            boolean hasChildren = false;
-            if (paramAnnotation != null && paramAnnotation.includeInApiDoc()) {
-                String description = paramAnnotation.description();
-                Class fieldClass = paramAnnotation.responseObject();
-                if (description != null && !description.isEmpty()) {
-                    respArg.setDescription(description);
-                }
-
-                if (fieldClass != null) {
-                    Class<?> superClass = fieldClass.getSuperclass();
-                    if (superClass != null) {
-                        String superName = superClass.getName();
-                        if (superName.equals(BaseResponse.class.getName())) {
-                            ArrayList<Argument> fieldArguments = new ArrayList<Argument>();
-                            Field[] fields = fieldClass.getDeclaredFields();
-                            fieldArguments = setResponseFields(fields);
-                            respArg.setArguments(fieldArguments);
-                            hasChildren = true;
-                        }
-                    }
-                }
-            }
-
-            if (paramAnnotation != null && paramAnnotation.includeInApiDoc()) {
-                if (nameAnnotation.value().equals("id")) {
-                    id = respArg;
-                } else {
-                    if (hasChildren) {
-                        respArg.setName(nameAnnotation.value() + "(*)");
-                        sortedArguments.add(respArg);
-                    } else {
-                        sortedChildlessArguments.add(respArg);
-                    }
-                }
+            if (nameAnnotation != null) {
+            	 Param paramAnnotation = responseField.getAnnotation(Param.class);
+                 Argument respArg = new Argument(nameAnnotation.value());
+
+                 boolean hasChildren = false;
+                 if (paramAnnotation != null && paramAnnotation.includeInApiDoc()) {
+                     String description = paramAnnotation.description();
+                     Class fieldClass = paramAnnotation.responseObject();
+                     if (description != null && !description.isEmpty()) {
+                         respArg.setDescription(description);
+                     }
+
+                     if (fieldClass != null) {
+                         Class<?> superClass = fieldClass.getSuperclass();
+                         if (superClass != null) {
+                             String superName = superClass.getName();
+                             if (superName.equals(BaseResponse.class.getName())) {
+                                 ArrayList<Argument> fieldArguments = new ArrayList<Argument>();
+                                 Field[] fields = fieldClass.getDeclaredFields();
+                                 fieldArguments = setResponseFields(fields);
+                                 respArg.setArguments(fieldArguments);
+                                 hasChildren = true;
+                             }
+                         }
+                     }
+                 }
+
+                 if (paramAnnotation != null && paramAnnotation.includeInApiDoc()) {
+                     if (nameAnnotation.value().equals("id")) {
+                         id = respArg;
+                     } else {
+                         if (hasChildren) {
+                             respArg.setName(nameAnnotation.value() + "(*)");
+                             sortedArguments.add(respArg);
+                         } else {
+                             sortedChildlessArguments.add(respArg);
+                         }
+                     }
+                 }
             }
         }
 
