From 512be5b236c5702ce74089a0902afff3149b50dd Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 1 Jul 2014 15:12:40 +0200
Subject: [PATCH] [#3370] Allow for overriding the class Javadocs for generated
 objects

---
 .../java/org/jooq/util/GenerationTool.java    |   1 -
 .../java/org/jooq/util/JavaGenerator.java     | 236 +++++---
 .../org/jooq/test/utils/h2/H2Generator.java   |  13 +
 jOOQ-test/pom.xml                             | 562 +++++++++---------
 4 files changed, 461 insertions(+), 351 deletions(-)

diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
index 56168684cf..451fd649e4 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
@@ -52,7 +52,6 @@ import java.io.OutputStream;
 import java.io.StringReader;
 import java.sql.Connection;
 import java.sql.Driver;
-import java.sql.DriverManager;
 import java.util.List;
 import java.util.Properties;
 
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
index 8e868a8565..f302e6f312 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
@@ -317,6 +317,7 @@ public class JavaGenerator extends AbstractGenerator {
         printPackage(out, schema);
         printClassJavadoc(out,
             "A class modelling foreign key relationships between tables of the <code>" + schema.getOutputName() + "</code> schema");
+        printClassAnnotations(out);
 
         out.println("public class Keys {");
         out.tab(1).header("IDENTITY definitions");
@@ -540,7 +541,13 @@ public class JavaGenerator extends AbstractGenerator {
 
         JavaWriter out = new JavaWriter(getStrategy().getFile(tableOrUdt, Mode.RECORD));
         printPackage(out, tableOrUdt, Mode.RECORD);
-        printClassJavadoc(out, tableOrUdt);
+
+        if (tableOrUdt instanceof TableDefinition)
+            generateRecordClassJavadoc((TableDefinition) tableOrUdt, out);
+        else
+            generateUDTRecordClassJavadoc((UDTDefinition) tableOrUdt, out);
+
+        printClassAnnotations(out);
         if (tableOrUdt instanceof TableDefinition)
             printTableJPAAnnotation(out, (TableDefinition) tableOrUdt);
 
@@ -776,12 +783,17 @@ public class JavaGenerator extends AbstractGenerator {
 
     /**
      * Subclasses may override this method to provide record class footer code.
-     *
-     * @param table The table
-     * @param out The writer
      */
+    @SuppressWarnings("unused")
     protected void generateRecordClassFooter(TableDefinition table, JavaWriter out) {}
 
+    /**
+     * Subclasses may override this method to provide their own Javadoc.
+     */
+    protected void generateRecordClassJavadoc(TableDefinition table, JavaWriter out) {
+        printClassJavadoc(out, table);
+    }
+
     private final String getRowType(Collection<? extends TypedElementDefinition<?>> columns) {
         StringBuilder result = new StringBuilder();
         String separator = "";
@@ -822,7 +834,12 @@ public class JavaGenerator extends AbstractGenerator {
 
         JavaWriter out = new JavaWriter(getStrategy().getFile(tableOrUDT, Mode.INTERFACE));
         printPackage(out, tableOrUDT, Mode.INTERFACE);
-        printClassJavadoc(out, tableOrUDT);
+        if (tableOrUDT instanceof TableDefinition)
+            generateInterfaceClassJavadoc((TableDefinition) tableOrUDT, out);
+        else
+            generateUDTInterfaceClassJavadoc((UDTDefinition) tableOrUDT, out);
+
+        printClassAnnotations(out);
 
         if (tableOrUDT instanceof TableDefinition)
             printTableJPAAnnotation(out, (TableDefinition) tableOrUDT);
@@ -865,12 +882,10 @@ public class JavaGenerator extends AbstractGenerator {
         }
 
 
-        if (tableOrUDT instanceof TableDefinition) {
+        if (tableOrUDT instanceof TableDefinition)
             generateInterfaceClassFooter((TableDefinition) tableOrUDT, out);
-        }
-        else {
+        else
             generateUDTInterfaceClassFooter((UDTDefinition) tableOrUDT, out);
-        }
 
         out.println("}");
         out.close();
@@ -879,12 +894,17 @@ public class JavaGenerator extends AbstractGenerator {
     /**
      * Subclasses may override this method to provide interface class footer
      * code.
-     *
-     * @param table The table
-     * @param out The writer
      */
+    @SuppressWarnings("unused")
     protected void generateInterfaceClassFooter(TableDefinition table, JavaWriter out) {}
 
+    /**
+     * Subclasses may override this method to provide their own Javadoc.
+     */
+    protected void generateInterfaceClassJavadoc(TableDefinition table, JavaWriter out) {
+        printClassJavadoc(out, table);
+    }
+
     protected void generateUDTs(SchemaDefinition schema) {
         log.info("Generating UDTs");
 
@@ -910,7 +930,8 @@ public class JavaGenerator extends AbstractGenerator {
 
         JavaWriter out = new JavaWriter(getStrategy().getFile(udt));
         printPackage(out, udt);
-        printClassJavadoc(out, udt);
+        generateUDTClassJavadoc(udt, out);
+        printClassAnnotations(out);
 
         // [#799] Oracle UDTs with member procedures have similarities with packages
         if (udt.getRoutines().size() > 0) {
@@ -976,12 +997,17 @@ public class JavaGenerator extends AbstractGenerator {
 
     /**
      * Subclasses may override this method to provide udt class footer code.
-     *
-     * @param udt The udt
-     * @param out The writer
      */
+    @SuppressWarnings("unused")
     protected void generateUDTClassFooter(UDTDefinition udt, JavaWriter out) {}
 
+    /**
+     * Subclasses may override this method to provide their own Javadoc.
+     */
+    protected void generateUDTClassJavadoc(UDTDefinition udt, JavaWriter out) {
+        printClassJavadoc(out, udt);
+    }
+
     protected void generateUDTPojos(SchemaDefinition schema) {
         log.info("Generating UDT POJOs");
 
@@ -999,12 +1025,17 @@ public class JavaGenerator extends AbstractGenerator {
 
     /**
      * Subclasses may override this method to provide UDT POJO class footer code.
-     *
-     * @param udt The UDT
-     * @param out The writer
      */
+    @SuppressWarnings("unused")
     protected void generateUDTPojoClassFooter(UDTDefinition udt, JavaWriter out) {}
 
+    /**
+     * Subclasses may override this method to provide their own Javadoc.
+     */
+    protected void generateUDTPojoClassJavadoc(UDTDefinition udt, JavaWriter out) {
+        printClassJavadoc(out, udt);
+    }
+
     protected void generateUDTInterfaces(SchemaDefinition schema) {
         log.info("Generating UDT interfaces");
 
@@ -1021,12 +1052,17 @@ public class JavaGenerator extends AbstractGenerator {
 
     /**
      * Subclasses may override this method to provide UDT interface class footer code.
-     *
-     * @param udt The UDT
-     * @param out The writer
      */
+    @SuppressWarnings("unused")
     protected void generateUDTInterfaceClassFooter(UDTDefinition udt, JavaWriter out) {}
 
+    /**
+     * Subclasses may override this method to provide their own Javadoc.
+     */
+    protected void generateUDTInterfaceClassJavadoc(UDTDefinition udt, JavaWriter out) {
+        printClassJavadoc(out, udt);
+    }
+
     /**
      * Generating UDT record classes
      */
@@ -1050,12 +1086,17 @@ public class JavaGenerator extends AbstractGenerator {
 
     /**
      * Subclasses may override this method to provide udt record class footer code.
-     *
-     * @param udt The udt
-     * @param out The writer
      */
+    @SuppressWarnings("unused")
     protected void generateUDTRecordClassFooter(UDTDefinition udt, JavaWriter out) {}
 
+    /**
+     * Subclasses may override this method to provide their own Javadoc.
+     */
+    protected void generateUDTRecordClassJavadoc(UDTDefinition udt, JavaWriter out) {
+        printClassJavadoc(out, udt);
+    }
+
     protected void generateUDTRoutines(SchemaDefinition schema) {
         for (UDTDefinition udt : database.getUDTs(schema)) {
             if (udt.getRoutines().size() > 0) {
@@ -1087,6 +1128,7 @@ public class JavaGenerator extends AbstractGenerator {
         JavaWriter out = new JavaWriter(new File(getStrategy().getFile(schema).getParentFile(), "UDTs.java"));
         printPackage(out, schema);
         printClassJavadoc(out, "Convenience access to all UDTs in " + schema.getOutputName());
+        printClassAnnotations(out);
         out.println("public class UDTs {");
 
         for (UDTDefinition udt : database.getUDTs(schema)) {
@@ -1131,7 +1173,8 @@ public class JavaGenerator extends AbstractGenerator {
 
         xxxxxxxxxx xxx x xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxx
-        xxxxxxxxxxxxxxxxxxxxxx xxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxx
+        xxxxxxxxxxxxxxxxxxxxxxxxxxx
 
         xxxxxxxxxxxxxxxxxxx xxxxx xx xxxxxxx xxxxxxxxxxxxxxx xxxxxxxxxx xxxxxx xxx xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxx xxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxx
@@ -1183,12 +1226,17 @@ public class JavaGenerator extends AbstractGenerator {
 
     /**
      * Subclasses may override this method to provide array class footer code.
-     *
-     * @param array The array
-     * @param out The writer
      */
+    @SuppressWarnings("unused")
     protected void generateArrayClassFooter(ArrayDefinition array, JavaWriter out) {}
 
+    /**
+     * Subclasses may override this method to provide their own Javadoc.
+     */
+    protected void generateArrayClassJavadoc(ArrayDefinition array, JavaWriter out) {
+        printClassJavadoc(out, array);
+    }
+
     protected void generateEnums(SchemaDefinition schema) {
         log.info("Generating ENUMs");
 
@@ -1211,7 +1259,8 @@ public class JavaGenerator extends AbstractGenerator {
 
         JavaWriter out = new JavaWriter(getStrategy().getFile(e, Mode.ENUM));
         printPackage(out, e);
-        printClassJavadoc(out, e);
+        generateEnumClassJavadoc(e, out);
+        printClassAnnotations(out);
 
         interfaces.add(EnumType.class.getName());
 
@@ -1266,22 +1315,28 @@ public class JavaGenerator extends AbstractGenerator {
 
     /**
      * Subclasses may override this method to provide enum class footer code.
-     *
-     * @param e The enum
-     * @param out The writer
      */
+    @SuppressWarnings("unused")
     protected void generateEnumClassFooter(EnumDefinition e, JavaWriter out) {}
 
+    /**
+     * Subclasses may override this method to provide their own Javadoc.
+     */
+    protected void generateEnumClassJavadoc(EnumDefinition e, JavaWriter out) {
+        printClassJavadoc(out, e);
+    }
+
     protected void generateRoutines(SchemaDefinition schema) {
         log.info("Generating routines and table-valued functions");
 
-        JavaWriter outR = new JavaWriter(new File(getStrategy().getFile(schema).getParentFile(), "Routines.java"));
-        printPackage(outR, schema);
-        printClassJavadoc(outR, "Convenience access to all stored procedures and functions in " + schema.getOutputName());
+        JavaWriter out = new JavaWriter(new File(getStrategy().getFile(schema).getParentFile(), "Routines.java"));
+        printPackage(out, schema);
+        printClassJavadoc(out, "Convenience access to all stored procedures and functions in " + schema.getOutputName());
+        printClassAnnotations(out);
 
-        outR.println("public class Routines {");
+        out.println("public class Routines {");
         for (RoutineDefinition routine : database.getRoutines(schema)) {
-            printRoutine(outR, routine);
+            printRoutine(out, routine);
 
             try {
                 generateRoutine(schema, routine);
@@ -1292,12 +1347,12 @@ public class JavaGenerator extends AbstractGenerator {
 
         for (TableDefinition table : database.getTables(schema)) {
             if (table.isTableValuedFunction()) {
-                printTableValuedFunction(outR, table);
+                printTableValuedFunction(out, table);
             }
         }
 
-        outR.println("}");
-        outR.close();
+        out.println("}");
+        out.close();
 
         watch.splitInfo("Routines generated");
     }
@@ -1351,7 +1406,8 @@ public class JavaGenerator extends AbstractGenerator {
         // Static convenience methods
         JavaWriter out = new JavaWriter(getStrategy().getFile(pkg));
         printPackage(out, pkg);
-        printClassJavadoc(out, "Convenience access to all stored procedures and functions in " + pkg.getName());
+        generatePackageClassJavadoc(pkg, out);
+        printClassAnnotations(out);
 
         out.println("public class %s extends %s[[before= implements ][%s]] {", className, PackageImpl.class, interfaces);
         out.printSerial();
@@ -1379,12 +1435,17 @@ public class JavaGenerator extends AbstractGenerator {
 
     /**
      * Subclasses may override this method to provide package class footer code.
-     *
-     * @param pkg The package
-     * @param out The writer
      */
+    @SuppressWarnings("unused")
     protected void generatePackageClassFooter(PackageDefinition pkg, JavaWriter out) {}
 
+    /**
+     * Subclasses may override this method to provide their own Javadoc.
+     */
+    protected void generatePackageClassJavadoc(PackageDefinition pkg, JavaWriter out) {
+        printClassJavadoc(out, "Convenience access to all stored procedures and functions in " + pkg.getName());
+    }
+
     /**
      * Generating central static table access
      */
@@ -1394,6 +1455,7 @@ public class JavaGenerator extends AbstractGenerator {
         JavaWriter out = new JavaWriter(new File(getStrategy().getFile(schema).getParentFile(), "Tables.java"));
         printPackage(out, schema);
         printClassJavadoc(out, "Convenience access to all tables in " + schema.getOutputName());
+        printClassAnnotations(out);
         out.println("public class Tables {");
 
         for (TableDefinition table : database.getTables(schema)) {
@@ -1468,7 +1530,8 @@ public class JavaGenerator extends AbstractGenerator {
 
         JavaWriter out = new JavaWriter(getStrategy().getFile(table, Mode.DAO));
         printPackage(out, table, Mode.DAO);
-        printClassJavadoc(out, table);
+        generateDaoClassJavadoc(table, out);
+        printClassAnnotations(out);
 
         out.println("public class %s extends %s<%s, %s, %s> {", className, daoImpl, tableRecord, pType, tType);
 
@@ -1547,12 +1610,17 @@ public class JavaGenerator extends AbstractGenerator {
 
     /**
      * Subclasses may override this method to provide dao class footer code.
-     *
-     * @param table The table
-     * @param out The writer
      */
+    @SuppressWarnings("unused")
     protected void generateDaoClassFooter(TableDefinition table, JavaWriter out) {}
 
+    /**
+     * Subclasses may override this method to provide their own Javadoc.
+     */
+    protected void generateDaoClassJavadoc(TableDefinition table, JavaWriter out) {
+        printClassJavadoc(out, table);
+    }
+
     protected void generatePojos(SchemaDefinition schema) {
         log.info("Generating table POJOs");
 
@@ -1585,7 +1653,13 @@ public class JavaGenerator extends AbstractGenerator {
 
         JavaWriter out = new JavaWriter(getStrategy().getFile(tableOrUDT, Mode.POJO));
         printPackage(out, tableOrUDT, Mode.POJO);
-        printClassJavadoc(out, tableOrUDT);
+
+        if (tableOrUDT instanceof TableDefinition)
+            generatePojoClassJavadoc((TableDefinition) tableOrUDT, out);
+        else
+            generateUDTPojoClassJavadoc((UDTDefinition) tableOrUDT, out);
+
+        printClassAnnotations(out);
 
         if (tableOrUDT instanceof TableDefinition)
             printTableJPAAnnotation(out, (TableDefinition) tableOrUDT);
@@ -1699,12 +1773,10 @@ public class JavaGenerator extends AbstractGenerator {
             printFromAndInto(out, tableOrUDT);
         }
 
-        if (tableOrUDT instanceof TableDefinition) {
+        if (tableOrUDT instanceof TableDefinition)
             generatePojoClassFooter((TableDefinition) tableOrUDT, out);
-        }
-        else {
+        else
             generateUDTPojoClassFooter((UDTDefinition) tableOrUDT, out);
-        }
 
         out.println("}");
         out.close();
@@ -1727,12 +1799,17 @@ public class JavaGenerator extends AbstractGenerator {
 
     /**
      * Subclasses may override this method to provide POJO class footer code.
-     *
-     * @param table The table
-     * @param out The writer
      */
+    @SuppressWarnings("unused")
     protected void generatePojoClassFooter(TableDefinition table, JavaWriter out) {}
 
+    /**
+     * Subclasses may override this method to provide their own Javadoc.
+     */
+    protected void generatePojoClassJavadoc(TableDefinition table, JavaWriter out) {
+        printClassJavadoc(out, table);
+    }
+
     protected void generateTables(SchemaDefinition schema) {
         log.info("Generating tables");
 
@@ -1767,7 +1844,8 @@ public class JavaGenerator extends AbstractGenerator {
 
         JavaWriter out = new JavaWriter(getStrategy().getFile(table));
         printPackage(out, table);
-        printClassJavadoc(out, table);
+        generateTableClassJavadoc(table, out);
+        printClassAnnotations(out);
 
         out.println("public class %s extends %s<%s>[[before= implements ][%s]] {", className, TableImpl.class, recordType, interfaces);
         out.printSerial();
@@ -1999,18 +2077,24 @@ public class JavaGenerator extends AbstractGenerator {
 
     /**
      * Subclasses may override this method to provide table class footer code.
-     *
-     * @param table The table
-     * @param out The writer
      */
+    @SuppressWarnings("unused")
     protected void generateTableClassFooter(TableDefinition table, JavaWriter out) {}
 
+    /**
+     * Subclasses may override this method to provide their own Javadoc.
+     */
+    protected void generateTableClassJavadoc(TableDefinition table, JavaWriter out) {
+        printClassJavadoc(out, table);
+    }
+
     protected void generateSequences(SchemaDefinition schema) {
         log.info("Generating sequences");
 
         JavaWriter out = new JavaWriter(new File(getStrategy().getFile(schema).getParentFile(), "Sequences.java"));
         printPackage(out, schema);
         printClassJavadoc(out, "Convenience access to all sequences in " + schema.getOutputName());
+        printClassAnnotations(out);
         out.println("public class Sequences {");
 
         for (SequenceDefinition sequence : database.getSequences(schema)) {
@@ -2041,7 +2125,8 @@ public class JavaGenerator extends AbstractGenerator {
 
         JavaWriter out = new JavaWriter(getStrategy().getFile(schema));
         printPackage(out, schema);
-        printClassJavadoc(out, schema);
+        generateSchemaClassJavadoc(schema, out);
+        printClassAnnotations(out);
 
         out.println("public class %s extends %s[[before= implements ][%s]] {", className, SchemaImpl.class, interfaces);
         out.printSerial();
@@ -2068,12 +2153,17 @@ public class JavaGenerator extends AbstractGenerator {
 
     /**
      * Subclasses may override this method to provide schema class footer code.
-     *
-     * @param schema The schema
-     * @param out The writer
      */
+    @SuppressWarnings("unused")
     protected void generateSchemaClassFooter(SchemaDefinition schema, JavaWriter out) {}
 
+    /**
+     * Subclasses may override this method to provide their own Javadoc.
+     */
+    protected void generateSchemaClassJavadoc(SchemaDefinition schema, JavaWriter out) {
+        printClassJavadoc(out, schema);
+    }
+
     protected void printFromAndInto(JavaWriter out, TableDefinition table) {
         printFromAndInto(out, (Definition) table);
     }
@@ -2269,7 +2359,8 @@ public class JavaGenerator extends AbstractGenerator {
 
         JavaWriter out = new JavaWriter(getStrategy().getFile(routine));
         printPackage(out, routine);
-        printClassJavadoc(out, routine);
+        generateRoutineClassJavadoc(routine, out);
+        printClassAnnotations(out);
 
         out.println("public class %s extends %s<%s>[[before= implements ][%s]] {", className, AbstractRoutine.class, returnType, interfaces);
         out.printSerial();
@@ -2367,12 +2458,17 @@ public class JavaGenerator extends AbstractGenerator {
 
     /**
      * Subclasses may override this method to provide routine class footer code.
-     *
-     * @param routine The routine
-     * @param out The writer
      */
+    @SuppressWarnings("unused")
     protected void generateRoutineClassFooter(RoutineDefinition routine, JavaWriter out) {}
 
+    /**
+     * Subclasses may override this method to provide their own Javadoc.
+     */
+    protected void generateRoutineClassJavadoc(RoutineDefinition routine, JavaWriter out) {
+        printClassJavadoc(out, routine);
+    }
+
     protected void printConvenienceMethodFunctionAsField(JavaWriter out, RoutineDefinition function, boolean parametersAsField) {
         // [#281] - Java can't handle more than 255 method parameters
         if (function.getInParameters().size() > 254) {
@@ -2683,7 +2779,9 @@ public class JavaGenerator extends AbstractGenerator {
         }
 
         out.println(" */");
+    }
 
+    protected void printClassAnnotations(JavaWriter out) {
         if (generateGeneratedAnnotation()) {
             out.println("@javax.annotation.Generated(value    = { \"http://www.jooq.org\", \"%s\" },", Constants.VERSION);
             out.println("                            comments = \"This class is generated by jOOQ\")");
diff --git a/jOOQ-test-utils/src/main/java/org/jooq/test/utils/h2/H2Generator.java b/jOOQ-test-utils/src/main/java/org/jooq/test/utils/h2/H2Generator.java
index 95438d2a27..ee8a509773 100644
--- a/jOOQ-test-utils/src/main/java/org/jooq/test/utils/h2/H2Generator.java
+++ b/jOOQ-test-utils/src/main/java/org/jooq/test/utils/h2/H2Generator.java
@@ -53,4 +53,17 @@ public class H2Generator extends JavaGenerator {
         out.println();
         out.tab(1).println("// Here, a toString() method could be generated");
     }
+
+    @Override
+    protected void generatePojoClassJavadoc(TableDefinition table, JavaWriter out) {
+        out.println("/**");
+        out.println(" * This is a POJO for table " + table.getOutputName() + ".");
+
+        if (table.getComment() != null && !"".equals(table.getComment())) {
+            out.println(" * <p>");
+            out.println(" * " + table.getComment());
+        }
+
+        out.println(" */");
+    }
 }
diff --git a/jOOQ-test/pom.xml b/jOOQ-test/pom.xml
index c97015ca6e..5e2458c9bb 100644
--- a/jOOQ-test/pom.xml
+++ b/jOOQ-test/pom.xml
@@ -32,7 +32,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
-        
+
         <db.cubrid.version>9.2.0.0155</db.cubrid.version>
         <db.derby.version>10.10.2.0</db.derby.version>
         <db.firebird.version>2.2.5</db.firebird.version>
@@ -42,7 +42,7 @@
         <db.mysql.version>5.1.30</db.mysql.version>
         <db.postgres.version>9.3-1101-jdbc41</db.postgres.version>
         <db.sqlite.version>3.7.15-M1</db.sqlite.version>
-        
+
         <!-- [pro] xxx
         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -52,8 +52,8 @@
         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
         xxxx [/pro] -->
     </properties>
-    
-    
+
+
     <dependencies>
         <dependency>
             <groupId>org.jooq</groupId>
@@ -72,7 +72,7 @@
             <artifactId>jooq-test-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
-    
+
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -98,8 +98,8 @@
             <artifactId>guava</artifactId>
             <version>17.0</version>
         </dependency>
-        
-        
+
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -120,8 +120,8 @@
             <artifactId>jmock-junit4</artifactId>
             <version>2.6.0</version>
         </dependency>
-        
-        
+
+
         <dependency>
             <groupId>javax.persistence</groupId>
             <artifactId>persistence-api</artifactId>
@@ -137,8 +137,8 @@
             <artifactId>connector-api</artifactId>
             <version>1.5</version>
         </dependency>
-        
-        
+
+
         <!-- JDBC drivers -->
         <dependency>
             <groupId>org.apache.derby</groupId>
@@ -219,7 +219,7 @@
             <artifactId>sqlite-jdbc</artifactId>
             <version>${db.sqlite.version}</version>
         </dependency>
-        
+
         <!-- [pro] xxx
         xxxxxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -232,8 +232,8 @@
             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxx
 
-        
-        xxxxxxxxxxxx    
+
+        xxxxxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -263,7 +263,7 @@
         xxxxxxxxxxxxx
         xxxx [/pro] -->
     </dependencies>
-        
+
     <build>
         <plugins>
             <plugin>
@@ -286,11 +286,11 @@
                     </compilerArguments>
                 </configuration>
             </plugin>
-            
+
             <!-- We're using the properties plugin to load external properties into Maven.
                  See this excellent blog post for an explanation:
                  http://www.petrikainulainen.net/programming/tips-and-tricks/creating-profile-specific-configuration-files-with-maven/ -->
-                 
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>properties-maven-plugin</artifactId>
@@ -311,13 +311,13 @@
             </plugin>
         </plugins>
     </build>
-    
-    
+
+
     <!-- Currently, Maven profiles are used instead of a more appropriate mechanism in order to execute only
          *one* run target. Apparently, it is not possible to call single executions like in ant
          Suggestions about how to improve this are very welcome! -->
     <profiles>
-        
+
         <!-- Start Java databases like HSQLDB or Derby -->
         <profile>
             <id>start-hsqldb</id>
@@ -334,7 +334,7 @@
                                 </goals>
                             </execution>
                         </executions>
-                                
+
                         <configuration>
                             <mainClass>org.hsqldb.server.Server</mainClass>
                             <arguments>
@@ -342,7 +342,7 @@
                                 <argument>file:${project.build.directory}/databases/hsqld</argument>
                             </arguments>
                         </configuration>
-                        
+
                         <dependencies>
                             <dependency>
                                 <groupId>org.hsqldb</groupId>
@@ -354,7 +354,7 @@
                 </plugins>
             </build>
         </profile>
-        
+
         <profile>
             <id>start-derby</id>
             <build>
@@ -370,7 +370,7 @@
                                 </goals>
                             </execution>
                         </executions>
-                                
+
                         <configuration>
                             <mainClass>org.apache.derby.iapi.tools.run</mainClass>
                             <arguments>
@@ -378,7 +378,7 @@
                                 <argument>start</argument>
                             </arguments>
                         </configuration>
-                        
+
                         <dependencies>
                             <dependency>
                                 <groupId>org.apache.derby</groupId>
@@ -392,8 +392,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <!-- Code generation profiles -->
         <profile>
             <id>codegen-cubrid</id>
@@ -403,7 +403,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-cubrid</id>
@@ -428,7 +428,7 @@
                                             <excludes>t_book_details</excludes>
                                             <dateAsTimestamp>false</dateAsTimestamp>
                                             <unsignedTypes>true</unsignedTypes>
-                                
+
                                             <customTypes>
                                                 <customType>
                                                     <name>org.jooq.test.all.converters.Boolean_10</name>
@@ -459,7 +459,7 @@
                                                     <converter>org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter</converter>
                                                 </customType>
                                             </customTypes>
-                                
+
                                             <forcedTypes>
                                                 <forcedType>
                                                     <name>BOOLEAN</name>
@@ -469,7 +469,7 @@
                                                     <name>UUID</name>
                                                     <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                                                 </forcedType>
-                                                
+
                                                 <!-- [#2477] Check if unsigned types work correctly -->
                                                 <forcedType>
                                                     <name>TINYINTUNSIGNED</name>
@@ -487,7 +487,7 @@
                                                     <name>BIGINTUNSIGNED</name>
                                                     <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                                                 </forcedType>
-                                
+
                                                 <forcedType>
                                                     <name>org.jooq.test.all.converters.Boolean_YES_NO_LC</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
@@ -547,9 +547,9 @@
                 </plugins>
             </build>
         </profile>
-        
-        
-        
+
+
+
         <profile>
             <id>codegen-cubrid-dba</id>
             <build>
@@ -558,7 +558,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-cubrid</id>
@@ -609,8 +609,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-derby</id>
             <build>
@@ -619,7 +619,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-derby</id>
@@ -646,7 +646,7 @@
                                             <recordVersionFields>REC_VERSION</recordVersionFields>
                                             <recordTimestampFields>REC_TIMESTAMP</recordTimestampFields>
                                             <unsignedTypes>true</unsignedTypes>
-                                
+
                                             <customTypes>
                                                 <customType>
                                                     <name>org.jooq.test.all.converters.Boolean_10</name>
@@ -677,7 +677,7 @@
                                                     <converter>org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter</converter>
                                                 </customType>
                                             </customTypes>
-                                
+
                                             <forcedTypes>
                                                 <forcedType>
                                                     <name>BOOLEAN</name>
@@ -687,7 +687,7 @@
                                                     <name>UUID</name>
                                                     <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                                                 </forcedType>
-                                                
+
                                                 <!-- [#2477] Check if unsigned types work correctly -->
                                                 <forcedType>
                                                     <name>TINYINTUNSIGNED</name>
@@ -705,7 +705,7 @@
                                                     <name>BIGINTUNSIGNED</name>
                                                     <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                                                 </forcedType>
-                                
+
                                                 <forcedType>
                                                     <name>org.jooq.test.all.converters.Boolean_YES_NO_LC</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
@@ -764,8 +764,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-derby-sys</id>
             <build>
@@ -774,7 +774,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-derby-sys</id>
@@ -844,7 +844,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-firebird</id>
@@ -895,7 +895,7 @@
                                                     <name>org.jooq.test.all.converters.OrdinalEnum1</name>
                                                     <converter>org.jooq.test.all.converters.OrdinalEnum1Converter</converter>
                                                 </customType>
-                                
+
                                                 <customType>
                                                     <name>java.util.Date</name>
                                                     <converter>org.jooq.test.all.converters.DateConverter</converter>
@@ -904,7 +904,7 @@
                                                     <name>java.util.GregorianCalendar</name>
                                                     <converter>org.jooq.test.all.converters.CalendarConverter</converter>
                                                 </customType>
-                                
+
                                                 <customType>
                                                     <name>org.jooq.test.all.converters.Boolean_10</name>
                                                     <converter>org.jooq.test.all.converters.Boolean_10_Converter</converter>
@@ -934,7 +934,7 @@
                                                     <converter>org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter</converter>
                                                 </customType>
                                             </customTypes>
-                                
+
                                             <forcedTypes>
                                                 <forcedType>
                                                     <name>org.jooq.test.all.converters.StringEnum</name>
@@ -960,7 +960,7 @@
                                                     <name>java.util.GregorianCalendar</name>
                                                     <expression>(?i:(.*?\.)?T_MAPPED_TYPES.JAVA_UTIL_CALENDAR)</expression>
                                                 </forcedType>
-                                
+
                                                 <forcedType>
                                                     <name>BOOLEAN</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
@@ -969,7 +969,7 @@
                                                     <name>UUID</name>
                                                     <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                                                 </forcedType>
-                                                
+
                                                 <!-- [#2477] Check if unsigned types work correctly -->
                                                 <forcedType>
                                                     <name>TINYINTUNSIGNED</name>
@@ -987,7 +987,7 @@
                                                     <name>BIGINTUNSIGNED</name>
                                                     <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                                                 </forcedType>
-                                
+
                                                 <forcedType>
                                                     <name>org.jooq.test.all.converters.Boolean_YES_NO_LC</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
@@ -1058,7 +1058,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-firebird-rdb</id>
@@ -1125,8 +1125,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-h2</id>
             <build>
@@ -1135,7 +1135,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-h2</id>
@@ -1151,7 +1151,7 @@
                                         <password>${db.h2.password}</password>
                                     </jdbc>
                                     <generator>
-                                        <name>org.jooq.util.DefaultGenerator</name>
+                                        <name>org.jooq.test.utils.h2.H2Generator</name>
                                         <database>
                                             <includes>.*</includes>
                                             <excludes>
@@ -1180,12 +1180,12 @@
                                             <dateAsTimestamp>false</dateAsTimestamp>
                                             <unsignedTypes>true</unsignedTypes>
                                             <inputSchema>${db.h2.schema}</inputSchema>
-                                
+
                                             <customTypes>
                                                 <!-- [#2844] This typo should emit a warning -->
                                                 <customtype>
                                                 </customtype>
-                                                
+
                                                 <customType>
                                                     <name>org.jooq.test.all.converters.Boolean_10</name>
                                                     <converter>org.jooq.test.all.converters.Boolean_10_Converter</converter>
@@ -1215,13 +1215,13 @@
                                                     <converter>org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter</converter>
                                                 </customType>
                                             </customTypes>
-                                
+
                                             <forcedTypes>
                                                 <forcedType>
                                                     <name>BOOLEAN</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                                                 </forcedType>
-                                                
+
                                                 <!-- [#2477] Check if unsigned types work correctly -->
                                                 <forcedType>
                                                     <name>TINYINTUNSIGNED</name>
@@ -1239,7 +1239,7 @@
                                                     <name>BIGINTUNSIGNED</name>
                                                     <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                                                 </forcedType>
-                                
+
                                                 <forcedType>
                                                     <name>org.jooq.test.all.converters.Boolean_YES_NO_LC</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
@@ -1274,11 +1274,11 @@
                                             <!-- [#2294] daos=true should enforce relations=true -->
                                             <relations>false</relations>
                                             <daos>true</daos>
-                                
-                                            <!-- [#1280] daos=true should enforce records=true and pojos=true -->            
+
+                                            <!-- [#1280] daos=true should enforce records=true and pojos=true -->
                                             <records>false</records>
                                             <pojos>false</pojos>
-                                
+
                                             <!-- [#2401] Be sure that excess whitespace is trimmed by JAXB -->
                                             <deprecated>
                                                 true
@@ -1306,7 +1306,7 @@
                                 <artifactId>h2</artifactId>
                                 <version>${db.h2.version}</version>
                             </dependency>
-                            
+
                             <!-- Stored procedures need to be on the classpath -->
                             <dependency>
                                 <groupId>org.jooq</groupId>
@@ -1318,8 +1318,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-h2-jdbc</id>
             <build>
@@ -1328,7 +1328,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-h2-jdbc</id>
@@ -1354,7 +1354,7 @@
                                             <dateAsTimestamp>false</dateAsTimestamp>
                                             <unsignedTypes>true</unsignedTypes>
                                             <inputSchema>${db.h2.schema}</inputSchema>
-                                
+
                                             <customTypes>
                                                 <customType>
                                                     <name>org.jooq.test.all.converters.Boolean_10</name>
@@ -1385,7 +1385,7 @@
                                                     <converter>org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter</converter>
                                                 </customType>
                                             </customTypes>
-                                
+
                                             <forcedTypes>
                                                 <forcedType>
                                                     <name>BOOLEAN</name>
@@ -1395,7 +1395,7 @@
                                                     <name>UUID</name>
                                                     <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                                                 </forcedType>
-                                                
+
                                                 <!-- [#2477] Check if unsigned types work correctly -->
                                                 <forcedType>
                                                     <name>TINYINTUNSIGNED</name>
@@ -1413,7 +1413,7 @@
                                                     <name>BIGINTUNSIGNED</name>
                                                     <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                                                 </forcedType>
-                                
+
                                                 <forcedType>
                                                     <name>org.jooq.test.all.converters.Boolean_YES_NO_LC</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
@@ -1469,7 +1469,7 @@
                                 <artifactId>h2</artifactId>
                                 <version>${db.h2.version}</version>
                             </dependency>
-                            
+
                             <!-- Stored procedures need to be on the classpath -->
                             <dependency>
                                 <groupId>org.jooq</groupId>
@@ -1481,8 +1481,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-h2-matchers</id>
             <build>
@@ -1491,7 +1491,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-h2-matchers</id>
@@ -1522,7 +1522,7 @@
                                                         <schemaImplements>java.lang.Cloneable</schemaImplements>
                                                     </schema>
                                                 </schemas>
-                                            
+
                                                 <tables>
                                                     <!-- The T_BOOK table identifier should be renamed to THE_BOOK -->
                                                     <table>
@@ -1531,12 +1531,12 @@
                                                             <expression>THE_BOOK</expression>
                                                         </tableIdentifier>
                                                     </table>
-                                
+
                                                     <!-- All table classes for *BOOK* tables should germanised
                                                          This should also affect T_BOOK, although T_BOOK's identifier was already renamed above -->
-                                                    <table>                
+                                                    <table>
                                                         <expression>^(.*?)BOOK(.*)$</expression>
-                                    
+
                                                         <tableIdentifier>
                                                             <expression>$1BUCH$2</expression>
                                                         </tableIdentifier>
@@ -1545,26 +1545,26 @@
                                                             <expression>$1BUCH$2</expression>
                                                         </tableClass>
                                                         <tableImplements>java.io.Serializable, java.lang.Cloneable</tableImplements>
-                                                        
+
                                                         <recordClass>
                                                             <transform>PASCAL</transform>
                                                             <expression>$1BUCH$2_RECORD</expression>
                                                         </recordClass>
                                                         <recordImplements>java.io.Serializable, java.lang.Cloneable</recordImplements>
-                                                        
+
                                                         <pojoClass>
                                                             <transform>UPPER</transform>
                                                             <expression>$1BUCH$2</expression>
                                                         </pojoClass>
                                                         <pojoImplements>java.io.Serializable, java.lang.Cloneable</pojoImplements>
-                                                        
+
                                                         <daoClass>
                                                             <transform>UPPER</transform>
                                                             <expression>$1BUCH$2_DAO</expression>
                                                         </daoClass>
                                                         <daoExtends>java.lang.Object</daoExtends>
                                                         <daoImplements>java.io.Serializable, java.lang.Cloneable</daoImplements>
-                                                        
+
                                                         <interfaceClass>
                                                             <transform>LOWER</transform>
                                                             <expression>I_$1BUCH$2</expression>
@@ -1572,14 +1572,14 @@
                                                         <interfaceImplements>java.io.Serializable, java.lang.Cloneable</interfaceImplements>
                                                     </table>
                                                 </tables>
-                                                
-                                                <!-- Some fields are also tampered with -->                
+
+                                                <!-- Some fields are also tampered with -->
                                                 <fields>
                                                     <field>
                                                         <expression>TITLE</expression>
-                                                    
+
                                                         <fieldIdentifier>
-                                                            <expression>THE_TITLE</expression>                        
+                                                            <expression>THE_TITLE</expression>
                                                         </fieldIdentifier>
                                                         <fieldMember>
                                                             <expression>the__title</expression>
@@ -1592,14 +1592,14 @@
                                                         </fieldGetter>
                                                     </field>
                                                 </fields>
-                                                
+
                                                 <!-- And some routines -->
                                                 <routines>
                                                     <routine>
                                                         <expression>
                                                             F_ONE
                                                         </expression>
-                                                        
+
                                                         <routineClass>
                                                             <expression>F_ONE_FUNCTION</expression>
                                                         </routineClass>
@@ -1609,7 +1609,7 @@
                                                         <routineImplements>java.io.Serializable, java.lang.Cloneable</routineImplements>
                                                     </routine>
                                                 </routines>
-                                                
+
                                                 <sequences>
                                                     <sequence>
                                                         <sequenceIdentifier>
@@ -1629,7 +1629,7 @@
                                             <dateAsTimestamp>false</dateAsTimestamp>
                                             <unsignedTypes>true</unsignedTypes>
                                             <inputSchema>PUBLIC</inputSchema>
-                                
+
                                             <customTypes>
                                                 <customType>
                                                     <name>org.jooq.test.all.converters.Boolean_10</name>
@@ -1660,13 +1660,13 @@
                                                     <converter>org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter</converter>
                                                 </customType>
                                             </customTypes>
-                                
+
                                             <forcedTypes>
                                                 <forcedType>
                                                     <name>BOOLEAN</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                                                 </forcedType>
-                                                
+
                                                 <!-- [#2477] Check if unsigned types work correctly -->
                                                 <forcedType>
                                                     <name>TINYINTUNSIGNED</name>
@@ -1684,7 +1684,7 @@
                                                     <name>BIGINTUNSIGNED</name>
                                                     <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                                                 </forcedType>
-                                
+
                                                 <forcedType>
                                                     <name>org.jooq.test.all.converters.Boolean_YES_NO_LC</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
@@ -1719,11 +1719,11 @@
                                             <!-- [#2294] daos=true should enforce relations=true -->
                                             <relations>false</relations>
                                             <daos>true</daos>
-                                
-                                            <!-- [#1280] daos=true should enforce records=true and pojos=true -->            
+
+                                            <!-- [#1280] daos=true should enforce records=true and pojos=true -->
                                             <records>false</records>
                                             <pojos>false</pojos>
-                                
+
                                             <!-- [#2401] Be sure that excess whitespace is trimmed by JAXB -->
                                             <deprecated>
                                                 true
@@ -1753,7 +1753,7 @@
                                 <artifactId>h2</artifactId>
                                 <version>${db.h2.version}</version>
                             </dependency>
-                            
+
                             <!-- Stored procedures need to be on the classpath -->
                             <dependency>
                                 <groupId>org.jooq</groupId>
@@ -1765,8 +1765,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-h2-information-schema</id>
             <build>
@@ -1775,7 +1775,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-h2-information-schema</id>
@@ -1829,7 +1829,7 @@
                                 <artifactId>h2</artifactId>
                                 <version>${db.h2.version}</version>
                             </dependency>
-                            
+
                             <!-- Stored procedures need to be on the classpath -->
                             <dependency>
                                 <groupId>org.jooq</groupId>
@@ -1841,8 +1841,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-hsqldb</id>
             <build>
@@ -1851,7 +1851,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-hsqldb</id>
@@ -1902,7 +1902,7 @@
                                                     <name>org.jooq.test.all.converters.OrdinalEnum1</name>
                                                     <converter>org.jooq.test.all.converters.OrdinalEnum1Converter</converter>
                                                 </customType>
-                                
+
                                                 <customType>
                                                     <name>java.util.Date</name>
                                                     <converter>org.jooq.test.all.converters.DateConverter</converter>
@@ -1911,7 +1911,7 @@
                                                     <name>java.util.GregorianCalendar</name>
                                                     <converter>org.jooq.test.all.converters.CalendarConverter</converter>
                                                 </customType>
-                                
+
                                                 <customType>
                                                     <name>org.jooq.test.all.converters.Boolean_10</name>
                                                     <converter>org.jooq.test.all.converters.Boolean_10_Converter</converter>
@@ -1941,7 +1941,7 @@
                                                     <converter>org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter</converter>
                                                 </customType>
                                             </customTypes>
-                                
+
                                             <forcedTypes>
                                                 <forcedType>
                                                     <name>org.jooq.test.all.converters.StringEnum</name>
@@ -1967,7 +1967,7 @@
                                                     <name>java.util.GregorianCalendar</name>
                                                     <expression>(?i:(.*?\.)?T_MAPPED_TYPES.JAVA_UTIL_CALENDAR)</expression>
                                                 </forcedType>
-                                
+
                                                 <forcedType>
                                                     <name>BOOLEAN</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
@@ -1976,7 +1976,7 @@
                                                     <name>UUID</name>
                                                     <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                                                 </forcedType>
-                                                
+
                                                 <!-- [#2477] Check if unsigned types work correctly -->
                                                 <forcedType>
                                                     <name>TINYINTUNSIGNED</name>
@@ -1994,7 +1994,7 @@
                                                     <name>BIGINTUNSIGNED</name>
                                                     <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                                                 </forcedType>
-                                
+
                                                 <forcedType>
                                                     <name>org.jooq.test.all.converters.Boolean_YES_NO_LC</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
@@ -2054,8 +2054,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-hsqldb-information-schema</id>
             <build>
@@ -2064,7 +2064,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-hsqldb-information-schema</id>
@@ -2131,8 +2131,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-mysql</id>
             <build>
@@ -2141,7 +2141,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-mysql</id>
@@ -2165,7 +2165,7 @@
                                             <excludes>t_book_details</excludes>
                                             <dateAsTimestamp>false</dateAsTimestamp>
                                             <unsignedTypes>true</unsignedTypes>
-                                
+
                                             <customTypes>
                                                 <customType>
                                                     <name>org.jooq.test.all.converters.Boolean_10</name>
@@ -2200,7 +2200,7 @@
                                                     <converter>org.jooq.test.all.converters.UUIDBinaryConverter</converter>
                                                 </customType>
                                             </customTypes>
-                                
+
                                            <forcedTypes>
                                                 <forcedType>
                                                     <name>BOOLEAN</name>
@@ -2210,7 +2210,7 @@
                                                     <name>java.util.UUID</name>
                                                     <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                                                 </forcedType>
-                                
+
                                                 <forcedType>
                                                     <name>org.jooq.test.all.converters.Boolean_YES_NO_LC</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
@@ -2271,8 +2271,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-mysql-schema-rewrite</id>
             <build>
@@ -2281,7 +2281,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-mysql-schema-rewrite</id>
@@ -2307,7 +2307,7 @@
                                             <unsignedTypes>true</unsignedTypes>
                                             <inputSchema>${db.mysql.schema}</inputSchema>
                                             <outputSchema>${db.mysql.schema}2</outputSchema>
-                                
+
                                             <customTypes>
                                                 <customType>
                                                     <name>org.jooq.test.all.converters.Boolean_10</name>
@@ -2342,7 +2342,7 @@
                                                     <converter>org.jooq.test.all.converters.UUIDBinaryConverter</converter>
                                                 </customType>
                                             </customTypes>
-                                
+
                                             <forcedTypes>
                                                 <forcedType>
                                                     <name>BOOLEAN</name>
@@ -2352,7 +2352,7 @@
                                                     <name>java.util.UUID</name>
                                                     <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                                                 </forcedType>
-                                
+
                                                 <forcedType>
                                                     <name>org.jooq.test.all.converters.Boolean_YES_NO_LC</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
@@ -2411,8 +2411,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-mysql-information-schema</id>
             <build>
@@ -2421,7 +2421,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-mysql-information-schema</id>
@@ -2480,8 +2480,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-mysql-mysql</id>
             <build>
@@ -2490,7 +2490,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-mysql-mysql</id>
@@ -2549,8 +2549,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-mariadb</id>
             <build>
@@ -2559,7 +2559,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-mariadb</id>
@@ -2583,7 +2583,7 @@
                                             <excludes>t_book_details</excludes>
                                             <dateAsTimestamp>false</dateAsTimestamp>
                                             <unsignedTypes>true</unsignedTypes>
-                                
+
                                             <customTypes>
                                                 <customType>
                                                     <name>org.jooq.test.all.converters.Boolean_10</name>
@@ -2618,7 +2618,7 @@
                                                     <converter>org.jooq.test.all.converters.UUIDBinaryConverter</converter>
                                                 </customType>
                                             </customTypes>
-                                
+
                                            <forcedTypes>
                                                 <forcedType>
                                                     <name>BOOLEAN</name>
@@ -2628,7 +2628,7 @@
                                                     <name>java.util.UUID</name>
                                                     <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                                                 </forcedType>
-                                
+
                                                 <forcedType>
                                                     <name>org.jooq.test.all.converters.Boolean_YES_NO_LC</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
@@ -2689,8 +2689,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-postgres</id>
             <build>
@@ -2699,7 +2699,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-postgres</id>
@@ -2723,14 +2723,14 @@
                                                 <fields>
                                                     <field>
                                                         <expression>(?i:(.*?.)?T_2781\.(.*))</expression>
-                                                        
+
                                                         <fieldIdentifier>
                                                             <transform>LOWER</transform>
                                                             <expression>$2</expression>
                                                         </fieldIdentifier>
                                                     </field>
                                                 </fields>
-                                            </matchers>        
+                                            </matchers>
                                         </strategy>
                                         <database>
                                             <name>org.jooq.util.postgres.PostgresDatabase</name>
@@ -2754,7 +2754,7 @@
                                                     <type>java.lang.Integer</type>
                                                     <converter>org.jooq.test.all.converters.T_3111_Bool2Converter</converter>
                                                 </customType>
-                                            
+
                                                 <customType>
                                                     <name>B10</name>
                                                     <type>org.jooq.test.all.converters.Boolean_10</type>
@@ -2784,7 +2784,7 @@
                                                     <name>org.jooq.test.all.converters.Boolean_YES_NO_UC</name>
                                                     <converter>org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter</converter>
                                                 </customType>
-                                                
+
                                                 <customType>
                                                     <name>StringArrayToStringList</name>
                                                     <type>java.util.List&lt;java.lang.String></type>
@@ -2801,9 +2801,9 @@
                                                     <converter>org.jooq.test.all.converters.StringArrayToDateListConverter</converter>
                                                 </customType>
                                             </customTypes>
-                                
+
                                             <forcedTypes>
-                                            
+
                                                 <!-- [#3111] Several forced types should be able to map to the same U type -->
                                                 <forcedType>
                                                     <name>3111_INVERSE</name>
@@ -2817,13 +2817,13 @@
                                                     <name>3111_BOOL2</name>
                                                     <expression>(?i:(.*?\.)?T_3111\.BOOL2)</expression>
                                                 </forcedType>
-                                            
-                                                
+
+
                                                 <forcedType>
                                                     <name>BOOLEAN</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                                                 </forcedType>
-                                                
+
                                                 <!-- [#2477] Check if unsigned types work correctly -->
                                                 <forcedType>
                                                     <name>TINYINTUNSIGNED</name>
@@ -2841,7 +2841,7 @@
                                                     <name>BIGINTUNSIGNED</name>
                                                     <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                                                 </forcedType>
-                                
+
                                                 <forcedType>
                                                     <name>org.jooq.test.all.converters.Boolean_YES_NO_LC</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
@@ -2870,8 +2870,8 @@
                                                     <name>B10</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
                                                 </forcedType>
-                                                
-                                                <!-- [#3310] Re-enable this, when it is fixed 
+
+                                                <!-- [#3310] Re-enable this, when it is fixed
                                                 <forcedType>
                                                     <name>StringArrayToStringList</name>
                                                     <expression>(?i:(.*?.)?t_arrays\.string_list)</expression>
@@ -2917,8 +2917,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-postgres-information-schema</id>
             <build>
@@ -2927,7 +2927,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-postgres-information-schema</id>
@@ -2987,8 +2987,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-postgres-pg-catalog</id>
             <build>
@@ -2997,7 +2997,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-postgres-pg-catalog</id>
@@ -3057,8 +3057,8 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <profile>
             <id>codegen-sqlite</id>
             <build>
@@ -3067,7 +3067,7 @@
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-codegen-maven</artifactId>
                         <version>${jooq.version}</version>
-        
+
                         <executions>
                             <execution>
                                 <id>generate-sqlite</id>
@@ -3092,7 +3092,7 @@
                                             <excludes>t_book_details|sqlite_sequence</excludes>
                                             <dateAsTimestamp>false</dateAsTimestamp>
                                             <unsignedTypes>true</unsignedTypes>
-                                
+
                                             <customTypes>
                                                 <customType>
                                                     <name>org.jooq.test.all.converters.Boolean_10</name>
@@ -3123,7 +3123,7 @@
                                                     <converter>org.jooq.test.all.converters.Boolean_YES_NO_UC_Converter</converter>
                                                 </customType>
                                             </customTypes>
-                                
+
                                             <forcedTypes>
                                                 <forcedType>
                                                     <name>BOOLEAN</name>
@@ -3133,7 +3133,7 @@
                                                     <name>UUID</name>
                                                     <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                                                 </forcedType>
-                                                
+
                                                 <!-- [#2477] Check if unsigned types work correctly -->
                                                 <forcedType>
                                                     <name>TINYINTUNSIGNED</name>
@@ -3151,7 +3151,7 @@
                                                     <name>BIGINTUNSIGNED</name>
                                                     <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                                                 </forcedType>
-                                
+
                                                 <forcedType>
                                                     <name>org.jooq.test.all.converters.Boolean_YES_NO_LC</name>
                                                     <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
@@ -3210,13 +3210,13 @@
                 </plugins>
             </build>
         </profile>
-        
-        
+
+
         <!-- [pro] xxx
-        
+
         xxxx xxx xx xxxxxx xxxxxxxxx xxxxxx xxxx xxxxx xx xx xxx xxx xxx
         xxxxxxxxx
-        
+
             xxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxx
                 xxxxxxxxx
@@ -3224,7 +3224,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxx
@@ -3232,7 +3232,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3249,7 +3249,7 @@
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3284,9 +3284,9 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
                                             xxxxxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
-                                            
+
                                                 xxxx xxxx xx xxx xxxxxxx xxxx xxxxx xxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxx
@@ -3324,9 +3324,9 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                
-                                
-                                                
+
+
+
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3335,7 +3335,7 @@
                                                     xxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                                
+
                                                 xxxx xxxxxxx xxxxx xx xxxxxxxx xxxxx xxxx xxxxxxxxx xxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3353,7 +3353,7 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                
+
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3403,8 +3403,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-      
+
+
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxx
             xxxxxxx
@@ -3413,7 +3413,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxx
@@ -3421,7 +3421,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3438,7 +3438,7 @@
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3469,13 +3469,13 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
                                             xxxxxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                                
+
                                                 xxxx xxxxxxx xxxxx xx xxxxxxxx xxxxx xxxx xxxxxxxxx xxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3493,7 +3493,7 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                
+
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3551,8 +3551,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-      
+
+
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxx
@@ -3561,7 +3561,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3569,7 +3569,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3621,8 +3621,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-      
+
+
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxx
             xxxxxxx
@@ -3631,7 +3631,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxx
@@ -3639,7 +3639,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3656,7 +3656,7 @@
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3687,7 +3687,7 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
                                             xxxxxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxx
@@ -3697,7 +3697,7 @@
                                                     xxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                                
+
                                                 xxxx xxxxxxx xxxxx xx xxxxxxxx xxxxx xxxx xxxxxxxxx xxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3715,7 +3715,7 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                
+
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3763,7 +3763,7 @@
                             xxxxxxxxxxxx
                         xxxxxxxxxxxxx
                         xxxxxxxxxxxxxx
-                            xxxxxxxxxxxx    
+                            xxxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3775,8 +3775,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-        
+
+
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxx
@@ -3785,7 +3785,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3793,7 +3793,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3835,7 +3835,7 @@
                             xxxxxxxxxxxx
                         xxxxxxxxxxxxx
                         xxxxxxxxxxxxxx
-                            xxxxxxxxxxxx    
+                            xxxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3847,8 +3847,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-        
+
+
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxx
@@ -3857,7 +3857,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxx
@@ -3865,7 +3865,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3882,7 +3882,7 @@
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3913,7 +3913,7 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
                                             xxxxxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxx
@@ -3923,7 +3923,7 @@
                                                     xxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                                
+
                                                 xxxx xxxxxxx xxxxx xx xxxxxxxx xxxxx xxxx xxxxxxxxx xxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3941,7 +3941,7 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                
+
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4000,8 +4000,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-        
+
+
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxx
@@ -4010,7 +4010,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4018,7 +4018,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4070,8 +4070,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-        
+
+
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxx
@@ -4080,7 +4080,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxx
@@ -4088,7 +4088,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4114,7 +4114,7 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxx
                                             xxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4145,7 +4145,7 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
                                             xxxxxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxx
@@ -4155,7 +4155,7 @@
                                                     xxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                                
+
                                                 xxxx xxxxxxx xxxxx xx xxxxxxxx xxxxx xxxx xxxxxxxxx xxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4173,7 +4173,7 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                
+
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4235,8 +4235,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-        
+
+
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxx
@@ -4245,7 +4245,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4253,7 +4253,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4276,7 +4276,7 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxx
                                             xxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4307,7 +4307,7 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
                                             xxxxxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxx
@@ -4317,7 +4317,7 @@
                                                     xxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                
+
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4380,8 +4380,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-        
+
+
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxx
@@ -4390,7 +4390,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4398,7 +4398,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4436,7 +4436,7 @@
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                             xxxxxxxxxxxxxxxxxxxxxxx
                                             xxxxxxxxxxxxxxxxxxx
-                                            xxxx 
+                                            xxxx
                                             xxxxxxx xxxx xxxxxxxxx xxxxxxxxx xxxxxxxxx xxxxxxx xx xxxxxxxxxx xxx xxx xxxxx xxxx xxxxxxxx xxx xxxxxxxxxxxxx xxx xxxxxxxxx
                                              xxx
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4458,7 +4458,7 @@
                                 xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                             xxxxxxxxxxxxx
-                            
+
                             xxxx xxxxxxxxxx xxx xx xxxx xxx
                             xxxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4470,8 +4470,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-        
+
+
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxx
@@ -4480,7 +4480,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4488,7 +4488,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4513,7 +4513,7 @@
                                             xxxxxxxxxxx
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-                                
+
                                             xxxx xxxxxxx xxx xxxxxxxxx xxxxxx xxxxx xxxx xxxxxxxxxxxxxxx xxx
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
@@ -4521,7 +4521,7 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
                                             xxxxxxxxxxxxxx
-                                
+
                                             xxxx xxxxxxx xxxxx xxxxxxxxx xxxxxx xxxxx xxxx xxxxxxxx xxxxxxx xxx
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
@@ -4554,7 +4554,7 @@
                                 xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                             xxxxxxxxxxxxx
-                            
+
                             xxxx xxxxxxxxxx xxx xx xxxx xxx
                             xxxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4566,8 +4566,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-        
+
+
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxx
@@ -4576,7 +4576,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4584,7 +4584,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4638,8 +4638,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-        
+
+
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxx
@@ -4648,7 +4648,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4656,7 +4656,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4704,14 +4704,14 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
                                             xxxxxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                
-                                                xxxx 
+
+                                                xxxx
                                                   xxxxxxx xxx xxxx xxxxxxxxxxxxxxx xxxx xxxxx
                                                   xxx
                                                 xxxxxxxxxxxx
@@ -4728,8 +4728,8 @@
                                                     xxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                
-                                                xxxx 
+
+                                                xxxx
                                                   xxxxxx xxx xxxxxx xxxxxxx xxxxxxx xxxx xxxxx
                                                   xxxxxxxxx xxxxxxxx x xxxxxx xxxxxxx
                                                   xxx
@@ -4737,7 +4737,7 @@
                                                     xxxxxxxxxxxx xxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                                                
+
                                                 xxxx xxxxxxx xxxxx xx xxxxxxxx xxxxx xxxx xxxxxxxxx xxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4755,7 +4755,7 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                                
+
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4814,8 +4814,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-        
+
+
         xxxx xxx xxx xxxxxx xxxxxxxxxxxxxxxxxx xx xxxx xxxxxxx xx xxxx xx xxxxxxx xxxxx xxxxx xxxxx xxxxxxxx xxx
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4825,7 +4825,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4884,8 +4884,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-        
+
+
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxx
@@ -4894,7 +4894,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxx
@@ -4902,7 +4902,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4920,7 +4920,7 @@
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4951,14 +4951,14 @@
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
                                             xxxxxxxxxxxxxx
-                                
+
                                             xxxxxxxxxxxxx
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                                
-                                                xxxx 
+
+                                                xxxx
                                                   xxxxxx xxxxxx xxx xxxxxxxx xxxxxxx xxxxxxx xxxx xxxxx
                                                   xxxxxxxxx xxxxxxxx x xxxxxx xxxxxxx
                                                   xxx
@@ -4966,7 +4966,7 @@
                                                     xxxxxxxxxxxx xxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                 xxxxxxxxxxxxx
-                                
+
                                                 xxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                                     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -5024,8 +5024,8 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
-        
-        
+
+
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxx
@@ -5034,7 +5034,7 @@
                         xxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        
+
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -5042,7 +5042,7 @@
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxx
-        
+
                                 xxxxxxxxxxxxxxx
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -5097,6 +5097,6 @@
             xxxxxxxx
         xxxxxxxxxx
         xxxx [/pro] -->
-        
+
     </profiles>
 </project>
\ No newline at end of file