[schema-registry-json] Update validation sample (#26774)

Azure · Aug 10, 2023 · dcbfdd3 · dcbfdd3
1 parent fc40831
commit dcbfdd3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/sdk/schemaregistry/schema-registry-json/samples-dev/schemaRegistryJsonWithValidation.ts b/sdk/schemaregistry/schema-registry-json/samples-dev/schemaRegistryJsonWithValidation.ts
@@ -27,21 +27,19 @@ const groupName = process.env["SCHEMA_REGISTRY_GROUP"] || "AzureSdkSampleGroup";
 
 // Sample Json Schema for user with first and last names
 export const schemaObject = {
-  $schema: "https://json-schema.org/draft/2020-12/schema",
   $id: "user",
   title: "User",
   description: "A user for the product",
   type: "object",
   properties: {
     firstName: {
       type: "string",
-      required: true,
     },
     lastName: {
       type: "string",
-      required: true,
     },
   },
+  required: ["firstName", "lastName"],
 };
 
 // Matching TypeScript interface for schema
@@ -82,9 +80,8 @@ export async function main() {
   // Validation using a third party library
   const ajv = new Ajv();
   const validator = ajv.compile(JSON.parse(schema));
-  let validators = new Map<string, ValidateFunction>();
+  const validators = new Map<string, ValidateFunction>();
   validators.set(schema, validator);
-
   const validateOptions: DeserializeOptions = {
     validateCallback(value, schema) {
       const validator = validators.get(schema);
@@ -93,8 +90,9 @@ export async function main() {
         if (!valid) {
           throw new Error(JSON.stringify(validator.errors));
         }
+      } else {
+        throw new Error("Unable to find validator");
       }
-      throw new Error("Unable to find validator");
     },
   };
 

diff --git a/...istry/schema-registry-json/samples/v1-beta/javascript/schemaRegistryJsonWithValidation.js b/...istry/schema-registry-json/samples/v1-beta/javascript/schemaRegistryJsonWithValidation.js
@@ -22,21 +22,19 @@ const groupName = process.env["SCHEMA_REGISTRY_GROUP"] || "AzureSdkSampleGroup";
 
 // Sample Json Schema for user with first and last names
 const schemaObject = {
-  $schema: "https://json-schema.org/draft/2020-12/schema",
   $id: "user",
   title: "User",
   description: "A user for the product",
   type: "object",
   properties: {
     firstName: {
       type: "string",
-      required: true,
     },
     lastName: {
       type: "string",
-      required: true,
     },
   },
+  required: ["firstName", "lastName"],
 };
 
 const schema = JSON.stringify(schemaObject);
@@ -71,9 +69,8 @@ async function main() {
   // Validation using a third party library
   const ajv = new Ajv();
   const validator = ajv.compile(JSON.parse(schema));
-  let validators = new Map();
+  const validators = new Map();
   validators.set(schema, validator);
-
   const validateOptions = {
     validateCallback(value, schema) {
       const validator = validators.get(schema);
@@ -82,8 +79,9 @@ async function main() {
         if (!valid) {
           throw new Error(JSON.stringify(validator.errors));
         }
+      } else {
+        throw new Error("Unable to find validator");
       }
-      throw new Error("Unable to find validator");
     },
   };
 

diff --git a/...y/schema-registry-json/samples/v1-beta/typescript/src/schemaRegistryJsonWithValidation.ts b/...y/schema-registry-json/samples/v1-beta/typescript/src/schemaRegistryJsonWithValidation.ts
@@ -27,21 +27,19 @@ const groupName = process.env["SCHEMA_REGISTRY_GROUP"] || "AzureSdkSampleGroup";
 
 // Sample Json Schema for user with first and last names
 export const schemaObject = {
-  $schema: "https://json-schema.org/draft/2020-12/schema",
   $id: "user",
   title: "User",
   description: "A user for the product",
   type: "object",
   properties: {
     firstName: {
       type: "string",
-      required: true,
     },
     lastName: {
       type: "string",
-      required: true,
     },
   },
+  required: ["firstName", "lastName"],
 };
 
 // Matching TypeScript interface for schema
@@ -82,9 +80,8 @@ export async function main() {
   // Validation using a third party library
   const ajv = new Ajv();
   const validator = ajv.compile(JSON.parse(schema));
-  let validators = new Map<string, ValidateFunction>();
+  const validators = new Map<string, ValidateFunction>();
   validators.set(schema, validator);
-
   const validateOptions: DeserializeOptions = {
     validateCallback(value, schema) {
       const validator = validators.get(schema);
@@ -93,8 +90,9 @@ export async function main() {
         if (!valid) {
           throw new Error(JSON.stringify(validator.errors));
         }
+      } else {
+        throw new Error("Unable to find validator");
       }
-      throw new Error("Unable to find validator");
     },
   };