From e0bd2f25e8d7d28148b7d8c5b4053f85c3e05f96 Mon Sep 17 00:00:00 2001 From: Aaron Klish Date: Tue, 19 May 2020 10:43:26 -0500 Subject: [PATCH] Finished rebase --- elide-async/pom.xml | 14 ++++++++++++++ elide-contrib/elide-dynamic-config-helpers/pom.xml | 2 +- .../elide/jsonapi/EntityProjectionMakerTest.java | 14 +++++++------- .../com/yahoo/elide/inheritance/InheritanceIT.java | 6 +++--- .../initialization/InMemoryDataStoreHarness.java | 4 ++-- .../test/java/com/yahoo/elide/tests/GraphQLIT.java | 4 ++-- elide-spring/elide-spring-boot-starter/pom.xml | 2 +- 7 files changed, 30 insertions(+), 16 deletions(-) diff --git a/elide-async/pom.xml b/elide-async/pom.xml index e80e4a7eda..2925a1cf6a 100644 --- a/elide-async/pom.xml +++ b/elide-async/pom.xml @@ -61,6 +61,20 @@ provided + + com.fasterxml.jackson.core + jackson-core + ${version.jackson} + test + + + + com.fasterxml.jackson.core + jackson-databind + ${version.jackson} + test + + org.apache.httpcomponents httpclient diff --git a/elide-contrib/elide-dynamic-config-helpers/pom.xml b/elide-contrib/elide-dynamic-config-helpers/pom.xml index 148289b93c..9d8f62a78b 100644 --- a/elide-contrib/elide-dynamic-config-helpers/pom.xml +++ b/elide-contrib/elide-dynamic-config-helpers/pom.xml @@ -40,7 +40,7 @@ 3.0.0 - 2.10.2 + 2.10.4 4.2.0 2.2.12 1.3.0 diff --git a/elide-core/src/test/java/com/yahoo/elide/jsonapi/EntityProjectionMakerTest.java b/elide-core/src/test/java/com/yahoo/elide/jsonapi/EntityProjectionMakerTest.java index cd051ee6ef..76508922cc 100644 --- a/elide-core/src/test/java/com/yahoo/elide/jsonapi/EntityProjectionMakerTest.java +++ b/elide-core/src/test/java/com/yahoo/elide/jsonapi/EntityProjectionMakerTest.java @@ -249,7 +249,7 @@ public void testRelationshipWithSingleInclude() { .attribute(Attribute.builder().parentType(Author.class).name("name").type(String.class).build()) .attribute(Attribute.builder().parentType(Author.class).name("type").type(Author.AuthorType.class).build()) .attribute(Attribute.builder().parentType(Author.class).name("homeAddress").type(Address.class).build()) - .attribute(Attribute.builder().parentType(Author.class).name("awards").type(String.class).build()) + .attribute(Attribute.builder().parentType(Author.class).name("awards").type(Collection.class).build()) .relationship("books", EntityProjection.builder() .type(Book.class) .build()) @@ -287,7 +287,7 @@ public void testRootCollectionWithSingleInclude() { .attribute(Attribute.builder().parentType(Author.class).name("name").type(String.class).build()) .attribute(Attribute.builder().parentType(Author.class).name("type").type(Author.AuthorType.class).build()) .attribute(Attribute.builder().parentType(Author.class).name("homeAddress").type(Address.class).build()) - .attribute(Attribute.builder().parentType(Author.class).name("awards").type(String.class).build()) + .attribute(Attribute.builder().parentType(Author.class).name("awards").type(Collection.class).build()) .relationship("books", EntityProjection.builder() .type(Book.class) .build()) @@ -328,7 +328,7 @@ public void testRootEntityWithSingleInclude() { .attribute(Attribute.builder().parentType(Author.class).name("name").type(String.class).build()) .attribute(Attribute.builder().parentType(Author.class).name("type").type(Author.AuthorType.class).build()) .attribute(Attribute.builder().parentType(Author.class).name("homeAddress").type(Address.class).build()) - .attribute(Attribute.builder().parentType(Author.class).name("awards").type(String.class).build()) + .attribute(Attribute.builder().parentType(Author.class).name("awards").type(Collection.class).build()) .relationship("books", EntityProjection.builder() .type(Book.class) .build()) @@ -362,7 +362,7 @@ public void testRootCollectionWithNestedInclude() throws Exception { .attribute(Attribute.builder().parentType(Author.class).name("homeAddress").type(Address.class).build()) .attribute(Attribute.builder().parentType(Author.class).name("name").type(String.class).build()) .attribute(Attribute.builder().parentType(Author.class).name("type").type(Author.AuthorType.class).build()) - .attribute(Attribute.builder().parentType(Author.class).name("awards").type(String.class).build()) + .attribute(Attribute.builder().parentType(Author.class).name("awards").type(Collection.class).build()) .relationship("books", EntityProjection.builder() .type(Book.class) .attribute(Attribute.builder().parentType(Book.class).name("title").type(String.class).build()) @@ -418,7 +418,7 @@ public void testRootEntityWithNestedInclude() { .attribute(Attribute.builder().parentType(Author.class).name("name").type(String.class).build()) .attribute(Attribute.builder().parentType(Author.class).name("type").type(Author.AuthorType.class).build()) .attribute(Attribute.builder().parentType(Author.class).name("homeAddress").type(Address.class).build()) - .attribute(Attribute.builder().parentType(Author.class).name("awards").type(String.class).build()) + .attribute(Attribute.builder().parentType(Author.class).name("awards").type(Collection.class).build()) .relationship("books", EntityProjection.builder() .type(Book.class) .attribute(Attribute.builder().parentType(Book.class).name("title").type(String.class).build()) @@ -571,7 +571,7 @@ public void testRootEntityWithNestedIncludeAndSparseFields() { .attribute(Attribute.builder().parentType(Author.class).name("name").type(String.class).build()) .attribute(Attribute.builder().parentType(Author.class).name("type").type(Author.AuthorType.class).build()) .attribute(Attribute.builder().parentType(Author.class).name("homeAddress").type(Address.class).build()) - .attribute(Attribute.builder().parentType(Author.class).name("awards").type(String.class).build()) + .attribute(Attribute.builder().parentType(Author.class).name("awards").type(Collection.class).build()) .relationship("books", EntityProjection.builder() .type(Book.class) .attribute(Attribute.builder().parentType(Book.class).name("title").type(String.class).build()) @@ -693,7 +693,7 @@ public void testRelationshipsAndIncludeWithFilterAndSort() { .attribute(Attribute.builder().parentType(Author.class).name("name").type(String.class).build()) .attribute(Attribute.builder().parentType(Author.class).name("type").type(Author.AuthorType.class).build()) .attribute(Attribute.builder().parentType(Author.class).name("homeAddress").type(Address.class).build()) - .attribute(Attribute.builder().parentType(Author.class).name("awards").type(String.class).build()) + .attribute(Attribute.builder().parentType(Author.class).name("awards").type(Collection.class).build()) .filterExpression(new InInsensitivePredicate(new Path(Author.class, dictionary, "name"), "Foo")) .relationship("books", EntityProjection.builder() .type(Book.class) diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/inheritance/InheritanceIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/inheritance/InheritanceIT.java index dd18473a0f..0a59052d17 100644 --- a/elide-integration-tests/src/test/java/com/yahoo/elide/inheritance/InheritanceIT.java +++ b/elide-integration-tests/src/test/java/com/yahoo/elide/inheritance/InheritanceIT.java @@ -298,9 +298,9 @@ public void testGraphQLCharacterInvalidFilter() throws Exception { ) )).toQuery(); - String expected = "{\"errors\":[{\"message\":\"Could not parse filter primaryFunction==*protocol* for " - + "type: character. reason: Invalid filter format: filter[character]\\nNo such association " - + "primaryFunction for type character\"}]}"; + String expected = "{\"errors\":[{\"message\":\"Invalid filter format: filter\\nNo such association " + + "primaryFunction for type character\\nInvalid filter format: filter[Optional[character]]\\nInvalid " + + "query parameter: filter[Optional[character]]\"}]}"; testUtils.runQueryWithExpectedResult(query, expected); } diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/InMemoryDataStoreHarness.java b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/InMemoryDataStoreHarness.java index c3e99d6289..c5468aee83 100644 --- a/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/InMemoryDataStoreHarness.java +++ b/elide-integration-tests/src/test/java/com/yahoo/elide/initialization/InMemoryDataStoreHarness.java @@ -35,8 +35,8 @@ public InMemoryDataStoreHarness() { Invoice.class.getPackage(), Manager.class.getPackage(), BookV2.class.getPackage(), - AsyncQuery.class.getPackage() - Droid.class.getPackage(), + AsyncQuery.class.getPackage(), + Droid.class.getPackage() ); mapStore = new HashMapDataStore(beanPackages); diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/GraphQLIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/GraphQLIT.java index 1da5f0f155..65f176e247 100644 --- a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/GraphQLIT.java +++ b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/GraphQLIT.java @@ -290,7 +290,7 @@ public void testInvalidFetch() throws IOException { + "(/book) : FETCH must not include data\"," + "\"locations\":[{\"line\":1,\"column\":2}],\"path\":[\"book\"]}]}"; - runQueryWithExpectedResult(graphQLRequest, expected); + testUtils.runQueryWithExpectedResult(graphQLRequest, expected); } @Test @@ -487,7 +487,7 @@ public void runManyToManyFilter(String filter) throws IOException { ) ).toResponse(); - runQueryWithExpectedResult(graphQLRequest, expectedResponse); + testUtils.runQueryWithExpectedResult(graphQLRequest, expectedResponse); } @Test diff --git a/elide-spring/elide-spring-boot-starter/pom.xml b/elide-spring/elide-spring-boot-starter/pom.xml index 5c88d621bd..a5c7d82aae 100644 --- a/elide-spring/elide-spring-boot-starter/pom.xml +++ b/elide-spring/elide-spring-boot-starter/pom.xml @@ -181,7 +181,7 @@ com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.11.0 + 2.10.4