From 8f65cc640ff1f87228851129ffca478f12f6ef31 Mon Sep 17 00:00:00 2001
From: Fran Mendez <fmvilas@gmail.com>
Date: Fri, 3 Nov 2023 15:40:39 +0100
Subject: [PATCH] feat!: remove messageId()

---
 src/models/message-trait.ts                   |  1 -
 src/models/v2/message-trait.ts                |  6 +---
 src/models/v3/message-trait.ts                |  8 ++----
 src/spec-types/v3.ts                          |  1 -
 .../custom-operations/apply-traits-v3.spec.ts | 20 ++++++-------
 test/models/v2/channel.spec.ts                |  6 ++--
 test/models/v2/message-trait.spec.ts          |  4 +--
 test/models/v2/server.spec.ts                 | 14 +++++-----
 test/models/v3/channel.spec.ts                | 10 +++----
 test/models/v3/message-trait.spec.ts          | 28 +++----------------
 test/models/v3/message.spec.ts                |  6 ----
 test/models/v3/operation-reply.spec.ts        |  8 +++---
 test/models/v3/operation.spec.ts              | 12 ++++----
 test/models/v3/server.spec.ts                 | 16 +++++------
 14 files changed, 52 insertions(+), 88 deletions(-)

diff --git a/src/models/message-trait.ts b/src/models/message-trait.ts
index 8abb1f18e..3e16104a2 100644
--- a/src/models/message-trait.ts
+++ b/src/models/message-trait.ts
@@ -9,7 +9,6 @@ export interface MessageTraitInterface extends BaseModel, BindingsMixinInterface
   hasSchemaFormat(): boolean;
   schemaFormat(): string | undefined;
   hasMessageId(): boolean;
-  messageId(): string | undefined;
   hasCorrelationId(): boolean;
   correlationId(): CorrelationIdInterface | undefined;
   hasContentType(): boolean;
