Improved mysql tasks

javadev · Nov 22, 2024 · 7a64938 · 7a64938
1 parent fe66e08
commit 7a64938
Show file tree

Hide file tree

Showing 50 changed files with 169 additions and 168 deletions.
diff --git a/src/main/kotlin/g0201_0300/s0212_word_search_ii/Solution.kt b/src/main/kotlin/g0201_0300/s0212_word_search_ii/Solution.kt
@@ -6,13 +6,14 @@ package g0201_0300.s0212_word_search_ii
 @Suppress("NAME_SHADOWING")
 class Solution {
     private var root: Tree? = null
-    fun findWords(board: Array<CharArray>, words: Array<String?>): List<String> {
-        if (board.size < 1 || board[0].size < 1) {
+
+    fun findWords(board: Array<CharArray>, words: Array<String>): List<String> {
+        if (board.isEmpty() || board[0].isEmpty()) {
             return emptyList()
         }
         root = Tree()
         for (word in words) {
-            Tree.addWord(root, word!!)
+            Tree.addWord(root, word)
         }
         val collected: MutableList<String> = ArrayList()
         for (i in board.indices) {

diff --git a/src/test/kotlin/g0101_0200/s0175_combine_two_tables/MysqlTest.kt b/src/test/kotlin/g0101_0200/s0175_combine_two_tables/MysqlTest.kt
@@ -34,7 +34,7 @@ internal class MysqlTest {
     @Test
     @Throws(SQLException::class, FileNotFoundException::class)
     fun testScript(@EmbeddedDatabase dataSource: DataSource) {
-        dataSource.getConnection().use { connection ->
+        dataSource.connection.use { connection ->
             connection.createStatement().use { statement ->
                 statement.executeQuery(
                     BufferedReader(

diff --git a/src/test/kotlin/g0201_0300/s0212_word_search_ii/SolutionTest.kt b/src/test/kotlin/g0201_0300/s0212_word_search_ii/SolutionTest.kt
@@ -13,7 +13,7 @@ internal class SolutionTest {
             charArrayOf('i', 'h', 'k', 'r'),
             charArrayOf('i', 'f', 'l', 'v'),
         )
-        val words = arrayOf<String?>("oath", "pea", "eat", "rain")
+        val words = arrayOf<String>("oath", "pea", "eat", "rain")
         val expected: MutableList<String> = ArrayList()
         expected.add("oath")
         expected.add("eat")
@@ -23,7 +23,7 @@ internal class SolutionTest {
     @Test
     fun findWords2() {
         val board = arrayOf(charArrayOf('a', 'b'), charArrayOf('c', 'd'))
-        val words = arrayOf<String?>("abcb")
+        val words = arrayOf<String>("abcb")
         assertThat(Solution().findWords(board, words), equalTo(emptyList()))
     }
 }
diff --git a/src/test/kotlin/g0201_0300/s0262_trips_and_users/MysqlTest.kt b/src/test/kotlin/g0201_0300/s0262_trips_and_users/MysqlTest.kt
@@ -53,7 +53,7 @@ internal class MysqlTest {
     @Test
     @Throws(SQLException::class, FileNotFoundException::class)
     fun testScript(@EmbeddedDatabase dataSource: DataSource) {
-        dataSource.getConnection().use { connection ->
+        dataSource.connection.use { connection ->
             connection.createStatement().use { statement ->
                 statement.executeQuery(
                     BufferedReader(

diff --git a/src/test/kotlin/g0501_0600/s0511_game_play_analysis_i/MysqlTest.kt b/src/test/kotlin/g0501_0600/s0511_game_play_analysis_i/MysqlTest.kt
@@ -34,7 +34,7 @@ internal class MysqlTest {
     @Test
     @Throws(SQLException::class, FileNotFoundException::class)
     fun testScript(@EmbeddedDatabase dataSource: DataSource) {
-        dataSource.getConnection().use { connection ->
+        dataSource.connection.use { connection ->
             connection.createStatement().use { statement ->
                 statement.executeQuery(
                     BufferedReader(

diff --git a/src/test/kotlin/g0501_0600/s0550_game_play_analysis_iv/MysqlTest.kt b/src/test/kotlin/g0501_0600/s0550_game_play_analysis_iv/MysqlTest.kt
@@ -39,7 +39,7 @@ internal class MysqlTest {
     @Test
     @Throws(SQLException::class, FileNotFoundException::class)
     fun testScript(@EmbeddedDatabase dataSource: DataSource) {
-        dataSource.getConnection().use { connection ->
+        dataSource.connection.use { connection ->
             connection.createStatement().use { statement ->
                 statement.executeQuery(
                     BufferedReader(

diff --git a/src/test/kotlin/g0501_0600/s0584_find_customer_referee/MysqlTest.kt b/src/test/kotlin/g0501_0600/s0584_find_customer_referee/MysqlTest.kt
@@ -29,7 +29,7 @@ internal class MysqlTest {
     @Test
     @Throws(SQLException::class, FileNotFoundException::class)
     fun testScript(@EmbeddedDatabase dataSource: DataSource) {
-        dataSource.getConnection().use { connection ->
+        dataSource.connection.use { connection ->
             connection.createStatement().use { statement ->
                 statement.executeQuery(
                     BufferedReader(

diff --git a/src/test/kotlin/g0601_0700/s0602_friend_requests_ii_who_has_the_most_friends/MysqlTest.kt b/src/test/kotlin/g0601_0700/s0602_friend_requests_ii_who_has_the_most_friends/MysqlTest.kt
@@ -31,7 +31,7 @@ internal class MysqlTest {
     @Test
     @Throws(SQLException::class, FileNotFoundException::class)
     fun testScript(@EmbeddedDatabase dataSource: DataSource) {
-        dataSource.getConnection().use { connection ->
+        dataSource.connection.use { connection ->
             connection.createStatement().use { statement ->
                 statement.executeQuery(
                     BufferedReader(

diff --git a/src/test/kotlin/g0601_0700/s0607_sales_person/MysqlTest.kt b/src/test/kotlin/g0601_0700/s0607_sales_person/MysqlTest.kt
@@ -49,7 +49,7 @@ internal class MysqlTest {
     @Test
     @Throws(SQLException::class, FileNotFoundException::class)
     fun testScript(@EmbeddedDatabase dataSource: DataSource) {
-        dataSource.getConnection().use { connection ->
+        dataSource.connection.use { connection ->
             connection.createStatement().use { statement ->
                 statement.executeQuery(
                     BufferedReader(

diff --git a/src/test/kotlin/g0601_0700/s0610_triangle_judgement/MysqlTest.kt b/src/test/kotlin/g0601_0700/s0610_triangle_judgement/MysqlTest.kt
@@ -27,7 +27,7 @@ internal class MysqlTest {
     @Test
     @Throws(SQLException::class, FileNotFoundException::class)
     fun testScript(@EmbeddedDatabase dataSource: DataSource) {
-        dataSource.getConnection().use { connection ->
+        dataSource.connection.use { connection ->
             connection.createStatement().use { statement ->
                 statement.executeQuery(
                     BufferedReader(

diff --git a/src/test/kotlin/g0601_0700/s0619_biggest_single_number/MysqlTest.kt b/src/test/kotlin/g0601_0700/s0619_biggest_single_number/MysqlTest.kt
@@ -31,7 +31,7 @@ internal class MysqlTest {
     @Test
     @Throws(SQLException::class, FileNotFoundException::class)
     fun testScript(@EmbeddedDatabase dataSource: DataSource) {
-        dataSource.getConnection().use { connection ->
+        dataSource.connection.use { connection ->
             connection.createStatement().use { statement ->
                 statement.executeQuery(
                     BufferedReader(

diff --git a/src/test/kotlin/g1101_1200/s1145_binary_tree_coloring_game/SolutionTest.kt b/src/test/kotlin/g1101_1200/s1145_binary_tree_coloring_game/SolutionTest.kt
@@ -8,13 +8,13 @@ import org.junit.jupiter.api.Test
 internal class SolutionTest {
     @Test
     fun btreeGameWinningMove() {
-        val root = TreeNode.create(mutableListOf<Int?>(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11))
+        val root = TreeNode.create(mutableListOf<Int>(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11))
         assertThat(Solution().btreeGameWinningMove(root, 11, 3), equalTo(true))
     }
 
     @Test
     fun btreeGameWinningMove2() {
-        val root = TreeNode.create(mutableListOf<Int?>(1, 2, 3))
+        val root = TreeNode.create(mutableListOf<Int>(1, 2, 3))
         assertThat(Solution().btreeGameWinningMove(root, 3, 1), equalTo(false))
     }
 }
diff --git a/...est/kotlin/g2301_2400/s2356_number_of_unique_subjects_taught_by_each_teacher/MysqlTest.kt b/...est/kotlin/g2301_2400/s2356_number_of_unique_subjects_taught_by_each_teacher/MysqlTest.kt
@@ -38,7 +38,7 @@ internal class MysqlTest {
     @Test
     @Throws(SQLException::class, FileNotFoundException::class)
     fun testScript(@EmbeddedDatabase dataSource: DataSource) {
-        dataSource.getConnection().use { connection ->
+        dataSource.connection.use { connection ->
             connection.createStatement().use { statement ->
                 statement.executeQuery(
                     BufferedReader(

diff --git a/src/test/kotlin/g2401_2500/s2468_split_message_based_on_limit/SolutionTest.kt b/src/test/kotlin/g2401_2500/s2468_split_message_based_on_limit/SolutionTest.kt
@@ -10,7 +10,7 @@ internal class SolutionTest {
         assertThat(
             Solution().splitMessage("this is really a very awesome message", 9),
             equalTo(
-                arrayOf<String?>(
+                arrayOf<String>(
                     "thi<1/14>",
                     "s i<2/14>",
                     "s r<3/14>",
@@ -34,7 +34,7 @@ internal class SolutionTest {
     fun splitMessage2() {
         assertThat(
             Solution().splitMessage("short message", 15),
-            equalTo(arrayOf<String?>("short mess<1/2>", "age<2/2>")),
+            equalTo(arrayOf<String>("short mess<1/2>", "age<2/2>")),
         )
     }
 }
diff --git a/src/test/kotlin/g2801_2900/s2809_minimum_time_to_make_array_sum_at_most_x/SolutionTest.kt b/src/test/kotlin/g2801_2900/s2809_minimum_time_to_make_array_sum_at_most_x/SolutionTest.kt
@@ -8,15 +8,15 @@ internal class SolutionTest {
     @Test
     fun minimumTime() {
         assertThat(
-            Solution().minimumTime(mutableListOf<Int?>(1, 2, 3), mutableListOf<Int?>(1, 2, 3), 4),
+            Solution().minimumTime(mutableListOf<Int>(1, 2, 3), mutableListOf<Int>(1, 2, 3), 4),
             equalTo(3),
         )
     }
 
     @Test
     fun minimumTime2() {
         assertThat(
-            Solution().minimumTime(mutableListOf<Int?>(1, 2, 3), mutableListOf<Int?>(3, 3, 3), 4),
+            Solution().minimumTime(mutableListOf<Int>(1, 2, 3), mutableListOf<Int>(3, 3, 3), 4),
             equalTo(-1),
         )
     }

diff --git a/src/test/kotlin/g2801_2900/s2818_apply_operations_to_maximize_score/SolutionTest.kt b/src/test/kotlin/g2801_2900/s2818_apply_operations_to_maximize_score/SolutionTest.kt
@@ -8,15 +8,15 @@ internal class SolutionTest {
     @Test
     fun maximumScore() {
         assertThat(
-            Solution().maximumScore(mutableListOf<Int?>(8, 3, 9, 3, 8), 2),
+            Solution().maximumScore(mutableListOf<Int>(8, 3, 9, 3, 8), 2),
             equalTo(81),
         )
     }
 
     @Test
     fun maximumScore2() {
         assertThat(
-            Solution().maximumScore(mutableListOf<Int?>(19, 12, 14, 6, 10, 18), 3),
+            Solution().maximumScore(mutableListOf<Int>(19, 12, 14, 6, 10, 18), 3),
             equalTo(4788),
         )
     }

diff --git a/...test/kotlin/g2901_3000/s2966_divide_array_into_arrays_with_max_difference/SolutionTest.kt b/...test/kotlin/g2901_3000/s2966_divide_array_into_arrays_with_max_difference/SolutionTest.kt
@@ -9,7 +9,7 @@ internal class SolutionTest {
     fun divideArray() {
         assertThat(
             Solution().divideArray(intArrayOf(1, 3, 4, 8, 7, 9, 3, 5, 1), 2),
-            equalTo(arrayOf<IntArray?>(intArrayOf(1, 1, 3), intArrayOf(3, 4, 5), intArrayOf(7, 8, 9))),
+            equalTo(arrayOf<IntArray>(intArrayOf(1, 1, 3), intArrayOf(3, 4, 5), intArrayOf(7, 8, 9))),
         )
     }
 

diff --git a/src/test/kotlin/g3001_3100/s3076_shortest_uncommon_substring_in_an_array/SolutionTest.kt b/src/test/kotlin/g3001_3100/s3076_shortest_uncommon_substring_in_an_array/SolutionTest.kt
@@ -9,15 +9,15 @@ internal class SolutionTest {
     fun shortestSubstrings() {
         assertThat(
             Solution().shortestSubstrings(arrayOf("cab", "ad", "bad", "c")),
-            equalTo(arrayOf<String?>("ab", "", "ba", "")),
+            equalTo(arrayOf<String>("ab", "", "ba", "")),
         )
     }
 
     @Test
     fun shortestSubstrings2() {
         assertThat(
             Solution().shortestSubstrings(arrayOf("abc", "bcd", "abcd")),
-            equalTo(arrayOf<String?>("", "", "abcd")),
+            equalTo(arrayOf<String>("", "", "abcd")),
         )
     }
 }
diff --git a/src/test/kotlin/g3201_3300/s3280_convert_date_to_binary/SolutionTest.kt b/src/test/kotlin/g3201_3300/s3280_convert_date_to_binary/SolutionTest.kt
@@ -7,17 +7,17 @@ import org.junit.jupiter.api.Test
 internal class SolutionTest {
     @Test
     fun convertDateToBinary() {
-        assertThat<String?>(
+        assertThat<String>(
             Solution().convertDateToBinary("2080-02-29"),
-            equalTo<String?>("100000100000-10-11101"),
+            equalTo<String>("100000100000-10-11101"),
         )
     }
 
     @Test
     fun convertDateToBinary2() {
-        assertThat<String?>(
+        assertThat<String>(
             Solution().convertDateToBinary("1900-01-01"),
-            equalTo<String?>("11101101100-1-1"),
+            equalTo<String>("11101101100-1-1"),
         )
     }
 }
diff --git a/src/test/kotlin/g3201_3300/s3281_maximize_score_of_numbers_in_ranges/SolutionTest.kt b/src/test/kotlin/g3201_3300/s3281_maximize_score_of_numbers_in_ranges/SolutionTest.kt
@@ -7,17 +7,17 @@ import org.junit.jupiter.api.Test
 internal class SolutionTest {
     @Test
     fun maxPossibleScore() {
-        assertThat<Int?>(
+        assertThat<Int>(
             Solution().maxPossibleScore(intArrayOf(6, 0, 3), 2),
-            equalTo<Int?>(4),
+            equalTo<Int>(4),
         )
     }
 
     @Test
     fun maxPossibleScore2() {
-        assertThat<Int?>(
+        assertThat<Int>(
             Solution().maxPossibleScore(intArrayOf(2, 6, 13, 13), 5),
-            equalTo<Int?>(5),
+            equalTo<Int>(5),
         )
     }
 }
diff --git a/src/test/kotlin/g3201_3300/s3282_reach_end_of_array_with_max_score/SolutionTest.kt b/src/test/kotlin/g3201_3300/s3282_reach_end_of_array_with_max_score/SolutionTest.kt
@@ -7,17 +7,17 @@ import org.junit.jupiter.api.Test
 internal class SolutionTest {
     @Test
     fun findMaximumScore() {
-        assertThat<Long?>(
+        assertThat<Long>(
             Solution().findMaximumScore(mutableListOf<Int>(1, 3, 1, 5)),
-            equalTo<Long?>(7L),
+            equalTo<Long>(7L),
         )
     }
 
     @Test
     fun findMaximumScore2() {
-        assertThat<Long?>(
+        assertThat<Long>(
             Solution().findMaximumScore(mutableListOf<Int>(4, 3, 1, 3, 2)),
-            equalTo<Long?>(16L),
+            equalTo<Long>(16L),
         )
     }
 }
diff --git a/src/test/kotlin/g3201_3300/s3283_maximum_number_of_moves_to_kill_all_pawns/SolutionTest.kt b/src/test/kotlin/g3201_3300/s3283_maximum_number_of_moves_to_kill_all_pawns/SolutionTest.kt
@@ -7,33 +7,33 @@ import org.junit.jupiter.api.Test
 internal class SolutionTest {
     @Test
     fun maxMoves() {
-        assertThat<Int?>(
+        assertThat<Int>(
             Solution().maxMoves(1, 1, arrayOf(intArrayOf(0, 0))),
-            equalTo<Int?>(4),
+            equalTo<Int>(4),
         )
     }
 
     @Test
     fun maxMoves2() {
-        assertThat<Int?>(
+        assertThat<Int>(
             Solution().maxMoves(
                 0,
                 2,
                 arrayOf(intArrayOf(1, 1), intArrayOf(2, 2), intArrayOf(3, 3)),
             ),
-            equalTo<Int?>(8),
+            equalTo<Int>(8),
         )
     }
 
     @Test
     fun maxMoves3() {
-        assertThat<Int?>(
+        assertThat<Int>(
             Solution().maxMoves(
                 0,
                 0,
                 arrayOf(intArrayOf(1, 2), intArrayOf(2, 4)),
             ),
-            equalTo<Int?>(3),
+            equalTo<Int>(3),
         )
     }
 }
diff --git a/src/test/kotlin/g3201_3300/s3286_find_a_safe_walk_through_a_grid/SolutionTest.kt b/src/test/kotlin/g3201_3300/s3286_find_a_safe_walk_through_a_grid/SolutionTest.kt
@@ -1,14 +1,14 @@
 package g3201_3300.s3286_find_a_safe_walk_through_a_grid
 
 import com_github_leetcode.ArrayUtils.getLists
-import org.hamcrest.CoreMatchers
-import org.hamcrest.MatcherAssert
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 
 internal class SolutionTest {
     @Test
     fun findSafeWalk() {
-        MatcherAssert.assertThat<Boolean?>(
+        assertThat<Boolean>(
             Solution()
                 .findSafeWalk(
                     getLists(
@@ -20,13 +20,13 @@ internal class SolutionTest {
                     ),
                     1,
                 ),
-            CoreMatchers.equalTo<Boolean?>(true),
+            equalTo<Boolean>(true),
         )
     }
 
     @Test
     fun findSafeWalk2() {
-        MatcherAssert.assertThat<Boolean?>(
+        assertThat<Boolean>(
             Solution()
                 .findSafeWalk(
                     getLists(
@@ -39,13 +39,13 @@ internal class SolutionTest {
                     ),
                     3,
                 ),
-            CoreMatchers.equalTo<Boolean?>(false),
+            equalTo<Boolean>(false),
         )
     }
 
     @Test
     fun findSafeWalk3() {
-        MatcherAssert.assertThat<Boolean?>(
+        assertThat<Boolean>(
             Solution()
                 .findSafeWalk(
                     getLists(
@@ -57,7 +57,7 @@ internal class SolutionTest {
                     ),
                     5,
                 ),
-            CoreMatchers.equalTo<Boolean?>(true),
+            equalTo<Boolean>(true),
         )
     }
 }