Skip to content

Commit 924b8bf

Browse files
authored
Merge branch 'master' into gh3306
2 parents 6b86d72 + fedf59d commit 924b8bf

File tree

5 files changed

+21
-13
lines changed

5 files changed

+21
-13
lines changed

elide-quarkus/deployment/src/test/java/com/yahoo/elide/extension/test/ElideExtensionTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ public void testBookJsonApiEndpoint() {
8181
RestAssured.when().get("/test-jsonapi/book").then().log().all().statusCode(200);
8282
}
8383

84+
@Test
85+
public void testTypeConvertersAreRegistered() {
86+
RestAssured.when().get("/test-jsonapi/book?filter=releaseDate<2025-02-19T19:17:53Z").then().log().all().statusCode(200);
87+
}
88+
8489
@Test
8590
public void testBookGraphqlEndpoint() {
8691
String query = document(

elide-quarkus/deployment/src/test/java/com/yahoo/elide/extension/test/models/Book.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,15 @@
1111
import jakarta.persistence.Entity;
1212
import jakarta.persistence.Id;
1313

14+
import java.time.OffsetDateTime;
15+
1416
@Include
1517
@Entity
1618
public class Book {
1719
@Id
1820
private long id;
1921

2022
private String title;
23+
24+
private OffsetDateTime releaseDate;
2125
}

elide-quarkus/runtime/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<plugins>
8585
<plugin>
8686
<groupId>io.quarkus</groupId>
87-
<artifactId>quarkus-bootstrap-maven-plugin</artifactId>
87+
<artifactId>quarkus-extension-maven-plugin</artifactId>
8888
<version>3.0.0.Beta1</version>
8989
<executions>
9090
<execution>

elide-quarkus/runtime/src/main/java/com/yahoo/elide/extension/runtime/ElideBeans.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,9 @@ public Elide produceElide(DataStore store, EntityDictionary dictionary) {
7272
builder = builder.verboseErrors(true);
7373
}
7474

75-
LOG.debug("Scanning for security checks...");
76-
dictionary.scanForSecurityChecks();
77-
78-
return new Elide(builder.build());
75+
Elide elide = new Elide(builder.build());
76+
elide.doScans();
77+
return elide;
7978
}
8079

8180
@Produces

pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@
9898
<federation-graphql-java-support-api.version>5.1.0</federation-graphql-java-support-api.version>
9999
<graphql-java.version>22.0</graphql-java.version>
100100
<graal-sdk.version>24.0.1</graal-sdk.version>
101-
<guava.version>33.2.0-jre</guava.version>
101+
<guava.version>33.4.0-jre</guava.version>
102102
<handlebars.version>4.4.0</handlebars.version>
103103
<hibernate.version>6.6.3.Final</hibernate.version>
104-
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
104+
<hibernate-validator.version>8.0.2.Final</hibernate-validator.version>
105105
<hibernate-search.version>6.2.4.Final</hibernate-search.version>
106106
<hjson.version>3.1.0</hjson.version>
107107
<httpclient5.version>5.4.1</httpclient5.version>
@@ -124,24 +124,24 @@
124124
<json-path.version>2.9.0</json-path.version>
125125
<json-schema-validator.version>1.4.2</json-schema-validator.version>
126126
<junit.version>5.10.2</junit.version>
127-
<logback.version>1.5.6</logback.version>
127+
<logback.version>1.5.18</logback.version>
128128
<lombok.version>1.18.36</lombok.version>
129129
<poi.version>5.2.5</poi.version>
130130
<rest-assured.version>5.5.0</rest-assured.version>
131131
<reactor-bom.version>2023.0.6</reactor-bom.version>
132132
<rsql-parser.version>2.1.0</rsql-parser.version>
133133
<slf4j.version>2.0.16</slf4j.version>
134-
<spring-boot.version>3.4.0</spring-boot.version>
134+
<spring-boot.version>3.4.1</spring-boot.version>
135135
<spring-framework.version>6.1.10</spring-framework.version>
136136
<spring-cloud-commons.version>4.1.4</spring-cloud-commons.version>
137137
<springdoc.version>2.8.5</springdoc.version>
138-
<swagger-api.version>2.2.26</swagger-api.version>
138+
<swagger-api.version>2.2.29</swagger-api.version>
139139
<system-lambda.version>1.2.1</system-lambda.version>
140-
<tomcat.version>10.1.31</tomcat.version>
140+
<tomcat.version>11.0.5</tomcat.version>
141141
<mockito.version>5.12.0</mockito.version>
142142
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
143143
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
144-
<checkstyle.version>10.20.1</checkstyle.version>
144+
<checkstyle.version>10.21.4</checkstyle.version>
145145
<dependency-check-maven.version>9.2.0</dependency-check-maven.version>
146146
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
147147
<jaxb-api.version>2.3.1</jaxb-api.version>
@@ -155,7 +155,7 @@
155155
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
156156
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
157157
<maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
158-
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
158+
<maven-site-plugin.version>3.21.0</maven-site-plugin.version>
159159
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
160160
<maven-scm-provider-gitexe.version>2.1.0</maven-scm-provider-gitexe.version>
161161
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>

0 commit comments

Comments
 (0)