- make judge inner classpath configurable via env variable

Author: spolnik

src/main/kotlin/com/jalgoarena/ApplicationConfiguration.kt

@@ -11,13 +11,17 @@ import com.jalgoarena.codegeneration.JavaCodeGenerator
 import com.jalgoarena.compile.InMemoryJavaCompiler
 import com.jalgoarena.type.GraphNode
 import com.jalgoarena.type.ListNode
+import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.web.client.RestTemplate
 
 @Configuration
 open class ApplicationConfiguration {
 
+    @Value("\${jalgoarena.judge.classpath:build/classes/kotlin/main}")
+    private lateinit var jalgoarenaJudgeClasspath: String
+
     @Bean
     open fun objectMapper(): ObjectMapper {
         val objectMapper = jacksonObjectMapper()
@@ -36,11 +40,14 @@ open class ApplicationConfiguration {
     }
 
     @Bean
-    open fun restTemplate() = RestTemplate()
+    open fun restTemplate() =
+            RestTemplate()
 
     @Bean
-    open fun javaCompiler() = InMemoryJavaCompiler()
+    open fun javaCompiler() =
+            InMemoryJavaCompiler(jalgoarenaJudgeClasspath)
 
     @Bean
-    open fun javaCodeGenerator() = JavaCodeGenerator()
+    open fun javaCodeGenerator() =
+            JavaCodeGenerator()
 }

src/main/kotlin/com/jalgoarena/compile/InMemoryJavaCompiler.kt

@@ -7,7 +7,9 @@ import java.io.IOException
 import java.nio.CharBuffer
 import javax.tools.*
 
-open class InMemoryJavaCompiler : JvmCompiler {
+open class InMemoryJavaCompiler(
+        private val jalgoarenaJudgeClasspath: String = "build/classes/kotlin/main"
+) : JvmCompiler {
 
     private val logger = LoggerFactory.getLogger(this.javaClass)
 
@@ -71,22 +73,17 @@ open class InMemoryJavaCompiler : JvmCompiler {
     private fun buildClassPath(): String {
         val classpath = mutableListOf<String>()
 
-        addToClassPath(classpath, "build/classes/kotlin/main")
+        addToClassPath(classpath, jalgoarenaJudgeClasspath)
 
         val result = classpath.joinToString(File.pathSeparator)
         logger.info("Classpath: $result")
         return result
     }
 
     private fun addToClassPath(classpath: MutableList<String>, path: String) {
-        val dockerPath = "/app/$path"
-        val nomadPath = "local/$path"
-
         when {
             File(path).exists() -> classpath.add(File(path).absolutePath)
-            File(dockerPath).exists() -> classpath.add(File(dockerPath).absolutePath)
-            File(nomadPath).exists() -> classpath.add(File(nomadPath).absolutePath)
-            else -> logger.warn("[err] Could not find any of paths: [$path, $dockerPath, $nomadPath]")
+            else -> logger.warn("[err] Could not find class path: $path")
         }
     }
 

src/main/resources/application.yml

@@ -7,6 +7,8 @@ server:
 jalgoarena:
   problems:
     source: ${PROBLEMS_SOURCE:problems.json}
+  jude:
+    classpath: ${JUDGE_CLASSPATH:build/classes/kotlin/main}
 
 spring:
   kafka:

src/test/kotlin/com/jalgoarena/config/TestApplicationConfiguration.kt

@@ -3,7 +3,6 @@ package com.jalgoarena.config
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.jalgoarena.ApplicationConfiguration
 import com.jalgoarena.codegeneration.JavaCodeGenerator
-import com.jalgoarena.codegeneration.JvmCodeGenerator
 import com.jalgoarena.compile.InMemoryJavaCompiler
 import com.jalgoarena.data.JsonProblemsRepository
 import com.jalgoarena.data.ProblemsRepository