OPENDJ-1242 (CR-5982) Enable dsconfig to generate doc for properties change...

Jean-Noel Rouvignac

17.38.2015 a463946319020c97a8f3b7ea2aa05f0192b37a14

OPENDJ-1242 (CR-5982) Enable dsconfig to generate doc for properties changed through subcommand options

No properties were output for access-log-filtering-criteria.
Problem was linked to how leaf definitions were computed: always check if current definition is a leaf and in that case add it to the leafs definitions list.

DSConfig.java:
Renamed addLeafChildren to addIfLeaf() + changed the logic to check the passed in definition.

 opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java

@@ -260,7 +260,7 @@
                AbstractManagedObjectDefinition<?, ?> defn) {
            final ArrayList<AbstractManagedObjectDefinition<?, ?>> results =
                    new ArrayList<AbstractManagedObjectDefinition<?, ?>>();
            addLeafChildren(results, defn);
            addIfLeaf(results, defn);
            Collections.sort(results, new Comparator<AbstractManagedObjectDefinition<?, ?>>() {
                @Override
                public int compare(AbstractManagedObjectDefinition<?, ?> o1, AbstractManagedObjectDefinition<?, ?> o2) {
@@ -270,13 +270,13 @@
            return results;
        }

        private void addLeafChildren(final Collection<AbstractManagedObjectDefinition<?, ?>> results,
        private void addIfLeaf(final Collection<AbstractManagedObjectDefinition<?, ?>> results,
                final AbstractManagedObjectDefinition<?, ?> defn) {
            for (AbstractManagedObjectDefinition<?, ?> child : defn.getChildren()) {
                if (child.getChildren().isEmpty()) {
                    results.add(child);
            if (defn.getChildren().isEmpty()) {
                results.add(defn);
                } else {
                    addLeafChildren(results, child);
                for (AbstractManagedObjectDefinition<?, ?> child : defn.getChildren()) {
                    addIfLeaf(results, child);
                }
            }
        }