Finished rebase

yahoo · May 19, 2020 · e0bd2f2 · e0bd2f2
1 parent e00e950
commit e0bd2f2
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 16 deletions.
diff --git a/elide-async/pom.xml b/elide-async/pom.xml
@@ -61,6 +61,20 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${version.jackson}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${version.jackson}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

diff --git a/elide-contrib/elide-dynamic-config-helpers/pom.xml b/elide-contrib/elide-dynamic-config-helpers/pom.xml
@@ -40,7 +40,7 @@
 
     <properties>
         <hjson.version>3.0.0</hjson.version>
-        <jackson.version>2.10.2</jackson.version>
+        <jackson.version>2.10.4</jackson.version>
         <handlebars.version>4.2.0</handlebars.version>
         <json-schema-validator.version>2.2.12</json-schema-validator.version>
         <mdkt.compiler.version>1.3.0</mdkt.compiler.version>

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
@@ -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
@@ -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/...egration-tests/src/test/java/com/yahoo/elide/initialization/InMemoryDataStoreHarness.java b/...egration-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
@@ -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
@@ -181,7 +181,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-jaxb-annotations</artifactId>
-            <version>2.11.0</version>
+            <version>2.10.4</version>
         </dependency>
 
     </dependencies>