Reorder examples to match slides; rename some stuff

src/main/kotlin/t13_WhenAsExpressionBody/bad.kt → src/main/kotlin/t01_WhenAsExpressionBody/bad.kt

@@ -1,4 +1,4 @@
-package t13_WhenAsExpressionBody.bad
+package t01_WhenAsExpressionBody.bad
 
 fun parseEnglishNumber(number: String): Int? {
     when (number) {

src/main/kotlin/t13_WhenAsExpressionBody/good.kt → src/main/kotlin/t01_WhenAsExpressionBody/good.kt

@@ -1,4 +1,4 @@
-package t13_WhenAsExpressionBody.good
+package t01_WhenAsExpressionBody.good
 
 fun parseEnglishNumber(number: String) = when (number) {
     "one" -> 1

src/main/kotlin/t14_TryAsExpressionBody/bad.kt → src/main/kotlin/t02_TryAsExpressionBody/bad.kt

@@ -1,4 +1,4 @@
-package t14_TryAsExpressionBody.bad
+package t02_TryAsExpressionBody.bad
 
 fun tryParseInt(number: String): Int? {
     try {

src/main/kotlin/t14_TryAsExpressionBody/good.kt → src/main/kotlin/t02_TryAsExpressionBody/good.kt

@@ -1,4 +1,4 @@
-package t14_TryAsExpressionBody.good
+package t02_TryAsExpressionBody.good
 
 fun tryParseInt(number: String) =
     try {

src/main/kotlin/t15_ReturnInElvis/bad.kt → src/main/kotlin/t03_ReturnInElvis/bad.kt

@@ -1,4 +1,4 @@
-package t15_ReturnInElvis.bad
+package t03_ReturnInElvis.bad
 
 class Person(val name: String?,
              val age: Int?)

src/main/kotlin/t15_ReturnInElvis/good.kt → src/main/kotlin/t03_ReturnInElvis/good.kt

@@ -1,4 +1,4 @@
-package t15_ReturnInElvis.good
+package t03_ReturnInElvis.good
 
 class Person(val name: String?,
              val age: Int?)

src/main/kotlin/t16_Range/bad.kt → src/main/kotlin/t04_Range/bad.kt

@@ -1,4 +1,4 @@
-package t16_Range.bad
+package t04_Range.bad
 
 fun isLatinUppercase(c: Char) =
     c >= 'A' && c <= 'Z'

src/main/kotlin/t16_Range/good.kt → src/main/kotlin/t04_Range/good.kt

@@ -1,4 +1,4 @@
-package t16_Range.good
+package t04_Range.good
 
 fun isLatinUppercase(c: Char) =
     c in 'A'..'Z'

src/main/kotlin/t07_MemberExtensionFunctions/bad.kt

@@ -3,6 +3,4 @@ package t07_MemberExtensionFunctions.bad
 class PhoneBook {
     fun String.isPhoneNumber() =
        length == 7 && all { it.isDigit() }
-
-    fun PhoneBook.findPhone(name: String) = "1234567"
 }

src/main/kotlin/t07_MemberExtensionFunctions/good.kt

@@ -1,7 +1,6 @@
 package t07_MemberExtensionFunctions.good
 
 class PhoneBook {
-    fun findPhone(name: String) = "1234567"
 }
 
 private fun String.isPhoneNumber() =

src/main/kotlin/t08_MemberExtensionFunctionsSelfReceiver/bad.kt

@@ -0,0 +1,5 @@
+package t08_MemberExtensionFunctionsSelfReceiver.bad
+
+class PhoneBook {
+    fun PhoneBook.findPhone(name: String) = "1234567"
+}

src/main/kotlin/t08_MemberExtensionFunctionsSelfReceiver/good.kt

@@ -0,0 +1,5 @@
+package t08_MemberExtensionFunctionsSelfReceiver.good
+
+class PhoneBook {
+    fun findPhone(name: String) = "1234567"
+}

src/main/kotlin/t03_Lateinit/bad.kt → src/main/kotlin/t11_Lateinit/bad.kt

@@ -1,4 +1,4 @@
-package t03_Lateinit.bad
+package t11_Lateinit.bad
 
 import org.junit.Assert
 import org.junit.Before

src/main/kotlin/t03_Lateinit/good.kt → src/main/kotlin/t11_Lateinit/good.kt

@@ -1,4 +1,4 @@
-package t03_Lateinit.good
+package t11_Lateinit.good
 
 import org.junit.Assert
 import org.junit.Before

src/main/kotlin/t04_Typealias/bad.kt → src/main/kotlin/t12_Typealias/bad.kt

@@ -1,4 +1,4 @@
-package t04_Typealias.bad
+package t12_Typealias.bad
 
 class Event
 

src/main/kotlin/t04_Typealias/good.kt → src/main/kotlin/t12_Typealias/good.kt

@@ -1,4 +1,4 @@
-package t04_Typealias.good
+package t12_Typealias.good
 
 class Event
 

src/main/kotlin/t13_ReturnMultipleValues/bad.kt

@@ -0,0 +1,10 @@
+package t13_ReturnMultipleValues.bad
+
+fun namedNum(): Pair<Int, String> =
+    1 to "one"
+
+fun main(args: Array<String>) {
+    val pair = namedNum()
+    val number = pair.first
+    val name = pair.second
+}

src/main/kotlin/t11_ReturnMultipleValues/good.kt → src/main/kotlin/t13_ReturnMultipleValues/good.kt

@@ -1,11 +1,11 @@
-package t11_ReturnMultipleValues.good
+package t13_ReturnMultipleValues.good
 
 data class NamedNumber(val number: Int,
                        val name: String)
 
-fun returnMultipleValues() =
+fun namedNum() =
     NamedNumber(1, "one")
 
 fun main(args: Array<String>) {
-    val (number, name) = returnMultipleValues()
+    val (number, name) = namedNum()
 }

src/main/kotlin/t18_DestructuringInLoops/bad.kt → src/main/kotlin/t14_DestructuringInLoops/bad.kt

@@ -1,4 +1,4 @@
-package t18_DestructuringInLoops.bad
+package t14_DestructuringInLoops.bad
 
 fun printMap(map: Map<String, String>) {
     for (item in map.entries) {

src/main/kotlin/t18_DestructuringInLoops/good.kt → src/main/kotlin/t14_DestructuringInLoops/good.kt

@@ -1,4 +1,4 @@
-package t18_DestructuringInLoops.good
+package t14_DestructuringInLoops.good
 
 fun printMap(map: Map<String, String>) {
     for ((key, value) in map) {

src/main/kotlin/t12_DestructuringList/bad.kt → src/main/kotlin/t15_DestructuringList/bad.kt

@@ -1,4 +1,4 @@
-package t12_DestructuringList.bad
+package t15_DestructuringList.bad
 
 data class NameExt(val name: String,
                    val ext: String?)

src/main/kotlin/t12_DestructuringList/good.kt → src/main/kotlin/t15_DestructuringList/good.kt

@@ -1,4 +1,4 @@
-package t12_DestructuringList.good
+package t15_DestructuringList.good
 
 data class NameExt(val name: String,
                    val ext: String?)

src/main/kotlin/t02_DataClassCopy/bad.kt → src/main/kotlin/t16_DataClassCopy/bad.kt

@@ -1,4 +1,4 @@
-package t02_DataClassCopy.bad
+package t16_DataClassCopy.bad
 
 class Person(val name: String, var age: Int)
 

src/main/kotlin/t02_DataClassCopy/good.kt → src/main/kotlin/t16_DataClassCopy/good.kt

@@ -1,4 +1,4 @@
-package t02_DataClassCopy.good
+package t16_DataClassCopy.good
 
 data class Person(val name: String, val age: Int)
 

src/main/kotlin/t20_Apply/bad.kt → src/main/kotlin/t18_Apply/bad.kt

@@ -1,4 +1,4 @@
-package t20_Apply.bad
+package t18_Apply.bad
 
 import java.awt.Color
 import javax.swing.JLabel

src/main/kotlin/t20_Apply/good.kt → src/main/kotlin/t18_Apply/good.kt

@@ -1,4 +1,4 @@
-package t20_Apply.good
+package t18_Apply.good
 
 import java.awt.Color
 import javax.swing.JLabel

src/main/kotlin/t21_FilterIsInstance/bad.kt → src/main/kotlin/t19_FilterIsInstance/bad.kt

@@ -1,4 +1,4 @@
-package t21_FilterIsInstance.bad
+package t19_FilterIsInstance.bad
 
 fun findAllStrings(objects: List<Any>) =
     objects.filter { it is String }

src/main/kotlin/t21_FilterIsInstance/good.kt → src/main/kotlin/t19_FilterIsInstance/good.kt

@@ -1,4 +1,4 @@
-package t21_FilterIsInstance.good
+package t19_FilterIsInstance.good
 
 fun findAllStrings(objects: List<Any>) =
     objects.filterIsInstance<String>()

src/main/kotlin/t20_MapNotNull/bad.kt

@@ -0,0 +1,9 @@
+package t20_MapNotNull.bad
+
+data class Result(val data: Any?,
+                  val error: String?)
+
+fun listErrors(results: List<Result>): List<String> =
+    results.map { it.error }.filterNotNull()
+
+

src/main/kotlin/t22_MapNotNull/good.kt → src/main/kotlin/t20_MapNotNull/good.kt

@@ -1,4 +1,4 @@
-package t22_MapNotNull.good
+package t20_MapNotNull.good
 
 data class Result(val data: Any?,
                   val errorMessage: String?)

src/main/kotlin/t23_CompareBy/bad.kt → src/main/kotlin/t21_CompareBy/bad.kt

@@ -1,4 +1,4 @@
-package t23_CompareBy.bad
+package t21_CompareBy.bad
 
 class Person(val name: String,
              val age: Int)

src/main/kotlin/t23_CompareBy/good.kt → src/main/kotlin/t21_CompareBy/good.kt

@@ -1,4 +1,4 @@
-package t23_CompareBy.good
+package t21_CompareBy.good
 
 class Person(val name: String,
              val age: Int)

src/main/kotlin/t25_GroupBy/bad.kt → src/main/kotlin/t22_GroupBy/bad.kt

@@ -1,10 +1,10 @@
-package t25_GroupBy.bad
+package t22_GroupBy.bad
 
 class Request(val url: String,
               val remoteIP: String,
               val timestamp: Long)
 
-fun analyzeRequests(log: List<Request>) {
+fun analyzeLog(log: List<Request>) {
     val map = mutableMapOf<String, MutableList<Request>>()
     for (request in log) {
         map.getOrPut(request.url) { mutableListOf() }

src/main/kotlin/t25_GroupBy/good.kt → src/main/kotlin/t22_GroupBy/good.kt

@@ -1,9 +1,9 @@
-package t25_GroupBy.good
+package t22_GroupBy.good
 
 class Request(val url: String,
               val remoteIP: String,
               val timestamp: Long)
 
-fun analyzeRequests(log: List<Request>) {
+fun analyzeLog(log: List<Request>) {
     val map = log.groupBy(Request::url)
 }

src/main/kotlin/t26_SubstringBeforeLast/bad.kt → src/main/kotlin/t23_SubstringBeforeLast/bad.kt

@@ -1,7 +1,7 @@
-package t26_SubstringBeforeLast.bad
+package t23_SubstringBeforeLast.bad
 
-data class PathParts(val directory: String,
-                     val fileName: String)
+data class PathParts(val dir: String,
+                     val name: String)
 
 val pattern = Regex("(.+)/([^/]*)")
 

src/main/kotlin/t23_SubstringBeforeLast/good.kt

@@ -0,0 +1,8 @@
+package t23_SubstringBeforeLast.good
+
+data class PathParts(val dir: String,
+                     val name: String)
+
+fun splitPath(path: String) = PathParts(
+    path.substringBeforeLast('/', ""),
+    path.substringAfterLast('/'))

src/main/kotlin/t09_OmitReturnTypes/IJavaInterface.java → src/main/kotlin/t99_OmitReturnTypes/IJavaInterface.java

@@ -1,4 +1,4 @@
-package t09_OmitReturnTypes;
+package t99_OmitReturnTypes;
 
 public interface IJavaInterface {
     String getJavaValue();

src/main/kotlin/t09_OmitReturnTypes/bad.kt → src/main/kotlin/t99_OmitReturnTypes/bad.kt

@@ -1,6 +1,6 @@
-package t09_OmitReturnTypes.bad
+package t99_OmitReturnTypes.bad
 
-import t09_OmitReturnTypes.IJavaInterface
+import t99_OmitReturnTypes.IJavaInterface
 
 class KtImpl : IJavaInterface {
     fun getName(): String = "Foo"

src/main/kotlin/t09_OmitReturnTypes/good.kt → src/main/kotlin/t99_OmitReturnTypes/good.kt

@@ -1,6 +1,6 @@
-package t09_OmitReturnTypes.good
+package t99_OmitReturnTypes.good
 
-import t09_OmitReturnTypes.IJavaInterface
+import t99_OmitReturnTypes.IJavaInterface
 
 class KtImpl : IJavaInterface {
     fun getName() = "Foo"

src/main/kotlin/t19_Optional/bad.kt → src/main/kotlin/t99_Optional/bad.kt

@@ -1,4 +1,4 @@
-package t19_Optional.bad
+package t99_Optional.bad
 
 import java.util.*
 

src/main/kotlin/t19_Optional/good.kt → src/main/kotlin/t99_Optional/good.kt

@@ -1,4 +1,4 @@
-package t19_Optional.good
+package t99_Optional.good
 
 fun processOptional(x: String?) {
     val s = x ?: "Unknown"

src/main/kotlin/t01_SmallClasses/bad/Address.kt → src/main/kotlin/t99_SmallClasses/bad/Address.kt

@@ -1,4 +1,4 @@
-package t01_SmallClasses.bad
+package t99_SmallClasses.bad
 
 class Address(val city: String, val street: String, val zipCode: String) {
 }

src/main/kotlin/t01_SmallClasses/bad/Company.kt → src/main/kotlin/t99_SmallClasses/bad/Company.kt

@@ -1,4 +1,4 @@
-package t01_SmallClasses.bad
+package t99_SmallClasses.bad
 
 class Company(val personnel: List<Person>, val address: Address) {
 }

src/main/kotlin/t01_SmallClasses/bad/Person.kt → src/main/kotlin/t99_SmallClasses/bad/Person.kt

@@ -1,4 +1,4 @@
-package t01_SmallClasses.bad
+package t99_SmallClasses.bad
 
 class Person(val name: String, val address: Address) {
 }

src/main/kotlin/t01_SmallClasses/good.kt → src/main/kotlin/t99_SmallClasses/good.kt

@@ -1,4 +1,4 @@
-package t01_SmallClasses
+package t99_SmallClasses
 
 class Address(val city: String, val street: String, val zipCode: String)
 

src/main/kotlin/t24_Zip/bad.kt → src/main/kotlin/t99_Zip/bad.kt

@@ -1,4 +1,4 @@
-package t24_Zip.bad
+package t99_Zip.bad
 
 fun calculateRequestDurations(requestTimestamps: LongArray,
                               responseTimestamps: LongArray) =

src/main/kotlin/t24_Zip/good.kt → src/main/kotlin/t99_Zip/good.kt

@@ -1,4 +1,4 @@
-package t24_Zip.good
+package t99_Zip.good
 
 fun calculateRequestDurations(requestTimestamps: LongArray,
                               responseTimestamps: LongArray) =