io-to-data.9 : inline old generate

Duncan McGregor · dmcg · commit 5e6625e96f7a · 2021-06-23T22:24:14.000+01:00
diff --git a/src/main/java/travelator/marketing/HighValueCustomersMain.kt b/src/main/java/travelator/marketing/HighValueCustomersMain.kt
@@ -1,12 +1,13 @@
 package travelator.marketing
 
-import java.io.InputStreamReader
-import java.io.OutputStreamWriter
-
 fun main() {
-    InputStreamReader(System.`in`).use { reader ->
-        OutputStreamWriter(System.out).use { writer ->
-            generate(writer, reader.readLines())
+    System.`in`.reader().use { reader ->
+        System.out.writer().use { writer ->
+            writer.append(
+                generate(
+                    reader.readLines()
+                ).joinToString("\n")
+            )
         }
     }
 }
diff --git a/src/main/java/travelator/marketing/HighValueCustomersReport.kt b/src/main/java/travelator/marketing/HighValueCustomersReport.kt
@@ -1,13 +1,5 @@
 package travelator.marketing
 
-import java.io.IOException
-import java.io.Writer
-
-@Throws(IOException::class)
-fun generate(writer: Writer, lines: List<String>) {
-    writer.append(generate(lines).joinToString("\n"))
-}
-
 fun generate(lines: List<String>): List<String> {
     val valuableCustomers = lines
         .toValuableCustomers()
diff --git a/src/test/java/travelator/marketing/HighValueCustomersReportTests.kt b/src/test/java/travelator/marketing/HighValueCustomersReportTests.kt
@@ -52,7 +52,7 @@ class HighValueCustomersReportTests {
         expectedLines: List<String>
     ) {
         val output = StringWriter()
-        generate(output, inputLines)
+        output.append(generate(inputLines).joinToString("\n"))
         val outputLines = output.toString().lines()
 
         assertEquals(expectedLines, outputLines)

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`package travelator.marketing`
`2`	`2`
`3`		`-import java.io.InputStreamReader`
`4`		`-import java.io.OutputStreamWriter`
`5`		`-`
`6`	`3`	`fun main() {`
`7`		- InputStreamReader(System.`in`).use { reader ->
`8`		`- OutputStreamWriter(System.out).use { writer ->`
`9`		`- generate(writer, reader.readLines())`
	`4`	+ System.`in`.reader().use { reader ->
	`5`	`+ System.out.writer().use { writer ->`
	`6`	`+ writer.append(`
	`7`	`+ generate(`
	`8`	`+ reader.readLines()`
	`9`	`+ ).joinToString("\n")`
	`10`	`+ )`
`10`	`11`	`}`
`11`	`12`	`}`
`12`	`13`	`}`