From 53911972cb36e04b22e6db240c4fc5796edd8a11 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Tue, 15 Aug 2017 11:05:56 +0300
Subject: [PATCH] Eliminate a set of warnings, mostly nullability ones

Original commit: 3623f581b8ce01e8d9458f5f6af911b827378413
---
 .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt   | 2 --
 .../kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt    | 2 +-
 .../kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt   | 2 +-
 .../kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt | 1 -
 .../kotlin/jps/model/KotlinCompilerSettingsSerializer.kt        | 2 +-
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
index 2460aec7f80..cd7b295f01e 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
@@ -1094,8 +1094,6 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
                     touch(file)
                 Operation.DELETE ->
                     assertTrue("Can not delete file \"" + file.absolutePath + "\"", file.delete())
-                else ->
-                    fail("Unknown operation")
             }
         }
     }
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt
index 6f5001e7b3b..f8283134768 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings
 internal class Kotlin2JsCompilerArgumentsSerializer : JpsProjectExtensionSerializer(KOTLIN_COMPILER_SETTINGS_FILE,
                                                                                     KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION) {
     override fun loadExtension(project: JpsProject, componentTag: Element) {
-        val settings = XmlSerializer.deserialize(componentTag, K2JSCompilerArguments::class.java) ?: K2JSCompilerArguments()
+        val settings = XmlSerializer.deserialize(componentTag, K2JSCompilerArguments::class.java)
         JpsKotlinCompilerSettings.setK2JsCompilerArguments(project, settings)
     }
 
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt
index ed27868a3c6..4c527f14c88 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt
@@ -30,7 +30,7 @@ internal class Kotlin2JvmCompilerArgumentsSerializer : JpsProjectExtensionSerial
                                                                                      KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION) {
 
     override fun loadExtension(project: JpsProject, componentTag: Element) {
-        val settings = XmlSerializer.deserialize(componentTag, K2JVMCompilerArguments::class.java) ?: K2JVMCompilerArguments()
+        val settings = XmlSerializer.deserialize(componentTag, K2JVMCompilerArguments::class.java)
         JpsKotlinCompilerSettings.setK2JvmCompilerArguments(project, settings)
     }
 
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt
index 2f15f384cfe..db41132e1ba 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt
@@ -31,7 +31,6 @@ internal class KotlinCommonCompilerArgumentsSerializer : JpsProjectExtensionSeri
 
     override fun loadExtension(project: JpsProject, componentTag: Element) {
         val settings = XmlSerializer.deserialize(componentTag, CommonCompilerArguments.DummyImpl::class.java)
-                       ?: CommonCompilerArguments.DummyImpl()
         if (VersionComparatorUtil.compare(settings.languageVersion, settings.apiVersion) < 0) {
             settings.apiVersion = settings.languageVersion
         }
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.kt
index 6dbf6c336bf..71e3475bd2f 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.kt
@@ -30,7 +30,7 @@ internal class KotlinCompilerSettingsSerializer : JpsProjectExtensionSerializer(
                                                                                 KOTLIN_COMPILER_SETTINGS_SECTION) {
 
     override fun loadExtension(project: JpsProject, componentTag: Element) {
-        val settings = XmlSerializer.deserialize(componentTag, CompilerSettings::class.java) ?: CompilerSettings()
+        val settings = XmlSerializer.deserialize(componentTag, CompilerSettings::class.java)
         JpsKotlinCompilerSettings.setCompilerSettings(project, settings)
     }