Add more JSON Schema validation tests (#95)

Author: rayokota

schemaregistry/rules/encryption/encrypt-executor.ts

@@ -84,11 +84,11 @@ export class FieldEncryptionExecutor extends FieldRuleExecutor {
     this.config = config
   }
 
-  type(): string {
+  override type(): string {
     return 'ENCRYPT'
   }
 
-  newTransform(ctx: RuleContext): FieldTransform {
+  override newTransform(ctx: RuleContext): FieldTransform {
     const cryptor = this.getCryptor(ctx)
     const kekName = this.getKekName(ctx)
     const dekExpiryDays = this.getDekExpiryDays(ctx)
@@ -97,7 +97,7 @@ export class FieldEncryptionExecutor extends FieldRuleExecutor {
     return transform
   }
 
-  async close(): Promise<void> {
+  override async close(): Promise<void> {
     if (this.client != null) {
       await this.client.close()
     }

schemaregistry/serde/avro.ts

@@ -45,7 +45,7 @@ export class AvroSerializer extends Serializer implements AvroSerde {
     }
   }
 
-  async serialize(topic: string, msg: any): Promise<Buffer> {
+  override async serialize(topic: string, msg: any): Promise<Buffer> {
     if (this.client == null) {
       throw new Error('client is not initialized')
     }
@@ -126,7 +126,7 @@ export class AvroDeserializer extends Deserializer implements AvroSerde {
     }
   }
 
-  async deserialize(topic: string, payload: Buffer): Promise<any> {
+  override async deserialize(topic: string, payload: Buffer): Promise<any> {
     if (!Buffer.isBuffer(payload)) {
       throw new Error('Invalid buffer')
     }
@@ -366,7 +366,7 @@ function resolveUnion(schema: Type, msg: any): Type | null {
 function getInlineTags(info: SchemaInfo, deps: Map<string, string>): Map<string, Set<string>> {
   const inlineTags = new Map<string, Set<string>>()
   getInlineTagsRecursively('', '', JSON.parse(info.schema), inlineTags)
-  for (const depSchema of Object.values(deps)) {
+  for (const depSchema of deps.values()) {
     getInlineTagsRecursively('', '', JSON.parse(depSchema), inlineTags)
   }
   return inlineTags

schemaregistry/serde/json.ts

@@ -65,7 +65,7 @@ export class JsonSerializer extends Serializer implements JsonSerde {
     }
   }
 
-  async serialize(topic: string, msg: any): Promise<Buffer> {
+  override async serialize(topic: string, msg: any): Promise<Buffer> {
     if (this.client == null) {
       throw new Error('client is not initialized')
     }
@@ -139,7 +139,7 @@ export class JsonDeserializer extends Deserializer implements JsonSerde {
     }
   }
 
-  async deserialize(topic: string, payload: Buffer): Promise<any> {
+  override async deserialize(topic: string, payload: Buffer): Promise<any> {
     if (!Buffer.isBuffer(payload)) {
       throw new Error('Invalid buffer')
     }

schemaregistry/serde/protobuf.ts

@@ -110,7 +110,7 @@ export class ProtobufSerializer extends Serializer implements ProtobufSerde {
     }
   }
 
-  async serialize(topic: string, msg: any): Promise<Buffer> {
+  override async serialize(topic: string, msg: any): Promise<Buffer> {
     if (this.client == null) {
       throw new Error('client is not initialized')
     }
@@ -293,7 +293,7 @@ export class ProtobufDeserializer extends Deserializer implements ProtobufSerde
     }
   }
 
-  async deserialize(topic: string, payload: Buffer): Promise<any> {
+  override async deserialize(topic: string, payload: Buffer): Promise<any> {
     if (!Buffer.isBuffer(payload)) {
       throw new Error('Invalid buffer')
     }

schemaregistry/serde/serde.ts

@@ -224,7 +224,6 @@ export abstract class Serializer extends Serde {
     return this.conf as SerializerConfig
   }
 
-  // serialize will serialize the given message
   abstract serialize(topic: string, msg: any): Promise<Buffer>
 
   // GetID returns a schema ID for the given schema
@@ -282,6 +281,8 @@ export abstract class Deserializer extends Serde {
     return this.conf as DeserializerConfig
   }
 
+  abstract deserialize(topic: string, payload: Buffer): Promise<any>
+
   async getSchema(topic: string, payload: Buffer, format?: string): Promise<SchemaInfo> {
     const magicByte = payload.subarray(0, 1)
     if (!magicByte.equals(MAGIC_BYTE)) {

test/schemaregistry/serde/json.spec.ts

@@ -39,7 +39,15 @@ const rootSchema = `
   }
 }
 `
-
+const rootSchema2020_12 = `
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "properties": {
+    "otherField": { "$ref": "DemoSchema" }
+  }
+}
+`
 const demoSchema = `
 {
   "type": "object",
@@ -154,7 +162,10 @@ describe('JsonSerializer', () => {
       cacheCapacity: 1000
     }
     let client = SchemaRegistryClient.newClient(conf)
-    let ser = new JsonSerializer(client, SerdeType.VALUE, {autoRegisterSchemas: true})
+    let ser = new JsonSerializer(client, SerdeType.VALUE, {
+      autoRegisterSchemas: true,
+      validate: true
+    })
     let obj = {
       intField: 123,
       doubleField: 45.67,
@@ -205,7 +216,10 @@ describe('JsonSerializer', () => {
       cacheCapacity: 1000
     }
     let client = SchemaRegistryClient.newClient(conf)
-    let ser = new JsonSerializer(client, SerdeType.VALUE, {autoRegisterSchemas: true})
+    let ser = new JsonSerializer(client, SerdeType.VALUE, {
+      autoRegisterSchemas: true,
+      validate: true
+    })
 
     let obj = {
       intField: 123,
@@ -226,7 +240,10 @@ describe('JsonSerializer', () => {
       cacheCapacity: 1000
     }
     let client = SchemaRegistryClient.newClient(conf)
-    let ser = new JsonSerializer(client, SerdeType.VALUE, {useLatestVersion: true})
+    let ser = new JsonSerializer(client, SerdeType.VALUE, {
+      useLatestVersion: true,
+      validate: true
+    })
 
     let info: SchemaInfo = {
       schemaType: 'JSON',
@@ -258,6 +275,47 @@ describe('JsonSerializer', () => {
     let obj2 = await deser.deserialize(topic, bytes)
     expect(obj2).toEqual(obj)
   })
+  it('serialize reference 2020_12', async () => {
+    let conf: ClientConfig = {
+      baseURLs: [baseURL],
+      cacheCapacity: 1000
+    }
+    let client = SchemaRegistryClient.newClient(conf)
+    let ser = new JsonSerializer(client, SerdeType.VALUE, {
+      useLatestVersion: true,
+      validate: true
+    })
+
+    let info: SchemaInfo = {
+      schemaType: 'JSON',
+      schema: demoSchema2020_12
+    }
+    await client.register('demo-value', info, false)
+
+    info = {
+      schemaType: 'JSON',
+      schema: rootSchema2020_12,
+      references: [{
+        name: 'DemoSchema',
+        subject: 'demo-value',
+        version: 1
+      }]
+    }
+    await client.register(subject, info, false)
+
+    let obj = {
+      intField: 123,
+      doubleField: 45.67,
+      stringField: 'hi',
+      boolField: true,
+      bytesField: Buffer.from([0, 0, 0, 1]).toString('base64')
+    }
+    let bytes = await ser.serialize(topic, obj)
+
+    let deser = new JsonDeserializer(client, SerdeType.VALUE, {})
+    let obj2 = await deser.deserialize(topic, bytes)
+    expect(obj2).toEqual(obj)
+  })
   it('basic failing validation', async () => {
     let conf: ClientConfig = {
       baseURLs: [baseURL],