add filename to downloaded file

fractalwrench · fractalwrench · commit 0913073d634b · 2018-03-04T08:32:37.000Z
diff --git a/core/src/main/kotlin/com/fractalwrench/json2kotlin/ConversionInfo.kt b/core/src/main/kotlin/com/fractalwrench/json2kotlin/ConversionInfo.kt
@@ -0,0 +1,3 @@
+package com.fractalwrench.json2kotlin
+
+data class ConversionInfo(val filename: String)
diff --git a/core/src/main/kotlin/com/fractalwrench/json2kotlin/Kotlin2JsonConverter.kt b/core/src/main/kotlin/com/fractalwrench/json2kotlin/Kotlin2JsonConverter.kt
@@ -17,13 +17,17 @@ class Kotlin2JsonConverter(private val buildDelegate: SourceBuildDelegate = Gson
     /**
      * Converts an InputStream of JSON to Kotlin source code, writing the result to the OutputStream.
      */
-    fun convert(input: InputStream, output: OutputStream, args: ConversionArgs) {
+    fun convert(input: InputStream, output: OutputStream, args: ConversionArgs): ConversionInfo {
         try {
             val jsonRoot = jsonReader.readJsonTree(input, args)
             val jsonStack = treeTraverser.traverse(jsonRoot, args.rootClassName)
             val generator = TypeSpecGenerator(buildDelegate, ::defaultGroupingStrategy)
             val typeSpecs = generator.generateTypeSpecs(jsonStack)
+
+            val name = typeSpecs.peek().name
+            val conversionInfo = ConversionInfo("$name.kt")
             sourceFileWriter.writeSourceFile(typeSpecs, args, output)
+            return conversionInfo
         } catch (e: JsonSyntaxException) {
             throw IllegalArgumentException("Invalid JSON supplied", e)
         }
diff --git a/spring/src/main/kotlin/com/fractalwrench/json2kotlin/ConversionController.kt b/spring/src/main/kotlin/com/fractalwrench/json2kotlin/ConversionController.kt
@@ -29,10 +29,10 @@ class ConversionController {
 
     @PostMapping("/")
     fun convertToKotlin(model: Model, @ModelAttribute conversionForm: ConversionForm): String {
-        val os = conversionService.convert(conversionForm.json)
+        val pair = conversionService.convert(conversionForm.json)
         model.addAttribute(formKey, conversionForm)
-        model.addAttribute("kotlin", String(os.toByteArray()))
-        model.addAttribute("filename", "Foo.kt") // FIXME!
+        model.addAttribute("kotlin", String(pair.first.toByteArray()))
+        model.addAttribute("filename", pair.second)
         return displayConversionForm(model)
     }
 
diff --git a/spring/src/main/kotlin/com/fractalwrench/json2kotlin/KotlinConversionService.kt b/spring/src/main/kotlin/com/fractalwrench/json2kotlin/KotlinConversionService.kt
@@ -12,16 +12,15 @@ class KotlinConversionService {
         val maxPayloadSize = 10000
     }
 
-    fun convert(json: String): ByteArrayOutputStream {
+    fun convert(json: String): Pair<ByteArrayOutputStream, String> {
         val os = ByteArrayOutputStream()
 
         if (json.length > maxPayloadSize) {
             throw IllegalArgumentException("JSON input cannot be larger than $maxPayloadSize")
         }
 
         val inputStream = ByteArrayInputStream(json.toByteArray())
-
-        Kotlin2JsonConverter().convert(inputStream, os, ConversionArgs())
-        return os
+        val conversionInfo = Kotlin2JsonConverter().convert(inputStream, os, ConversionArgs())
+        return Pair(os, conversionInfo.filename)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package com.fractalwrench.json2kotlin`
	`2`	`+`
	`3`	`+data class ConversionInfo(val filename: String)`
Original file line number	Diff line number	Diff line change
`@@ -12,16 +12,15 @@ class KotlinConversionService {`
`12`	`12`	`val maxPayloadSize = 10000`
`13`	`13`	`}`
`14`	`14`
`15`		`- fun convert(json: String): ByteArrayOutputStream {`
	`15`	`+ fun convert(json: String): Pair<ByteArrayOutputStream, String> {`
`16`	`16`	`val os = ByteArrayOutputStream()`
`17`	`17`
`18`	`18`	`if (json.length > maxPayloadSize) {`
`19`	`19`	`throw IllegalArgumentException("JSON input cannot be larger than $maxPayloadSize")`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`val inputStream = ByteArrayInputStream(json.toByteArray())`
`23`		`-`
`24`		`- Kotlin2JsonConverter().convert(inputStream, os, ConversionArgs())`
`25`		`- return os`
	`23`	`+ val conversionInfo = Kotlin2JsonConverter().convert(inputStream, os, ConversionArgs())`
	`24`	`+ return Pair(os, conversionInfo.filename)`
`26`	`25`	`}`
`27`	`26`	`}`