diff --git a/src/models/v2/message-trait.ts b/src/models/v2/message-trait.ts
index cee11664a..fb327f615 100644
--- a/src/models/v2/message-trait.ts
+++ b/src/models/v2/message-trait.ts
@@ -21,7 +21,7 @@ import type { v2 } from '../../spec-types';
 
 export class MessageTrait<J extends v2.MessageTraitObject = v2.MessageTraitObject> extends BaseModel<J, { id: string }> implements MessageTraitInterface {
   id(): string {
-    return this.messageId() || this._meta.id || this.json(xParserMessageName) as string;
+    return this._json.messageId || this._meta.id || this.json(xParserMessageName) as string;
   }
 
   hasSchemaFormat(): boolean {
@@ -35,10 +35,6 @@ export class MessageTrait<J extends v2.MessageTraitObject = v2.MessageTraitObjec
   hasMessageId(): boolean {
     return !!this._json.messageId;
   }
-
-  messageId(): string | undefined {
-    return this._json.messageId;
-  }
   
   hasCorrelationId(): boolean {
     return !!this._json.correlationId;
diff --git a/src/models/v3/message-trait.ts b/src/models/v3/message-trait.ts
index ccbd8ca25..c76126651 100644
--- a/src/models/v3/message-trait.ts
+++ b/src/models/v3/message-trait.ts
@@ -15,11 +15,11 @@ import type { v3 } from '../../spec-types';
 
 export class MessageTrait<J extends v3.MessageTraitObject = v3.MessageTraitObject> extends CoreModel<J, { id: string }> implements MessageTraitInterface {
   id(): string {
-    return this.messageId() || this._meta.id || this.extensions().get(xParserMessageName)?.value<string>() as string;
+    return this._meta.id || this.extensions().get(xParserMessageName)?.value<string>() as string;
   }
 
   hasMessageId(): boolean {
-    return !!this._json.messageId;
+    return false;
   }
 
   hasSchemaFormat(): boolean {
@@ -29,10 +29,6 @@ export class MessageTrait<J extends v3.MessageTraitObject = v3.MessageTraitObjec
   schemaFormat(): string | undefined {
     return undefined;
   }
-
-  messageId(): string | undefined {
-    return this._json.messageId;
-  }
   
   hasCorrelationId(): boolean {
     return !!this._json.correlationId;
diff --git a/src/spec-types/v3.ts b/src/spec-types/v3.ts
index cacd21228..e24da3bb6 100644
--- a/src/spec-types/v3.ts
+++ b/src/spec-types/v3.ts
@@ -180,7 +180,6 @@ export interface MessageObject extends MessageTraitObject, SpecificationExtensio
 }
 
 export interface MessageTraitObject extends SpecificationExtensions {
-  messageId?: string;
   headers?: MultiFormatSchemaObject;
   correlationId?: CorrelationIDObject | ReferenceObject;
   contentType?: string;
diff --git a/test/custom-operations/apply-traits-v3.spec.ts b/test/custom-operations/apply-traits-v3.spec.ts
index d4cbfae8d..61ff909ec 100644
--- a/test/custom-operations/apply-traits-v3.spec.ts
+++ b/test/custom-operations/apply-traits-v3.spec.ts
@@ -76,7 +76,7 @@ describe('custom operations - apply traits v3', function() {
             someMessage: {
               traits: [
                 {
-                  messageId: 'traitMessageId',
+                  summary: 'some summary',
                   description: 'some description' 
                 },
                 {
@@ -89,11 +89,11 @@ describe('custom operations - apply traits v3', function() {
         someChannel2: {
           messages: {
             someMessage: {
-              messageId: 'rootMessageId',
+              summary: 'root summary',
               description: 'root description',
               traits: [
                 {
-                  messageId: 'traitMessageId',
+                  summary: 'some summary',
                   description: 'some description' 
                 },
                 {
@@ -112,11 +112,11 @@ describe('custom operations - apply traits v3', function() {
 
     const message1 = v3Document?.json()?.channels?.someChannel1?.messages?.someMessage;
     delete (message1 as v3.MessageObject)?.traits;
-    expect(message1).toEqual({ messageId: 'traitMessageId', description: 'another description', 'x-parser-message-name': 'traitMessageId' });
+    expect(message1).toEqual({ summary: 'some summary', description: 'another description', 'x-parser-message-name': 'someMessage' });
 
     const message2 = v3Document?.json()?.channels?.someChannel2?.messages?.someMessage;
     delete (message2 as v3.MessageObject)?.traits;
-    expect(message2).toEqual({ messageId: 'rootMessageId', description: 'root description', 'x-parser-message-name': 'rootMessageId' });
+    expect(message2).toEqual({ summary: 'root summary', description: 'root description', 'x-parser-message-name': 'someMessage' });
   });
 
   it('should apply traits to messages (components)', async function() {
@@ -131,7 +131,7 @@ describe('custom operations - apply traits v3', function() {
           someMessage1: {
             traits: [
               {
-                messageId: 'traitMessageId',
+                summary: 'some summary',
                 description: 'some description' 
               },
               {
@@ -140,11 +140,11 @@ describe('custom operations - apply traits v3', function() {
             ]
           },
           someMessage2: {
-            messageId: 'rootMessageId',
+            summary: 'root summary',
             description: 'root description',
             traits: [
               {
-                messageId: 'traitMessageId',
+                summary: 'some summary',
                 description: 'some description' 
               },
               {
@@ -162,10 +162,10 @@ describe('custom operations - apply traits v3', function() {
 
     const message1 = v3Document?.json()?.components?.messages?.someMessage1;
     delete (message1 as v3.MessageObject)?.traits;
-    expect(message1).toEqual({ messageId: 'traitMessageId', description: 'another description', 'x-parser-message-name': 'traitMessageId' });
+    expect(message1).toEqual({ summary: 'some summary', description: 'another description', 'x-parser-message-name': 'someMessage1' });
 
     const message2 = v3Document?.json()?.components?.messages?.someMessage2;
     delete (message2 as v3.MessageObject)?.traits;
-    expect(message2).toEqual({ messageId: 'rootMessageId', description: 'root description', 'x-parser-message-name': 'rootMessageId' });
+    expect(message2).toEqual({ summary: 'root summary', description: 'root description', 'x-parser-message-name': 'someMessage2' });
   });
 });
diff --git a/test/models/v2/channel.spec.ts b/test/models/v2/channel.spec.ts
index 279969a8d..fc1a01a22 100644
--- a/test/models/v2/channel.spec.ts
+++ b/test/models/v2/channel.spec.ts
@@ -100,7 +100,7 @@ describe('Channel model', function() {
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(1);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
-      expect(d.messages().all()[0].messageId()).toEqual((doc as any).publish.message.messageId);
+      expect(d.messages().all()[0].id()).toEqual((doc as any).publish.message.messageId);
     });
     
     it('should return collection of messages - oneOf message', function() {
@@ -109,9 +109,9 @@ describe('Channel model', function() {
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(2);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
-      expect(d.messages().all()[0].messageId()).toEqual((doc as any).subscribe.message.oneOf[0].messageId);
+      expect(d.messages().all()[0].id()).toEqual((doc as any).subscribe.message.oneOf[0].messageId);
       expect(d.messages().all()[1]).toBeInstanceOf(Message);
-      expect(d.messages().all()[1].messageId()).toEqual((doc as any).subscribe.message.oneOf[1].messageId);
+      expect(d.messages().all()[1].id()).toEqual((doc as any).subscribe.message.oneOf[1].messageId);
     });
 
     it('should return collection of messages - single message and oneOf', function() {
diff --git a/test/models/v2/message-trait.spec.ts b/test/models/v2/message-trait.spec.ts
index e2b2bc0d6..41382b330 100644
--- a/test/models/v2/message-trait.spec.ts
+++ b/test/models/v2/message-trait.spec.ts
@@ -53,13 +53,13 @@ describe('MessageTrait model', function() {
     it('should return the value', function() {
       const doc = { messageId: '...' };
       const d = new MessageTrait(doc);
-      expect(d.messageId()).toEqual(doc.messageId);
+      expect(d.id()).toEqual(doc.messageId);
     });
     
     it('should return undefined when there is no value', function() {
       const doc = {};
       const d = new MessageTrait(doc);
-      expect(d.messageId()).toBeUndefined();
+      expect(d.id()).toBeUndefined();
     });
   });
 
diff --git a/test/models/v2/server.spec.ts b/test/models/v2/server.spec.ts
index 8a97b8cc7..bb98877ba 100644
--- a/test/models/v2/server.spec.ts
+++ b/test/models/v2/server.spec.ts
@@ -144,7 +144,7 @@ describe('Server Model', function () {
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(1);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
-      expect(d.messages().all()[0].messageId()).toEqual('1');
+      expect(d.messages().all()[0].id()).toEqual('1');
     });
 
     it('should return collection of messages - multiple channels', function() {
@@ -153,11 +153,11 @@ describe('Server Model', function () {
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(3);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
-      expect(d.messages().all()[0].messageId()).toEqual('1');
+      expect(d.messages().all()[0].id()).toEqual('1');
       expect(d.messages().all()[1]).toBeInstanceOf(Message);
-      expect(d.messages().all()[1].messageId()).toEqual('2');
+      expect(d.messages().all()[1].id()).toEqual('2');
       expect(d.messages().all()[2]).toBeInstanceOf(Message);
-      expect(d.messages().all()[2].messageId()).toEqual('3');
+      expect(d.messages().all()[2].id()).toEqual('3');
     });
 
     it('should return collection of messages - server available only in particular channel', function() {
@@ -166,11 +166,11 @@ describe('Server Model', function () {
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(3);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
-      expect(d.messages().all()[0].messageId()).toEqual('1');
+      expect(d.messages().all()[0].id()).toEqual('1');
       expect(d.messages().all()[1]).toBeInstanceOf(Message);
-      expect(d.messages().all()[1].messageId()).toEqual('2');
+      expect(d.messages().all()[1].id()).toEqual('2');
       expect(d.messages().all()[2]).toBeInstanceOf(Message);
-      expect(d.messages().all()[2].messageId()).toEqual('3');
+      expect(d.messages().all()[2].id()).toEqual('3');
     });
   });
 
diff --git a/test/models/v3/channel.spec.ts b/test/models/v3/channel.spec.ts
index 4d65d8594..a444b1c62 100644
--- a/test/models/v3/channel.spec.ts
+++ b/test/models/v3/channel.spec.ts
@@ -98,26 +98,26 @@ describe('Channel model', function() {
 
   describe('.messages()', function() {
     it('should return collection of messages - single message', function() {
-      const doc = serializeInput<v3.ChannelObject>({ messages: { someMessage: { messageId: 'messageId' } } });
+      const doc = serializeInput<v3.ChannelObject>({ messages: { someMessage: {} } });
       const d = new Channel(doc);
       const msg = doc.messages?.['someMessage'] as v3.MessageObject;
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(1);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
-      expect(d.messages().all()[0].messageId()).toEqual(msg?.messageId);
+      expect(d.messages().all()[0].id()).toEqual('someMessage');
     });
     
     it('should return collection of messages - more than one messages', function() {
-      const doc = serializeInput<v3.ChannelObject>({ messages: { someMessage1: { messageId: 'messageId1' }, someMessage2: { messageId: 'messageId2' } } });
+      const doc = serializeInput<v3.ChannelObject>({ messages: { someMessage1: {}, someMessage2: {} } });
       const d = new Channel(doc);
       const msg1 = doc.messages?.['someMessage1'] as v3.MessageObject;
       const msg2 = doc.messages?.['someMessage2'] as v3.MessageObject;
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(2);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
-      expect(d.messages().all()[0].id()).toEqual(msg1.messageId);
+      expect(d.messages().all()[0].id()).toEqual('someMessage1');
       expect(d.messages().all()[1]).toBeInstanceOf(Message);
-      expect(d.messages().all()[1].id()).toEqual(msg2.messageId);
+      expect(d.messages().all()[1].id()).toEqual('someMessage2');
     });
   });
 
diff --git a/test/models/v3/message-trait.spec.ts b/test/models/v3/message-trait.spec.ts
index ad046af22..49f3b2fed 100644
--- a/test/models/v3/message-trait.spec.ts
+++ b/test/models/v3/message-trait.spec.ts
@@ -13,12 +13,6 @@ describe('MessageTrait model', function() {
       const d = new MessageTrait(doc, { asyncapi: {} as any, pointer: '', id: 'trait' });
       expect(d.id()).toEqual('trait');
     });
-
-    it('should reuse messageId', function() {
-      const doc = { messageId: '...' };
-      const d = new MessageTrait(doc);
-      expect(d.id()).toEqual(doc.messageId);
-    });
   });
 
   describe('.schemaFormat()', function() {
@@ -38,30 +32,16 @@ describe('MessageTrait model', function() {
   });
 
   describe('.hasMessageId()', function() {
-    it('should return true when there is a value', function() {
-      const doc = { messageId: '...' };
-      const d = new MessageTrait(doc);
-      expect(d.hasMessageId()).toEqual(true);
-    });
-    
-    it('should return false when there is no value', function() {
+    it('should return false when there is a value', function() {
       const doc = {};
-      const d = new MessageTrait(doc);
+      const d = new MessageTrait(doc, { asyncapi: {} as any, pointer: '', id: 'message' });
       expect(d.hasMessageId()).toEqual(false);
     });
-  });
-
-  describe('.messageId()', function() {
-    it('should return the value', function() {
-      const doc = { messageId: '...' };
-      const d = new MessageTrait(doc);
-      expect(d.messageId()).toEqual(doc.messageId);
-    });
     
-    it('should return undefined when there is no value', function() {
+    it('should return false when there is no value', function() {
       const doc = {};
       const d = new MessageTrait(doc);
-      expect(d.messageId()).toBeUndefined();
+      expect(d.hasMessageId()).toEqual(false);
     });
   });
 
diff --git a/test/models/v3/message.spec.ts b/test/models/v3/message.spec.ts
index 3bcca68d0..9d02b2885 100644
--- a/test/models/v3/message.spec.ts
+++ b/test/models/v3/message.spec.ts
@@ -18,12 +18,6 @@ describe('Message model', function() {
       const d = new Message(doc, { asyncapi: {} as any, pointer: '', id: 'message' });
       expect(d.id()).toEqual('message');
     });
-
-    it('should reuse messageId', function() {
-      const doc = { messageId: '...' };
-      const d = new Message(doc);
-      expect(d.id()).toEqual(doc.messageId);
-    });
   });
 
   describe('.schemaFormat() + .hasSchemaFormat()', function() {
diff --git a/test/models/v3/operation-reply.spec.ts b/test/models/v3/operation-reply.spec.ts
index 140c24903..3f065d5a1 100644
--- a/test/models/v3/operation-reply.spec.ts
+++ b/test/models/v3/operation-reply.spec.ts
@@ -64,20 +64,20 @@ describe('OperationReply model', function() {
   
   describe('.messages()', function() {
     it('should return collection of messages - single message', function() {
-      const d = new OperationReply({ messages: { someMessage: { messageId: 'messageId' } } });
+      const d = new OperationReply({ messages: { someMessage: {} } });
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(1);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
     });
 
     it('should return collection of messages - more than one messages', function() {
-      const d = new OperationReply({ messages: { someMessage1: { messageId: 'messageId1' }, someMessage2: { messageId: 'messageId2' } } });
+      const d = new OperationReply({ messages: { someMessage1: {}, someMessage2: {} } });
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(2);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
-      expect(d.messages().all()[0].messageId()).toEqual('messageId1');
+      expect(d.messages().all()[0].id()).toEqual('someMessage1');
       expect(d.messages().all()[1]).toBeInstanceOf(Message);
-      expect(d.messages().all()[1].messageId()).toEqual('messageId2');
+      expect(d.messages().all()[1].id()).toEqual('someMessage2');
     });
 
     it('should return undefined if address is not present', function() {
diff --git a/test/models/v3/operation.spec.ts b/test/models/v3/operation.spec.ts
index 1bf852e4d..9dcd179bb 100644
--- a/test/models/v3/operation.spec.ts
+++ b/test/models/v3/operation.spec.ts
@@ -89,7 +89,7 @@ describe('Operation model', function() {
 
   describe('.messages()', function() {
     it('should return collection of messages - single message', function() {
-      const channel = { messages: { someMessage: { messageId: 'messageId' } } };
+      const channel = { messages: { someMessage: { summary: 'summary' } } };
       const d = new Operation({ action: 'send', channel }, { asyncapi: { parsed: { channels: { someChannel: channel } } } as any, pointer: '', id: 'operation' });
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(1);
@@ -97,23 +97,23 @@ describe('Operation model', function() {
     });
 
     it('should return collection of messages - more than one messages', function() {
-      const channel = { messages: { someMessage1: { messageId: 'messageId1' }, someMessage2: { messageId: 'messageId2' } } };
+      const channel = { messages: { someMessage1: { summary: 'summary1' }, someMessage2: { summary: 'summary2' } } };
       const d = new Operation({ action: 'send', channel }, { asyncapi: { parsed: { channels: { someChannel: channel } } } as any, pointer: '', id: 'operation' });
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(2);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
-      expect(d.messages().all()[0].messageId()).toEqual('messageId1');
+      expect(d.messages().all()[0].summary()).toEqual('summary1');
       expect(d.messages().all()[1]).toBeInstanceOf(Message);
-      expect(d.messages().all()[1].messageId()).toEqual('messageId2');
+      expect(d.messages().all()[1].summary()).toEqual('summary2');
     });
 
     it('should return collection of messages - defined message on operation level', function() {
-      const channel = { messages: { someMessage1: { messageId: 'messageId1' }, someMessage2: { messageId: 'messageId2' } } };
+      const channel = { messages: { someMessage1: { summary: 'summary1' }, someMessage2: { summary: 'summary2' } } };
       const d = new Operation({ action: 'send', channel, messages: [channel.messages.someMessage1] }, { asyncapi: { parsed: { channels: { someChannel: channel } } } as any, pointer: '', id: 'operation' });
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(1);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
-      expect(d.messages().all()[0].messageId()).toEqual('messageId1');
+      expect(d.messages().all()[0].summary()).toEqual('summary1');
     });
     
     it('should return undefined when there is no value', function() {
diff --git a/test/models/v3/server.spec.ts b/test/models/v3/server.spec.ts
index 6289a8954..9059fac8c 100644
--- a/test/models/v3/server.spec.ts
+++ b/test/models/v3/server.spec.ts
@@ -168,33 +168,33 @@ describe('Server Model', function () {
   describe('.messages()', function() {
     it('should return collection of messages - one message', function() {
       const doc = serializeInput<v3.ServerObject>({});
-      const d = new Server(doc, { asyncapi: { parsed: { channels: { someChannel: { messages: { someMessage: { messageId: 'messageId' } } } } } } as any, pointer: '', id: 'production' });
+      const d = new Server(doc, { asyncapi: { parsed: { channels: { someChannel: { messages: { someMessage: { summary: 'summary' } } } } } } as any, pointer: '', id: 'production' });
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(1);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
-      expect(d.messages().all()[0].messageId()).toEqual('messageId');
+      expect(d.messages().all()[0].summary()).toEqual('summary');
     });
 
     it('should return collection of messages - more than one messages', function() {
       const doc = serializeInput<v3.ServerObject>({});
-      const d = new Server(doc, { asyncapi: { parsed: { channels: { someChannel1: { messages: { someMessage1: { messageId: 'messageId1' } } }, someChannel2: { messages: { someMessage2: { messageId: 'messageId2' }, someMessage3: { messageId: 'messageId3' } } } } } } as any, pointer: '', id: 'production' });
+      const d = new Server(doc, { asyncapi: { parsed: { channels: { someChannel1: { messages: { someMessage1: { summary: 'summary1' } } }, someChannel2: { messages: { someMessage2: { summary: 'summary2' }, someMessage3: { summary: 'summary3' } } } } } } as any, pointer: '', id: 'production' });
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(3);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
-      expect(d.messages().all()[0].messageId()).toEqual('messageId1');
+      expect(d.messages().all()[0].summary()).toEqual('summary1');
       expect(d.messages().all()[1]).toBeInstanceOf(Message);
-      expect(d.messages().all()[1].messageId()).toEqual('messageId2');
+      expect(d.messages().all()[1].summary()).toEqual('summary2');
       expect(d.messages().all()[2]).toBeInstanceOf(Message);
-      expect(d.messages().all()[2].messageId()).toEqual('messageId3');
+      expect(d.messages().all()[2].summary()).toEqual('summary3');
     });
 
     it('should return collection of messages - server available only in particular channel', function() {
       const doc = serializeInput<v3.ServerObject>({});
-      const d = new Server(doc, { asyncapi: { parsed: { channels: { someChannel1: { servers: [doc], messages: { someMessage1: { messageId: 'messageId1' } } }, someChannel2: { servers: [{}], messages: { someMessage2: { messageId: 'messageId2' }, someMessage3: { messageId: 'messageId3' } } } } } } as any, pointer: '', id: 'production' });
+      const d = new Server(doc, { asyncapi: { parsed: { channels: { someChannel1: { servers: [doc], messages: { someMessage1: { summary: 'summary1' } } }, someChannel2: { servers: [{}], messages: { someMessage2: { summary: 'summary2' }, someMessage3: { summary: 'summary3' } } } } } } as any, pointer: '', id: 'production' });
       expect(d.messages()).toBeInstanceOf(Messages);
       expect(d.messages().all()).toHaveLength(1);
       expect(d.messages().all()[0]).toBeInstanceOf(Message);
-      expect(d.messages().all()[0].messageId()).toEqual('messageId1');
+      expect(d.messages().all()[0].summary()).toEqual('summary1');
     });
   });