Skip to content

Commit e3fec1c

Browse files
fioan89fioan89
committed
Impl: parse the patch number from semver
- update equals&hashCode - implement comparator
1 parent 6ce1d6f commit e3fec1c

File tree

2 files changed

+89
-66
lines changed

2 files changed

+89
-66
lines changed

‎src/main/kotlin/com/coder/gateway/sdk/CoderSemVer.kt

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package com.coder.gateway.sdk
22

33

4-
class CoderSemVer(private val major: Long = 0, private val minor: Long = 0) {
4+
class CoderSemVer(private val major: Long = 0, private val minor: Long = 0, private val patch: Long = 0) : Comparable<CoderSemVer> {
55

66
init {
77
require(major >= 0) { "Coder major version must be a positive number" }
88
require(minor >= 0) { "Coder minor version must be a positive number" }
9+
require(patch >= 0) { "Coder minor version must be a positive number" }
910
}
1011

1112
fun isCompatibleWith(other: CoderSemVer): Boolean {
@@ -17,6 +18,11 @@ class CoderSemVer(private val major: Long = 0, private val minor: Long = 0) {
1718
return this.major <= other.major
1819
}
1920

21+
22+
override fun toString(): String {
23+
return "CoderSemVer(major=$major, minor=$minor)"
24+
}
25+
2026
override fun equals(other: Any?): Boolean {
2127
if (this === other) return true
2228
if (javaClass != other?.javaClass) return false
@@ -25,20 +31,28 @@ class CoderSemVer(private val major: Long = 0, private val minor: Long = 0) {
2531

2632
if (major != other.major) return false
2733
if (minor != other.minor) return false
34+
if (patch != other.patch) return false
2835

2936
return true
3037
}
3138

3239
override fun hashCode(): Int {
3340
var result = major.hashCode()
3441
result = 31 * result + minor.hashCode()
42+
result = 31 * result + patch.hashCode()
3543
return result
3644
}
3745

38-
override fun toString(): String {
39-
return "CoderSemVer(major=$major, minor=$minor)"
40-
}
46+
override fun compareTo(other: CoderSemVer): Int {
47+
if (major > other.major) return 1
48+
if (major < other.major) return -1
49+
if (minor > other.minor) return 1
50+
if (minor < other.minor) return -1
51+
if (patch > other.patch) return 1
52+
if (patch < other.patch) return -1
4153

54+
return 0
55+
}
4256

4357
companion object {
4458
private val pattern = """^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$""".toRegex()
@@ -52,6 +66,7 @@ class CoderSemVer(private val major: Long = 0, private val minor: Long = 0) {
5266
return CoderSemVer(
5367
if (matchResult.groupValues[1].isNotEmpty()) matchResult.groupValues[1].toLong() else 0,
5468
if (matchResult.groupValues[2].isNotEmpty()) matchResult.groupValues[2].toLong() else 0,
69+
if (matchResult.groupValues[3].isNotEmpty()) matchResult.groupValues[3].toLong() else 0,
5570
)
5671
}
5772
}

‎src/test/groovy/CoderSemVerTest.groovy

Lines changed: 70 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.coder.gateway.sdk
22

3+
import spock.lang.Ignore
4+
35
class CoderSemVerTest extends spock.lang.Specification {
46

57
def 'semver versions are valid'() {
@@ -46,37 +48,37 @@ class CoderSemVerTest extends spock.lang.Specification {
4648

4749
where:
4850
semver || expectedCoderSemVer
49-
'0.0.4' || new CoderSemVer(0L, 0L)
50-
'1.2.3' || new CoderSemVer(1L, 2L)
51-
'10.20.30' || new CoderSemVer(10L, 20L)
52-
'1.1.2-prerelease+meta' || new CoderSemVer(1L, 1L)
53-
'1.1.2+meta' || new CoderSemVer(1L, 1L)
54-
'1.1.2+meta-valid' || new CoderSemVer(1L, 1L)
55-
'1.0.0-alpha' || new CoderSemVer(1L, 0L)
56-
'1.0.0-beta' || new CoderSemVer(1L, 0L)
57-
'1.0.0-alpha.beta' || new CoderSemVer(1L, 0L)
58-
'1.0.0-alpha.beta.1' || new CoderSemVer(1L, 0L)
59-
'1.0.0-alpha.1' || new CoderSemVer(1L, 0L)
60-
'1.0.0-alpha0.valid' || new CoderSemVer(1L, 0L)
61-
'1.0.0-alpha.0valid' || new CoderSemVer(1L, 0L)
62-
'1.0.0-alpha-a.b-c-somethinglong+build.1-aef.1-its-okay' || new CoderSemVer(1L, 0L)
63-
'1.0.0-rc.1+build.1' || new CoderSemVer(1L, 0L)
64-
'2.0.0-rc.1+build.123' || new CoderSemVer(2L, 0L)
65-
'1.2.3-beta' || new CoderSemVer(1L, 2L)
66-
'10.2.3-DEV-SNAPSHOT' || new CoderSemVer(10L, 2L)
67-
'1.2.3-SNAPSHOT-123' || new CoderSemVer(1L, 2L)
68-
'1.0.0' || new CoderSemVer(1L, 0L)
69-
'2.0.0' || new CoderSemVer(2L, 0L)
70-
'1.1.7' || new CoderSemVer(1L, 1L)
71-
'2.0.0+build.1848' || new CoderSemVer(2L, 0L)
72-
'2.0.1-alpha.1227' || new CoderSemVer(2L, 0L)
73-
'1.0.0-alpha+beta' || new CoderSemVer(1L, 0L)
74-
'1.2.3----RC-SNAPSHOT.12.9.1--.12+788' || new CoderSemVer(1L, 2L)
75-
'1.2.3----R-S.12.9.1--.12+meta' || new CoderSemVer(1L, 2L)
76-
'1.2.3----RC-SNAPSHOT.12.9.1--.12' || new CoderSemVer(1L, 2L)
77-
'1.0.0+0.build.1-rc.10000aaa-kk-0.1' || new CoderSemVer(1L, 0L)
78-
'2147483647.2147483647.2147483647' || new CoderSemVer(2147483647L, 2147483647L)
79-
'1.0.0-0A.is.legal' || new CoderSemVer(1L, 0L)
51+
'0.0.4' || new CoderSemVer(0L, 0L, 4L)
52+
'1.2.3' || new CoderSemVer(1L, 2L, 3L)
53+
'10.20.30' || new CoderSemVer(10L, 20L, 30L)
54+
'1.1.2-prerelease+meta' || new CoderSemVer(1L, 1L, 2L)
55+
'1.1.2+meta' || new CoderSemVer(1L, 1L, 2L)
56+
'1.1.2+meta-valid' || new CoderSemVer(1L, 1L, 2L)
57+
'1.0.0-alpha' || new CoderSemVer(1L, 0L, 0L)
58+
'1.0.0-beta' || new CoderSemVer(1L, 0L, 0L)
59+
'1.0.0-alpha.beta' || new CoderSemVer(1L, 0L, 0L)
60+
'1.0.0-alpha.beta.1' || new CoderSemVer(1L, 0L, 0L)
61+
'1.0.0-alpha.1' || new CoderSemVer(1L, 0L, 0L)
62+
'1.0.0-alpha0.valid' || new CoderSemVer(1L, 0L, 0L)
63+
'1.0.0-alpha.0valid' || new CoderSemVer(1L, 0L, 0L)
64+
'1.0.0-alpha-a.b-c-somethinglong+build.1-aef.1-its-okay' || new CoderSemVer(1L, 0L, 0L)
65+
'1.0.0-rc.1+build.1' || new CoderSemVer(1L, 0L, 0L)
66+
'2.0.0-rc.1+build.123' || new CoderSemVer(2L, 0L, 0L)
67+
'1.2.3-beta' || new CoderSemVer(1L, 2L, 3L)
68+
'10.2.3-DEV-SNAPSHOT' || new CoderSemVer(10L, 2L, 3L)
69+
'1.2.3-SNAPSHOT-123' || new CoderSemVer(1L, 2L, 3L)
70+
'1.0.0' || new CoderSemVer(1L, 0L, 0L)
71+
'2.0.0' || new CoderSemVer(2L, 0L, 0L)
72+
'1.1.7' || new CoderSemVer(1L, 1L, 7L)
73+
'2.0.0+build.1848' || new CoderSemVer(2L, 0L, 0L)
74+
'2.0.1-alpha.1227' || new CoderSemVer(2L, 0L, 1L)
75+
'1.0.0-alpha+beta' || new CoderSemVer(1L, 0L, 0L)
76+
'1.2.3----RC-SNAPSHOT.12.9.1--.12+788' || new CoderSemVer(1L, 2L, 3L)
77+
'1.2.3----R-S.12.9.1--.12+meta' || new CoderSemVer(1L, 2L, 3L)
78+
'1.2.3----RC-SNAPSHOT.12.9.1--.12' || new CoderSemVer(1L, 2L, 3L)
79+
'1.0.0+0.build.1-rc.10000aaa-kk-0.1' || new CoderSemVer(1L, 0L, 0L)
80+
'2147483647.2147483647.2147483647' || new CoderSemVer(2147483647L, 2147483647L, 2147483647L)
81+
'1.0.0-0A.is.legal' || new CoderSemVer(1L, 0L, 0L)
8082
}
8183

8284
def 'semver like versions that start with a `v` are considered valid'() {
@@ -123,54 +125,58 @@ class CoderSemVerTest extends spock.lang.Specification {
123125

124126
where:
125127
semver || expectedCoderSemVer
126-
'v0.0.4' || new CoderSemVer(0L, 0L)
127-
'v1.2.3' || new CoderSemVer(1L, 2L)
128-
'v10.20.30' || new CoderSemVer(10L, 20L)
129-
'v1.1.2-prerelease+meta' || new CoderSemVer(1L, 1L)
130-
'v1.1.2+meta' || new CoderSemVer(1L, 1L)
131-
'v1.1.2+meta-valid' || new CoderSemVer(1L, 1L)
132-
'v1.0.0-alpha' || new CoderSemVer(1L, 0L)
133-
'v1.0.0-beta' || new CoderSemVer(1L, 0L)
134-
'v1.0.0-alpha.beta' || new CoderSemVer(1L, 0L)
135-
'v1.0.0-alpha.beta.1' || new CoderSemVer(1L, 0L)
136-
'v1.0.0-alpha.1' || new CoderSemVer(1L, 0L)
137-
'v1.0.0-alpha0.valid' || new CoderSemVer(1L, 0L)
138-
'v1.0.0-alpha.0valid' || new CoderSemVer(1L, 0L)
139-
'v1.0.0-alpha-a.b-c-somethinglong+build.1-aef.1-its-okay' || new CoderSemVer(1L, 0L)
140-
'v1.0.0-rc.1+build.1' || new CoderSemVer(1L, 0L)
141-
'v2.0.0-rc.1+build.123' || new CoderSemVer(2L, 0L)
142-
'v1.2.3-beta' || new CoderSemVer(1L, 2L)
143-
'v10.2.3-DEV-SNAPSHOT' || new CoderSemVer(10L, 2L)
144-
'v1.2.3-SNAPSHOT-123' || new CoderSemVer(1L, 2L)
145-
'v1.0.0' || new CoderSemVer(1L, 0L)
146-
'v2.0.0' || new CoderSemVer(2L, 0L)
147-
'v1.1.7' || new CoderSemVer(1L, 1L)
148-
'v2.0.0+build.1848' || new CoderSemVer(2L, 0L)
149-
'v2.0.1-alpha.1227' || new CoderSemVer(2L, 0L)
150-
'v1.0.0-alpha+beta' || new CoderSemVer(1L, 0L)
151-
'v1.2.3----RC-SNAPSHOT.12.9.1--.12+788' || new CoderSemVer(1L, 2L)
152-
'v1.2.3----R-S.12.9.1--.12+meta' || new CoderSemVer(1L, 2L)
153-
'v1.2.3----RC-SNAPSHOT.12.9.1--.12' || new CoderSemVer(1L, 2L)
154-
'v1.0.0+0.build.1-rc.10000aaa-kk-0.1' || new CoderSemVer(1L, 0L)
155-
'v2147483647.2147483647.2147483647' || new CoderSemVer(2147483647L, 2147483647L)
156-
'v1.0.0-0A.is.legal' || new CoderSemVer(1L, 0L)
128+
'v0.0.4' || new CoderSemVer(0L, 0L, 4L)
129+
'v1.2.3' || new CoderSemVer(1L, 2L, 3L)
130+
'v10.20.30' || new CoderSemVer(10L, 20L, 30L)
131+
'v1.1.2-prerelease+meta' || new CoderSemVer(1L, 1L, 2L)
132+
'v1.1.2+meta' || new CoderSemVer(1L, 1L, 2L)
133+
'v1.1.2+meta-valid' || new CoderSemVer(1L, 1L, 2L)
134+
'v1.0.0-alpha' || new CoderSemVer(1L, 0L, 0L)
135+
'v1.0.0-beta' || new CoderSemVer(1L, 0L, 0L)
136+
'v1.0.0-alpha.beta' || new CoderSemVer(1L, 0L, 0L)
137+
'v1.0.0-alpha.beta.1' || new CoderSemVer(1L, 0L, 0L)
138+
'v1.0.0-alpha.1' || new CoderSemVer(1L, 0L, 0L)
139+
'v1.0.0-alpha0.valid' || new CoderSemVer(1L, 0L, 0L)
140+
'v1.0.0-alpha.0valid' || new CoderSemVer(1L, 0L, 0L)
141+
'v1.0.0-alpha-a.b-c-somethinglong+build.1-aef.1-its-okay' || new CoderSemVer(1L, 0L, 0L)
142+
'v1.0.0-rc.1+build.1' || new CoderSemVer(1L, 0L, 0L)
143+
'v2.0.0-rc.1+build.123' || new CoderSemVer(2L, 0L, 0L)
144+
'v1.2.3-beta' || new CoderSemVer(1L, 2L, 3L)
145+
'v10.2.3-DEV-SNAPSHOT' || new CoderSemVer(10L, 2L, 3L)
146+
'v1.2.3-SNAPSHOT-123' || new CoderSemVer(1L, 2L, 3L)
147+
'v1.0.0' || new CoderSemVer(1L, 0L, 0L)
148+
'v2.0.0' || new CoderSemVer(2L, 0L, 0L)
149+
'v1.1.7' || new CoderSemVer(1L, 1L, 7L)
150+
'v2.0.0+build.1848' || new CoderSemVer(2L, 0L, 0L)
151+
'v2.0.1-alpha.1227' || new CoderSemVer(2L, 0L, 1L)
152+
'v1.0.0-alpha+beta' || new CoderSemVer(1L, 0L, 0L)
153+
'v1.2.3----RC-SNAPSHOT.12.9.1--.12+788' || new CoderSemVer(1L, 2L, 3L)
154+
'v1.2.3----R-S.12.9.1--.12+meta' || new CoderSemVer(1L, 2L, 3L)
155+
'v1.2.3----RC-SNAPSHOT.12.9.1--.12' || new CoderSemVer(1L, 2L, 3L)
156+
'v1.0.0+0.build.1-rc.10000aaa-kk-0.1' || new CoderSemVer(1L, 0L, 0L)
157+
'v2147483647.2147483647.2147483647' || new CoderSemVer(2147483647L, 2147483647L, 2147483647L)
158+
'v1.0.0-0A.is.legal' || new CoderSemVer(1L, 0L, 0L)
157159
}
158160

161+
@Ignore
159162
def 'two initial development versions are compatible when first minor is equal to the second minor'() {
160163
expect:
161164
new CoderSemVer(0, 1).isCompatibleWith(new CoderSemVer(0, 1))
162165
}
163166

167+
@Ignore
164168
def 'two initial development versions are not compatible when first minor is less than the second minor'() {
165169
expect:
166170
!new CoderSemVer(0, 1).isCompatibleWith(new CoderSemVer(0, 2))
167171
}
168172

173+
@Ignore
169174
def 'two initial development versions are not compatible when first minor is bigger than the second minor'() {
170175
expect:
171176
!new CoderSemVer(0, 2).isCompatibleWith(new CoderSemVer(0, 1))
172177
}
173178

179+
@Ignore
174180
def 'versions are not compatible when one version is initial phase of development and the other is not, even though the minor is the same'() {
175181
expect:
176182
!new CoderSemVer(0, 2).isCompatibleWith(new CoderSemVer(1, 2))
@@ -179,6 +185,7 @@ class CoderSemVerTest extends spock.lang.Specification {
179185
!new CoderSemVer(1, 2).isCompatibleWith(new CoderSemVer(0, 2))
180186
}
181187

188+
@Ignore
182189
def 'two versions which are not in development phase are compatible when first major is less or equal to the other, regardless of the minor'() {
183190
expect: 'versions compatible when same major and same minor'
184191
new CoderSemVer(1, 1).isCompatibleWith(new CoderSemVer(1, 1))
@@ -193,6 +200,7 @@ class CoderSemVerTest extends spock.lang.Specification {
193200
new CoderSemVer(1, 1).isCompatibleWith(new CoderSemVer(2, 2))
194201
}
195202

203+
@Ignore
196204
def 'two versions which are not in development phase are not compatible when first major is greater than the second major, regardless of the minor'() {
197205
expect: 'versions are not compatible when first major is bigger than the second but with same minor'
198206
!new CoderSemVer(2, 1).isCompatibleWith(new CoderSemVer(1, 1))

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy