[AEA-6305] review comments

Author: Orkastrated

src/main/java/software/nhs/fhirvalidator/controller/ValidateController.java

@@ -79,7 +79,8 @@ public OperationOutcome parseAndValidateResource(String input) {
                 | DataFormatException e) {
             log.error(e.toString());
             return OperationOutcomeUtils
-                    .createOperationOutcome((e.getMessage() != null && !e.getMessage().contains("null")) ? e.getMessage() : "Invalid JSON", null);
+                    .createOperationOutcome((e.getMessage() != null && !(e instanceof NullPointerException))
+                    ? e.getMessage() : "Invalid JSON", null);
         }
     }
 

src/test/resources/results/searchSet.json

@@ -2393,41 +2393,42 @@
             ]
         },
         {
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-line",
-          "valueInteger": 1
-        },
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col",
-          "valueInteger": 496
-        }
-      ],
-      "severity": "warning",
-      "code": "processing",
-      "diagnostics": "Constraint failed: dom-6: 'A resource should have narrative for robust management' (defined in http://hl7.org/fhir/StructureDefinition/DomainResource) (Best Practice Recommendation)",
-      "location": [
-        "OperationOutcome",
-        "Line[1] Col[496]"
-      ]
-    },
-    {
-        "extension": [
-            {
+            "extension": [
+                {
                 "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-line",
                 "valueInteger": 1
-            },
-            {
+                },
+                {
                 "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col",
                 "valueInteger": 496
-            }
-        ],
-        "severity": "warning",
-        "code": "processing",
-        "diagnostics": "Constraint failed: dom-6: 'A resource should have narrative for robust management' (defined in http://hl7.org/fhir/StructureDefinition/DomainResource) (Best Practice Recommendation)",
-        "location": [
-            "OperationOutcome",
-            "Line[1] Col[496]"
-        ]
-    }]
+                }
+            ],
+            "severity": "warning",
+            "code": "processing",
+            "diagnostics": "Constraint failed: dom-6: 'A resource should have narrative for robust management' (defined in http://hl7.org/fhir/StructureDefinition/DomainResource) (Best Practice Recommendation)",
+            "location": [
+                "OperationOutcome",
+                "Line[1] Col[496]"
+            ]
+        },
+        {
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-line",
+                    "valueInteger": 1
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col",
+                    "valueInteger": 496
+                }
+            ],
+            "severity": "warning",
+            "code": "processing",
+            "diagnostics": "Constraint failed: dom-6: 'A resource should have narrative for robust management' (defined in http://hl7.org/fhir/StructureDefinition/DomainResource) (Best Practice Recommendation)",
+            "location": [
+                "OperationOutcome",
+                "Line[1] Col[496]"
+            ]
+        }
+    ]
 }