Fix object answer. Improve sample

PierreAdam · PierreAdam · commit f87ff8872cb6 · 2025-03-17T16:30:55.000+01:00
Signed-off-by: Pierre Adam &lt;p.adam@merim-groupe.com&gt;
diff --git a/core/pom.xml b/core/pom.xml
@@ -1,5 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+  ~ The MIT License (MIT)
+  ~
+  ~ Copyright (c) 2025 Pierre Adam
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  -->
+
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/core/src/main/java/com/github/PierreAdam/javadatatables/core/implementations/SimpleDataTables.java b/core/src/main/java/com/github/PierreAdam/javadatatables/core/implementations/SimpleDataTables.java
@@ -202,19 +202,26 @@ public JsonNode getAjaxResult(final Parameters parameters, final C context) {
         return this.objectMapper.valueToTree(result);
     }
 
+    /**
+     * Use object answer boolean.
+     *
+     * @param parameters the parameters
+     * @return the boolean
+     */
     private boolean useObjectAnswer(final Parameters parameters) {
         for (final Column column : parameters.getColumns()) {
             if (column.getData() != null) {
                 try {
                     Long.parseLong(column.getData());
-                    return false;
                 } catch (final NumberFormatException ignore) {
+                    return true;
                     // Not a number, continue checking
                 }
             }
         }
 
-        return true;
+        // All the column are using numbers. We can use non-object answer.
+        return false;
     }
 
     /**
@@ -315,7 +322,7 @@ protected ArrayNode objectToArrayNode(final E entity, final Parameters parameter
         final ArrayNode data = this.objectMapper.createArrayNode();
 
         parameters.getOrderedColumns().forEach(column -> {
-            if (column == null) {
+            if (column == null || column.getSafeName() == null) {
                 data.addNull();
             } else {
                 final Optional<BiFunction<E, C, String>> optionalDisplaySupplier = this.field(column.getSafeName()).getDisplaySupplier();
@@ -346,10 +353,12 @@ protected ObjectNode objectToObjectNode(final E entity, final Parameters paramet
             final String columnName = column.getSafeName();
             final Optional<BiFunction<E, C, String>> optionalDisplaySupplier = this.field(columnName).getDisplaySupplier();
 
-            if (optionalDisplaySupplier.isPresent()) {
-                data.put(columnName, optionalDisplaySupplier.get().apply(entity, context));
-            } else {
-                data.set(columnName, this.resolveColumn(column, entity, context));
+            if (columnName != null) {
+                if (optionalDisplaySupplier.isPresent()) {
+                    data.put(columnName, optionalDisplaySupplier.get().apply(entity, context));
+                } else {
+                    data.set(columnName, this.resolveColumn(column, entity, context));
+                }
             }
         });
 
diff --git a/core/src/test/resources/logback.xml b/core/src/test/resources/logback.xml
@@ -1,4 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ The MIT License (MIT)
+  ~
+  ~ Copyright (c) 2025 Pierre Adam
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  -->
+
 <configuration>
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
diff --git a/jooq/pom.xml b/jooq/pom.xml
@@ -1,5 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+  ~ The MIT License (MIT)
+  ~
+  ~ Copyright (c) 2025 Pierre Adam
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  -->
+
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+  ~ The MIT License (MIT)
+  ~
+  ~ Copyright (c) 2025 Pierre Adam
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  -->
+
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/sample/pom.xml b/sample/pom.xml
@@ -1,5 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+  ~ The MIT License (MIT)
+  ~
+  ~ Copyright (c) 2025 Pierre Adam
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  -->
+
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/sample/src/main/java/com/github/PierreAdam/javadatatables/sample/JooqPersonDataTable.java b/sample/src/main/java/com/github/PierreAdam/javadatatables/sample/JooqPersonDataTable.java
@@ -31,6 +31,7 @@
 import org.jooq.impl.DSL;
 
 import java.time.OffsetDateTime;
+import java.util.HashMap;
 import java.util.UUID;
 
 /**
@@ -75,13 +76,28 @@ public JooqPersonDataTable(final ObjectMapper objectMapper, final DSLContext dsl
                                 )
                         )
                 )
-                .setRowExtraData(extraData -> {
-                        }//extraData
-//                                .setRowId(personEntity -> personEntity.getUid().toString())
-//                        .setRowData(personEntity -> new HashMap<String, String>() {{
-//                            this.put("uid", personEntity.getUid().toString());
-//                            this.put("fullName", String.format("%s %s", personEntity.getFirstName(), personEntity.getLastName()));
-//                        }})
+                .setRowExtraData(extraData -> extraData
+                        .setRowId(personEntity -> personEntity.getUid().toString())
+                        .setRowClass(personEntity -> personEntity.getActive() ? "active" : "inactive")
+                        .setRowAttr(personEntity -> new HashMap<String, String>() {{
+                            this.put("createdAt", personEntity.getCreatedAt().toString());
+                        }})
+                        .setRowData(personEntity -> new HashMap<String, String>() {{
+                            this.put("uid", personEntity.getUid().toString());
+                            this.put("fullName", String.format("%s %s", personEntity.getFirstName(), personEntity.getLastName()));
+                        }})
+                )
+                .field("firstName", field -> field
+                        .setSearchHandler((jooqProvider, s) -> jooqProvider.addCondition(DSL.field("firstName").containsIgnoreCase(s)))
+                        .setOrderHandler((jooqProvider, orderEnum) -> jooqProvider.addSort(DSL.field("firstName"), orderEnum))
+                )
+                .field("lastName", field -> field
+                        .setSearchHandler((jooqProvider, s) -> jooqProvider.addCondition(DSL.field("lastName").containsIgnoreCase(s)))
+                        .setOrderHandler((jooqProvider, orderEnum) -> jooqProvider.addSort(DSL.field("lastName"), orderEnum))
+                )
+                .field("title", field -> field
+                        .setSearchHandler((jooqProvider, s) -> jooqProvider.addCondition(DSL.field("title").containsIgnoreCase(s)))
+                        .setOrderHandler((jooqProvider, orderEnum) -> jooqProvider.addSort(DSL.field("title"), orderEnum))
                 )
                 .field("fullName", field -> field
                         .setDisplaySupplier((entity, context) ->
diff --git a/sample/src/main/java/com/github/PierreAdam/javadatatables/sample/MainClass.java b/sample/src/main/java/com/github/PierreAdam/javadatatables/sample/MainClass.java
@@ -33,7 +33,7 @@
 import io.undertow.util.Headers;
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.InputStream;
+import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.util.Scanner;
 
@@ -56,6 +56,9 @@ public class MainClass {
      */
     private final Undertow server;
 
