Skip to content

Commit d916b52

Browse files
committed
Rename duplicate asciidoc documentation id
1 parent cc1d34a commit d916b52

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

src/Nest/Mapping/Types/Core/Join/JoinField.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
namespace Nest
44
{
5-
/// This does not extend from Union because its intended to be used on folk's _source's
6-
/// And the union serialization will bleed into their own JSON.NET serializer should they
7-
/// have one configured and then it will blow up because their contractresolver do not extend ours
8-
/// from which we can snoop ConnectionSettings.
9-
///
10-
/// ContractJsonResolverAttribute works as well but I rather keep this class contained as much as possible
11-
///
5+
// This does not extend from Union because its intended to be used on folk's _source's
6+
// And the union serialization will bleed into their own JSON.NET serializer should they
7+
// have one configured and then it will blow up because their contractresolver do not extend ours
8+
// from which we can snoop ConnectionSettings.
9+
//
10+
// ContractJsonResolverAttribute works as well but I rather keep this class contained as much as possible
11+
/// <summary>
12+
/// The field on which a parent-child relationship is joined
1213
/// </summary>
1314
[ContractJsonConverter(typeof(JoinFieldJsonConverter))]
1415
public class JoinField

src/Tests/ClientConcepts/HighLevel/Mapping/ParentChildJoins.doc.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,21 @@
1212

1313
namespace Tests.ClientConcepts.HighLevel.Mapping
1414
{
15-
/**[[multi-fields]]
15+
/**[[parent-child-joins]]
1616
* === Parent Child joins using the join mapping
1717
*
1818
* Prior to Elasticsearch 6.x you could have multiple types in a single index. Through the special _parent field mapping of a given type
1919
* one could create 1 to N relationship of parent => children documents. This worked because when indexing children you passed a
2020
* `_parent` id which would act as the routing key making sure a parent and its (grand)children all lived on the same shard.
2121
*
22-
* Starting with 6.x indices you may no longer have multiple types in a single index. One reason for this is that if for instance
22+
* Starting with 6.x indices, you may no longer have multiple types in a single index. One reason for this is that if for instance
2323
* two types * have the same `name` property they need to be mapped exactly the same but all the API's acted as if you could map
2424
* them individually which often lead to confusion.
2525
*
2626
* So how do you create a parent join now that indices no longer allow you store different types in the same index and therefor also
2727
* not on the same shard?
2828
*
2929
*/
30-
3130
public class ParentChildJoins : DocumentationTestBase
3231
{
3332
public abstract class MyDocument
@@ -79,8 +78,6 @@ public void SimpleParentChildMapping()
7978
)
8079
);
8180

82-
/**
83-
*/
8481
//json
8582
var expected = new
8683
{

0 commit comments

Comments
 (0)