From 27518515dc108431b46839a119d0cb80370ff76b Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Fri, 23 Aug 2019 11:28:36 -0400
Subject: [PATCH] WIP

---
 .../ui/jsonschema/LowLevelJsonSchemaValidator.groovy      | 8 +++++++-
 ...adataResolversSchemaValidatingControllerAdvice.groovy} | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
 rename backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/{MetadataResolverSchemaValidatingControllerAdvice.groovy => MetadataResolversSchemaValidatingControllerAdvice.groovy} (94%)

diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/LowLevelJsonSchemaValidator.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/LowLevelJsonSchemaValidator.groovy
index a793f0fbd..bea82ba26 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/LowLevelJsonSchemaValidator.groovy
+++ b/backend/src/main/groovy/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/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/MetadataResolverSchemaValidatingControllerAdvice.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/MetadataResolversSchemaValidatingControllerAdvice.groovy
similarity index 94%
rename from backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/MetadataResolverSchemaValidatingControllerAdvice.groovy
rename to backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/MetadataResolversSchemaValidatingControllerAdvice.groovy
index 6ecbef95a..1c051a9c0 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/MetadataResolverSchemaValidatingControllerAdvice.groovy
+++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/MetadataResolversSchemaValidatingControllerAdvice.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