Small refactoring

mrapplexz · mrapplexz · commit 7ca76d62c2d1 · 2020-08-27T23:06:07.000+05:00
diff --git a/src/androidTest/kotlin/net/pearx/kpastebin/test/helper/runBlocking.kt b/src/androidTest/kotlin/net/pearx/kpastebin/test/helper/runBlocking.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.test.helper
 
 import kotlinx.coroutines.CoroutineScope
diff --git a/src/commonMain/kotlin/net/pearx/kpastebin/PastebinClient.kt b/src/commonMain/kotlin/net/pearx/kpastebin/PastebinClient.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin
 
 import io.ktor.client.HttpClient
diff --git a/src/commonMain/kotlin/net/pearx/kpastebin/PastebinExceptions.kt b/src/commonMain/kotlin/net/pearx/kpastebin/PastebinExceptions.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin
 
 import net.pearx.kpastebin.model.Privacy
diff --git a/src/commonMain/kotlin/net/pearx/kpastebin/internal/Constant.kt b/src/commonMain/kotlin/net/pearx/kpastebin/internal/Constant.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.internal
 
 internal const val API_URL = "https://pastebin.com/api"
@@ -7,4 +14,4 @@ internal const val API_URL_RAW = "$API_URL/api_raw.php"
 internal const val URL_RAW = "https://pastebin.com/raw"
 
 internal val XML_PROPERTY_REGEX = Regex("<([a-zA-Z_]+)>(.*)</\\1>")
-internal val XML_PARENT_REGEX = Regex("<([a-zA-Z]+)>((?:.|\r\n|\r|\n)+?)</\\1>")
+internal val XML_PARENT_REGEX = Regex("<([a-zA-Z]+)>((?:.|\r\n|\r|\n)+?)</\\1>")
diff --git a/src/commonMain/kotlin/net/pearx/kpastebin/internal/ExceptionHelper.kt b/src/commonMain/kotlin/net/pearx/kpastebin/internal/ExceptionHelper.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.internal
 
 import net.pearx.kpastebin.*
@@ -32,4 +39,4 @@ internal fun checkPastebinResponse(response: String) {
             }
         }
     }
-}
+}
diff --git a/src/commonMain/kotlin/net/pearx/kpastebin/model/AccountType.kt b/src/commonMain/kotlin/net/pearx/kpastebin/model/AccountType.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.model
 
 /**
@@ -9,4 +16,4 @@ public enum class AccountType {
 
     /** Paid pro account. */
     PRO;
-}
+}
diff --git a/src/commonMain/kotlin/net/pearx/kpastebin/model/ExpireDate.kt b/src/commonMain/kotlin/net/pearx/kpastebin/model/ExpireDate.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.model
 
 /**
@@ -34,4 +41,4 @@ public enum class ExpireDate(internal val code: String) {
     internal companion object {
         fun forCode(code: String) = values().first { it.code == code }
     }
-}
+}
diff --git a/src/commonMain/kotlin/net/pearx/kpastebin/model/PasteDetails.kt b/src/commonMain/kotlin/net/pearx/kpastebin/model/PasteDetails.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.model
 
 import net.pearx.kpastebin.internal.XML_PARENT_REGEX
@@ -6,7 +13,6 @@ import net.pearx.kpastebin.internal.XML_PROPERTY_REGEX
 /**
  * A detailed Pastebin paste information.
  */
-@ExperimentalUnsignedTypes
 public data class PasteDetails(
     /** Paste key. */
     val key: String,
@@ -55,4 +61,4 @@ public data class PasteDetails(
             return lst
         }
     }
-}
+}
diff --git a/src/commonMain/kotlin/net/pearx/kpastebin/model/Privacy.kt b/src/commonMain/kotlin/net/pearx/kpastebin/model/Privacy.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.model
 
 /**
@@ -12,4 +19,4 @@ public enum class Privacy {
 
     /** Paste is visible only for you. */
     PRIVATE;
-}
+}
diff --git a/src/commonMain/kotlin/net/pearx/kpastebin/model/UserDetails.kt b/src/commonMain/kotlin/net/pearx/kpastebin/model/UserDetails.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.model
 
 import net.pearx.kpastebin.internal.XML_PARENT_REGEX
@@ -48,4 +55,4 @@ public data class UserDetails(
                 throw IllegalArgumentException(input)
         }
     }
-}
+}
diff --git a/src/commonTest/kotlin/net.pearx.kpastebin.test/helper/runBlocking.kt b/src/commonTest/kotlin/net.pearx.kpastebin.test/helper/runBlocking.kt
diff --git a/src/commonTest/kotlin/net/pearx/kpastebin/test/AnonymousTest.kt b/src/commonTest/kotlin/net/pearx/kpastebin/test/AnonymousTest.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.test
 
 import net.pearx.kpastebin.*
