Skip to content

Commit df138ea

Browse files
jakhogjakhog
authored
Upgrade contracts to released 6.0.0 (#64)
* Upgrade to released 6.0.0 contracts * Fix references to event types
1 parent 3818d9a commit df138ea

16 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎Source/artifacts/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@dolittle/concepts": "5.0.1",
3737
"@dolittle/rudiments": "5.0.1",
3838
"@dolittle/types": "5.0.1",
39-
"@dolittle/runtime.contracts": "6.0.0-eventsource.0"
39+
"@dolittle/runtime.contracts": "6.0.0"
4040
},
4141
"devDependencies": {
4242
"@types/is-natural-number": "^4.0.0"

‎Source/embeddings/Internal/EmbeddingProcessor.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ export class EmbeddingProcessor<TReadModel> extends ClientProcessor<EmbeddingId,
183183
const pbEventSourceId = pbEvent.getEventsourceid();
184184
if (!pbEventSourceId) throw new MissingEventInformation('EventSourceId');
185185

186-
const pbArtifact = pbEvent.getArtifact();
187-
if (!pbArtifact) throw new MissingEventInformation('Artifact');
186+
const pbEventType = pbEvent.getEventtype();
187+
if (!pbEventType) throw new MissingEventInformation('Event Type');
188188

189189
if (!request.getCurrentstate() || !request.getCurrentstate()?.getState()) {
190190
throw new MissingEventInformation('No state in ProjectionRequest');
@@ -202,7 +202,7 @@ export class EmbeddingProcessor<TReadModel> extends ClientProcessor<EmbeddingId,
202202

203203
let event = JSON.parse(pbEvent.getContent());
204204

205-
const eventType = eventTypes.toSDK(pbArtifact);
205+
const eventType = eventTypes.toSDK(pbEventType);
206206
if (this._eventTypes.hasTypeFor(eventType)) {
207207
const typeOfEvent = this._eventTypes.getTypeFor(eventType);
208208
event = Object.assign(new typeOfEvent(), event);

‎Source/embeddings/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
},
3535
"dependencies": {
3636
"@dolittle/concepts": "5.0.1",
37-
"@dolittle/contracts": "6.0.0-eventsource.0",
37+
"@dolittle/contracts": "6.0.0",
3838
"@dolittle/rudiments": "5.0.1",
39-
"@dolittle/runtime.contracts": "6.0.0-eventsource.0",
39+
"@dolittle/runtime.contracts": "6.0.0",
4040
"@dolittle/types": "5.0.1",
4141
"luxon": "1.24.1",
4242
"@types/luxon": "1.24.1"

‎Source/eventHorizon/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
},
3535
"dependencies": {
3636
"@dolittle/rudiments": "5.0.1",
37-
"@dolittle/runtime.contracts": "6.0.0-eventsource.0",
37+
"@dolittle/runtime.contracts": "6.0.0",
3838
"@dolittle/sdk.events": "18.0.0-eventsource.1",
3939
"@dolittle/sdk.artifacts": "18.0.0-eventsource.1",
4040
"@dolittle/sdk.execution": "18.0.0-eventsource.1",

‎Source/events.filtering/Internal/FilterEventProcessor.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ export abstract class FilterEventProcessor<TRegisterArguments, TResponse> extend
5353
const pbOccurred = pbEvent.getOccurred();
5454
if (!pbOccurred) throw new MissingEventInformation('Occurred');
5555

56-
const pbArtifact = pbEvent.getType();
57-
if (!pbArtifact) throw new MissingEventInformation('Artifact');
56+
const pbEventType = pbEvent.getEventtype();
57+
if (!pbEventType) throw new MissingEventInformation('Event Type');
5858

5959
const eventContext = new EventContext(
6060
pbSequenceNumber,
@@ -64,7 +64,7 @@ export abstract class FilterEventProcessor<TRegisterArguments, TResponse> extend
6464

6565
let event = JSON.parse(pbEvent.getContent());
6666

67-
const artifact = eventTypes.toSDK(pbArtifact);
67+
const artifact = eventTypes.toSDK(pbEventType);
6868
if (this._eventTypes.hasTypeFor(artifact)) {
6969
const eventType = this._eventTypes.getTypeFor(artifact);
7070
event = Object.assign(new eventType(), event);

‎Source/events.filtering/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
"lint:fix": "gulp lint-fix --gulpfile ../../node_modules/@dolittle/typescript.build/Gulpfile.js"
3333
},
3434
"dependencies": {
35-
"@dolittle/contracts": "6.0.0-eventsource.0",
35+
"@dolittle/contracts": "6.0.0",
3636
"@dolittle/rudiments": "5.0.1",
37-
"@dolittle/runtime.contracts": "6.0.0-eventsource.0",
37+
"@dolittle/runtime.contracts": "6.0.0",
3838
"@dolittle/sdk.artifacts": "18.0.0-eventsource.1",
3939
"@dolittle/sdk.events": "18.0.0-eventsource.1",
4040
"@dolittle/sdk.events.handling": "18.0.0-eventsource.1",

‎Source/events.handling/Internal/EventHandlerProcessor.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export class EventHandlerProcessor extends internal.EventProcessor<EventHandlerI
6060
for (const eventType of this._handler.handledEvents) {
6161
handledArtifacts.push(eventTypes.toProtobuf(eventType));
6262
}
63-
registerArguments.setTypesList(handledArtifacts);
63+
registerArguments.setEventtypesList(handledArtifacts);
6464
return registerArguments;
6565
}
6666

@@ -123,8 +123,8 @@ export class EventHandlerProcessor extends internal.EventProcessor<EventHandlerI
123123
const pbOccurred = pbEvent.getOccurred();
124124
if (!pbOccurred) throw new MissingEventInformation('Occurred');
125125

126-
const pbArtifact = pbEvent.getType();
127-
if (!pbArtifact) throw new MissingEventInformation('Artifact');
126+
const pbEventType = pbEvent.getEventtype();
127+
if (!pbEventType) throw new MissingEventInformation('Event Type');
128128

129129
const eventContext = new EventContext(
130130
pbSequenceNumber,
@@ -134,7 +134,7 @@ export class EventHandlerProcessor extends internal.EventProcessor<EventHandlerI
134134

135135
let event = JSON.parse(pbEvent.getContent());
136136

137-
const eventType = eventTypes.toSDK(pbArtifact);
137+
const eventType = eventTypes.toSDK(pbEventType);
138138
if (this._eventTypes.hasTypeFor(eventType)) {
139139
const typeOfEvent = this._eventTypes.getTypeFor(eventType);
140140
event = Object.assign(new typeOfEvent(), event);

‎Source/events.handling/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
"lint:fix": "gulp lint-fix --gulpfile ../../node_modules/@dolittle/typescript.build/Gulpfile.js"
3434
},
3535
"dependencies": {
36-
"@dolittle/contracts": "6.0.0-eventsource.0",
36+
"@dolittle/contracts": "6.0.0",
3737
"@dolittle/types": "5.0.1",
38-
"@dolittle/runtime.contracts": "6.0.0-eventsource.0",
38+
"@dolittle/runtime.contracts": "6.0.0",
3939
"@dolittle/sdk.artifacts": "18.0.0-eventsource.1",
4040
"@dolittle/sdk.common": "18.0.0-eventsource.1",
4141
"@dolittle/sdk.events": "18.0.0-eventsource.1",

‎Source/events.processing/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
"lint:fix": "gulp lint-fix --gulpfile ../../node_modules/@dolittle/typescript.build/Gulpfile.js"
3333
},
3434
"dependencies": {
35-
"@dolittle/contracts": "6.0.0-eventsource.0",
35+
"@dolittle/contracts": "6.0.0",
3636
"@dolittle/concepts": "5.0.1",
3737
"@dolittle/rudiments": "5.0.1",
38-
"@dolittle/runtime.contracts": "6.0.0-eventsource.0",
38+
"@dolittle/runtime.contracts": "6.0.0",
3939
"@dolittle/sdk.artifacts": "18.0.0-eventsource.1",
4040
"@dolittle/sdk.events": "18.0.0-eventsource.1",
4141
"@dolittle/sdk.execution": "18.0.0-eventsource.1",

‎Source/events/EventConverters.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export class EventConverters {
3939
*/
4040
static getUncommittedEventFrom(event: any, eventSourceId: EventSourceId, eventType: EventType, isPublic: boolean): PbUncommittedEvent {
4141
const uncommittedEvent = new PbUncommittedEvent();
42-
uncommittedEvent.setArtifact(eventTypes.toProtobuf(eventType));
42+
uncommittedEvent.setEventtype(eventTypes.toProtobuf(eventType));
4343
uncommittedEvent.setEventsourceid(eventSourceId.value);
4444
uncommittedEvent.setPublic(isPublic);
4545
uncommittedEvent.setContent(JSON.stringify(event));
@@ -55,7 +55,7 @@ export class EventConverters {
5555
*/
5656
static getUncommittedEmbeddingEventFrom(event: any, eventType: EventType, isPublic: boolean): PbUncommittedEvent {
5757
const uncommittedEvent = new PbUncommittedEvent();
58-
uncommittedEvent.setArtifact(eventTypes.toProtobuf(eventType));
58+
uncommittedEvent.setEventtype(eventTypes.toProtobuf(eventType));
5959
uncommittedEvent.setPublic(isPublic);
6060
uncommittedEvent.setContent(JSON.stringify(event));
6161
return uncommittedEvent;
@@ -71,7 +71,7 @@ export class EventConverters {
7171
*/
7272
static getUncommittedAggregateEventFrom(event: any, eventType: EventType, isPublic: boolean): PbUncommittedAggregateEvents.UncommittedAggregateEvent {
7373
const uncommittedAggregateEvent = new PbUncommittedAggregateEvents.UncommittedAggregateEvent();
74-
uncommittedAggregateEvent.setArtifact(eventTypes.toProtobuf(eventType));
74+
uncommittedAggregateEvent.setEventtype(eventTypes.toProtobuf(eventType));
7575
uncommittedAggregateEvent.setPublic(isPublic);
7676
uncommittedAggregateEvent.setContent(JSON.stringify(event));
7777
return uncommittedAggregateEvent;
@@ -91,7 +91,7 @@ export class EventConverters {
9191
aggregateRootId,
9292
aggregateRootVersion,
9393
executionContexts.toSDK(executionContext),
94-
eventTypes.toSDK(input.getType()),
94+
eventTypes.toSDK(input.getEventtype()),
9595
JSON.parse(input.getContent()),
9696
input.getPublic()
9797
);
@@ -115,7 +115,7 @@ export class EventConverters {
115115
DateTime.fromJSDate((input.getOccurred()?.toDate() || new Date())),
116116
EventSourceId.from(input.getEventsourceid()),
117117
executionContexts.toSDK(executionContext),
118-
eventTypes.toSDK(input.getType()),
118+
eventTypes.toSDK(input.getEventtype()),
119119
JSON.parse(input.getContent()),
120120
input.getPublic(),
121121
input.getExternal(),
@@ -141,7 +141,7 @@ export class EventConverters {
141141
committedEvent.setOccurred(occurred);
142142
committedEvent.setEventsourceid(input.eventSourceId.value);
143143
committedEvent.setExecutioncontext(executionContexts.toProtobuf(input.executionContext));
144-
committedEvent.setType(eventTypes.toProtobuf(input.type));
144+
committedEvent.setEventtype(eventTypes.toProtobuf(input.type));
145145
committedEvent.setContent(JSON.stringify(input.content));
146146
committedEvent.setPublic(input.isPublic);
147147
committedEvent.setExternal(input.isExternal);

0 commit comments

Comments
 (0)