- change domain model

- for Problem, change property name function to func, as function is keyword in javascript and it cause problems ...
- for Problem, change property name return to returnStatement, as return is keyword in javascript and it cause problems ...

Author: spolnik

gradle/versioning.gradle

@@ -1,6 +1,6 @@
 //noinspection GroovyAssignabilityCheck
 version = new ProjectVersion(
-        '1', '0', '21', System.env.TRAVIS_BUILD_NUMBER
+        '1', '0', '22', System.env.TRAVIS_BUILD_NUMBER
 )
 
 println "Version number: " + version

src/main/kotlin/com/jalgoarena/domain/Function.kt

@@ -1,11 +1,10 @@
 package com.jalgoarena.domain
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
-import com.fasterxml.jackson.annotation.JsonProperty
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class Function(val name: String,
-               @JsonProperty("return") val returnStatement: Return,
+               val returnStatement: Return,
                val parameters: List<Parameter>) {
 
     @JsonIgnoreProperties(ignoreUnknown = true)

src/main/kotlin/com/jalgoarena/domain/Problem.kt

@@ -8,14 +8,14 @@ import com.fasterxml.jackson.databind.node.ArrayNode
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 data class Problem(val id: String,
-              val title: String,
-              val description: String,
-              val timeLimit: Long,
-              val memoryLimit: Int,
-              val function: Function?,
-              val testCases: List<TestCase>?,
-              val skeletonCode: Map<String, String>?,
-              val level: Int) {
+                   val title: String,
+                   val description: String,
+                   val timeLimit: Long,
+                   val memoryLimit: Int,
+                   val func: Function?,
+                   val testCases: List<TestCase>?,
+                   val skeletonCode: Map<String, String>?,
+                   val level: Int) {
 
     @JsonIgnoreProperties(ignoreUnknown = true)
     data class TestCase(val input: ArrayNode, val output: JsonNode)

src/main/kotlin/com/jalgoarena/judge/JvmJudgeEngine.kt

@@ -33,7 +33,7 @@ open class JvmJudgeEngine(
 
         val compiler = compilers.first { it.programmingLanguage() == language }
 
-        return compileAndJudge(className, compiler, problem.function!!, problem, judgeRequest.sourceCode)
+        return compileAndJudge(className, compiler, problem.func!!, problem, judgeRequest.sourceCode)
     }
 
     private fun judge(clazz: Any, method: Method, problem: Problem): JudgeResult {
@@ -118,7 +118,7 @@ open class JvmJudgeEngine(
 
     private fun readInternalTestCases(problem: Problem): Array<InternalTestCase> {
         val testCases = problem.testCases
-        val function = problem.function
+        val function = problem.func
 
         val parser = InternalTestCaseParser(function!!, objectMapper)
 

src/main/kotlin/com/jalgoarena/web/ProblemsController.kt

@@ -25,9 +25,9 @@ class ProblemsController(
 
     private fun enhancedProblem(problem: Problem): Problem {
         return problem.copy(
-                function = null,
+                func = null,
                 testCases = null,
-                skeletonCode = generateSkeletonCodes(problem.function!!)
+                skeletonCode = generateSkeletonCodes(problem.func!!)
         )
     }
 

src/test/kotlin/com/jalgoarena/domain/ProblemJsonSerializationTest.kt

@@ -47,7 +47,7 @@ class ProblemJsonSerializationTest {
             level = 3,
             memoryLimit = 1,
             timeLimit = 1,
-            function = TWO_SUM_FUNCTION,
+            func = TWO_SUM_FUNCTION,
             skeletonCode = mapOf(
                     Pair("java", "dummy code"),
                     Pair("kotlin", "kotlin dummy code")
@@ -67,9 +67,9 @@ class ProblemJsonSerializationTest {
   "description": "dummy description",
   "timeLimit": 1,
   "memoryLimit": 1,
-  "function": {
+  "func": {
     "name": "twoSum",
-    "return": {
+    "returnStatement": {
       "type": "[I",
       "comment": "[index1 + 1, index2 + 1] (index1 < index2)"
     },

src/test/kotlin/com/jalgoarena/web/JudgeControllerSpec.kt

@@ -157,9 +157,9 @@ class JudgeControllerSpec {
   "description": "Write the `fib` function to return the N'th term.\r\nWe start counting from:\r\n* fib(0) = 0\r\n* fib(1) = 1.\r\n\r\n### Examples\r\n\r\n* `0` -> `0`\r\n* `6` -> `8`",
   "timeLimit": 1,
   "memoryLimit": 32,
-  "function": {
+  "func": {
     "name": "fib",
-    "return": {
+    "returnStatement": {
       "type": "java.lang.Long",
       "comment": " N'th term of Fibonacci sequence"
     },

src/test/kotlin/com/jalgoarena/web/JudgeControllerTest.kt

@@ -64,7 +64,7 @@ class JudgeControllerTest {
             level = 1,
             memoryLimit = 1,
             timeLimit = 1,
-            function = FIB_FUNCTION,
+            func = FIB_FUNCTION,
             skeletonCode = mapOf(
                     Pair("java", "dummy code"),
                     Pair("kotln", "kotlin dummy code")

src/test/kotlin/com/jalgoarena/web/ProblemsClientSpec.kt

@@ -73,7 +73,7 @@ class ProblemsClientSpec {
             level = 3,
             memoryLimit = 1,
             timeLimit = 1,
-            function = FIB_FUNCTION,
+            func = FIB_FUNCTION,
             skeletonCode = mapOf(
                     Pair("java", "dummy code"),
                     Pair("kotln", "kotlin dummy code")

src/test/kotlin/com/jalgoarena/web/ProblemsControllerSpec.kt

@@ -74,9 +74,9 @@ class ProblemsControllerSpec {
   "description": "Write the `fib` function to return the N'th term.\r\nWe start counting from:\r\n* fib(0) = 0\r\n* fib(1) = 1.\r\n\r\n### Examples\r\n\r\n* `0` -> `0`\r\n* `6` -> `8`",
   "timeLimit": 1,
   "memoryLimit": 32,
-  "function": {
+  "func": {
     "name": "fib",
-    "return": {
+    "returnStatement": {
       "type": "java.lang.Long",
       "comment": " N'th term of Fibonacci sequence"
     },

src/test/resources/com/jalgoarena/domain/problem.json

@@ -4,9 +4,9 @@
   "description": "dummy description",
   "timeLimit": 1,
   "memoryLimit": 1,
-  "function": {
+  "func": {
     "name": "twoSum",
-    "return": {
+    "returnStatement": {
       "type": "[I",
       "comment": "[index1 + 1, index2 + 1] (index1 < index2)"
     },