Skip to content

Format AbstractFilteringTestCase (backport of #77217) #77254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2021
Merged

Format AbstractFilteringTestCase (backport of #77217) #77254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build-tools-internal/src/main/groovy/elasticsearch.formatting.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ subprojects {
if (project.path == ':server') {
target 'src/*/java/org/elasticsearch/action/admin/cluster/repositories/**/*.java',
'src/*/java/org/elasticsearch/action/admin/cluster/snapshots/**/*.java',
'src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java',
'src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java',
'src/*/java/org/elasticsearch/index/snapshots/**/*.java',
'src/*/java/org/elasticsearch/repositories/**/*.java',
'src/*/java/org/elasticsearch/search/aggregations/**/*.java',
Expand Down
1,351 changes: 180 additions & 1,171 deletions ...er/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java
View file
Open in desktop

Large diffs are not rendered by default.

442 changes: 208 additions & 234 deletions server/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions ...rg/elasticsearch/common/xcontent/support/filtering/AbstractXContentFilteringTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ protected final void testFilter(Builder expected, Builder actual, Set<String> in

protected abstract XContentType getXContentType();

@Override
protected boolean removesEmptyArrays() {
return true;
}

private XContentBuilder createBuilder() throws IOException {
return XContentBuilder.builder(getXContentType().xContent());
}
Expand Down
71 changes: 71 additions & 0 deletions server/src/test/resources/org/elasticsearch/common/xcontent/support/sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"title" : "My awesome book",
"pages" : 456,
"price" : 27.99,
"timestamp" : 1428582942867,
"default" : null,
"tags" : [
"elasticsearch",
"java"
],
"authors" : [
{
"name" : "John Doe",
"lastname" : "John",
"firstname" : "Doe"
},
{
"name" : "William Smith",
"lastname" : "William",
"firstname" : "Smith"
}
],
"properties" : {
"weight" : 0.8,
"language" : {
"en" : {
"lang" : "English",
"available" : true,
"distributors" : [
{
"name" : "The Book Shop",
"addresses" : [
{
"name" : "address #1",
"street" : "Hampton St",
"city" : "London"
},
{
"name" : "address #2",
"street" : "Queen St",
"city" : "Stornoway"
}
]
},
{
"name" : "Sussex Books House"
}
]
},
"fr" : {
"lang" : "French",
"available" : false,
"distributors" : [
{
"name" : "La Maison du Livre",
"addresses" : [
{
"name" : "address #1",
"street" : "Rue Mouffetard",
"city" : "Paris"
}
]
},
{
"name" : "Thetra"
}
]
}
}
}
}
14 changes: 14 additions & 0 deletions server/src/test/resources/org/elasticsearch/common/xcontent/support/sample_just_authors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"authors" : [
{
"name" : "John Doe",
"lastname" : "John",
"firstname" : "Doe"
},
{
"name" : "William Smith",
"lastname" : "William",
"firstname" : "Smith"
}
]
}
10 changes: 10 additions & 0 deletions ...est/resources/org/elasticsearch/common/xcontent/support/sample_just_authors_lastname.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"authors" : [
{
"lastname" : "John"
},
{
"lastname" : "William"
}
]
}
47 changes: 47 additions & 0 deletions server/src/test/resources/org/elasticsearch/common/xcontent/support/sample_just_names.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"authors" : [
{
"name" : "John Doe"
},
{
"name" : "William Smith"
}
],
"properties" : {
"language" : {
"en" : {
"distributors" : [
{
"name" : "The Book Shop",
"addresses" : [
{
"name" : "address #1"
},
{
"name" : "address #2"
}
]
},
{
"name" : "Sussex Books House"
}
]
},
"fr" : {
"distributors" : [
{
"name" : "La Maison du Livre",
"addresses" : [
{
"name" : "address #1"
}
]
},
{
"name" : "Thetra"
}
]
}
}
}
}
51 changes: 51 additions & 0 deletions server/src/test/resources/org/elasticsearch/common/xcontent/support/sample_just_pr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"price" : 27.99,
"properties" : {
"weight" : 0.8,
"language" : {
"en" : {
"lang" : "English",
"available" : true,
"distributors" : [
{
"name" : "The Book Shop",
"addresses" : [
{
"name" : "address #1",
"street" : "Hampton St",
"city" : "London"
},
{
"name" : "address #2",
"street" : "Queen St",
"city" : "Stornoway"
}
]
},
{
"name" : "Sussex Books House"
}
]
},
"fr" : {
"lang" : "French",
"available" : false,
"distributors" : [
{
"name" : "La Maison du Livre",
"addresses" : [
{
"name" : "address #1",
"street" : "Rue Mouffetard",
"city" : "Paris"
}
]
},
{
"name" : "Thetra"
}
]
}
}
}
}
26 changes: 26 additions & 0 deletions .../org/elasticsearch/common/xcontent/support/sample_just_properties_distributors_names.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"properties" : {
"language" : {
"en" : {
"distributors" : [
{
"name" : "The Book Shop"
},
{
"name" : "Sussex Books House"
}
]
},
"fr" : {
"distributors" : [
{
"name" : "La Maison du Livre"
},
{
"name" : "Thetra"
}
]
}
}
}
}
24 changes: 24 additions & 0 deletions .../resources/org/elasticsearch/common/xcontent/support/sample_just_properties_en_names.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"properties" : {
"language" : {
"en" : {
"distributors" : [
{
"name" : "The Book Shop",
"addresses" : [
{
"name" : "address #1"
},
{
"name" : "address #2"
}
]
},
{
"name" : "Sussex Books House"
}
]
}
}
}
}
26 changes: 26 additions & 0 deletions ...rch/common/xcontent/support/sample_just_properties_en_no_distributors_name_no_street.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"properties" : {
"language" : {
"en" : {
"lang" : "English",
"available" : true,
"distributors" : [
{
"name" : "The Book Shop",
"addresses" : [
{
"city" : "London"
},
{
"city" : "Stornoway"
}
]
},
{
"name" : "Sussex Books House"
}
]
}
}
}
}
39 changes: 39 additions & 0 deletions ...est/resources/org/elasticsearch/common/xcontent/support/sample_just_properties_names.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"properties" : {
"language" : {
"en" : {
"distributors" : [
{
"name" : "The Book Shop",
"addresses" : [
{
"name" : "address #1"
},
{
"name" : "address #2"
}
]
},
{
"name" : "Sussex Books House"
}
]
},
"fr" : {
"distributors" : [
{
"name" : "La Maison du Livre",
"addresses" : [
{
"name" : "address #1"
}
]
},
{
"name" : "Thetra"
}
]
}
}
}
}
15 changes: 15 additions & 0 deletions ...ces/org/elasticsearch/common/xcontent/support/sample_just_properties_no_distributors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"properties" : {
"weight" : 0.8,
"language" : {
"en" : {
"lang" : "English",
"available" : true
},
"fr" : {
"lang" : "French",
"available" : false
}
}
}
}
16 changes: 16 additions & 0 deletions ...resources/org/elasticsearch/common/xcontent/support/sample_just_tags_authors_no_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"tags" : [
"elasticsearch",
"java"
],
"authors" : [
{
"lastname" : "John",
"firstname" : "Doe"
},
{
"lastname" : "William",
"firstname" : "Smith"
}
]
}
Loading