Skip to content

Commit 5b5159d

Browse files
debopdebop
committed
Bump up kotlin (1.5.31), kluent (1.68)
1 parent 66c6c79 commit 5b5159d

File tree

118 files changed

+971
-931
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+971
-931
lines changed

‎buildSrc/src/main/kotlin/Libraries.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ object BuildPlugins {
2929

3030
object Versions {
3131

32-
const val kotlin = "1.5.30"
32+
const val kotlin = "1.5.31"
3333
const val kotlinx_coroutines = "1.5.2"
34-
const val atomicfu = "0.15.1"
34+
const val atomicfu = "0.16.3"
3535

3636
const val spring_boot = BuildPlugins.Versions.spring_boot
3737
const val spring_cloud = "2020.0.3"
@@ -70,7 +70,7 @@ object Versions {
7070

7171
const val koin = "2.0.1"
7272

73-
const val byte_buddy = "1.9.13"
73+
const val byte_buddy = "1.11.16"
7474

7575
const val junit_jupiter = "5.7.2"
7676
const val junit_platform = "1.7.2"
@@ -346,7 +346,7 @@ object Libraries {
346346
const val byte_buddy_agent = "net.bytebuddy:byte-buddy-agent:${Versions.byte_buddy}"
347347

348348
const val objenesis = "org.objenesis:objenesis:3.0.1"
349-
const val ow2_asm = "org.ow2.asm:asm:7.1"
349+
const val ow2_asm = "org.ow2.asm:asm:9.0"
350350

351351
// junit 5.4+ 부터는 junit-jupiter 만 있으면 됩니다.
352352
const val junit_jupiter = "org.junit.jupiter:junit-jupiter:${Versions.junit_jupiter}"
@@ -359,7 +359,7 @@ object Libraries {
359359

360360
const val kluent = "org.amshove.kluent:kluent:1.68"
361361
const val assertj_core = "org.assertj:assertj-core:3.20.2"
362-
const val mockk = "io.mockk:mockk:1.10.5"
362+
const val mockk = "io.mockk:mockk:1.12.0"
363363
const val mockito_core = "org.mockito:mockito-core:${Versions.mockito}"
364364
const val mockito_junit_jupiter = "org.mockito:mockito-junit-jupiter:${Versions.mockito}"
365365
const val mockito_kotlin = "com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0"

‎eventsourcing/javers-example/src/test/kotlin/io/github/debop/javers/examples/CommitAndQueryExample.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.debop.javers.examples
22

33
import mu.KLogging
4-
import org.amshove.kluent.shouldEqualTo
4+
import org.amshove.kluent.shouldBeEqualTo
55
import org.javers.core.JaversBuilder
66
import org.javers.repository.jql.QueryBuilder
77
import org.junit.jupiter.api.Test
@@ -34,15 +34,15 @@ class CommitAndQueryExample {
3434

3535
val shadows = javers.findShadows<Person>(query)
3636
shadows.forEach { println(it.get()) }
37-
shadows.size shouldEqualTo 2
37+
shadows.size shouldBeEqualTo 2
3838

3939
println("Snapshots query:")
4040
val snapshots = javers.findSnapshots(query)
4141
snapshots.forEach { println(it) }
42-
snapshots.size shouldEqualTo 2
42+
snapshots.size shouldBeEqualTo 2
4343

4444
val changes = javers.findChanges(query)
4545
println(changes.prettyPrint())
46-
changes.size shouldEqualTo 2
46+
changes.size shouldBeEqualTo 2
4747
}
4848
}

‎eventsourcing/javers-example/src/test/kotlin/io/github/debop/javers/examples/JqlExample.kt

+34-34
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package io.github.debop.javers.examples
33
import mu.KLogging
44
import org.amshove.kluent.shouldBeInstanceOf
55
import org.amshove.kluent.shouldBeNull
6-
import org.amshove.kluent.shouldEqual
7-
import org.amshove.kluent.shouldEqualTo
6+
import org.amshove.kluent.shouldBeEqualTo
7+
import org.amshove.kluent.shouldBeEqualTo
88
import org.javers.core.JaversBuilder
99
import org.javers.core.diff.changetype.ValueChange
1010
import org.javers.core.metamodel.annotation.Id
@@ -50,7 +50,7 @@ class JqlExample {
5050
var shadowE1 = shadows[0].get()
5151

5252
shadowE1 shouldBeInstanceOf Entity::class
53-
shadowE1.id shouldEqualTo 1
53+
shadowE1.id shouldBeEqualTo 1
5454
shadowE1.ref.shouldBeNull()
5555
}
5656

@@ -61,8 +61,8 @@ class JqlExample {
6161
val shadowE1 = shadows[0].get()
6262

6363
shadowE1 shouldBeInstanceOf Entity::class
64-
shadowE1.id shouldEqualTo 1
65-
shadowE1.ref!!.id shouldEqualTo 2
64+
shadowE1.id shouldBeEqualTo 1
65+
shadowE1.ref!!.id shouldBeEqualTo 2
6666
shadowE1.ref!!.ref.shouldBeNull()
6767
}
6868

@@ -73,10 +73,10 @@ class JqlExample {
7373
val shadowE1 = shadows[0].get()
7474

7575
shadowE1 shouldBeInstanceOf Entity::class
76-
shadowE1.id shouldEqualTo 1
77-
shadowE1.ref!!.id shouldEqualTo 2
78-
shadowE1.ref!!.ref!!.id shouldEqualTo 3
79-
shadowE1.ref!!.ref!!.ref!!.id shouldEqualTo 4
76+
shadowE1.id shouldBeEqualTo 1
77+
shadowE1.ref!!.id shouldBeEqualTo 2
78+
shadowE1.ref!!.ref!!.id shouldBeEqualTo 3
79+
shadowE1.ref!!.ref!!.ref!!.id shouldBeEqualTo 4
8080
}
8181
}
8282

@@ -96,7 +96,7 @@ class JqlExample {
9696
val shadows = javers.findShadows<Entity>(byInstanceId(1, Entity::class.java).build())
9797
val shadowE1 = shadows[0].get()
9898
shadowE1 shouldBeInstanceOf Entity::class
99-
shadowE1.id shouldEqualTo 1
99+
shadowE1.id shouldBeEqualTo 1
100100
shadowE1.ref.shouldBeNull()
101101
}
102102

@@ -107,10 +107,10 @@ class JqlExample {
107107
val shadowE1 = shadows[0].get()
108108

109109
shadowE1 shouldBeInstanceOf Entity::class
110-
shadowE1.id shouldEqualTo 1
111-
shadowE1.ref!!.id shouldEqualTo 2
112-
shadowE1.ref!!.ref!!.id shouldEqualTo 3
113-
shadowE1.ref!!.ref!!.ref!!.id shouldEqualTo 4
110+
shadowE1.id shouldBeEqualTo 1
111+
shadowE1.ref!!.id shouldBeEqualTo 2
112+
shadowE1.ref!!.ref!!.id shouldBeEqualTo 3
113+
shadowE1.ref!!.ref!!.ref!!.id shouldBeEqualTo 4
114114
}
115115
}
116116

@@ -132,17 +132,17 @@ class JqlExample {
132132

133133
val changes = javers.findChanges(QueryBuilder.anyDomainObject().build())
134134

135-
changes.size shouldEqualTo 2
135+
changes.size shouldBeEqualTo 2
136136
println(changes.prettyPrint())
137137

138138
val filtered = changes.getChangesByType(ValueChange::class.java)
139139
val salaryChange = filtered.find { it.propertyName == "salary" }!!
140140
val cityChange = filtered.find { it.propertyName == "city" }!!
141141

142-
salaryChange.left shouldEqual 1000
143-
salaryChange.right shouldEqual 2000
144-
cityChange.left shouldEqual "London"
145-
cityChange.right shouldEqual "Paris"
142+
salaryChange.left shouldBeEqualTo 1000
143+
salaryChange.right shouldBeEqualTo 2000
144+
cityChange.left shouldBeEqualTo "London"
145+
cityChange.right shouldBeEqualTo "Paris"
146146
}
147147

148148
@Test
@@ -160,17 +160,17 @@ class JqlExample {
160160

161161
val shadows = javers.findShadows<Employee>(QueryBuilder.byInstance(bob).build())
162162

163-
shadows.size shouldEqualTo 2
163+
shadows.size shouldBeEqualTo 2
164164
val bobNew: Employee = shadows[0].get()
165165
val bobOld: Employee = shadows[1].get()
166166

167-
bobNew.salary shouldEqualTo 2000
168-
bobOld.salary shouldEqualTo 1000
169-
bobNew.primaryAddress?.city shouldEqual "Paris"
170-
bobOld.primaryAddress?.city shouldEqual "London"
167+
bobNew.salary shouldBeEqualTo 2000
168+
bobOld.salary shouldBeEqualTo 1000
169+
bobNew.primaryAddress?.city shouldBeEqualTo "Paris"
170+
bobOld.primaryAddress?.city shouldBeEqualTo "London"
171171

172-
shadows[0].commitMetadata.id.majorId shouldEqualTo 2
173-
shadows[1].commitMetadata.id.majorId shouldEqualTo 1
172+
shadows[0].commitMetadata.id.majorId shouldBeEqualTo 2
173+
shadows[1].commitMetadata.id.majorId shouldBeEqualTo 1
174174
}
175175

176176
@Test
@@ -199,30 +199,30 @@ class JqlExample {
199199
var bobShadow = shadows[0].get() // Bob의 최신 버전을 가진다
200200

201201
// THEN
202-
shadows.size shouldEqualTo 2
203-
bobShadow.name shouldEqual "bob"
202+
shadows.size shouldBeEqualTo 2
203+
bobShadow.name shouldBeEqualTo "bob"
204204
// 참조객체는 쿼리 범위에서 벗어났으므로 null을 가진다
205205
bobShadow.boss.shouldBeNull()
206206
// 자식으로 있는 `Value Object`는 항상 scope에 포함된다
207-
bobShadow.primaryAddress?.city shouldEqual "London"
207+
bobShadow.primaryAddress?.city shouldBeEqualTo "London"
208208

209209
// WHEN `commit-deep scope query`
210210
shadows = javers.findShadows<Employee>(QueryBuilder.byInstance(bob).withScopeCommitDeep().build())
211211
bobShadow = shadows[0].get()
212212

213213
// THEN
214-
bobShadow.boss?.name shouldEqual "john" // John is inside the query scope, so his shadow is loaded and linked to Bob
214+
bobShadow.boss?.name shouldBeEqualTo "john" // John is inside the query scope, so his shadow is loaded and linked to Bob
215215
bobShadow.boss?.boss.shouldBeNull() // Steve is still outside the scope
216-
bobShadow.primaryAddress?.city shouldEqual "London"
216+
bobShadow.primaryAddress?.city shouldBeEqualTo "London"
217217

218218
// WHEN `deep+2 scope query`
219219
shadows = javers.findShadows<Employee>(QueryBuilder.byInstance(bob).withScopeDeepPlus(2).build())
220220
bobShadow = shadows[0].get()
221221

222222
// THEN
223-
bobShadow.boss?.name shouldEqual "john"
224-
bobShadow.boss?.boss?.name shouldEqual "steve" // Steve is loaded thanks to deep+2 scope
225-
bobShadow.primaryAddress?.city shouldEqual "London"
223+
bobShadow.boss?.name shouldBeEqualTo "john"
224+
bobShadow.boss?.boss?.name shouldBeEqualTo "steve" // Steve is loaded thanks to deep+2 scope
225+
bobShadow.primaryAddress?.city shouldBeEqualTo "London"
226226
}
227227
}
228228
}