+    /**
+     * The Object mapper.
+     */
     private final ObjectMapper objectMapper;
 
     /**
@@ -119,15 +122,25 @@ public void run() throws InterruptedException {
      */
     public void index(final HttpServerExchange exchange) {
         exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "text/html");
-        try (final InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("index.html");
-             final Scanner scanner = new Scanner(inputStream, StandardCharsets.UTF_8)) {
+        Scanner scanner = null;
+
+        try {
+            if (true) {
+                scanner = new Scanner(new File("sample/src/main/resources/index.html"), StandardCharsets.UTF_8);
+            } else {
+                scanner = new Scanner(this.getClass().getClassLoader().getResourceAsStream("index.html"), StandardCharsets.UTF_8);
+            }
+
             final String content = scanner.useDelimiter("\\A").next();
             exchange.getResponseSender().send(content);
         } catch (final Exception e) {
             MainClass.logger.error("Failed to load index.html", e);
             exchange.setStatusCode(500);
             exchange.getResponseSender().send("Internal Server Error");
         } finally {
+            if (scanner != null) {
+                scanner.close();
+            }
             exchange.endExchange();
         }
     }
diff --git a/sample/src/main/resources/index.html b/sample/src/main/resources/index.html
@@ -1,3 +1,27 @@
+<!--
+  ~ The MIT License (MIT)
+  ~
+  ~ Copyright (c) 2025 Pierre Adam
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  -->
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -12,7 +36,7 @@
     <script src="https://cdn.datatables.net/1.13.5/js/jquery.dataTables.min.js"></script>
     <script>
         $(document).ready(function () {
-            $('#example').DataTable({
+            const table = $('#example').DataTable({
                 serverSide: true,
                 processing: true,
                 searching: true,
@@ -25,12 +49,49 @@
                     }
                 },
                 columns: [
+                    {
+                        className: 'dt-control',
+                        orderable: false,
+                        data: null,
+                        defaultContent: ''
+                    },
                     {data: "firstName", orderable: true, searchable: true},
                     {data: "lastName", orderable: true, searchable: true},
                     {data: "title", orderable: true, searchable: true},
                     {data: "bloodGroup", orderable: false, searchable: true},
                     {data: "active", orderable: false, searchable: false}
-                ]
+                ],
+                order: [[1, 'asc']]
+            });
+
+            function format(d) {
+                // `d` is the original data object for the row
+                return (
+                    '<dl>' +
+                    '<dt>Full name:</dt>' +
+                    '<dd>' +
+                    d.fullName +
+                    '</dd>' +
+                    '<dt>UUID:</dt>' +
+                    '<dd>' +
+                    d.uid +
+                    '</dd>'
+                );
+            }
+
+            table.on('click', 'td.dt-control', function (e) {
+                let tr = e.target.closest('tr');
+                let jqData = $(tr).data();
+                let row = table.row(tr);
+                let fullDtData = row.data();
+
+                if (row.child.isShown()) {
+                    // This row is already open - close it
+                    row.child.hide();
+                } else {
+                    // Open this row
+                    row.child(format(jqData)).show();
+                }
             });
         });
     </script>
@@ -41,6 +102,7 @@ <h1>DataTables Example</h1>
     <table class="display" id="example" style="width:100%">
         <thead>
         <tr>
+            <th style="width: 30px"></th>
             <th>First Name</th>
             <th>Last Name</th>
             <th>Title</th>
diff --git a/test-data/pom.xml b/test-data/pom.xml
