From 4709e2c2743ce649707d8486fa11190b75092107 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 10 Mar 2022 23:20:08 +0300
Subject: [PATCH] stdlib-gen: simpify copyright notice reading

---
 .../kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt  | 3 ---
 .../src/generators/math/mathTestGeneratorMain.kt             | 4 ----
 .../src/generators/unicode/GenerateUnicodeData.kt            | 5 -----
 .../tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt     | 5 ++++-
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt
index 081b6e25978..2f3b7085737 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt
@@ -35,9 +35,6 @@ fun main(args: Array<String>) {
         ComparableOps
     )
 
-    COPYRIGHT_NOTICE =
-        readCopyrightNoticeFromProfile { Thread.currentThread().contextClassLoader.getResourceAsStream("apache.xml")!!.reader() }
-
     val targetBaseDirs = mutableMapOf<KotlinTarget, File>()
 
     when (args.size) {
diff --git a/libraries/tools/kotlin-stdlib-gen/src/generators/math/mathTestGeneratorMain.kt b/libraries/tools/kotlin-stdlib-gen/src/generators/math/mathTestGeneratorMain.kt
index dcb763a3fc8..feeaa99c849 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/generators/math/mathTestGeneratorMain.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/generators/math/mathTestGeneratorMain.kt
@@ -2,7 +2,6 @@ package generators.math
 
 import templates.COPYRIGHT_NOTICE
 import templates.autoGeneratedWarning
-import templates.readCopyrightNoticeFromProfile
 import java.io.File
 import java.io.FileWriter
 import kotlin.math.*
@@ -20,9 +19,6 @@ fun main(args: Array<String>) {
         }
     }
 
-    COPYRIGHT_NOTICE =
-        readCopyrightNoticeFromProfile { Thread.currentThread().contextClassLoader.getResourceAsStream("apache.xml")!!.reader() }
-
     generateUtils(baseDir.resolve("mathTestUtils.kt"))
 
     val trigonometryFunctions = listOf(
diff --git a/libraries/tools/kotlin-stdlib-gen/src/generators/unicode/GenerateUnicodeData.kt b/libraries/tools/kotlin-stdlib-gen/src/generators/unicode/GenerateUnicodeData.kt
index 6edefa097de..4587417978c 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/generators/unicode/GenerateUnicodeData.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/generators/unicode/GenerateUnicodeData.kt
@@ -14,9 +14,7 @@ import generators.unicode.mappings.string.StringLowercaseGenerator
 import generators.unicode.mappings.string.StringUppercaseGenerator
 import generators.unicode.ranges.OtherLowercaseRangesGenerator
 import generators.unicode.ranges.OtherUppercaseRangesGenerator
-import templates.COPYRIGHT_NOTICE
 import templates.KotlinTarget
-import templates.readCopyrightNoticeFromProfile
 import java.io.File
 import java.net.URL
 import kotlin.system.exitProcess
@@ -167,9 +165,6 @@ fun main(args: Array<String>) {
         }
     }
 
-    COPYRIGHT_NOTICE =
-        readCopyrightNoticeFromProfile { Thread.currentThread().contextClassLoader.getResourceAsStream("apache.xml").reader() }
-
     categoryRangesGenerators.forEach {
         bmpUnicodeDataLines.forEach { line -> it.appendLine(line) }
         it.generate()
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt
index 45b6604401d..9c137f747f0 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt
@@ -16,7 +16,7 @@ fun autoGeneratedWarning(generator: String): String = """//
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //"""
 
-lateinit var COPYRIGHT_NOTICE: String
+val COPYRIGHT_NOTICE: String by lazy { readCopyrightNoticeFromResource() }
 
 fun readCopyrightNoticeFromProfile(copyrightProfile: File): String = readCopyrightNoticeFromProfile { copyrightProfile.reader() }
 
@@ -31,6 +31,9 @@ fun readCopyrightNoticeFromProfile(getCopyrightReader: () -> Reader): String {
     return template.replace(yearTemplate, year).lines().joinToString("", prefix = "/*\n", postfix = " */\n") { " * $it\n" }
 }
 
+fun readCopyrightNoticeFromResource() = readCopyrightNoticeFromProfile { Thread.currentThread().contextClassLoader.getResourceAsStream("apache.xml")!!.reader() }
+
+
 
 data class TargetedSourceFile(
     val target: KotlinTarget,