‎eventsourcing/javers-example/src/test/kotlin/io/github/debop/javers/examples/MappingExample.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package io.github.debop.javers.examples
22

33
import org.amshove.kluent.shouldBeEmpty
44
import org.amshove.kluent.shouldBeInstanceOf
5-
import org.amshove.kluent.shouldEqual
5+
import org.amshove.kluent.shouldBeEqualTo
66
import org.amshove.kluent.shouldNotEqual
77
import org.javers.core.JaversBuilder
88
import org.javers.core.metamodel.`object`.InstanceId
@@ -37,7 +37,7 @@ class MappingExample {
3737
println("JaversType of Person: ${personType.prettyPrint()}")
3838
println("Id of bob: `${bobId.value()}`")
3939

40-
bobId.value() shouldEqual "Person/Bob"
40+
bobId.value() shouldBeEqualTo "Person/Bob"
4141
bobId shouldBeInstanceOf InstanceId::class
4242
}
4343

@@ -75,7 +75,7 @@ class MappingExample {
7575
var javers = JaversBuilder.javers().build()
7676
var id = javers.getTypeMapping<EntityType>(Entity::class.java).createIdFromInstance(entity)
7777

78-
id.value() shouldEqual "Entity/0.3333333333333333,1.3333333333333333"
78+
id.value() shouldBeEqualTo "Entity/0.3333333333333333,1.3333333333333333"
7979

8080
// when custom toString function
8181
javers = JaversBuilder.javers()
@@ -84,6 +84,6 @@ class MappingExample {
8484

8585
id = javers.getTypeMapping<EntityType>(Entity::class.java).createIdFromInstance(entity)
8686

87-
id.value() shouldEqual "Entity/(0,1)"
87+
id.value() shouldBeEqualTo "Entity/(0,1)"
8888
}
8989
}

