diff --git a/sample/src/main/graphql/org.aerogear.graphqlandroid/FragmentTask.graphql b/sample/src/main/graphql/org.aerogear.graphqlandroid/FragmentTask.graphql new file mode 100644 index 0000000..409bc1b --- /dev/null +++ b/sample/src/main/graphql/org.aerogear.graphqlandroid/FragmentTask.graphql @@ -0,0 +1,20 @@ +fragment taskDetails on Task { + id + version + title + description + status +} + +fragment taskUserCreationDetails on Task { + creationMetadata{ + createdDate + taskId + createdBy{ + ...userDetails + } + } + assignedTo{ + ...userDetails + } +} \ No newline at end of file diff --git a/sample/src/main/graphql/org.aerogear.graphqlandroid/FragmentUser.graphql b/sample/src/main/graphql/org.aerogear.graphqlandroid/FragmentUser.graphql new file mode 100644 index 0000000..99ff086 --- /dev/null +++ b/sample/src/main/graphql/org.aerogear.graphqlandroid/FragmentUser.graphql @@ -0,0 +1,9 @@ +fragment userDetails on User { + id + firstName + lastName + title + email + taskId + creationmetadataId +} \ No newline at end of file diff --git a/sample/src/main/graphql/org.aerogear.graphqlandroid/checkAndUpdateTask.graphql b/sample/src/main/graphql/org.aerogear.graphqlandroid/checkAndUpdateTask.graphql index 3f69b28..57fcbdd 100644 --- a/sample/src/main/graphql/org.aerogear.graphqlandroid/checkAndUpdateTask.graphql +++ b/sample/src/main/graphql/org.aerogear.graphqlandroid/checkAndUpdateTask.graphql @@ -1,26 +1,6 @@ mutation checkAndUpdateTask($id: ID!, $title: String, $description: String, $version: Int!, $status: String!){ checkAndUpdateTask(id: $id, title: $title, description: $description, version: $version, status: $status){ - id - version - title - description - status - creationMetadata{ - createdDate - createdBy{ - id - firstName - lastName - title - email - } - } - assignedTo{ - id - firstName - lastName - title - email - } + ...taskDetails + ...taskUserCreationDetails } } \ No newline at end of file diff --git a/sample/src/main/graphql/org.aerogear.graphqlandroid/createTask.graphql b/sample/src/main/graphql/org.aerogear.graphqlandroid/createTask.graphql index 735d749..8f38a1a 100644 --- a/sample/src/main/graphql/org.aerogear.graphqlandroid/createTask.graphql +++ b/sample/src/main/graphql/org.aerogear.graphqlandroid/createTask.graphql @@ -1,31 +1,6 @@ mutation createTask($input: TaskInput!){ createTask(input: $input){ - id - version - title - description - status - creationMetadata{ - createdDate - taskId - createdBy{ - id - firstName - lastName - title - email - taskId - creationmetadataId - } - } - assignedTo{ - id - firstName - lastName - title - email - taskId - creationmetadataId - } + ...taskDetails + ...taskUserCreationDetails } } \ No newline at end of file diff --git a/sample/src/main/graphql/org.aerogear.graphqlandroid/createUser.graphql b/sample/src/main/graphql/org.aerogear.graphqlandroid/createUser.graphql index 696e0aa..d3b5dd5 100644 --- a/sample/src/main/graphql/org.aerogear.graphqlandroid/createUser.graphql +++ b/sample/src/main/graphql/org.aerogear.graphqlandroid/createUser.graphql @@ -1,11 +1,5 @@ mutation createUser($input: UserInput!){ createUser(input: $input){ - id - firstName - lastName - title - email - taskId - creationmetadataId + ...userDetails } } \ No newline at end of file diff --git a/sample/src/main/graphql/org.aerogear.graphqlandroid/findAllTasks.graphql b/sample/src/main/graphql/org.aerogear.graphqlandroid/findAllTasks.graphql index 23001a4..f6e5972 100644 --- a/sample/src/main/graphql/org.aerogear.graphqlandroid/findAllTasks.graphql +++ b/sample/src/main/graphql/org.aerogear.graphqlandroid/findAllTasks.graphql @@ -1,31 +1,6 @@ query findAllTasks{ findAllTasks{ - id - version - title - description - status - creationMetadata{ - createdDate - taskId - createdBy{ - id - firstName - lastName - title - email - taskId - creationmetadataId - } - } - assignedTo{ - id - firstName - lastName - title - email - taskId - creationmetadataId - } + ...taskDetails + ...taskUserCreationDetails } } \ No newline at end of file diff --git a/sample/src/main/graphql/org.aerogear.graphqlandroid/findAllUsers.graphql b/sample/src/main/graphql/org.aerogear.graphqlandroid/findAllUsers.graphql index 64add97..92bba54 100644 --- a/sample/src/main/graphql/org.aerogear.graphqlandroid/findAllUsers.graphql +++ b/sample/src/main/graphql/org.aerogear.graphqlandroid/findAllUsers.graphql @@ -1,11 +1,5 @@ query findAllUsers{ findAllUsers{ - id - firstName - lastName - title - email - taskId - creationmetadataId + ...userDetails } } \ No newline at end of file diff --git a/sample/src/main/graphql/org.aerogear.graphqlandroid/findUsers.graphql b/sample/src/main/graphql/org.aerogear.graphqlandroid/findUsers.graphql index b9dca39..c6c8e78 100644 --- a/sample/src/main/graphql/org.aerogear.graphqlandroid/findUsers.graphql +++ b/sample/src/main/graphql/org.aerogear.graphqlandroid/findUsers.graphql @@ -1,11 +1,5 @@ query findUsers($fields: UserFilter!){ findUsers(fields: $fields){ - id - firstName - lastName - title - email - taskId - creationmetadataId + ...userDetails } } \ No newline at end of file diff --git a/sample/src/main/graphql/org.aerogear.graphqlandroid/newTask.graphql b/sample/src/main/graphql/org.aerogear.graphqlandroid/newTask.graphql index 9c286f1..24dca53 100644 --- a/sample/src/main/graphql/org.aerogear.graphqlandroid/newTask.graphql +++ b/sample/src/main/graphql/org.aerogear.graphqlandroid/newTask.graphql @@ -1,31 +1,6 @@ subscription newTask{ newTask{ - id - version - title - description - status - creationMetadata{ - createdDate - taskId - createdBy{ - id - firstName - lastName - title - email - taskId - creationmetadataId - } - } - assignedTo{ - id - firstName - lastName - title - email - taskId - creationmetadataId - } + ...taskDetails + ...taskUserCreationDetails } } \ No newline at end of file diff --git a/sample/src/main/graphql/org.aerogear.graphqlandroid/newUser.graphql b/sample/src/main/graphql/org.aerogear.graphqlandroid/newUser.graphql index ff7228a..fdd3cf1 100644 --- a/sample/src/main/graphql/org.aerogear.graphqlandroid/newUser.graphql +++ b/sample/src/main/graphql/org.aerogear.graphqlandroid/newUser.graphql @@ -1,11 +1,5 @@ subscription newUser{ newUser{ - id - firstName - lastName - title - email - taskId - creationmetadataId + ...userDetails } } \ No newline at end of file diff --git a/sample/src/main/graphql/org.aerogear.graphqlandroid/updateTask.graphql b/sample/src/main/graphql/org.aerogear.graphqlandroid/updateTask.graphql index 2739594..94b0b45 100644 --- a/sample/src/main/graphql/org.aerogear.graphqlandroid/updateTask.graphql +++ b/sample/src/main/graphql/org.aerogear.graphqlandroid/updateTask.graphql @@ -1,31 +1,6 @@ mutation updateTask($id: ID!, $input: TaskInput!){ updateTask(id: $id, input: $input){ - id - version - title - description - status - creationMetadata{ - createdDate - taskId - createdBy{ - id - firstName - lastName - title - email - taskId - creationmetadataId - } - } - assignedTo{ - id - firstName - lastName - title - email - taskId - creationmetadataId - } + ...taskDetails + ...taskUserCreationDetails } } \ No newline at end of file diff --git a/sample/src/main/graphql/org.aerogear.graphqlandroid/updateUser.graphql b/sample/src/main/graphql/org.aerogear.graphqlandroid/updateUser.graphql index d77b35d..514087f 100644 --- a/sample/src/main/graphql/org.aerogear.graphqlandroid/updateUser.graphql +++ b/sample/src/main/graphql/org.aerogear.graphqlandroid/updateUser.graphql @@ -1,11 +1,5 @@ mutation updateUser($id: ID!, $input: UserInput!){ updateUser(id: $id, input: $input){ - id - firstName - lastName - title - email - taskId - creationmetadataId + ...userDetails } } \ No newline at end of file diff --git a/sample/src/main/graphql/org.aerogear.graphqlandroid/updatedTask.graphql b/sample/src/main/graphql/org.aerogear.graphqlandroid/updatedTask.graphql index 0571978..26f26da 100644 --- a/sample/src/main/graphql/org.aerogear.graphqlandroid/updatedTask.graphql +++ b/sample/src/main/graphql/org.aerogear.graphqlandroid/updatedTask.graphql @@ -1,31 +1,6 @@ subscription updatedTask{ updatedTask{ - id - version - title - description - status - creationMetadata{ - createdDate - taskId - createdBy{ - id - firstName - lastName - title - email - taskId - creationmetadataId - } - } - assignedTo{ - id - firstName - lastName - title - email - taskId - creationmetadataId - } + ...taskDetails + ...taskUserCreationDetails } } \ No newline at end of file diff --git a/sample/src/main/graphql/org.aerogear.graphqlandroid/updatedUser.graphql b/sample/src/main/graphql/org.aerogear.graphqlandroid/updatedUser.graphql index babc599..dfcd958 100644 --- a/sample/src/main/graphql/org.aerogear.graphqlandroid/updatedUser.graphql +++ b/sample/src/main/graphql/org.aerogear.graphqlandroid/updatedUser.graphql @@ -1,11 +1,5 @@ subscription updatedUser{ updatedUser{ - id - firstName - lastName - title - email - taskId - creationmetadataId + ...userDetails } } \ No newline at end of file diff --git a/sample/src/main/java/org/aerogear/graphqlandroid/UserConflictResolutionHandler.kt b/sample/src/main/java/org/aerogear/graphqlandroid/UserConflictResolutionHandler.kt index 356992e..1082c24 100644 --- a/sample/src/main/java/org/aerogear/graphqlandroid/UserConflictResolutionHandler.kt +++ b/sample/src/main/java/org/aerogear/graphqlandroid/UserConflictResolutionHandler.kt @@ -53,7 +53,7 @@ class UserConflictResolutionHandler(val context: Context) : ConflictResolutionIn } override fun onResponse(response: Response) { - Log.e("onResp checkAndUpdate", "${response.data()?.checkAndUpdateTask()?.title()}") + Log.e("onResp checkAndUpdate", "${response.data()?.checkAndUpdateTask()?.fragments()?.taskDetails()?.title()}") val result = response.data()?.checkAndUpdateTask() //In case of conflicts data returned from the server id null. @@ -91,7 +91,7 @@ class UserConflictResolutionHandler(val context: Context) : ConflictResolutionIn } override fun onResponse(response: Response) { - Log.e("onResponse() updateTask", "${response.data()?.updateTask()?.title()}") + Log.e("onResponse() updateTask", "${response.data()?.updateTask()?.fragments()?.taskDetails()?.title()}") val result = response.data()?.updateTask() //In case of conflicts data returned from the server id null. @@ -128,7 +128,7 @@ class UserConflictResolutionHandler(val context: Context) : ConflictResolutionIn } override fun onResponse(response: Response) { - Log.e("onResp checkAndUpdate", "${response.data()?.checkAndUpdateTask()?.title()}") + Log.e("onResp checkAndUpdate", "${response.data()?.checkAndUpdateTask()?.fragments()?.taskDetails()?.title()}") val result = response.data()?.checkAndUpdateTask() //In case of conflicts data returned from the server id null. diff --git a/sample/src/main/java/org/aerogear/graphqlandroid/activities/MainActivity.kt b/sample/src/main/java/org/aerogear/graphqlandroid/activities/MainActivity.kt index 3f8acb1..41cf34d 100644 --- a/sample/src/main/java/org/aerogear/graphqlandroid/activities/MainActivity.kt +++ b/sample/src/main/java/org/aerogear/graphqlandroid/activities/MainActivity.kt @@ -130,18 +130,19 @@ class MainActivity : AppCompatActivity() { val result = response.data()?.findAllTasks() result?.forEach { allTasks -> - val title = allTasks.title() - val desc = allTasks.description() - val id = allTasks.id() + val title = allTasks.fragments().taskDetails().title() + val desc = allTasks.fragments().taskDetails().description() + val id = allTasks.fragments().taskDetails().id() var firstName = "" var lastName = "" var email = "" var userId = "" - allTasks.assignedTo()?.let { query -> - firstName = query.firstName() - lastName = query.lastName() - email = query.email() - userId = query.id() + + allTasks.fragments().taskUserCreationDetails().assignedTo()?.let { query -> + firstName = query.fragments().userDetails().firstName() + lastName = query.fragments().userDetails().lastName() + email = query.fragments().userDetails().email() + userId = query.fragments().userDetails().id() } ?: kotlin.run { firstName = "" lastName = "" @@ -494,7 +495,7 @@ class MainActivity : AppCompatActivity() { res?.let { Log.e( TAG, - " inside subscriptionUpdateTask ${it.title()} mutated upon updating" + " inside subscriptionUpdateTask ${it.fragments().taskDetails().title()} mutated upon updating" ) } } @@ -527,7 +528,7 @@ class MainActivity : AppCompatActivity() { res?.let { Log.e( TAG, - " inside subscriptionNewUser ${it.title()} mutated upon new title" + " inside subscriptionNewUser ${it.fragments().userDetails().title()} mutated upon new title" ) } } @@ -561,7 +562,7 @@ class MainActivity : AppCompatActivity() { res?.let { Log.e( TAG, - " inside subscriptionUpdateUser ${it.title()} mutated upon updating" + " inside subscriptionUpdateUser ${it.fragments().userDetails().title()} mutated upon updating" ) } }