This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-3676 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 4f83e1478e549d8e2d46adeae6ef9a2a4cefc70f Author: danhaywood <[email protected]> AuthorDate: Thu Feb 15 06:38:42 2024 +0000 CAUSEWAY-3676: scrubs bookmarks for repeatability; removes the ugly 'gqlv_' part of the default prefixes --- .../causeway/core/config/CausewayConfiguration.java | 4 ++-- ...CausewayViewerGraphqlTestModuleIntegTestAbstract.java | 16 +++++++++++++++- .../Department_IntegTest.find_all_departments._.gql | 2 +- ...partment_IntegTest.find_all_departments.approved.json | 12 ++++++------ ...st.find_department_and_add_staff_member_choices._.gql | 3 +-- ...department_and_add_staff_member_choices.approved.json | 9 +++------ ...IntegTest.find_department_and_add_staff_members._.gql | 3 +-- ...t.find_department_and_add_staff_members.approved.json | 9 +++------ ...ptHeadMutating_IntegTest.change_department_name._.gql | 2 +- .../StaffMutating_IntegTest.staff_member_edit_name._.gql | 2 +- ...f_IntegTest.create_staff_member_with_department._.gql | 4 ++-- ...est.create_staff_member_with_department.approved.json | 4 ++-- ...staff_member_by_name_and_download_photo.approved.json | 2 +- .../Staff_IntegTest.list_all_staff_members.approved.json | 10 +++++----- ...tment_IntegTest.find_department_and_change_name._.gql | 2 +- ...tegTest.find_department_and_change_name.approved.json | 2 +- 16 files changed, 46 insertions(+), 40 deletions(-) diff --git a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java index f5583682e6..36ef5f5891 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java @@ -2389,7 +2389,7 @@ public class CausewayConfiguration { * Note that field names <i>cannot</i> being with "__", as that is reserved by the * underlying GraphQL implementation. */ - private String fieldName = "_gqlv_meta"; + private String fieldName = "_meta"; } private final Lookup lookup = new Lookup(); @@ -2412,7 +2412,7 @@ public class CausewayConfiguration { /** * The name of the synthetic argument of mutators representing the target domain object. */ - private String targetArgName = "_gqlv_target"; + private String targetArgName = "_target"; } private final ScalarMarshaller scalarMarshaller = new ScalarMarshaller(); diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java index 227a2eebea..e46df99789 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java @@ -230,10 +230,24 @@ public abstract class CausewayViewerGraphqlTestModuleIntegTestAbstract { return _Resources.loadAsString(getClass(), resourceName, StandardCharsets.UTF_8); } + public enum BookmarkOptions { + SCRUB, + PRESERVE, + ; + } + protected Options jsonOptions() { + return jsonOptions(BookmarkOptions.SCRUB); + } + + protected Options jsonOptions(BookmarkOptions bookmarkOptions) { return new Options().withScrubber(s -> { try { - return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectMapper.readTree(s)); + String prettyJson = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectMapper.readTree(s)); + if (bookmarkOptions == BookmarkOptions.SCRUB) { + prettyJson = prettyJson.replaceAll(":\\d+/", ":NNN/"); + } + return prettyJson; } catch (JsonProcessingException e) { throw new RuntimeException(e); } diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_all_departments._.gql b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_all_departments._.gql index 5b447f0071..e158df0ea0 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_all_departments._.gql +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_all_departments._.gql @@ -6,7 +6,7 @@ get datatype } - _gqlv_meta { + _meta { logicalTypeName version } diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_all_departments.approved.json b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_all_departments.approved.json index 4c490f08d8..2295666c39 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_all_departments.approved.json +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_all_departments.approved.json @@ -7,7 +7,7 @@ "get" : "Civil Engineering", "datatype" : "java_lang_String" }, - "_gqlv_meta" : { + "_meta" : { "logicalTypeName" : "university.dept.Department", "version" : null } @@ -16,7 +16,7 @@ "get" : "Classics", "datatype" : "java_lang_String" }, - "_gqlv_meta" : { + "_meta" : { "logicalTypeName" : "university.dept.Department", "version" : null } @@ -25,7 +25,7 @@ "get" : "Mathematics", "datatype" : "java_lang_String" }, - "_gqlv_meta" : { + "_meta" : { "logicalTypeName" : "university.dept.Department", "version" : null } @@ -34,7 +34,7 @@ "get" : "Pathology", "datatype" : "java_lang_String" }, - "_gqlv_meta" : { + "_meta" : { "logicalTypeName" : "university.dept.Department", "version" : null } @@ -43,7 +43,7 @@ "get" : "Physics", "datatype" : "java_lang_String" }, - "_gqlv_meta" : { + "_meta" : { "logicalTypeName" : "university.dept.Department", "version" : null } @@ -52,7 +52,7 @@ "get" : "Textiles", "datatype" : "java_lang_String" }, - "_gqlv_meta" : { + "_meta" : { "logicalTypeName" : "university.dept.Department", "version" : null } diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_member_choices._.gql b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_member_choices._.gql index 3f8207e675..a023f2471d 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_member_choices._.gql +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_member_choices._.gql @@ -8,8 +8,7 @@ params { staffMembers { choices { - _gqlv_meta { - id + _meta { saveAs(ref: "staff-member-choices") } name { diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_member_choices.approved.json b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_member_choices.approved.json index 5d9cf1af12..b7e21cff07 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_member_choices.approved.json +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_member_choices.approved.json @@ -9,24 +9,21 @@ "params" : { "staffMembers" : { "choices" : [ { - "_gqlv_meta" : { - "id" : "15", + "_meta" : { "saveAs" : "staff-member-choices" }, "name" : { "get" : "John Gartner" } }, { - "_gqlv_meta" : { - "id" : "16", + "_meta" : { "saveAs" : "staff-member-choices" }, "name" : { "get" : "Margaret Randall" } }, { - "_gqlv_meta" : { - "id" : "14", + "_meta" : { "saveAs" : "staff-member-choices" }, "name" : { diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_members._.gql b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_members._.gql index 8363554ae5..a4f1332653 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_members._.gql +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_members._.gql @@ -24,8 +24,7 @@ staffMembers { datatype choices { - _gqlv_meta { - id + _meta { saveAs(ref: "staff-member") } name { diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_members.approved.json b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_members.approved.json index 960446e13a..4c28283be5 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_members.approved.json +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.find_department_and_add_staff_members.approved.json @@ -29,24 +29,21 @@ "staffMembers" : { "datatype" : "university_dept_StaffMember", "choices" : [ { - "_gqlv_meta" : { - "id" : "15", + "_meta" : { "saveAs" : "staff-member" }, "name" : { "get" : "John Gartner" } }, { - "_gqlv_meta" : { - "id" : "16", + "_meta" : { "saveAs" : "staff-member" }, "name" : { "get" : "Margaret Randall" } }, { - "_gqlv_meta" : { - "id" : "14", + "_meta" : { "saveAs" : "staff-member" }, "name" : { diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DeptHeadMutating_IntegTest.change_department_name._.gql b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DeptHeadMutating_IntegTest.change_department_name._.gql index 2d140978b5..a9fc915d22 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DeptHeadMutating_IntegTest.change_department_name._.gql +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DeptHeadMutating_IntegTest.change_department_name._.gql @@ -1,6 +1,6 @@ mutation { university_dept_Department__changeName( - _gqlv_target: {id : "$departmentId"}, + _target: {id : "$departmentId"}, newName: "Classics and Ancient History" ) { name { diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/StaffMutating_IntegTest.staff_member_edit_name._.gql b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/StaffMutating_IntegTest.staff_member_edit_name._.gql index c251ee695e..0e5b98b75c 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/StaffMutating_IntegTest.staff_member_edit_name._.gql +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/StaffMutating_IntegTest.staff_member_edit_name._.gql @@ -1,6 +1,6 @@ mutation { university_dept_StaffMember__name( - _gqlv_target: {id: "$staffMemberId"}, + _target: {id: "$staffMemberId"}, name: "Jonathon Gartner" ) { name { diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department._.gql b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department._.gql index 0a7147f775..5876019ffb 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department._.gql +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department._.gql @@ -5,7 +5,7 @@ university_dept_Departments { findDepartmentByName { invoke(name: "Classics") { - _gqlv_meta { + _meta { saveAs(ref: "classics") } } @@ -26,7 +26,7 @@ } } } - _gqlv_meta { + _meta { title logicalTypeName version diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department.approved.json b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department.approved.json index 5a06846af8..1929ae96ef 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department.approved.json +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department.approved.json @@ -6,7 +6,7 @@ "university_dept_Departments" : { "findDepartmentByName" : { "invoke" : { - "_gqlv_meta" : { + "_meta" : { "saveAs" : "classics" } } @@ -27,7 +27,7 @@ } } }, - "_gqlv_meta" : { + "_meta" : { "title" : "Untitled Staff Member", "logicalTypeName" : "university.dept.StaffMember", "version" : null, diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.find_staff_member_by_name_and_download_photo.approved.json b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.find_staff_member_by_name_and_download_photo.approved.json index 8fe6c5418c..376620cb6a 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.find_staff_member_by_name_and_download_photo.approved.json +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.find_staff_member_by_name_and_download_photo.approved.json @@ -8,7 +8,7 @@ }, "photo" : { "get" : { - "bytes" : "///graphql/object/university.dept.StaffMember:13/photo/blobBytes" + "bytes" : "///graphql/object/university.dept.StaffMember:NNN/photo/blobBytes" } } } diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.list_all_staff_members.approved.json b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.list_all_staff_members.approved.json index 58c2e97788..31c2a1ca5a 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.list_all_staff_members.approved.json +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.list_all_staff_members.approved.json @@ -13,7 +13,7 @@ "get" : { "name" : "StaffMember-photo-Bar.pdf", "mimeType" : "application/pdf", - "bytes" : "///graphql/object/university.dept.StaffMember:658/photo/blobBytes" + "bytes" : "///graphql/object/university.dept.StaffMember:NNN/photo/blobBytes" } } }, { @@ -27,7 +27,7 @@ "get" : { "name" : null, "mimeType" : null, - "bytes" : "///graphql/object/university.dept.StaffMember:660/photo/blobBytes" + "bytes" : "///graphql/object/university.dept.StaffMember:NNN/photo/blobBytes" } } }, { @@ -41,7 +41,7 @@ "get" : { "name" : "StaffMember-photo-Foo.pdf", "mimeType" : "application/pdf", - "bytes" : "///graphql/object/university.dept.StaffMember:657/photo/blobBytes" + "bytes" : "///graphql/object/university.dept.StaffMember:NNN/photo/blobBytes" } } }, { @@ -55,7 +55,7 @@ "get" : { "name" : null, "mimeType" : null, - "bytes" : "///graphql/object/university.dept.StaffMember:661/photo/blobBytes" + "bytes" : "///graphql/object/university.dept.StaffMember:NNN/photo/blobBytes" } } }, { @@ -69,7 +69,7 @@ "get" : { "name" : "StaffMember-photo-Fizz.pdf", "mimeType" : "application/pdf", - "bytes" : "///graphql/object/university.dept.StaffMember:659/photo/blobBytes" + "bytes" : "///graphql/object/university.dept.StaffMember:NNN/photo/blobBytes" } } } ] diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Department_IntegTest.find_department_and_change_name._.gql b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Department_IntegTest.find_department_and_change_name._.gql index 351faedeb6..0d1c229a2e 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Department_IntegTest.find_department_and_change_name._.gql +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Department_IntegTest.find_department_and_change_name._.gql @@ -6,7 +6,7 @@ university_dept_Departments { findDepartmentByName { invoke(name: "Classics") { - _gqlv_meta { + _meta { saveAs(ref: "classics_dept") } } diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Department_IntegTest.find_department_and_change_name.approved.json b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Department_IntegTest.find_department_and_change_name.approved.json index 8f6b6c89f8..d234085e62 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Department_IntegTest.find_department_and_change_name.approved.json +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Department_IntegTest.find_department_and_change_name.approved.json @@ -6,7 +6,7 @@ "university_dept_Departments" : { "findDepartmentByName" : { "invoke" : { - "_gqlv_meta" : { + "_meta" : { "saveAs" : "classics_dept" } }