‎eventsourcing/javers-example/src/test/kotlin/io/github/debop/javers/examples/ObjectDiffExample.kt

+19-19
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package io.github.debop.javers.examples
33
import mu.KLogging
44
import org.amshove.kluent.shouldContainSame
55
import org.amshove.kluent.shouldEndWith
6-
import org.amshove.kluent.shouldEqual
7-
import org.amshove.kluent.shouldEqualTo
6+
import org.amshove.kluent.shouldBeEqualTo
7+
import org.amshove.kluent.shouldBeEqualTo
88
import org.javers.core.JaversBuilder
99
import org.javers.core.diff.changetype.NewObject
1010
import org.javers.core.diff.changetype.ObjectRemoved
@@ -32,7 +32,7 @@ class ObjectDiffExample {
3232
val diff = javers.compare(tommyOld, tommyNew)
3333

3434
logger.debug { "diff=$diff" }
35-
diff.changes.size shouldEqualTo 1
35+
diff.changes.size shouldBeEqualTo 1
3636

3737
logger.debug { javers.jsonConverter.toJson(diff) }
3838
}
@@ -80,12 +80,12 @@ class ObjectDiffExample {
8080
logger.debug { "Removed diff=\n${javers.jsonConverter.toJson(diff)}" }
8181

8282
val removed = diff.getChangesByType(ObjectRemoved::class.java)
83-
removed.size shouldEqualTo 1
83+
removed.size shouldBeEqualTo 1
8484
removed.forEach {
8585
logger.trace { "removed=$it" }
8686
logger.trace { it.affectedObject }
8787
}
88-
removed[0].affectedObject.get() shouldEqual Employee("To Be Fired")
88+
removed[0].affectedObject.get() shouldBeEqualTo Employee("To Be Fired")
8989
}
9090

