WIP

TIER · Aug 23, 2019 · 2751851 · 2751851
1 parent 0d48d4c
commit 2751851
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/LowLevelJsonSchemaValidator.groovy b/...oovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/LowLevelJsonSchemaValidator.groovy
@@ -21,6 +21,7 @@ class LowLevelJsonSchemaValidator {
 
     static HttpInputMessage validateMetadataResolverTypePayloadAgainstSchema(HttpInputMessage inputMessage,
                                                                              JsonSchemaResourceLocationRegistry schemaRegistry) {
+
         def origInput = [inputMessage.body.bytes, inputMessage.headers]
         def json = extractJsonPayload(origInput)
         def schemaUri = null
@@ -37,12 +38,17 @@ class LowLevelJsonSchemaValidator {
             default:
                 break
         }
-        if(!schemaUri) {
+        if (!schemaUri) {
             return newInputMessage(origInput)
         }
         doValidate(origInput, Json.schema(schemaUri), json)
     }
 
+    static HttpInputMessage validateMetadataFilterTypePayloadAgainstSchema(HttpInputMessage inputMessage,
+                                                                           JsonSchemaResourceLocationRegistry schemaRegistry) {
+        null
+    }
+
     private static Json extractJsonPayload(List origInput) {
         Json.read(new ByteArrayInputStream(origInput[0]).getText())
     }

diff --git a/...erSchemaValidatingControllerAdvice.groovy → ...rsSchemaValidatingControllerAdvice.groovy b/...erSchemaValidatingControllerAdvice.groovy → ...rsSchemaValidatingControllerAdvice.groovy
@@ -21,7 +21,7 @@ import static edu.internet2.tier.shibboleth.admin.ui.jsonschema.LowLevelJsonSche
  * @author Dmitriy Kopylenko
  */
 @ControllerAdvice
-class MetadataResolverSchemaValidatingControllerAdvice extends RequestBodyAdviceAdapter {
+class MetadataResolversSchemaValidatingControllerAdvice extends RequestBodyAdviceAdapter {
 
     @Autowired
     JsonSchemaResourceLocationRegistry jsonSchemaResourceLocationRegistry