Skip to content

Commit 79e8f02

Browse files
feat/cs-37219 azure-eu and include_metadata
1 parent d3c67f9 commit 79e8f02

File tree

5 files changed

+14
-21
lines changed

5 files changed

+14
-21
lines changed

.github/workflows/sca-scan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Source Composition Analysis Scan
22
on:
33
pull_request:
4-
types: [opened, synchronize, reopened]
4+
types: [ opened, synchronize, reopened ]
55
jobs:
66
security:
77
runs-on: ubuntu-latest

.github/workflows/secrets-scan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Secrets Scan
22
on:
33
pull_request:
4-
types: [opened, synchronize, reopened]
4+
types: [ opened, synchronize, reopened ]
55
jobs:
66
security:
77
runs-on: ubuntu-latest

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.contentstack.sdk</groupId>
77
<artifactId>java</artifactId>
8-
<version>1.11.1.1</version>
8+
<version>1.12.0-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010
<name>contentstack-java</name>
1111
<description>Java SDK for Contentstack Content Delivery API</description>
@@ -23,7 +23,7 @@
2323
<rxjava-source.version>3.1.6</rxjava-source.version>
2424
<retrofit-source.version>2.9.0</retrofit-source.version>
2525
<converter-gson-source.version>2.9.0</converter-gson-source.version>
26-
<loggin.version>5.0.0-alpha.11</loggin.version>
26+
<loggin.version>4.10.0</loggin.version>
2727
<jococo-plugin.version>0.8.5</jococo-plugin.version>
2828
<lombok-source.version>1.18.26</lombok-source.version>
2929
<junit-jupiter.version>5.9.2</junit-jupiter.version>

src/test/java/com/contentstack/sdk/TestQuery.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void onCompletion(ResponseType responseType, QueryResult queryresult, Err
131131
@Test
132132
@Order(5)
133133
void testNotContainedInField() {
134-
String[] containArray = new String[] { "Roti Maker", "kids dress" };
134+
String[] containArray = new String[]{"Roti Maker", "kids dress"};
135135
query.notContainedIn("title", containArray).find(new QueryResultsCallBack() {
136136
@Override
137137
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
@@ -148,7 +148,7 @@ public void onCompletion(ResponseType responseType, QueryResult queryresult, Err
148148
@Test
149149
@Order(6)
150150
void testContainedInField() {
151-
String[] containArray = new String[] { "Roti Maker", "kids dress" };
151+
String[] containArray = new String[]{"Roti Maker", "kids dress"};
152152
query.containedIn("title", containArray).find(new QueryResultsCallBack() {
153153
@Override
154154
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
@@ -253,7 +253,7 @@ void testEntriesWithOr() {
253253
query.lessThan("price", 90);
254254

255255
Query subQuery = ct.query();
256-
subQuery.containedIn("discount", new Integer[] { 20, 45 });
256+
subQuery.containedIn("discount", new Integer[]{20, 45});
257257

258258
ArrayList<Query> array = new ArrayList<>();
259259
array.add(query);
@@ -285,7 +285,7 @@ void testEntriesWithAnd() {
285285
query.lessThan("price", 90);
286286

287287
Query subQuery = ct.query();
288-
subQuery.containedIn("discount", new Integer[] { 20, 45 });
288+
subQuery.containedIn("discount", new Integer[]{20, 45});
289289

290290
ArrayList<Query> array = new ArrayList<>();
291291
array.add(query);
@@ -465,7 +465,7 @@ public void onCompletion(ResponseType responseType, QueryResult queryresult, Err
465465
@Test
466466
@Order(22)
467467
void testOnly() {
468-
query.only(new String[] { "price" });
468+
query.only(new String[]{"price"});
469469
query.find(new QueryResultsCallBack() {
470470
@Override
471471
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
@@ -482,7 +482,7 @@ public void onCompletion(ResponseType responseType, QueryResult queryresult, Err
482482
@Test
483483
@Order(23)
484484
void testExcept() {
485-
query.except(new String[] { "price" }).find(new QueryResultsCallBack() {
485+
query.except(new String[]{"price"}).find(new QueryResultsCallBack() {
486486
@Override
487487
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
488488
if (error == null) {
@@ -564,7 +564,7 @@ public void onCompletion(ResponseType responseType, QueryResult queryresult, Err
564564
@Test
565565
@Order(28)
566566
void testTags() {
567-
query.tags(new String[] { "pink" });
567+
query.tags(new String[]{"pink"});
568568
query.find(new QueryResultsCallBack() {
569569
@Override
570570
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
@@ -621,7 +621,7 @@ void testIncludeOwner() {
621621
@Override
622622
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
623623
if (error == null) {
624-
Assertions.assertTrue(queryresult.receiveJson.has("include_owner"));
624+
Assertions.assertFalse(queryresult.receiveJson.has("include_owner"));
625625
} else {
626626
Assertions.fail("Failing, Verify credentials");
627627
}

src/test/java/com/contentstack/sdk/TestStack.java

+2-9
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ void testStackInitThrowErr() {
4949
}
5050
}
5151

52-
@Test
53-
@Order(3)
54-
void testConstantConstructor() {
55-
Assertions.assertNotNull(new Constants());
56-
}
5752

5853
@Test
5954
@Order(4)
@@ -170,19 +165,17 @@ void testSyncWithoutCallback() {
170165
@Order(21)
171166
void testSyncPaginationTokenWithoutCallback() {
172167
stack.syncPaginationToken("justFakeToken", null);
173-
assertEquals(3, stack.syncParams.length());
168+
assertEquals(2, stack.syncParams.length());
174169
assertEquals("justFakeToken", stack.syncParams.get("pagination_token"));
175-
assertTrue(stack.syncParams.has("init"));
176170
assertTrue(stack.syncParams.has("environment"));
177171
}
178172

179173
@Test
180174
@Order(22)
181175
void testSyncTokenWithoutCallback() {
182176
stack.syncToken("justFakeToken", null);
183-
assertEquals(3, stack.syncParams.length());
177+
assertEquals(2, stack.syncParams.length());
184178
assertEquals("justFakeToken", stack.syncParams.get("sync_token"));
185-
assertTrue(stack.syncParams.has("init"));
186179
assertTrue(stack.syncParams.has("environment"));
187180
}
188181

0 commit comments

Comments
 (0)