Skip to content

Commit 60431b0

Browse files
authored
Release 2.0.0 (#46)
# [2.0.0](https://github.com/kuzzleio/sdk-csharp/releases/tag/2.0.0) (2019-11-27) #### Breaking changes - [ [#43](#43) ] Kuzzle v2 compatibility ([Aschen](https://github.com/Aschen)) ---
1 parent a918847 commit 60431b0

File tree

269 files changed

+812
-1084
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

269 files changed

+812
-1084
lines changed

.ci/doc/docker-compose.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,28 @@ version: '3'
22

33
services:
44
kuzzle:
5-
image: kuzzleio/kuzzle:1
5+
image: kuzzleio/kuzzle:2
66
ports:
77
- "7512:7512"
88
cap_add:
99
- SYS_PTRACE
1010
depends_on:
1111
- redis
1212
- elasticsearch
13-
container_name: kuzzle
1413
environment:
15-
- kuzzle_services__db__client__host=http://elasticsearch:9200
14+
- kuzzle_services__storageEngine__client__node=http://elasticsearch:9200
1615
- kuzzle_services__internalCache__node__host=redis
1716
- kuzzle_services__memoryStorage__node__host=redis
17+
- kuzzle_services__storageEngine__commonMapping__dynamic=true
1818
- NODE_ENV=production
1919

2020
redis:
2121
image: redis:5
2222

2323
elasticsearch:
24-
image: kuzzleio/elasticsearch:5.6.10
24+
image: kuzzleio/elasticsearch:7.4.0
2525
ulimits:
2626
nofile: 65536
27-
environment:
28-
- cluster.name=kuzzle
29-
- "ES_JAVA_OPTS=-Xms256m -Xmx256m"
3027

3128
doc-tests:
3229
image: kuzzleio/snippets-tests

.ci/docker-compose.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3'
22

33
services:
44
kuzzle:
5-
image: kuzzleio/kuzzle:1
5+
image: kuzzleio/kuzzle:2
66
ports:
77
- "7512:7512"
88
cap_add:
@@ -11,21 +11,19 @@ services:
1111
- redis
1212
- elasticsearch
1313
environment:
14-
- kuzzle_services__db__client__host=http://elasticsearch:9200
14+
- kuzzle_services__storageEngine__client__node=http://elasticsearch:9200
1515
- kuzzle_services__internalCache__node__host=redis
1616
- kuzzle_services__memoryStorage__node__host=redis
17+
- kuzzle_services__storageEngine__commonMapping__dynamic=true
1718
- NODE_ENV=production
1819

1920
redis:
2021
image: redis:5
2122

2223
elasticsearch:
23-
image: kuzzleio/elasticsearch:5.6.10
24+
image: kuzzleio/elasticsearch:7.4.0
2425
ulimits:
2526
nofile: 65536
26-
environment:
27-
- cluster.name=kuzzle
28-
- "ES_JAVA_OPTS=-Xms256m -Xmx256m"
2927

3028
volumes:
3129
snippets:

Kuzzle.Tests/API/Controllers/CollectionControllerTest.cs

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,7 @@ public async void ExistsAsyncTest(bool result) {
7878
public async void GetMappingAsyncTest() {
7979
var expected = JObject.Parse(@"
8080
{
81-
foo: {
82-
mappings: {
83-
bar: {
84-
some: 'mappings'
85-
}
86-
}
87-
}
81+
some: 'mappings'
8882
}");
8983

9084
_api.SetResult(new JObject { { "result", expected } });
@@ -100,7 +94,7 @@ public async void GetMappingAsyncTest() {
10094
});
10195

10296
Assert.Equal(
103-
expected["foo"]["mappings"]["bar"],
97+
expected,
10498
mappings,
10599
new JTokenEqualityComparer());
106100
}
@@ -297,15 +291,33 @@ public async void ValidateSpecificationsAsyncTest(bool response) {
297291
var payload = new JObject { { "foo", "bar" } };
298292

299293
bool result =
300-
await _collectionController.ValidateSpecificationsAsync(payload);
294+
await _collectionController.ValidateSpecificationsAsync(
295+
"foo", "bar", payload);
301296

302297
_api.Verify(new JObject {
303298
{ "controller", "collection" },
304299
{ "action", "validateSpecifications" },
300+
{ "index", "foo" },
301+
{ "collection", "bar" },
305302
{ "body", payload }
306303
});
307304

308305
Assert.Equal(response, result);
309306
}
307+
308+
[Fact]
309+
public async void RefreshAsyncTest() {
310+
_api.SetResult(@"{result: null}");
311+
312+
await _collectionController.RefreshAsync("foo", "bar");
313+
314+
_api.Verify(new JObject {
315+
{ "controller", "collection" },
316+
{ "action", "refresh" },
317+
{ "index", "foo" },
318+
{ "collection", "bar" },
319+
});
320+
}
321+
310322
}
311323
}

