Merge branch 'Workiva:master' into fix/issue-175-export-ValidationRes…

…ults
Workiva · Jul 24, 2024 · 4ed36e5 · 4ed36e5
2 parents c64dd96 + 721a365
commit 4ed36e5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/src/json_schema/json_schema.dart b/lib/src/json_schema/json_schema.dart
@@ -305,7 +305,10 @@ class JsonSchema {
       _customFormats = customFormats;
       _rootMemomizedPathResults = {};
       try {
-        _fetchedFromUriBase = JsonSchemaUtils.getBaseFromFullUri(_fetchedFromUri!);
+        // Only fetch the base if given
+        if (_fetchedFromUri != null) {
+          _fetchedFromUriBase = JsonSchemaUtils.getBaseFromFullUri(_fetchedFromUri!);
+        }
       } catch (e) {
         // ID base can't be set for schemes other than HTTP(S).
         // This is expected behavior.

diff --git a/lib/src/json_schema/models/validation_results.dart b/lib/src/json_schema/models/validation_results.dart
@@ -40,7 +40,8 @@ import 'package:json_schema/src/json_schema/validator.dart';
 
 /// The result of validating data against a schema
 class ValidationResults {
-  ValidationResults(List<ValidationError> errors, List<ValidationError> warnings)
+  ValidationResults(
+      List<ValidationError> errors, List<ValidationError> warnings)
       : errors = List.of(errors),
         warnings = List.of(warnings);
 
@@ -52,7 +53,9 @@ class ValidationResults {
 
   @override
   String toString() {
-    return '${errors.isEmpty ? 'VALID' : 'INVALID'}${errors.isEmpty ? ', Errors: $errors' : ''}${warnings.isEmpty ? ', Warnings: $warnings' : ''}';
+    return '${errors.isEmpty ? 'VALID' : 'INVALID'}'
+        '${errors.isEmpty ? '' : ', Errors: $errors'}'
+        '${warnings.isEmpty ? '' : ', Warnings: $warnings'}';
   }
 
   /// Whether the [Instance] was valid against its [JsonSchema]