Skip to content

Commit 56612c9

Browse files
andrusandrus
committed
Upgarde Jackson to 2.19.4 #250 
1 parent 41a63b9 commit 56612c9

12 files changed

Lines changed: 80 additions & 53 deletions

‎RELEASE-NOTES.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
## Release 3.0.0
1010

1111
* #249 Upgrade to Cayenne 4.2.3
12+
* #250 Upgarde Jackson to 2.19.4 #250
1213

1314
## Release 3.0.0-RC4
1415

‎link-move/src/test/java/com/nhl/link/move/itest/CreateIT.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public void sync() {
4848
assertExec(2, 2, 0, 0, e1);
4949

5050
etl1t().matcher().assertMatches(2);
51-
etl1t().matcher().eq("name", "a").eq("age", 3).assertOneMatch();
52-
etl1t().matcher().eq("name", "b").eq("age", null).assertOneMatch();
51+
etl1t().matcher().eq("name", "a").andEq("age", 3).assertOneMatch();
52+
etl1t().matcher().eq("name", "b").andEq("age", null).assertOneMatch();
5353

5454
srcEtl1().insertColumns("name").values("c").exec();
5555
srcEtl1().update().set("age", 5).where("name", "a").exec();
@@ -58,16 +58,16 @@ public void sync() {
5858
assertExec(3, 3, 0, 0, e2);
5959

6060
etl1t().matcher().assertMatches(5);
61-
etl1t().matcher().eq("name", "a").eq("age", 5).assertOneMatch();
62-
etl1t().matcher().eq("name", "c").eq("age", null).assertOneMatch();
61+
etl1t().matcher().eq("name", "a").andEq("age", 5).assertOneMatch();
62+
etl1t().matcher().eq("name", "c").andEq("age", null).assertOneMatch();
6363

6464
srcEtl1().delete().where("name", "a").exec();
6565

6666
Execution e3 = task.run();
6767
assertExec(2, 2, 0, 0, e3);
6868

6969
etl1t().matcher().assertMatches(7);
70-
etl1t().matcher().eq("name", "a").eq("age", 5).assertOneMatch();
70+
etl1t().matcher().eq("name", "a").andEq("age", 5).assertOneMatch();
7171

7272
Execution e4 = task.run();
7373
assertExec(2, 2, 0, 0, e4);
@@ -108,9 +108,9 @@ public void syncFk() {
108108
assertExec(2, 2, 0, 0, e1);
109109

110110
etl3t().matcher().assertMatches(2);
111-
etl3t().matcher().eq("e2_id", 58).eq("e5_id", 17).eq("name", "3Name1").eq("phone_number", "3PHONE1")
111+
etl3t().matcher().eq("e2_id", 58).andEq("e5_id", 17).andEq("name", "3Name1").andEq("phone_number", "3PHONE1")
112112
.assertOneMatch();
113-
etl3t().matcher().eq("e2_id", 34).eq("e5_id", 17).eq("name", "3Name2").eq("phone_number", "3PHONE2")
113+
etl3t().matcher().eq("e2_id", 34).andEq("e5_id", 17).andEq("name", "3Name2").andEq("phone_number", "3PHONE2")
114114
.assertOneMatch();
115115
}
116116
}

‎link-move/src/test/java/com/nhl/link/move/itest/CreateOrUpdateIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void matchByDbAttribute() {
8787
Execution e3 = task.run();
8888
assertExec(2, 0, 0, 0, e3);
8989
etl1t().matcher().assertMatches(3);
90-
etl1t().matcher().eq("name", "a").eq("age", 5).assertOneMatch();
90+
etl1t().matcher().eq("name", "a").andEq("age", 5).assertOneMatch();
9191

9292
Execution e4 = task.run();
9393
assertExec(2, 0, 0, 0, e4);
@@ -360,7 +360,7 @@ public void matchByAttribute_SyncNulls() {
360360
Execution e1 = task.run();
361361
assertExec(1, 0, 1, 0, e1);
362362
etl1t().matcher().assertOneMatch();
363-
etl1t().matcher().eq("name", "a").eq("age", null).assertOneMatch();
363+
etl1t().matcher().eq("name", "a").andEq("age", null).assertOneMatch();
364364
}
365365

366366
@Test

‎link-move/src/test/java/com/nhl/link/move/itest/CreateOrUpdate_CapsStrategyIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public void capsLower() {
2727
Execution e1 = task.run();
2828
assertExec(2, 2, 0, 0, e1);
2929
etl1t().matcher().assertMatches(2);
30-
etl1t().matcher().eq("name", "a").eq("age", 3).assertOneMatch();
31-
etl1t().matcher().eq("name", "b").eq("age", null).assertOneMatch();
30+
etl1t().matcher().eq("name", "a").andEq("age", 3).assertOneMatch();
31+
etl1t().matcher().eq("name", "b").andEq("age", null).assertOneMatch();
3232
}
3333

3434
@Test

‎link-move/src/test/java/com/nhl/link/move/itest/CreateOrUpdate_ImplicitMappingIT.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,24 @@ private void matchByKey(String key) {
3636
Execution e1 = task.run();
3737
assertExec(2, 2, 0, 0, e1);
3838
etl1t().matcher().assertMatches(2);
39-
etl1t().matcher().eq("name", "a").eq("age", 3).assertOneMatch();
40-
etl1t().matcher().eq("name", "b").eq("age", null).assertOneMatch();
39+
etl1t().matcher().eq("name", "a").andEq("age", 3).assertOneMatch();
40+
etl1t().matcher().eq("name", "b").andEq("age", null).assertOneMatch();
4141

4242
srcEtl1().insertColumns("name").values("c").exec();
4343
srcEtl1().update().set("age", 5).where("name", "a").exec();
4444

4545
Execution e2 = task.run();
4646
assertExec(3, 1, 1, 0, e2);
4747
etl1t().matcher().assertMatches(3);
48-
etl1t().matcher().eq("name", "a").eq("age", 5).assertOneMatch();
49-
etl1t().matcher().eq("name", "c").eq("age", null).assertOneMatch();
48+
etl1t().matcher().eq("name", "a").andEq("age", 5).assertOneMatch();
49+
etl1t().matcher().eq("name", "c").andEq("age", null).assertOneMatch();
5050

5151
srcEtl1().delete().where("name", "a").exec();
5252

5353
Execution e3 = task.run();
5454
assertExec(2, 0, 0, 0, e3);
5555
etl1t().matcher().assertMatches(3);
56-
etl1t().matcher().eq("name", "a").eq("age", 5).assertOneMatch();
56+
etl1t().matcher().eq("name", "a").andEq("age", 5).assertOneMatch();
5757

5858
Execution e4 = task.run();
5959
assertExec(2, 0, 0, 0, e4);
@@ -73,24 +73,24 @@ public void byId() {
7373
assertExec(2, 2, 0, 0, e1);
7474

7575
etl5t().matcher().assertMatches(2);
76-
etl5t().matcher().eq("name", "a").eq("id", 45).assertOneMatch();
77-
etl5t().matcher().eq("name", "b").eq("id", 11).assertOneMatch();
76+
etl5t().matcher().eq("name", "a").andEq("id", 45).assertOneMatch();
77+
etl5t().matcher().eq("name", "b").andEq("id", 11).assertOneMatch();
7878

7979
srcEtl5().insertColumns("id", "name").values(31, "c").exec();
8080
srcEtl5().update().set("name", "d").where("id", 45).exec();
8181

8282
Execution e2 = task.run();
8383
assertExec(3, 1, 1, 0, e2);
8484
etl5t().matcher().assertMatches(3);
85-
etl5t().matcher().eq("name", "d").eq("id", 45).assertOneMatch();
86-
etl5t().matcher().eq("name", "c").eq("id", 31).assertOneMatch();
85+
etl5t().matcher().eq("name", "d").andEq("id", 45).assertOneMatch();
86+
etl5t().matcher().eq("name", "c").andEq("id", 31).assertOneMatch();
8787

8888
srcEtl5().delete().where("id", 45).exec();
8989

9090
Execution e3 = task.run();
9191
assertExec(2, 0, 0, 0, e3);
9292
etl5t().matcher().assertMatches(3);
93-
etl5t().matcher().eq("name", "d").eq("id", 45).assertOneMatch();
93+
etl5t().matcher().eq("name", "d").andEq("id", 45).assertOneMatch();
9494

9595
Execution e4 = task.run();
9696
assertExec(2, 0, 0, 0, e4);

‎link-move/src/test/java/com/nhl/link/move/itest/CreateOrUpdate_InheritanceIT.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public void subclass_MatchBySubKey() {
2929
tiSuper().matcher().eq("type", "sub1").assertMatches(2);
3030

3131
tiSub1().matcher().assertMatches(2);
32-
tiSub1().matcher().eq("sub_key", "a").eq("subp1", "p1").assertOneMatch();
33-
tiSub1().matcher().eq("sub_key", "b").eq("subp1", "p2").assertOneMatch();
32+
tiSub1().matcher().eq("sub_key", "a").andEq("subp1", "p1").assertOneMatch();
33+
tiSub1().matcher().eq("sub_key", "b").andEq("subp1", "p2").assertOneMatch();
3434

3535
srcEtlSub1().insertColumns("s_key", "s_subp1").values("c", null).exec();
3636
tiSub1().update().set("subp1", "p3").where("subp1", "p1").exec();
@@ -41,9 +41,9 @@ public void subclass_MatchBySubKey() {
4141
tiSuper().matcher().eq("type", "sub1").assertMatches(3);
4242

4343
tiSub1().matcher().assertMatches(3);
44-
tiSub1().matcher().eq("sub_key", "a").eq("subp1", "p1").assertOneMatch();
45-
tiSub1().matcher().eq("sub_key", "b").eq("subp1", "p2").assertOneMatch();
46-
tiSub1().matcher().eq("sub_key", "c").eq("subp1", null).assertOneMatch();
44+
tiSub1().matcher().eq("sub_key", "a").andEq("subp1", "p1").assertOneMatch();
45+
tiSub1().matcher().eq("sub_key", "b").andEq("subp1", "p2").assertOneMatch();
46+
tiSub1().matcher().eq("sub_key", "c").andEq("subp1", null).assertOneMatch();
4747

4848
srcEtlSub1().delete().where("s_key", "a").exec();
4949

@@ -71,12 +71,12 @@ public void subclass_MatchBySuperKey() {
7171
Execution e1 = task.run();
7272
assertExec(2, 2, 0, 0, e1);
7373
tiSuper().matcher().assertMatches(2);
74-
tiSuper().matcher().eq("type", "sub1").eq("super_key", "a").assertOneMatch();
75-
tiSuper().matcher().eq("type", "sub1").eq("super_key", "b").assertOneMatch();
74+
tiSuper().matcher().eq("type", "sub1").andEq("super_key", "a").assertOneMatch();
75+
tiSuper().matcher().eq("type", "sub1").andEq("super_key", "b").assertOneMatch();
7676

7777
tiSub1().matcher().assertMatches(2);
78-
tiSub1().matcher().eq("sub_key", null).eq("subp1", "p1").assertOneMatch();
79-
tiSub1().matcher().eq("sub_key", null).eq("subp1", "p2").assertOneMatch();
78+
tiSub1().matcher().eq("sub_key", null).andEq("subp1", "p1").assertOneMatch();
79+
tiSub1().matcher().eq("sub_key", null).andEq("subp1", "p2").assertOneMatch();
8080

8181
srcEtlSub1().insertColumns("s_key", "s_subp1").values("c", null).exec();
8282
tiSub1().update().set("subp1", "p3").where("subp1", "p1").exec();
@@ -85,13 +85,13 @@ public void subclass_MatchBySuperKey() {
8585
assertExec(3, 1, 1, 0, e2);
8686

8787
tiSuper().matcher().assertMatches(3);
88-
tiSuper().matcher().eq("type", "sub1").eq("super_key", "a").assertOneMatch();
89-
tiSuper().matcher().eq("type", "sub1").eq("super_key", "b").assertOneMatch();
90-
tiSuper().matcher().eq("type", "sub1").eq("super_key", "c").assertOneMatch();
88+
tiSuper().matcher().eq("type", "sub1").andEq("super_key", "a").assertOneMatch();
89+
tiSuper().matcher().eq("type", "sub1").andEq("super_key", "b").assertOneMatch();
90+
tiSuper().matcher().eq("type", "sub1").andEq("super_key", "c").assertOneMatch();
9191

9292
tiSub1().matcher().assertMatches(2);
93-
tiSub1().matcher().eq("sub_key", null).eq("subp1", "p1").assertOneMatch();
94-
tiSub1().matcher().eq("sub_key", null).eq("subp1", "p2").assertOneMatch();
93+
tiSub1().matcher().eq("sub_key", null).andEq("subp1", "p1").assertOneMatch();
94+
tiSub1().matcher().eq("sub_key", null).andEq("subp1", "p2").assertOneMatch();
9595

9696
srcEtlSub1().delete().where("s_key", "a").exec();
9797

‎link-move/src/test/java/com/nhl/link/move/itest/CreateOrUpdate_ValueConvertersIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public void implicitJavaTimeConversion() {
178178
assertExec(1, 1, 0, 0, e1);
179179

180180
etl4t().matcher()
181-
.eq("id", 1).eq("c_date", "2020-01-02").andEq("c_time", "08:01:03").andEq("c_timestamp", "2020-03-04 09:01:04")
181+
.eq("id", 1).andEq("c_date", "2020-01-02").andEq("c_time", "08:01:03").andEq("c_timestamp", "2020-03-04 09:01:04")
182182
.assertOneMatch();
183183
}
184184
}

‎link-move/src/test/java/com/nhl/link/move/itest/CreateOrUpdate_WithConnectorFromTargetIT.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@ public void byAttribute() {
3434
assertExec(2, 2, 0, 0, e1);
3535

3636
etl2t().matcher().assertMatches(2);
37-
etl2t().matcher().eq("name", "a").eq("address", null).assertOneMatch();
38-
etl2t().matcher().eq("name", "b").eq("address", null).assertOneMatch();
37+
etl2t().matcher().eq("name", "a").andEq("address", null).assertOneMatch();
38+
etl2t().matcher().eq("name", "b").andEq("address", null).assertOneMatch();
3939

4040
etl1t().insertColumns("name").values("c").exec();
4141
etl1t().update().set("name", "d").where("name", "a").exec();
4242

4343
Execution e2 = task.run();
4444
assertExec(3, 2, 0, 0, e2);
4545
etl2t().matcher().assertMatches(4);
46-
etl2t().matcher().eq("name", "a").eq("address", null).assertOneMatch();
47-
etl2t().matcher().eq("name", "b").eq("address", null).assertOneMatch();
48-
etl2t().matcher().eq("name", "c").eq("address", null).assertOneMatch();
49-
etl2t().matcher().eq("name", "d").eq("address", null).assertOneMatch();
46+
etl2t().matcher().eq("name", "a").andEq("address", null).assertOneMatch();
47+
etl2t().matcher().eq("name", "b").andEq("address", null).assertOneMatch();
48+
etl2t().matcher().eq("name", "c").andEq("address", null).assertOneMatch();
49+
etl2t().matcher().eq("name", "d").andEq("address", null).assertOneMatch();
5050
}
5151
}

‎link-move/src/test/java/com/nhl/link/move/itest/ExtractorReloadingIT.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public void reload() throws InterruptedException {
6666
Execution e1 = task.run();
6767
assertExec(2, 2, 0, 0, e1);
6868
etl1t().matcher().assertMatches(2);
69-
etl1t().matcher().eq("name", "a").eq("age", 3).eq("description", null).assertOneMatch();
70-
etl1t().matcher().eq("name", "b").eq("age", null).eq("description", null).assertOneMatch();
69+
etl1t().matcher().eq("name", "a").andEq("age", 3).andEq("description", null).assertOneMatch();
70+
etl1t().matcher().eq("name", "b").andEq("age", null).andEq("description", null).assertOneMatch();
7171

7272
// sleep to make sure extractor file name timestamp change is detectable
7373
Thread.sleep(1000);
@@ -76,7 +76,7 @@ public void reload() throws InterruptedException {
7676
Execution e2 = task.run();
7777
assertExec(2, 0, 2, 0, e2);
7878
etl1t().matcher().assertMatches(2);
79-
etl1t().matcher().eq("name", "a").eq("age", 3).eq("description", "d1").assertOneMatch();
80-
etl1t().matcher().eq("name", "b").eq("age", null).eq("description", "d2").assertOneMatch();
79+
etl1t().matcher().eq("name", "a").andEq("age", 3).andEq("description", "d1").assertOneMatch();
80+
etl1t().matcher().eq("name", "b").andEq("age", null).andEq("description", "d2").assertOneMatch();
8181
}
8282
}

‎link-move/src/test/java/com/nhl/link/move/itest/xml/CreateOrUpdate_XmlConnectorIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ public void multiConnectors_XMLSource() {
3434
assertExec(1, 1, 0, 0, e1);
3535

3636
etl1t().matcher().assertOneMatch();
37-
etl1t().matcher().eq("name", "zzz").eq("age", 3).assertOneMatch();
37+
etl1t().matcher().eq("name", "zzz").andEq("age", 3).assertOneMatch();
3838
}
3939
}

0 commit comments

Comments
 (0)