Bugfix for middlename NULL and release 13.0.14

oharsta · oharsta · commit bbaee1613833 · 2026-05-19T09:45:56.000+02:00
diff --git a/dashboard-gui/pom.xml b/dashboard-gui/pom.xml
@@ -2,7 +2,7 @@
    <parent>
        <groupId>org.openconext</groupId>
        <artifactId>dashboard</artifactId>
-       <version>13.0.13</version>
+       <version>13.0.14</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dashboard-server/pom.xml b/dashboard-server/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>dashboard</artifactId>
-        <version>13.0.13</version>
+        <version>13.0.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dashboard-server/src/main/java/dashboard/sab/SabPerson.java b/dashboard-server/src/main/java/dashboard/sab/SabPerson.java
@@ -1,5 +1,7 @@
 package dashboard.sab;
 
+import org.springframework.util.StringUtils;
+
 import java.util.List;
 
 import static java.lang.String.format;
@@ -24,10 +26,10 @@ public SabPerson(String firstName, String middleName, String surname, String uid
     }
 
     public String resolveFullName() {
-        if (middleName.isEmpty()) {
-            return format("%s %s", firstName, surname);
+        if (StringUtils.hasText(middleName)) {
+            return format("%s %s %s", firstName, middleName, surname);
         }
-        return format("%s %s %s", firstName, middleName, surname);
+        return format("%s %s", firstName, surname);
     }
 
     public String getFullName() {
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>org.openconext</groupId>
     <artifactId>dashboard</artifactId>
-    <version>13.0.13</version>
+    <version>13.0.14</version>
     <name>dashboard</name>
     <description>OpenConext-Dashboard</description>
     <inceptionYear>2012</inceptionYear>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`package dashboard.sab;`
`2`	`2`
	`3`	`+import org.springframework.util.StringUtils;`
	`4`	`+`
`3`	`5`	`import java.util.List;`
`4`	`6`
`5`	`7`	`import static java.lang.String.format;`
`@@ -24,10 +26,10 @@ public SabPerson(String firstName, String middleName, String surname, String uid`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`public String resolveFullName() {`
`27`		`- if (middleName.isEmpty()) {`
`28`		`- return format("%s %s", firstName, surname);`
	`29`	`+ if (StringUtils.hasText(middleName)) {`
	`30`	`+ return format("%s %s %s", firstName, middleName, surname);`
`29`	`31`	`}`
`30`		`- return format("%s %s %s", firstName, middleName, surname);`
	`32`	`+ return format("%s %s", firstName, surname);`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`public String getFullName() {`