Basic reflection invocation of resolve method

Author: Håkan Rosenhorn

src/main/scala/se/uprise/graphql/execution/CoerceValueAST.scala

@@ -0,0 +1,33 @@
+package se.uprise.graphql.execution
+
+import se.uprise.graphql.error.GraphQLError
+import se.uprise.graphql.types.{GraphQLScalarType, GraphQLNonNull}
+import se.uprise.parser.GraphQlParser.{VariableContext, ValueContext, ValueOrVariableContext}
+
+object CoerceValueAST {
+
+// def apply(valueAST: ValueOrVariableContext, variables: Map[String, Any]) = {
+// valueAST.value() match {
+// case entry: ValueContext => this(entry, variables)
+// case _ =>
+// valueAST.variable() match {
+// case entry: VariableContext => this(entry, variables)
+// case _ => throw new GraphQLError("Tried to CoerceValueAST on unknown value", List(valueAST))
+// }
+// }
+// }
+
+// def apply(valueAST: ValueContext, variables: Map[String, Any]) = {
+//
+// }
+//
+// def apply(valueAST: VariableContext, variables: Map[String, Any]) = {
+//
+// }
+
+ // FIXME: Better type on variables
+ def apply(valueAST: GraphQLScalarType, variables: Map[String, Any]) = {
+
+ }
+ //def apply(valueAST: GraphQLNonNull)
+}

src/main/scala/se/uprise/graphql/execution/Executor.scala

@@ -89,8 +89,6 @@ object Executor {
  fields: Map[String, List[FieldContext]]): Any = {
 
  val finalResults = fields.keys.foldLeft(Map[String, Any]())((results: Map[String, Any], responseName) => {
- println("TJOHEJ")
-
  val fieldASTs = fields(responseName)
  val result = resolveField(exeContext, parentType, source, fieldASTs)
  // fields ++ Map(name -> merged)
@@ -120,15 +118,16 @@ object Executor {
  val fieldDef = getFieldDef(exeContext.schema, parentType, fieldAST)
  //val args: List[universe.Type] = resolveFn.typeSignature.typeArgs
 
+ val parentTypeMirror = universe.runtimeMirror(getClass.getClassLoader).reflect(parentType)
 
  val args = extractor.getArgumentValues(
  fieldDef.args,
  fieldAST.arguments(),
  exeContext.variables)
 
- // Some dynamic reflection invocation on the resolve method symbol
- //parentType.
-
+ //val resolveFn = fieldDef.resolve
+ val result = parentTypeMirror.reflectMethod(fieldDef.resolve)()
+ result
  }
 
  /**
@@ -178,7 +177,6 @@ object Executor {
  fields: Map[String, List[FieldContext]] = Map.empty,
  visitedFragmentNames: Map[String, Boolean] = Map.empty): Map[String, List[FieldContext]] = {
 
-
  selectionSet.selection().foldLeft(fields)((result, selection) =>
 
  // Check for field

src/main/scala/se/uprise/graphql/execution/ValueExtractor.scala

@@ -1,7 +1,7 @@
 package se.uprise.graphql.execution
 
 import se.uprise.graphql.types.{GraphQLFieldArgument, GraphQLInputType, GraphQLSchema}
-import se.uprise.parser.GraphQlParser.{VariableDefinitionContext, ArgumentsContext}
+import se.uprise.parser.GraphQlParser.{ValueOrVariableContext, VariableDefinitionContext, ArgumentsContext}
 
 import scala.reflect.runtime._
 import scala.collection.JavaConversions._
@@ -13,24 +13,26 @@ object ValueExtractor {
  * definitions and list of argument AST nodes.
  */
  // FIXME: Better Type for variables (guessing some decendant of InputType)
- def getArgumentValues(argDefs: List[GraphQLFieldArgument[_ <: GraphQLInputType]],
+ def getArgumentValues(argDefs: List[GraphQLFieldArgument[_ <: GraphQLInputType]] = List.empty,
  argASTs: ArgumentsContext,
- variables: Map[String, Any]) = {
-
-
- //val finalResults = fields.keys.foldLeft(Map[String, Any]())((results: Map[String, Any], responseName) => {
-
- // FIXME: Can we get null here?
- val argASTMap = argASTs.argument().toList.map({ entry =>
- val valueOrVariable = entry.valueOrVariable()
- entry.NAME().getText -> valueOrVariable
- }).toMap
-
- argDefs.foldLeft(Map[String, Any]())((results: Map[String, Any], argDef: GraphQLFieldArgument[_ <: GraphQLInputType]) => {
+ variables: Map[String, Any]): Map[String, GraphQLInputType] = {
+
+ // Avoid null pointer
+ val argASTMap = Option(argASTs) match {
+ case Some(value) => value.argument().toList.map({ entry =>
+  val valueOrVariable = entry.valueOrVariable()
+  entry.NAME().getText -> valueOrVariable
+ }).toMap
+ case None => Map[String, ValueOrVariableContext]()
+ }
+
+ argDefs.foldLeft(Map[String, GraphQLInputType]())((results: Map[String, GraphQLInputType], argDef: GraphQLFieldArgument[_ <: GraphQLInputType]) => {
  val name = argDef.name
  val valueAST = argASTMap(name)
 
- //results ++ Map(name -> coerceValueAST(argDef.), valueAST, variables))
+ throw new Exception("FIXME: Implement")
+ //results ++ Map(name -> CoerceValueAST(valueAST, variables))
+ results// ++ Map(name -> null)
  })
 
 

src/test/scala/se/uprise/graphql/BasicTest.scala

@@ -6,7 +6,7 @@ import se.uprise.graphql.starwars.StarWars
 class BasicTest extends FunSuite {
  test("SchemaTest") {
  // FIXME: Implement a basic test
- val foo = """query HeroNameQuery { human }"""
+ val foo = """query HeroNameQuery { hero }"""
  val slask: GraphQLResult = GraphQL(StarWars.schema, foo, None, Map.empty, "")
  slask
 

src/test/scala/se/uprise/graphql/starwars/StarWars.scala

@@ -98,6 +98,7 @@ class Query extends GraphQLObjectType {
  override def getFields(entry: GraphQLObjectType): Map[String, GraphQLFieldDefinition] = {
  val fields = this.getClassFields(this)
 
+
  Map(
  "hero" -> new GraphQLFieldDefinition("hero", "desc", List.empty, fields("hero"), ""),
  "human" -> new GraphQLFieldDefinition(