Skip to content

Commit 7146a39

Browse files
rfc2822rfc2822
committed
Lint
1 parent fa173ab commit 7146a39

File tree

11 files changed

+20
-23
lines changed

11 files changed

+20
-23
lines changed

‎src/main/kotlin/at/bitfire/dav4jvm/Response.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ data class Response(
172172
// (for clarity and resolving relative paths)
173173
propStat.filter { it.isSuccess() }
174174
.map { it.properties }
175-
.filterIsInstance(ResourceType::class.java)
175+
.filterIsInstance<ResourceType>()
176176
.firstOrNull()
177177
?.let { type ->
178178
if (type.types.contains(ResourceType.COLLECTION))

‎src/main/kotlin/at/bitfire/dav4jvm/UrlUtils.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ package at.bitfire.dav4jvm
99
import okhttp3.HttpUrl
1010
import java.net.URI
1111
import java.net.URISyntaxException
12-
import java.net.URLDecoder
1312
import java.util.logging.Level
1413
import java.util.logging.Logger
1514

‎src/main/kotlin/at/bitfire/dav4jvm/property/caldav/SupportedCalendarComponentSet.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ data class SupportedCalendarComponentSet(
3232

3333
override fun getName() = NAME
3434

35-
override fun create(parser: XmlPullParser): SupportedCalendarComponentSet? {
35+
override fun create(parser: XmlPullParser): SupportedCalendarComponentSet {
3636
/* <!ELEMENT supported-calendar-component-set (comp+)>
3737
<!ELEMENT comp ((allprop | prop*), (allcomp | comp*))>
3838
<!ATTLIST comp name CDATA #REQUIRED>

‎src/main/kotlin/at/bitfire/dav4jvm/property/push/PushSubscribe.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class PushSubscribe: Property {
3838

3939
override fun getName() = NAME
4040

41-
override fun create(parser: XmlPullParser): PushSubscribe? {
41+
override fun create(parser: XmlPullParser): PushSubscribe {
4242
val subscribe = PushSubscribe()
4343

4444
val depth = parser.depth

‎src/main/kotlin/at/bitfire/dav4jvm/property/webdav/CreationDate.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ data class CreationDate(
2323
override fun getName() = NAME
2424

2525
override fun create(parser: XmlPullParser): CreationDate? {
26-
XmlUtils.readText(parser)?.let { it ->
26+
XmlUtils.readText(parser)?.let {
2727
return CreationDate(it)
2828
}
2929
return null

‎src/main/kotlin/at/bitfire/dav4jvm/property/webdav/ResourceType.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ResourceType: Property {
3939

4040
override fun getName() = NAME
4141

42-
override fun create(parser: XmlPullParser): ResourceType? {
42+
override fun create(parser: XmlPullParser): ResourceType {
4343
val type = ResourceType()
4444

4545
val depth = parser.depth

‎src/main/kotlin/at/bitfire/dav4jvm/property/webdav/SupportedReportSet.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class SupportedReportSet: Property {
3434

3535
override fun getName() = NAME
3636

37-
override fun create(parser: XmlPullParser): SupportedReportSet? {
37+
override fun create(parser: XmlPullParser): SupportedReportSet {
3838
/* <!ELEMENT supported-report-set (supported-report*)>
3939
<!ELEMENT supported-report report>
4040
<!ELEMENT report ANY>

‎src/test/kotlin/at/bitfire/dav4jvm/BasicDigestAuthHandlerTest.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class BasicDigestAuthHandlerTest {
5454
BasicDigestAuthHandler.nonceCount.set(1)
5555

5656
// construct WWW-Authenticate
57-
val authScheme = Challenge("Digest", mapOf<String?, String>(
57+
val authScheme = Challenge("Digest", mapOf(
5858
Pair("realm", "[email protected]"),
5959
Pair("qop", "auth"),
6060
Pair("nonce", "dcd98b7102dd2f0e8b11d0f600bfb0c093"),
@@ -85,7 +85,7 @@ class BasicDigestAuthHandlerTest {
8585
BasicDigestAuthHandler.nonceCount.set(1)
8686

8787
// example 1
88-
var authScheme = Challenge("Digest", mapOf<String?, String>(
88+
var authScheme = Challenge("Digest", mapOf(
8989
Pair("realm", "Group-Office"),
9090
Pair("qop", "auth"),
9191
Pair("nonce", "56212407212c8"),
@@ -110,7 +110,7 @@ class BasicDigestAuthHandlerTest {
110110

111111
// example 2
112112
authenticator = BasicDigestAuthHandler(null, "test", "test")
113-
authScheme = Challenge("digest", mapOf<String?, String>( // lower case
113+
authScheme = Challenge("digest", mapOf( // lower case
114114
Pair("nonce", "87c4c2aceed9abf30dd68c71"),
115115
Pair("algorithm", "md5"),
116116
Pair("opaque", "571609eb7058505d35c7bf7288fbbec4-ODdjNGMyYWNlZWQ5YWJmMzBkZDY4YzcxLDAuMC4wLjAsMTQ0NTM3NzE0Nw=="),
@@ -140,7 +140,7 @@ class BasicDigestAuthHandlerTest {
140140
BasicDigestAuthHandler.clientNonce = "hxk1lu63b6c7vhk"
141141
BasicDigestAuthHandler.nonceCount.set(1)
142142

143-
val authScheme = Challenge("Digest", mapOf<String?, String>(
143+
val authScheme = Challenge("Digest", mapOf(
144144
Pair("realm", "MD5-sess Example"),
145145
Pair("qop", "auth"),
146146
Pair("algorithm", "MD5-sess"),
@@ -179,7 +179,7 @@ class BasicDigestAuthHandlerTest {
179179
BasicDigestAuthHandler.clientNonce = "hxk1lu63b6c7vhk"
180180
BasicDigestAuthHandler.nonceCount.set(1)
181181

182-
val authScheme = Challenge("Digest", mapOf<String?, String>(
182+
val authScheme = Challenge("Digest", mapOf(
183183
Pair("realm", "AuthInt Example"),
184184
Pair("qop", "auth-int"),
185185
Pair("nonce", "367sj3265s5"),
@@ -217,7 +217,7 @@ class BasicDigestAuthHandlerTest {
217217
val authenticator = BasicDigestAuthHandler(null, "Mufasa", "CircleOfLife")
218218

219219
// construct WWW-Authenticate
220-
val authScheme = Challenge("Digest", mapOf<String?, String>(
220+
val authScheme = Challenge("Digest", mapOf(
221221
Pair("realm", "[email protected]"),
222222
Pair("nonce", "dcd98b7102dd2f0e8b11d0f600bfb0c093"),
223223
Pair("opaque", "5ccc069c403ebaf9f0171e9517f40e41")
@@ -249,18 +249,18 @@ class BasicDigestAuthHandlerTest {
249249
.url("http://www.nowhere.org/dir/index.html")
250250
.build()
251251

252-
assertNull(authenticator.digestRequest(original, Challenge("Digest", mapOf<String?, String>())))
252+
assertNull(authenticator.digestRequest(original, Challenge("Digest", mapOf())))
253253

254-
assertNull(authenticator.digestRequest(original, Challenge("Digest", mapOf<String?, String>(
254+
assertNull(authenticator.digestRequest(original, Challenge("Digest", mapOf(
255255
Pair("realm", "Group-Office")
256256
))))
257257

258-
assertNull(authenticator.digestRequest(original, Challenge("Digest", mapOf<String?, String>(
258+
assertNull(authenticator.digestRequest(original, Challenge("Digest", mapOf(
259259
Pair("realm", "Group-Office"),
260260
Pair("qop", "auth")
261261
))))
262262

263-
assertNotNull(authenticator.digestRequest(original, Challenge("Digest", mapOf<String?, String>(
263+
assertNotNull(authenticator.digestRequest(original, Challenge("Digest", mapOf(
264264
Pair("realm", "Group-Office"),
265265
Pair("qop", "auth"),
266266
Pair("nonce", "56212407212c8")
@@ -275,7 +275,7 @@ class BasicDigestAuthHandlerTest {
275275
.get()
276276
.url("http://example.com")
277277
.build()
278-
val response = Response.Builder()
278+
val response = Builder()
279279
.request(request)
280280
.protocol(Protocol.HTTP_2)
281281
.code(200).message("OK")

‎src/test/kotlin/at/bitfire/dav4jvm/DavCollectionTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class DavCollectionTest {
132132
}
133133
}
134134
assertEquals(3, nrCalled)
135-
assertEquals("http://example.com/ns/sync/1234", result.filterIsInstance(SyncToken::class.java).first().token)
135+
assertEquals("http://example.com/ns/sync/1234", result.filterIsInstance<SyncToken>().first().token)
136136
}
137137

138138
/**
@@ -211,7 +211,7 @@ class DavCollectionTest {
211211
}
212212
}
213213
}
214-
assertEquals("http://example.com/ns/sync/1233", result.filterIsInstance(SyncToken::class.java).first().token)
214+
assertEquals("http://example.com/ns/sync/1233", result.filterIsInstance<SyncToken>().first().token)
215215
assertEquals(4, nrCalled)
216216
}
217217

‎src/test/kotlin/at/bitfire/dav4jvm/DavResourceTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ class DavResourceTest {
602602
dav.propfind(0, ResourceType.NAME) { response, relation ->
603603
called = true
604604
assertEquals(Response.HrefRelation.SELF, relation)
605-
assertTrue(response.properties.filterIsInstance(ResourceType::class.java).isEmpty())
605+
assertTrue(response.properties.filterIsInstance<ResourceType>().isEmpty())
606606
}
607607
assertTrue(called)
608608

0 commit comments

Comments
 (0)