9191
@Test
@@ -103,10 +103,10 @@ class ObjectDiffExample {
103103
val diff = javers.compare(oldBoss, newBoss)
104104
val valueChanged = diff.getChangesByType(ValueChange::class.java)[0]
105105

106-
valueChanged.affectedLocalId shouldEqual "Great Developer"
107-
valueChanged.propertyName shouldEqual "salary"
108-
valueChanged.left shouldEqual 10_000
109-
valueChanged.right shouldEqual 20_000
106+
valueChanged.affectedLocalId shouldBeEqualTo "Great Developer"
107+
valueChanged.propertyName shouldBeEqualTo "salary"
108+
valueChanged.left shouldBeEqualTo 10_000
109+
valueChanged.right shouldBeEqualTo 20_000
110110
}
111111

112112
@Test
@@ -130,7 +130,7 @@ class ObjectDiffExample {
130130

131131
val change = diff.getChangesByType(ReferenceChange::class.java)[0]
132132

133-
change.affectedLocalId shouldEqual "Great Developer"
133+
change.affectedLocalId shouldBeEqualTo "Great Developer"
134134
change.left.value() shouldEndWith "Manager One"
135135
change.right.value() shouldEndWith "Manager Two"
136136
}
@@ -141,13 +141,13 @@ class ObjectDiffExample {
141141
val address2 = Address("New York", "6th Avenue")
142142

143143
val diff = javers.compare(address1, address2)
144-
diff.changes.size shouldEqualTo 1
144+
diff.changes.size shouldBeEqualTo 1
145145

146146
val change = diff.getChangesByType(ValueChange::class.java)[0]
147-
change.affectedGlobalId.value() shouldEqual "${Address::class.java.name}/"
148-
change.propertyName shouldEqual "street"
149-
change.left shouldEqual "5th Avenue"
150-
change.right shouldEqual "6th Avenue"
147+
change.affectedGlobalId.value() shouldBeEqualTo "${Address::class.java.name}/"
148+
change.propertyName shouldBeEqualTo "street"
149+
change.left shouldBeEqualTo "5th Avenue"
150+
change.right shouldBeEqualTo "6th Avenue"
151151
}
152152

153153
@Test
@@ -161,9 +161,9 @@ class ObjectDiffExample {
161161

162162
logger.debug { "diff=$diff" }
163163

164-
diff.changes.size shouldEqualTo 1
165-
change.propertyName shouldEqual "name"
166-
change.left shouldEqual "Tommy Smart"
167-
change.right shouldEqual "Tommy C. Smart"
164+
diff.changes.size shouldBeEqualTo 1
165+
change.propertyName shouldBeEqualTo "name"
166+
change.left shouldBeEqualTo "Tommy Smart"
167+
change.right shouldBeEqualTo "Tommy C. Smart"
168168
}
169169
}

‎eventsourcing/javers-testing/src/test/kotlin/org/javers/core/JaversCommitE2ETest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.javers.core
22

3-
import org.amshove.kluent.shouldEqualTo
3+
import org.amshove.kluent.shouldBeEqualTo
44
import org.javers.core.model.CategoryC
55
import org.javers.core.model.PhoneWithShallowCategory
66
import org.javers.core.model.ShallowPhone
@@ -37,7 +37,7 @@ class JaversCommitE2ETest {
3737

3838
// THEN
3939
commit.snapshots.forEach { println(it) }
40-
commit.snapshots.size shouldEqualTo 1
40+
commit.snapshots.size shouldBeEqualTo 1
4141
}
4242

4343
@Test
@@ -50,6 +50,6 @@ class JaversCommitE2ETest {
5050
val commit = javers.commit("", entity)
5151

5252
println(commit.snapshots[0])
53-
commit.snapshots.size shouldEqualTo 1
53+
commit.snapshots.size shouldBeEqualTo 1
5454
}
5555
}

0 commit comments

Comments
 (0)