@@ -72,4 +79,4 @@ class AnonymousTest {
         assertEquals(ExpireDate.ONE_WEEK.code, lastCreatedPaste["expireDate"])
         assertEquals(Privacy.UNLISTED.ordinal.toString(), lastCreatedPaste["private"])
     }
-}
+}
diff --git a/src/commonTest/kotlin/net/pearx/kpastebin/test/InvalidUserKeyTest.kt b/src/commonTest/kotlin/net/pearx/kpastebin/test/InvalidUserKeyTest.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.test
 
 import net.pearx.kpastebin.InvalidUserKeyException
@@ -42,4 +49,4 @@ class InvalidUserKeyTest {
             createClient(userKey = "invalid").getPaste(pastes.keys.first())
         }
     }
-}
+}
diff --git a/src/commonTest/kotlin/net/pearx/kpastebin/test/LoggedInTest.kt b/src/commonTest/kotlin/net/pearx/kpastebin/test/LoggedInTest.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.test
 
 import net.pearx.kpastebin.PasteNotFoundException
@@ -34,7 +41,7 @@ class LoggedInTest {
                 1297953260,
                 "javascript test",
                 15,
-                1297956860,
+                1297956860UL,
                 Privacy.PUBLIC,
                 "JavaScript",
                 "javascript",
@@ -46,7 +53,7 @@ class LoggedInTest {
                 1297694343,
                 "Welcome To Pastebin V3",
                 490,
-                0,
+                0UL,
                 Privacy.PUBLIC,
                 "None",
                 "text",
@@ -97,4 +104,4 @@ class LoggedInTest {
             assertEquals(text, createClient(userKey = globalUserKey).getPaste(key))
         }
     }
-}
+}
diff --git a/src/commonTest/kotlin/net/pearx/kpastebin/test/LoginTest.kt b/src/commonTest/kotlin/net/pearx/kpastebin/test/LoginTest.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.test
 
 import net.pearx.kpastebin.AccountNotActiveException
@@ -28,4 +35,4 @@ class LoginTest {
         cl.login(credentials.first, credentials.second)
         assertEquals(globalUserKey, cl.userKey)
     }
-}
+}
diff --git a/src/commonTest/kotlin/net/pearx/kpastebin/test/helper/TestHelper.kt b/src/commonTest/kotlin/net/pearx/kpastebin/test/helper/TestHelper.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.test.helper
 
 import io.ktor.client.HttpClient
diff --git a/src/commonTest/kotlin/net/pearx/kpastebin/test/helper/runBlocking.kt b/src/commonTest/kotlin/net/pearx/kpastebin/test/helper/runBlocking.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package net.pearx.kpastebin.test.helper
+
+import kotlinx.coroutines.CoroutineScope
+
+expect fun runTest(f: suspend CoroutineScope.() -> Unit)
diff --git a/src/jsTest/kotlin/net/pearx/kpastebin/test/helper/runBlocking.kt b/src/jsTest/kotlin/net/pearx/kpastebin/test/helper/runBlocking.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.test.helper
 
 import kotlinx.coroutines.CoroutineScope
diff --git a/src/jvmTest/kotlin/net/pearx/kpastebin/test/helper/runBlocking.kt b/src/jvmTest/kotlin/net/pearx/kpastebin/test/helper/runBlocking.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.test.helper
 
 import kotlinx.coroutines.CoroutineScope
diff --git a/src/nativeTest/kotlin/net/pearx/kpastebin/test/helper/runBlocking.kt b/src/nativeTest/kotlin/net/pearx/kpastebin/test/helper/runBlocking.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright © 2020, PearX Team
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package net.pearx.kpastebin.test.helper
 
 import kotlinx.coroutines.CoroutineScope

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,10 @@`
	`1`	`+/*`
	`2`	`+ * Copyright © 2020, PearX Team`
	`3`	`+ * This Source Code Form is subject to the terms of the Mozilla Public`
	`4`	`+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,`
	`5`	`+ * You can obtain one at https://mozilla.org/MPL/2.0/.`
	`6`	`+ */`
	`7`	`+`
`1`	`8`	`package net.pearx.kpastebin.internal`
`2`	`9`
`3`	`10`	`import net.pearx.kpastebin.*`
`@@ -32,4 +39,4 @@ internal fun checkPastebinResponse(response: String) {`
`32`	`39`	`}`
`33`	`40`	`}`
`34`	`41`	`}`
`35`		`-}`
	`42`	`+}`