Fix Javadoc generation on Java 8 and up

Author: garydgregory

src/main/java/org/apache/commons/beanutils/BasicDynaBean.java

@@ -258,9 +258,10 @@ protected DynaProperty getDynaProperty(final String name) {
 
     /**
      * Return a Map representation of this DynaBean.
-     * </p>
+     * <p>
      * This, for example, could be used in JSTL in the following way to access
      * a DynaBean's <code>fooProperty</code>:
+     * </p>
      * <ul><li><code>${myDynaBean.<strong>map</strong>.fooProperty}</code></li></ul>
      *
      * @return a Map representation of this DynaBean

src/main/java/org/apache/commons/beanutils/BasicDynaClass.java

@@ -15,16 +15,13 @@
  * limitations under the License.
  */
 
-
 package org.apache.commons.beanutils;
 
-
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 
-
 /**
  * <p>Minimal implementation of the <code>DynaClass</code> interface.  Can be
  * used as a convenience base class for more sophisticated implementations.</p> *
@@ -34,88 +31,68 @@
  * used to associate the DynaBean instance with this DynaClass.</p>
  *
  */
-
 public class BasicDynaClass implements DynaClass, Serializable {
 
-
-
-
     private static final long serialVersionUID = 1L;
 
-
     /**
      * The method signature of the constructor we will use to create
      * new DynaBean instances.
      */
     protected static Class<?>[] constructorTypes = { DynaClass.class };
 
-
     /**
      * The constructor of the <code>dynaBeanClass</code> that we will use
      * for creating new instances.
      */
     protected transient Constructor<?> constructor = null;
 
-
     /**
      * The argument values to be passed to the constructore we will use
      * to create new DynaBean instances.
      */
     protected Object[] constructorValues = { this };
 
-
-
-
     /**
      * The <code>DynaBean</code> implementation class we will use for
      * creating new instances.
      */
     protected Class<?> dynaBeanClass = BasicDynaBean.class;
 
-
     /**
      * The "name" of this DynaBean class.
      */
     protected String name = this.getClass().getName();
 
-
     /**
      * The set of dynamic properties that are part of this DynaClass.
      */
     protected DynaProperty[] properties = {};
 
-
     /**
      * The set of dynamic properties that are part of this DynaClass,
      * keyed by the property name.  Individual descriptor instances will
      * be the same instances as those in the <code>properties</code> list.
      */
     protected HashMap<String, DynaProperty> propertiesMap = new HashMap<>();
 
-
     /**
      * Construct a new BasicDynaClass with default parameters.
      */
     public BasicDynaClass() {
-
         this(null, null, null);
-
     }
 
-
     /**
      * Construct a new BasicDynaClass with the specified parameters.
      *
      * @param name Name of this DynaBean class
      * @param dynaBeanClass The implementation class for new instances
      */
     public BasicDynaClass(final String name, final Class<?> dynaBeanClass) {
-
         this(name, dynaBeanClass, null);
-
     }
 
-
     /**
      * Construct a new BasicDynaClass with the specified parameters.
      *
@@ -125,7 +102,6 @@ public BasicDynaClass(final String name, final Class<?> dynaBeanClass) {
      */
     public BasicDynaClass(final String name, Class<?> dynaBeanClass,
                           final DynaProperty[] properties) {
-
         if (name != null) {
             this.name = name;
         }
@@ -136,12 +112,8 @@ public BasicDynaClass(final String name, Class<?> dynaBeanClass,
         if (properties != null) {
             setProperties(properties);
         }
-
     }
 
-
-
-
     /**
      * Return the Class object we will use to create new instances in the
      * <code>newInstance()</code> method.  This Class <strong>MUST</strong>
@@ -150,12 +122,9 @@ public BasicDynaClass(final String name, Class<?> dynaBeanClass,
      * @return The class of the {@link DynaBean}
      */
     public Class<?> getDynaBeanClass() {
-
         return this.dynaBeanClass;
-
     }
 
-
     /**
      * <p>Return an array of <code>ProperyDescriptors</code> for the properties
      * currently defined in this DynaClass.  If no properties are defined, a
@@ -169,12 +138,9 @@ public Class<?> getDynaBeanClass() {
      */
     @Override
     public DynaProperty[] getDynaProperties() {
-
         return properties;
-
     }
 
-
     /**
      * Return a property descriptor for the specified property, if it exists;
      * otherwise, return <code>null</code>.
@@ -186,34 +152,26 @@ public DynaProperty[] getDynaProperties() {
      */
     @Override
     public DynaProperty getDynaProperty(final String name) {
-
         if (name == null) {
             throw new IllegalArgumentException
                     ("No property name specified");
         }
         return propertiesMap.get(name);
-
     }
 
-
     /**
      * Return the name of this DynaClass (analogous to the
-     * <code>getName()</code> method of <code>java.lang.Class</code), which
+     * <code>getName()</code> method of <code>java.lang.Class</code>), which
      * allows the same <code>DynaClass</code> implementation class to support
      * different dynamic classes, with different sets of properties.
      *
      * @return the name of the DynaClass
      */
     @Override
     public String getName() {
-
         return this.name;
-
     }
 
-
-
-
     /**
      * Instantiate and return a new DynaBean instance, associated
      * with this DynaClass.
@@ -228,7 +186,6 @@ public String getName() {
     @Override
     public DynaBean newInstance()
             throws IllegalAccessException, InstantiationException {
-
         try {
             // Refind the constructor after a deserialization (if needed)
             if (constructor == null) {
@@ -240,12 +197,8 @@ public DynaBean newInstance()
             throw new InstantiationException
                     (e.getTargetException().getMessage());
         }
-
     }
 
-
-
-
     /**
      * Set the Class object we will use to create new instances in the
      * <code>newInstance()</code> method.  This Class <strong>MUST</strong>
@@ -256,7 +209,6 @@ public DynaBean newInstance()
      *  implement the <code>DynaBean</code> interface
      */
     protected void setDynaBeanClass(final Class<?> dynaBeanClass) {
-
         // Validate the argument type specified
         if (dynaBeanClass.isInterface()) {
             throw new IllegalArgumentException
@@ -268,7 +220,6 @@ protected void setDynaBeanClass(final Class<?> dynaBeanClass) {
                     ("Class " + dynaBeanClass.getName() +
                     " does not implement DynaBean");
         }
-
         // Identify the Constructor we will use in newInstance()
         try {
             this.constructor = dynaBeanClass.getConstructor(constructorTypes);
@@ -278,24 +229,19 @@ protected void setDynaBeanClass(final Class<?> dynaBeanClass) {
                     " does not have an appropriate constructor");
         }
         this.dynaBeanClass = dynaBeanClass;
-
     }
 
-
     /**
      * Set the list of dynamic properties supported by this DynaClass.
      *
      * @param properties List of dynamic properties to be supported
      */
     protected void setProperties(final DynaProperty[] properties) {
-
         this.properties = properties;
         propertiesMap.clear();
         for (final DynaProperty propertie : properties) {
             propertiesMap.put(propertie.getName(), propertie);
         }
-
     }
 
-
 }

src/main/java/org/apache/commons/beanutils/BeanMap.java

@@ -253,22 +253,22 @@ public void clear() {
      * <ul>
      * <li>If there is no underlying bean, return a cloned BeanMap without a
      * bean.
-     *
+     * </li>
      * <li>Since there is an underlying bean, try to instantiate a new bean of
      * the same type using Class.newInstance().
-     *
+     * </li>
      * <li>If the instantiation fails, throw a CloneNotSupportedException
-     *
+     * </li>
      * <li>Clone the bean map and set the newly instantiated bean as the
      * underlying bean for the bean map.
-     *
+     * </li>
      * <li>Copy each property that is both readable and writable from the
      * existing object to a cloned bean map.
-     *
+     * </li>
      * <li>If anything fails along the way, throw a
      * CloneNotSupportedException.
-     *
-     * <ul>
+     * </li>
+     * </ul>
      *
      * @return a cloned instance of this bean map
      * @throws CloneNotSupportedException if the underlying bean

src/main/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java

@@ -33,35 +33,36 @@
  * what property will be updated and with what value.
  * <dl>
  *    <dt>
- *       <b><code>
- *           <pre>public BeanPropertyValueChangeClosure( String propertyName, Object propertyValue )</pre>
- *       </code></b>
+ *       <b>
+ *         <code>public BeanPropertyValueChangeClosure(String propertyName, Object propertyValue)</code>
+ *       </b>
  *    </dt>
  *    <dd>
  *       Will create a <code>Closure</code> that will update an object by setting the property
  *       specified by <code>propertyName</code> to the value specified by <code>propertyValue</code>.
  *    </dd>
  * </dl>
  *
- * <p/>
+ * <p>
  * <strong>Note:</strong> Property names can be a simple, nested, indexed, or mapped property as defined by
  * <code>org.apache.commons.beanutils.PropertyUtils</code>.  If any object in the property path
  * specified by <code>propertyName</code> is <code>null</code> then the outcome is based on the
  * value of the <code>ignoreNull</code> attribute.
- *
- * <p/>
+ * </p>
+ * <p>
  * A typical usage might look like:
- * <code><pre>
+ * </p>
+ * <pre>
  * // create the closure
  * BeanPropertyValueChangeClosure closure =
  *    new BeanPropertyValueChangeClosure( "activeEmployee", Boolean.TRUE );
  *
  * // update the Collection
  * CollectionUtils.forAllDo( peopleCollection, closure );
- * </pre></code>
- * <p/>
- *
+ * </pre>
+ * <p>
  * This would take a <code>Collection</code> of person objects and update the
+ * </p>
  * <code>activeEmployee</code> property of each object in the <code>Collection</code> to
  * <code>true</code>. Assuming...
  * <ul>