fix for NCS-graphql

Author: arcuri82

jdk_8_maven/cs/graphql/graphql-ncs/src/main/kotlin/org/graphqlncs/Exep.kt

@@ -1,13 +1,12 @@
 package org.graphqlncs
+
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
 
 
-
 @SpringBootApplication
 open class NcsApplication
 
-
 /*
     API accessible at
     http://localhost:8080/graphql

jdk_8_maven/cs/graphql/graphql-ncs/src/main/kotlin/org/graphqlncs/ExepTy.kt

@@ -1,12 +1,13 @@
 package org.graphqlncs.resolver
 
+import graphql.ErrorType
+import graphql.GraphQLError
 import graphql.kickstart.tools.GraphQLQueryResolver
-import org.graphqlncs.Exep
-import org.graphqlncs.ExpTy
+import graphql.language.SourceLocation
 import org.graphqlncs.type.*
-import org.springframework.http.ResponseEntity
 import org.springframework.stereotype.Component
 
+
 @Component
 open class QueryResolver(
         private val triangleClassification: TriangleClassification,
@@ -27,6 +28,10 @@ open class QueryResolver(
     }
 
     fun fisher(m: Int, n: Int, x:Double  ): Double {
+
+        if(m > 1000 || n > 1000){
+            throw CustomException(400, "Invalid input")
+        }
         return fisher.exe(m, n, x)
     }
 
@@ -36,17 +41,51 @@ open class QueryResolver(
 
     fun remainder(a: Int, b:Int  ): Int {
         val lim = 10000
-        return if (a > lim || a < -lim || b > lim || b < -lim) {
-            throw ExpTy("400")
-        } else remainder.exe(a, b)
+        if (a > lim || a < -lim || b > lim || b < -lim)
+            throw CustomException(400, "Invalid input")
+
+        return remainder.exe(a, b)
     }
 
     fun bessj(n:Int, x:Double  ): Double {
 
-        return if (n <= 2 || n > 1000) {
-            throw ExpTy("400")
+        if (n <= 2 || n > 1000) {
+            throw CustomException(400, "Invalid input")
+        }
 
-        } else
-            bessj.bessj(n, x)
+        return bessj.bessj(n, x)
     }
+}
+
+/**
+ * This does not fully work... but at least we get:
+ *
+ * "Unexpected error occurred"
+ *
+ * instead of:
+ *
+ * "Internal Server Error(s)..."
+ */
+class CustomException(private val errorCode: Int, errorMessage: String) : RuntimeException(errorMessage), GraphQLError {
+
+    override fun getExtensions(): Map<String, Any?>? {
+        val customAttributes: MutableMap<String, Any?> = LinkedHashMap()
+        customAttributes["errorCode"] = errorCode
+        customAttributes["errorMessage"] = message
+        return customAttributes
+    }
+
+    override fun getLocations(): List<SourceLocation>? {
+        return null
+    }
+
+    override fun getErrorType(): ErrorType? {
+        return ErrorType.ValidationError
+    }
+
+    @Suppress("ACCIDENTAL_OVERRIDE")
+    override fun getMessage(): String? {
+        return message
+    }
+
 }