Skip to content

Commit f0946a5

Browse files
croakyiampogo
authored andcommitted
sdk/java: enforce camel case for Name-Set
Closes #2946 Author: Dan Croak <dan@statusok.com> Date: Fri Apr 6 15:27:53 2018 -0700 upstream:cd0273879ab2787fde70ba6d9fef86361956e90b
1 parent 4b47515 commit f0946a5

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

src/main/java/com/seq/http/Client.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ private <T> T post(String path, Object body, ResponseCreator<T> respCreator)
220220
.header("User-Agent", "sequence-sdk-java/" + version)
221221
.header("Credential", this.credential)
222222
.header("Idempotency-Key", idempotencyKey)
223-
.header("Name-Set", "camel|snake")
223+
.header("Name-Set", "camel")
224224
.url(endpointURL)
225225
.method("POST", requestBody)
226226
.build();

src/test/java/com/seq/integration/FeedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void testActionFeedConsumption() throws Exception {
6767

6868
final Feed<Action> feed = new Feed.Action.Builder()
6969
.setId(uuid)
70-
.setFilter("snapshot.action_tags.test=$1")
70+
.setFilter("snapshot.actionTags.test=$1")
7171
.addFilterParameter(uuid)
7272
.create(client);
7373

@@ -115,7 +115,7 @@ public void testTransactionFeedConsumption() throws Exception {
115115

116116
final Feed<Transaction> feed = new Feed.Transaction.Builder()
117117
.setId(uuid)
118-
.setFilter("actions(snapshot.action_tags.test=$1)")
118+
.setFilter("actions(snapshot.actionTags.test=$1)")
119119
.addFilterParameter(uuid)
120120
.create(client);
121121

src/test/java/com/seq/integration/QueryTest.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ public void testTransactionQuery() throws Exception {
112112
.setId(flavorId)
113113
.addKeyId(key.id)
114114
.setQuorum(1)
115+
.addTag("test", test)
115116
.create(client);
116117

117118
new Transaction.Builder()
@@ -149,6 +150,13 @@ public void testTransactionQuery() throws Exception {
149150
.getPage(client);
150151
assertEquals(1, page.items.size());
151152
assertEquals(test, page.items.get(0).actions.get(0).tags.get("test"));
153+
154+
page =
155+
new Transaction.ListBuilder()
156+
.setFilter("actions(snapshot.flavorTags.test=$1)")
157+
.addFilterParameter(test)
158+
.getPage(client);
159+
assertEquals(1, page.items.size());
152160
}
153161

154162
public void testActionQuery() throws Exception {
@@ -318,7 +326,7 @@ public void testActionQuery() throws Exception {
318326
.addFilterParameter("transfer")
319327
.addFilterParameter(flavorId)
320328
.addGroupByField("type")
321-
.addGroupByField("flavor_id")
329+
.addGroupByField("flavorId")
322330
.addGroupByField("tags")
323331
.addGroupByField("snapshot")
324332
.getPage(client);
@@ -403,13 +411,13 @@ public void testTokenQuery() throws Exception {
403411

404412
TokenSum.Page sumPage =
405413
new Token.SumBuilder()
406-
.addGroupByField("account_id")
414+
.addGroupByField("accountId")
407415
.getPage(client);
408416
assertEquals(10, sumPage.items.size());
409417

410418
sumPage =
411419
new Token.SumBuilder()
412-
.addGroupByField("account_id")
420+
.addGroupByField("accountId")
413421
.setPageSize(7)
414422
.getPage(client);
415423
assertEquals(7, sumPage.items.size());
@@ -418,7 +426,7 @@ public void testTokenQuery() throws Exception {
418426
assertEquals(3, sumPage.items.size());
419427

420428
TokenSum.ItemIterable tokenSums = new Token.SumBuilder()
421-
.addGroupByField("account_id")
429+
.addGroupByField("accountId")
422430
.getIterable(client);
423431
for (TokenSum sum : tokenSums) {
424432
assertEquals(100, sum.amount);

src/test/java/com/seq/integration/TransactionTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,14 @@ public void testTransactionWithFilter() throws Exception {
192192

193193
Token.Page tokens =
194194
new Token.ListBuilder()
195-
.setFilter("account_id=$1")
195+
.setFilter("accountId=$1")
196196
.addFilterParameter(alice)
197197
.getPage(client);
198198
assertEquals(0, tokens.items.size());
199199

200200
tokens =
201201
new Token.ListBuilder()
202-
.setFilter("account_id=$1")
202+
.setFilter("accountId=$1")
203203
.addFilterParameter(bob)
204204
.getPage(client);
205205

@@ -219,7 +219,7 @@ public void testTransactionWithFilter() throws Exception {
219219

220220
tokens =
221221
new Token.ListBuilder()
222-
.setFilter("account_id=$1")
222+
.setFilter("accountId=$1")
223223
.addFilterParameter(bob)
224224
.getPage(client);
225225

0 commit comments

Comments
 (0)