Fix building of documentation

h2/src/main/org/h2/engine/MetaRecord.java

@@ -24,6 +24,14 @@ public class MetaRecord implements Comparable<MetaRecord> {
     private final int objectType;
     private final String sql;
 
+    /**
+     * Copy metadata from the specified object into specified search row.
+     *
+     * @param obj
+     *            database object
+     * @param r
+     *            search row
+     */
     public static void populateRowFromDBObject(DbObject obj, SearchRow r) {
         r.setValue(0, ValueInt.get(obj.getId()));
         r.setValue(1, ValueInt.get(0));

h2/src/main/org/h2/message/DbException.java

@@ -311,7 +311,8 @@ public class DbException extends RuntimeException {
             return get(ErrorCode.GENERAL_ERROR_1, e, e.toString());
         } catch (Throwable ex) {
             try {
-                DbException dbException = new DbException(new SQLException("GeneralError", "HY000", ErrorCode.GENERAL_ERROR_1, e));
+                DbException dbException = new DbException(
+                        new SQLException("GeneralError", "HY000", ErrorCode.GENERAL_ERROR_1, e));
                 dbException.addSuppressed(ex);
                 return dbException;
             } catch (OutOfMemoryError ignore) {

h2/src/main/org/h2/mvstore/tx/TxDecisionMaker.java

@@ -49,16 +49,19 @@ public abstract class TxDecisionMaker extends MVMap.DecisionMaker<VersionedValue
             // because a tree root has definitely been changed.
             logIt(existingValue.value == null ? null : VersionedValue.getInstance(existingValue.value));
             decision = MVMap.Decision.PUT;
-        } else if(fetchTransaction(blockingId) != null) {
-            // this entry comes from a different transaction, and this transaction is not committed yet
+        } else if (fetchTransaction(blockingId) != null) {
+            // this entry comes from a different transaction, and this
+            // transaction is not committed yet
             // should wait on blockingTransaction that was determined earlier
             decision = MVMap.Decision.ABORT;
-        } else if(id == lastOperationId) {
-            // There is no transaction with that id, so we've retried it just before,
-            // but map root has not changed (which must be the case if we just missed a closed transaction),
-            // therefore we came back here again.
-            // Now we assume it's a leftover after unclean shutdown (map update was written but not undo log),
-            // and will effectively roll it back (just overwrite).
+        } else if (id == lastOperationId) {
+            // There is no transaction with that id, so we've retried it just
+            // before, but map root has not changed (which must be the case if
+            // we just missed a closed transaction), therefore we came back here
+            // again.
+            // Now we assume it's a leftover after unclean shutdown (map update
+            // was written but not undo log), and will effectively roll it back
+            // (just overwrite).
             Object committedValue = existingValue.getCommittedValue();
             logIt(committedValue == null ? null : VersionedValue.getInstance(committedValue));
             decision = MVMap.Decision.PUT;

h2/src/main/org/h2/security/auth/H2AuthConfig.java

@@ -22,7 +22,7 @@ public class H2AuthConfig {
     public void setAllowUserRegistration(boolean allowUserRegistration) {
         this.allowUserRegistration = allowUserRegistration;
     }
-    
+
     boolean createMissingRoles=true;
 
     public boolean isCreateMissingRoles() {

h2/src/main/org/h2/security/auth/H2AuthConfigXml.java

@@ -58,7 +58,7 @@ public class H2AuthConfigXml extends DefaultHandler{
         default:
             throw new SAXException("unexpected element "+qName);
         }
-        
+
     }
 
     @Override
@@ -74,7 +74,7 @@ public class H2AuthConfigXml extends DefaultHandler{
             throw new SAXException("missing attribute "+attributeName);
         }
         return attributeValue;
-        
+
     }
 
     static String getAttributeValueOr(String attributeName, Attributes attributes, String defaultValue) {
@@ -90,7 +90,7 @@ public class H2AuthConfigXml extends DefaultHandler{
     }
 
     /**
-     * Parse the xml 
+     * Parse the xml
      * @param url
      * @return
      * @throws Exception
@@ -102,7 +102,7 @@ public class H2AuthConfigXml extends DefaultHandler{
     }
 
     public static H2AuthConfig parseFrom(InputStream inputStream) throws Exception{
-        SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();        
+        SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
         H2AuthConfigXml xmlHandler = new H2AuthConfigXml();
         saxParser.parse(inputStream,xmlHandler);
         return xmlHandler.getResult();

h2/src/main/org/h2/security/auth/HasConfigProperties.java

@@ -7,6 +7,9 @@ package org.h2.security.auth;
 
 import java.util.List;
 
+/**
+ * Interface for objects with configuration properties.
+ */
 public interface HasConfigProperties {
     List<PropertyConfig> getProperties();
 }

h2/src/main/org/h2/security/auth/RealmConfig.java

@@ -8,7 +8,10 @@ package org.h2.security.auth;
 import java.util.ArrayList;
 import java.util.List;
 
-public class RealmConfig implements HasConfigProperties{
+/**
+ * Configuration for authentication realm.
+ */
+public class RealmConfig implements HasConfigProperties {
 
     private String name;
 
@@ -32,6 +35,7 @@ public class RealmConfig implements HasConfigProperties{
 
     List<PropertyConfig> properties;
 
+    @Override
     public List<PropertyConfig> getProperties() {
         if (properties == null) {
             properties = new ArrayList<>();

h2/src/main/org/h2/security/auth/UserToRolesMapperConfig.java

@@ -8,7 +8,10 @@ package org.h2.security.auth;
 import java.util.ArrayList;
 import java.util.List;
 
-public class UserToRolesMapperConfig implements HasConfigProperties{
+/**
+ * Configuration for class that maps users to their roles.
+ */
+public class UserToRolesMapperConfig implements HasConfigProperties {
 
     private String className;
 
@@ -22,6 +25,7 @@ public class UserToRolesMapperConfig implements HasConfigProperties{
         this.className = className;
     }
 
+    @Override
     public List<PropertyConfig> getProperties() {
         if (properties == null) {
             properties = new ArrayList<>();

h2/src/test/org/h2/test/TestAll.java

@@ -889,7 +889,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
      */
     private void testAdditional() {
         if (networked) {
-            throw new RuntimeException("testAditional() is not allowed in networked mode");
+            throw new RuntimeException("testAdditional() is not allowed in networked mode");
         }
 
         addTest(new TestMVTableEngine());

h2/src/test/org/h2/test/auth/TestAuthentication.java

@@ -278,7 +278,7 @@ public class TestAuthentication extends TestBase {
         }
         testExternalUser();
     }
-    
+
     static final String TESTXML="<h2Auth allowUserRegistration=\"true\" createMissingRoles=\"false\">"
             + "<realm name=\"ciao\" validatorClass=\"myclass\"/>"
             + "<realm name=\"miao\" validatorClass=\"myclass1\">"
@@ -288,7 +288,7 @@ public class TestAuthentication extends TestBase {
             + "</userToRolesMapper>"
             + "</realm>"
             + "</h2Auth>";
-    
+
     protected void testXmlConfig() throws Exception {
         ByteArrayInputStream inputStream = new ByteArrayInputStream(TESTXML.getBytes());
         H2AuthConfig config = H2AuthConfigXml.parseFrom(inputStream);

h2/src/test/org/h2/test/store/TestTransactionStore.java

@@ -421,9 +421,9 @@ public class TestTransactionStore extends TestBase {
         }
     }
 
-    private boolean hasDataUndoLog(MVStore s) {
+    private static boolean hasDataUndoLog(MVStore s) {
         for (int i = 0; i < 255; i++) {
-            if(s.hasData(TransactionStore.getUndoLogName(true, 1))) {
+            if (s.hasData(TransactionStore.getUndoLogName(true, 1))) {
                 return true;
             }
         }

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -783,3 +783,4 @@ intentionally authenticator authrealm ventura credentials alessandro validator a
 ewkt ewkb informations authzpwd realms mappers jaxb realmname configurationfile unmarshal jaas externals customize
 authenticators appname interrogate metatable barrier preliminary staticuser staticpassword unregistered inquiry
 ldapexample remoteuser assignments djava validators mock relate mapid tighten
+retried helpers unclean missed parsers sax myclass suppose mandatory testxml miao ciao