js legacy exception (#679)

Throw exception on JS and canvas, and no flag on legacy-ir compiler
JetBrains · Sep 20, 2023 · 53fb857 · 53fb857
1 parent f277f98
commit 53fb857
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/main/kotlin/com/compiler/server/controllers/CompilerRestController.kt b/src/main/kotlin/com/compiler/server/controllers/CompilerRestController.kt
@@ -21,12 +21,8 @@ class CompilerRestController(private val kotlinProjectExecutor: KotlinProjectExe
   @PostMapping("/translate")
   fun translateKotlinProjectEndpoint(
     @RequestBody project: Project,
-    @RequestParam(defaultValue = "false") ir: Boolean,
     @RequestParam(defaultValue = "js") compiler: String
   ): TranslationResultWithJsCode {
-    if (!ir) {
-      return kotlinProjectExecutor.convertToJs(project)
-    }
     return when (KotlinTranslatableCompiler.valueOf(compiler.uppercase())) {
       KotlinTranslatableCompiler.JS -> kotlinProjectExecutor.convertToJsIr(project)
       KotlinTranslatableCompiler.WASM -> kotlinProjectExecutor.convertToWasm(project)

diff --git a/src/main/kotlin/com/compiler/server/controllers/KotlinPlaygroundRestController.kt b/src/main/kotlin/com/compiler/server/controllers/KotlinPlaygroundRestController.kt
@@ -1,5 +1,6 @@
 package com.compiler.server.controllers
 
+import com.compiler.server.exceptions.LegacyJsException
 import com.compiler.server.model.Project
 import com.compiler.server.model.ProjectType
 import com.compiler.server.service.KotlinProjectExecutor
@@ -39,7 +40,7 @@ class KotlinPlaygroundRestController(private val kotlinProjectExecutor: KotlinPr
           "run" -> {
             when (project.confType) {
               ProjectType.JAVA -> kotlinProjectExecutor.run(project)
-              ProjectType.JS, ProjectType.CANVAS -> kotlinProjectExecutor.convertToJs(project)
+              ProjectType.JS, ProjectType.CANVAS -> throw LegacyJsException()
               ProjectType.JS_IR -> kotlinProjectExecutor.convertToJsIr(project)
               ProjectType.WASM -> kotlinProjectExecutor.convertToWasm(project)
               ProjectType.JUNIT -> kotlinProjectExecutor.test(project)

diff --git a/src/main/kotlin/com/compiler/server/exceptions/LegacyJsException.kt b/src/main/kotlin/com/compiler/server/exceptions/LegacyJsException.kt
@@ -0,0 +1,7 @@
+package com.compiler.server.exceptions
+
+import org.springframework.http.HttpStatus
+import org.springframework.web.bind.annotation.ResponseStatus
+
+@ResponseStatus(value = HttpStatus.BAD_REQUEST)
+class LegacyJsException : RuntimeException()