(causeway) branch master updated: CAUSEWAY-3797: fixes prev. commit (potential NPE)

[ahuber]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/master by this push:
     new 3e236472cd CAUSEWAY-3797: fixes prev. commit (potential NPE)
3e236472cd is described below

commit 3e236472cdbad92ed84f1a2567b136ccb58e997a
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Thu Jun 27 06:33:34 2024 +0200

    CAUSEWAY-3797: fixes prev. commit (potential NPE)
---
 .../ajaxtable/columns/AssociationColumnAbstract.java                   | 2 +-
 .../components/collectioncontents/ajaxtable/columns/PluralColumn.java  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/AssociationColumnAbstract.java
 
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/AssociationColumnAbstract.java
index 1f273d0411..6a4f1310b2 100644
--- 
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/AssociationColumnAbstract.java
+++ 
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/AssociationColumnAbstract.java
@@ -58,7 +58,7 @@ extends GenericColumnAbstract {
             /**
              * If empty, sorting is disabled for this column.
              * <p>
-             * Not every column (e.g. as mapped to on association) is sortable.
+             * Not every column (e.g. as mapped to an association) is sortable.
              * The referenced type must implement {@link Comparable}.
              */
             final Optional<String> sortProperty,
diff --git 
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/PluralColumn.java
 
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/PluralColumn.java
index bbcbb1164f..4b1ed5aea9 100644
--- 
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/PluralColumn.java
+++ 
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/PluralColumn.java
@@ -69,8 +69,7 @@ extends AssociationColumnAbstract {
             final Optional<String> describedAs,
             final RenderOptions opts) {
         super(collectionVariant, columnNameModel,
-                null // sortProperty .. never sortable
-                ,
+                Optional.empty(), // empty sortProperty (hence never sortable)
                 propertyId, parentTypeName, describedAs);
         this.opts = opts;
     }