replace LinkedHashMap with Map in NadelDirectives

atlassian-labs · Dec 15, 2023 · 27557a6 · 27557a6
1 parent 7537711
commit 27557a6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 27 deletions.
diff --git a/lib/src/main/java/graphql/nadel/dsl/WhenConditionDefinition.kt b/lib/src/main/java/graphql/nadel/dsl/WhenConditionDefinition.kt
@@ -1,6 +1,5 @@
 package graphql.nadel.dsl
 
-
 data class WhenConditionDefinition(
     val result: WhenConditionResultDefinition
 )

diff --git a/lib/src/main/java/graphql/nadel/schema/NadelDirectives.kt b/lib/src/main/java/graphql/nadel/schema/NadelDirectives.kt
@@ -210,29 +210,6 @@ object NadelDirectives {
             ) on ENUM_VALUE
         """.trimIndent(),
     )
-
-
-    private fun buildConditionalHydrationObject(whenConditionArgument: GraphQLAppliedDirectiveArgument): WhenConditionDefinition? {
-
-        val result = whenConditionArgument.getValue<LinkedHashMap<String, LinkedHashMap<String, Any>>>()?.get("result")
-        if (result == null){
-            return null
-        }
-        val sourceField = result["sourceField"]!! as String
-        val predicate: LinkedHashMap<String, Any> = result["predicate"]!! as LinkedHashMap<String, Any>
-
-        return WhenConditionDefinition(
-            result = WhenConditionResultDefinition(
-                sourceField = sourceField,
-                predicate = WhenConditionPredicateDefinition(
-                    equals = predicate.get("equals"),
-                    startsWith = predicate.get("startsWith") as String?,
-                    matches = (predicate.get("matches")as String?)?.toRegex()
-                )
-            )
-        )
-
-    }
     fun createUnderlyingServiceHydration(
         fieldDefinition: GraphQLFieldDefinition,
         overallSchema: GraphQLSchema,
@@ -247,9 +224,6 @@ object NadelDirectives {
 
                 val conditionalHydration = buildConditionalHydrationObject(directive.getArgument("when"))?.result
 
-                    // directive.getArgument("when")
-                    // .getValue<LinkedHashMap<String, LinkedHashMap<String, Any>>>()?.get("result")
-
                 buildHydrationParameters(directive, arguments, identifiedBy, conditionalHydration)
             }
 
@@ -475,6 +449,27 @@ object NadelDirectives {
         ) as T
     }
 
+    private fun buildConditionalHydrationObject(whenConditionArgument: GraphQLAppliedDirectiveArgument): WhenConditionDefinition? {
+
+        val result = whenConditionArgument.getValue<Map<String, Map<String, Any>>>()?.get("result")
+        if (result == null){
+            return null
+        }
+        val sourceField = result["sourceField"]!! as String
+        val predicate: Map<String, Any> = result["predicate"]!! as Map<String, Any>
+
+        return WhenConditionDefinition(
+            result = WhenConditionResultDefinition(
+                sourceField = sourceField,
+                predicate = WhenConditionPredicateDefinition(
+                    equals = predicate.get("equals"),
+                    startsWith = predicate.get("startsWith") as String?,
+                    matches = (predicate.get("matches")as String?)?.toRegex()
+                )
+            )
+        )
+    }
+
     private inline fun <reified T : SDLDefinition<*>> parseDefinition(sdl: String): T {
         return Parser.parse(sdl).definitions.singleOfType()
     }