Fixes then functionality

spacether · spacether · commit c60c7787cd39 · 2024-01-20T10:52:36.000-08:00
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
@@ -25,8 +25,8 @@ public class ElseValidator implements KeywordValidator {
         JsonSchema elseSchemaInstance = JsonSchemaFactory.getInstance(elseSchema);
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         var elsePathToSchemas = JsonSchema.validate(elseSchemaInstance, data.arg(), data.validationMetadata());
-        pathToSchemas.update(elsePathToSchemas);
         // todo capture validation error and describe it as an else error?
+        pathToSchemas.update(elsePathToSchemas);
         return pathToSchemas;
     }
 }
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java
@@ -24,11 +24,10 @@ public class ThenValidator implements KeywordValidator {
         }
         JsonSchema thenSchema = JsonSchemaFactory.getInstance(then);
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
-        try {
-            var thenPathToSchemas = JsonSchema.validate(thenSchema, data.arg(), data.validationMetadata());
-            pathToSchemas.update(ifPathToSchemas);
-            pathToSchemas.update(thenPathToSchemas);
-        } catch (ValidationException | InvalidTypeException ignored) {}
+        var thenPathToSchemas = JsonSchema.validate(thenSchema, data.arg(), data.validationMetadata());
+        // todo capture validation error and describe it as an then error?
+        pathToSchemas.update(ifPathToSchemas);
+        pathToSchemas.update(thenPathToSchemas);
         return pathToSchemas;
     }
 }
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs
@@ -25,8 +25,8 @@ public class ElseValidator implements KeywordValidator {
         JsonSchema elseSchemaInstance = JsonSchemaFactory.getInstance(elseSchema);
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         var elsePathToSchemas = JsonSchema.validate(elseSchemaInstance, data.arg(), data.validationMetadata());
-        pathToSchemas.update(elsePathToSchemas);
         // todo capture validation error and describe it as an else error?
+        pathToSchemas.update(elsePathToSchemas);
         return pathToSchemas;
     }
 }
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/ThenValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/ThenValidator.hbs
@@ -24,11 +24,10 @@ public class ThenValidator implements KeywordValidator {
         }
         JsonSchema thenSchema = JsonSchemaFactory.getInstance(then);
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
-        try {
-            var thenPathToSchemas = JsonSchema.validate(thenSchema, data.arg(), data.validationMetadata());
-            pathToSchemas.update(ifPathToSchemas);
-            pathToSchemas.update(thenPathToSchemas);
-        } catch (ValidationException | InvalidTypeException ignored) {}
+        var thenPathToSchemas = JsonSchema.validate(thenSchema, data.arg(), data.validationMetadata());
+        // todo capture validation error and describe it as an then error?
+        pathToSchemas.update(ifPathToSchemas);
+        pathToSchemas.update(thenPathToSchemas);
         return pathToSchemas;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ public class ElseValidator implements KeywordValidator {`
`25`	`25`	`JsonSchema elseSchemaInstance = JsonSchemaFactory.getInstance(elseSchema);`
`26`	`26`	`PathToSchemasMap pathToSchemas = new PathToSchemasMap();`
`27`	`27`	`var elsePathToSchemas = JsonSchema.validate(elseSchemaInstance, data.arg(), data.validationMetadata());`
`28`		`- pathToSchemas.update(elsePathToSchemas);`
`29`	`28`	`// todo capture validation error and describe it as an else error?`
	`29`	`+ pathToSchemas.update(elsePathToSchemas);`
`30`	`30`	`return pathToSchemas;`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,10 @@ public class ThenValidator implements KeywordValidator {`
`24`	`24`	`}`
`25`	`25`	`JsonSchema thenSchema = JsonSchemaFactory.getInstance(then);`
`26`	`26`	`PathToSchemasMap pathToSchemas = new PathToSchemasMap();`
`27`		`- try {`
`28`		`- var thenPathToSchemas = JsonSchema.validate(thenSchema, data.arg(), data.validationMetadata());`
`29`		`- pathToSchemas.update(ifPathToSchemas);`
`30`		`- pathToSchemas.update(thenPathToSchemas);`
`31`		`- } catch (ValidationException \| InvalidTypeException ignored) {}`
	`27`	`+ var thenPathToSchemas = JsonSchema.validate(thenSchema, data.arg(), data.validationMetadata());`
	`28`	`+ // todo capture validation error and describe it as an then error?`
	`29`	`+ pathToSchemas.update(ifPathToSchemas);`
	`30`	`+ pathToSchemas.update(thenPathToSchemas);`
`32`	`31`	`return pathToSchemas;`
`33`	`32`	`}`
`34`	`33`	`}`