Kuzzle.Tests/API/Controllers/DocumentControllerTest.cs

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,11 @@ public async void GetAsync() {
188188
[InlineData(true)]
189189
[InlineData(false)]
190190
public async void MCreateAsync(bool refresh) {
191-
_api.SetResult("{ result: { hits: [1, 2, 3] } }");
191+
_api.SetResult("{ result: { successes: [1, 2, 3], errors: [] } }");
192192

193193
var documents = new JArray { "foo", "bar", "baz" };
194194

195-
JArray result = await _documentController.MCreateAsync(
195+
JObject result = await _documentController.MCreateAsync(
196196
"foo",
197197
"bar",
198198
documents,
@@ -212,7 +212,7 @@ public async void MCreateAsync(bool refresh) {
212212
_api.Verify(expected);
213213

214214
Assert.Equal(
215-
new JArray { 1, 2, 3 },
215+
JObject.Parse("{ successes: [1, 2, 3], errors: [] }"),
216216
result,
217217
new JTokenEqualityComparer());
218218
}
@@ -221,11 +221,11 @@ public async void MCreateAsync(bool refresh) {
221221
[InlineData(true)]
222222
[InlineData(false)]
223223
public async void MCreateOrReplaceAsync(bool refresh) {
224-
_api.SetResult("{ result: { hits: [1, 2, 3] } }");
224+
_api.SetResult("{ result: { successes: [1, 2, 3], errors: [] } }");
225225

226226
var documents = new JArray { "foo", "bar", "baz" };
227227

228-
JArray result = await _documentController.MCreateOrReplaceAsync(
228+
JObject result = await _documentController.MCreateOrReplaceAsync(
229229
"foo",
230230
"bar",
231231
documents,
@@ -245,7 +245,7 @@ public async void MCreateOrReplaceAsync(bool refresh) {
245245
_api.Verify(expected);
246246

247247
Assert.Equal(
248-
new JArray { 1, 2, 3 },
248+
JObject.Parse("{ successes: [1, 2, 3], errors: [] }"),
249249
result,
250250
new JTokenEqualityComparer());
251251
}
@@ -254,11 +254,11 @@ public async void MCreateOrReplaceAsync(bool refresh) {
254254
[InlineData(true)]
255255
[InlineData(false)]
256256
public async void MDeleteAsync(bool refresh) {
257-
_api.SetResult("{ result: ['foo', 'bar', 'baz'] }");
257+
_api.SetResult("{ result: { successes: [1, 2, 3], errors: [] } }");
258258

259259
var ids = new string[] { "foo", "bar", "baz" };
260260

261-
string[] result = await _documentController.MDeleteAsync(
261+
JObject result = await _documentController.MDeleteAsync(
262262
"foo",
263263
"bar",
264264
ids,
@@ -277,16 +277,19 @@ public async void MDeleteAsync(bool refresh) {
277277

278278
_api.Verify(expected);
279279

280-
Assert.Equal(ids, result);
280+
Assert.Equal(
281+
JObject.Parse("{ successes: [1, 2, 3], errors: [] }"),
282+
result,
283+
new JTokenEqualityComparer());
281284
}
282285

283286
[Fact]
284287
public async void MGetAsyncTest() {
285-
_api.SetResult("{ result: { hits: ['foo', 'bar', 'baz'] } }");
288+
_api.SetResult("{ result: { successes: ['foo', 'bar', 'baz'], errors: [] } }");
286289

287290
var ids = new JArray { "foo", "bar", "baz" };
288291

289-
JArray result = await _documentController.MGetAsync(
292+
JObject result = await _documentController.MGetAsync(
290293
"foo", "bar", ids);
291294

292295
var expected = new JObject {
@@ -301,7 +304,7 @@ public async void MGetAsyncTest() {
301304

302305
_api.Verify(expected);
303306
Assert.Equal(
304-
new JArray { "foo", "bar", "baz" },
307+
JObject.Parse("{ successes: ['foo', 'bar', 'baz'], errors: [] }"),
305308
result,
306309
new JTokenEqualityComparer());
307310
}
@@ -310,11 +313,11 @@ public async void MGetAsyncTest() {
310313
[InlineData(true)]
311314
[InlineData(false)]
312315
public async void MReplaceAsync(bool refresh) {
313-
_api.SetResult("{ result: { hits: [1, 2, 3] } }");
316+
_api.SetResult("{ result: { successes: [1, 2, 3], errors: [] } }");
314317

315318
var documents = new JArray { "foo", "bar", "baz" };
316319

317-
JArray result = await _documentController.MReplaceAsync(
320+
JObject result = await _documentController.MReplaceAsync(
318321
"foo",
319322
"bar",
320323
documents,
@@ -334,7 +337,7 @@ public async void MReplaceAsync(bool refresh) {
334337
_api.Verify(expected);
335338

336339
Assert.Equal(
337-
new JArray { 1, 2, 3 },
340+
JObject.Parse("{ successes: [1, 2, 3], errors: [] }"),
338341
result,
339342
new JTokenEqualityComparer());
340343
}
@@ -346,11 +349,11 @@ public async void MReplaceAsync(bool refresh) {
346349
MemberType = typeof(DocumentControllerGenerators))
347350
]
348351
public async void MUpdateAsyncTest(bool refresh, int? retries) {
349-
_api.SetResult("{ result: { hits: [1, 2, 3] } }");
352+
_api.SetResult("{ result: { successes: [1, 2, 3], errors: [] } }");
350353

351354
var documents = new JArray { "foo", "bar", "baz" };
352355

353-
JArray result;
356+
JObject result;
354357

355358
if (retries == null) {
356359
result = await _documentController.MUpdateAsync(
@@ -381,9 +384,8 @@ public async void MUpdateAsyncTest(bool refresh, int? retries) {
381384
expected.Add("retryOnConflict", retries ?? 0);
382385

383386
_api.Verify(expected);
384-
385387
Assert.Equal(
386-
new JArray { 1, 2, 3 },
388+
JObject.Parse("{ 'successes': [1, 2, 3], 'errors': [] }"),
387389
result,
388390
new JTokenEqualityComparer());
389391
}

0 commit comments

Comments
 (0)