fix: fix npe when trying to declare a nested type which is not wrapped in e.g. a list

Author: dataGeeek

plugin/src/main/kotlin/cloud/rio/gdprdoc/GenerateGdprDocumentationTask.kt

@@ -252,8 +252,8 @@ abstract class GenerateGdprDocumentationTask : DefaultTask() {
                 logger.info(fields.joinToString(separator = "\n"))
 
                 if (nestedTypeAnnotation != null) {
-                    val typeSignature = fieldInfo.typeSignature as ClassRefTypeSignature
-                    val referencedClassNames = typeSignature.typeArguments.map { it.toString() }
+                    val typeSignature = fieldInfo.typeSignature as ClassRefTypeSignature?
+                    val referencedClassNames = typeSignature?.typeArguments?.map { it.toString() } ?: listOf(fieldInfo.typeDescriptor.toString())
                     resolveFieldsFromNestedClass(referencedClassNames, fieldPath, depth, visited, fields)
                 }
             }

test/src/main/kotlin/cloud/rio/example/adapter/db/DriverEvent.kt

@@ -34,6 +34,8 @@ data class DriverEventDb(
     val position: List<PositionDb>,
     @GdprData.Field(level = PiiLevel.PSEUDONYM)
     val driverCardNumber: String,
+    @GdprData.NestedType
+    val address: AddressDb,
 )
 
 data class PositionDb(
@@ -42,3 +44,12 @@ data class PositionDb(
     @GdprData.Field(level = PiiLevel.NON_PII)
     val longitude: Double,
 )
+
+data class AddressDb(
+    @GdprData.Field(level = PiiLevel.NON_PII)
+    val street: String,
+    @GdprData.Field(level = PiiLevel.NON_PII)
+    val city: String,
+    @GdprData.Field(level = PiiLevel.NON_PII)
+    val country: String,
+)

test/src/test/kotlin/cloud/rio/gdprdoc/GdprDocumentationSnapshotTest.ss

@@ -148,7 +148,7 @@
 
 | Name | Database identifier | Responsible For Deletion | Retention | Fields  |
 | --- | --- | --- | --- | --- |
-| [DriverEventDb](#cloud.rio.example.adapter.db.DriverEventDb#DB) | arn:aws:dynamodb:region:accountId:table/driver-events | Dev team | Kept for 30 days | `assetId`, `timestamp`, `position.latitude`, `position.longitude`, `driverCardNumber` |
+| [DriverEventDb](#cloud.rio.example.adapter.db.DriverEventDb#DB) | arn:aws:dynamodb:region:accountId:table/driver-events | Dev team | Kept for 30 days | `assetId`, `timestamp`, `position.latitude`, `position.longitude`, `driverCardNumber`, `address.street`, `address.city`, `address.country` |
 | [DriverKafka](#cloud.rio.example.adapter.kafka.DriverKafka#DB) | arn:aws:dynamodb:region:accountId:table/driver-events | Owner of the upstream data source | Kept until data is deleted upstream | `driverCardNumber`, `name` |
 | [PermissionsKafka](#cloud.rio.example.adapter.kafka.PermissionsKafka#DB) | arn:aws:dynamodb:region:accountId:table/permissions | Owner of the upstream data source | Kept until data is deleted upstream | `userId`, `hasAccess` |
 
@@ -196,6 +196,26 @@
       <td><span style="background-color:darkorange; padding:2px 10px; border-radius:3px;">PSEUDONYM</span></td>
       <td>String</td>
     </tr>
+    <tr>
+      <td><code>address</code></td>
+      <td>-</td>
+      <td>AddressDb</td>
+    </tr>
+    <tr>
+      <td>&nbsp;&nbsp;&nbsp;&nbsp;<code>address.street</code></td>
+      <td><span style="background-color:green; padding:2px 10px; border-radius:3px;">NON PII</span></td>
+      <td>String</td>
+    </tr>
+    <tr>
+      <td>&nbsp;&nbsp;&nbsp;&nbsp;<code>address.city</code></td>
+      <td><span style="background-color:green; padding:2px 10px; border-radius:3px;">NON PII</span></td>
+      <td>String</td>
+    </tr>
+    <tr>
+      <td>&nbsp;&nbsp;&nbsp;&nbsp;<code>address.country</code></td>
+      <td><span style="background-color:green; padding:2px 10px; border-radius:3px;">NON PII</span></td>
+      <td>String</td>
+    </tr>
   </tbody>
 </table>