fixed sections issue in introspection

Author: quilicicf

modules/org.restlet.ext.apispark/src/org/restlet/ext/apispark/internal/introspection/application/ApplicationIntrospector.java

@@ -73,8 +73,6 @@ private static void addEnpoints(Application application, Reference baseRef,
             // Look for the endpoint to which this application is attached.
             Endpoint endpoint = ComponentIntrospector.getEndpoint(
                     component.getDefaultHost(), application, scheme);
-            // add sections
-            contract.setSections(collectInfo.getSections());
             if (endpoint != null) {
                 definition.getEndpoints().add(endpoint);
             }

modules/org.restlet.ext.apispark/src/org/restlet/ext/apispark/internal/introspection/application/ResourceCollector.java

@@ -92,6 +92,7 @@ public static void collectResource(CollectInfo collectInfo,
         for (IntrospectionHelper helper : introspectionHelper) {
             helper.processResource(resource, directory.getClass());
         }
+        addSectionsForResource(collectInfo, resource);
         collectInfo.addResource(resource);
     }
 
@@ -151,6 +152,7 @@ public static void collectResource(
             if (!operations.isEmpty()) {
                 sortOperationsByMethod(operations);
                 resource.setOperations(operations);
+                addSectionsForResource(collectInfo, resource);
                 collectInfo.addResource(resource);
             } else {
                 LOGGER.warning("Resource " + resource.getName()
@@ -411,13 +413,6 @@ private static Resource getResource(CollectInfo collectInfo,
             resource.setName(name);
         }
 
-        // add sections in collect info
-        for (String section : resource.getSections()) {
-            if (collectInfo.getSection(section) == null) {
-                collectInfo.addSection(new Section(section));
-            }
-        }
-
         Template template = new Template(basePath);
         for (String variable : template.getVariableNames()) {
             PathVariable pathVariable = new PathVariable();
@@ -432,6 +427,15 @@ private static Resource getResource(CollectInfo collectInfo,
         return resource;
     }
 
+    private static void addSectionsForResource(CollectInfo collectInfo,
+            Resource resource) {
+        for (String section : resource.getSections()) {
+            if (collectInfo.getSection(section) == null) {
+                collectInfo.addSection(new Section(section));
+            }
+        }
+    }
+
     private static void sortOperationsByMethod(ArrayList<Operation> operations) {
         Collections.sort(operations, new Comparator<Operation>() {
             public int compare(Operation o1, Operation o2) {