Skip to content

Support sort _score/_doc order shorthand #2002

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

Open
russcam wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −1
Open

Support sort _score/_doc order shorthand #2002

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: 1 addition & 1 deletion java-client/src/main/java/org/opensearch/client/opensearch/_types/ScoreSort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public ScoreSort build() {
protected static void setupScoreSortDeserializer(ObjectDeserializer<ScoreSort.Builder> op) {

op.add(Builder::order, SortOrder._DESERIALIZER, "order");

op.shortcutProperty("order");
}

}
28 changes: 28 additions & 0 deletions java-client/src/test/java/org/opensearch/client/opensearch/_types/SortOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,32 @@ public void testSortOptions() {
assertEquals("entityId", fieldSort.field());
assertEquals(SortOrder.Asc, fieldSort.order());
}

@Test
public void testScoreSortOrderShorthand() {
String jsonString = "[{\"_score\":\"asc\"}]";
StringReader reader = new StringReader(jsonString);
JacksonJsonpMapper mapper = new JacksonJsonpMapper();
JsonParser parser = mapper.jsonProvider().createParser(reader);

List<SortOptions> sortOptions = JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER).deserialize(parser, mapper);
assertEquals(1, sortOptions.size());
assertEquals(SortOptions.Kind.Score, sortOptions.get(0)._kind());
ScoreSort scoreSort = (ScoreSort) sortOptions.get(0)._get();
assertEquals(SortOrder.Asc, scoreSort.order());
}

@Test
public void testDocSortOrderShorthand() {
String jsonString = "[{\"_doc\":\"desc\"}]";
StringReader reader = new StringReader(jsonString);
JacksonJsonpMapper mapper = new JacksonJsonpMapper();
JsonParser parser = mapper.jsonProvider().createParser(reader);

List<SortOptions> sortOptions = JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER).deserialize(parser, mapper);
assertEquals(1, sortOptions.size());
assertEquals(SortOptions.Kind.Doc, sortOptions.get(0)._kind());
ScoreSort scoreSort = (ScoreSort) sortOptions.get(0)._get();
assertEquals(SortOrder.Desc, scoreSort.order());
}
}
Loading