Skip to content

Update to Spring Boot 3.5.8 and align dependencies #3398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
justin-tay wants to merge 1 commit into
base: master
Choose a base branch
from
+129 −73
Open

Update to Spring Boot 3.5.8 and align dependencies #3398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions elide-async/src/main/java/com/yahoo/elide/async/resources/ExportApiEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
package com.yahoo.elide.async.resources;

import com.yahoo.elide.async.service.storageengine.ResultStorageEngine;
import com.yahoo.elide.core.exceptions.HttpStatus;

import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.InternalServerErrorException;
import jakarta.ws.rs.NotFoundException;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.container.AsyncResponse;
Expand Down Expand Up @@ -83,9 +84,13 @@ public void get(@PathParam("asyncQueryId") String asyncQueryId, @Context HttpSer
try {
log.debug(message);
if (message != null && message.equals(ResultStorageEngine.RETRIEVE_ERROR)) {
httpServletResponse.sendError(HttpStatus.SC_NOT_FOUND, asyncQueryId + " Not Found");
String errorMessage = asyncQueryId + " Not Found";
throw new NotFoundException(errorMessage,
Response.status(Response.Status.NOT_FOUND).entity(errorMessage).build());
} else {
httpServletResponse.sendError(HttpStatus.SC_INTERNAL_SERVER_ERROR);
throw new InternalServerErrorException(
Response.status(Response.Status.INTERNAL_SERVER_ERROR)
.entity("Internal Server Error").build());
}
} catch (IllegalStateException ise) {
// If stream was flushed, Attachment download has already started.
Expand Down
3 changes: 0 additions & 3 deletions elide-core/src/main/java/com/yahoo/elide/core/exceptions/ExceptionMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

import com.yahoo.elide.ElideErrorResponse;

import javax.annotation.Nullable;

/**
* Maps an exception to an {@link ElideErrorResponse}.
*
Expand All @@ -24,6 +22,5 @@ public interface ExceptionMapper<E extends Throwable, T> {
* @param errorContext the error context
* @return the mapped ElideErrorResponse or null if you do not want to map this error
*/
@Nullable
ElideErrorResponse<? extends T> toErrorResponse(E exception, ErrorContext errorContext);
}
101 changes: 75 additions & 26 deletions elide-core/src/main/java/com/yahoo/elide/core/graal/ElideFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,54 +5,103 @@
*/
package com.yahoo.elide.core.graal;

import com.yahoo.elide.annotation.LifeCycleHookBinding;
import com.yahoo.elide.core.utils.ClassScannerCache;

import org.graalvm.nativeimage.hosted.Feature;
import org.graalvm.nativeimage.hosted.RuntimeReflection;

import io.github.classgraph.ClassGraph;
import io.github.classgraph.ClassInfo;
import io.github.classgraph.ScanResult;

import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

/**
* Native Image Feature for Elide.
*/
public class ElideFeature implements Feature {
@Override
public void beforeAnalysis(BeforeAnalysisAccess access) {
ClassScannerCache.getInstance().values().stream().forEach(set -> set.stream().forEach(this::register));
}

void register(Class<?>... classes) {
Arrays.stream(classes).forEach(clazz -> {
System.out.println("Elide registering class " + clazz + " for reflection");

RuntimeReflection.register(clazz);

Map<String, Set<Class<?>>> classes = ClassScannerCache.getInstance();
// In GraalVM 21+ java.class.path is not set so need to use
// access.getApplicationClassPath otherwise no classes are found
try (ScanResult scanResult = new ClassGraph().overrideClasspath(access.getApplicationClassPath())
.enableClassInfo().enableAnnotationInfo().scan()) {
for (String annotationName : ClassScannerCache.getCachedAnnotations()) {
Set<Class<?>> value = scanResult.getClassesWithAnnotation(annotationName).stream()
.map(ClassInfo::loadClass).collect(Collectors.toCollection(LinkedHashSet::new));
if (!value.isEmpty()) {
classes.put(annotationName, value);
}
}
}
Set<Class<?>> results = new LinkedHashSet<>();
classes.values().stream().forEach(set -> set.stream().forEach(clazz -> {
results.add(clazz);
LifeCycleHookBinding lifeCycleHookBinding = clazz.getAnnotation(LifeCycleHookBinding.class);
if (lifeCycleHookBinding != null) {
results.add(lifeCycleHookBinding.hook());
}
}));
Set<Class<?>> hooks = new LinkedHashSet<>();
results.forEach(clazz -> {
for (Field field : clazz.getFields()) {
RuntimeReflection.register(field);
LifeCycleHookBinding lifeCycleHookBinding = field.getAnnotation(LifeCycleHookBinding.class);
if (lifeCycleHookBinding != null) {
hooks.add(lifeCycleHookBinding.hook());
}
}

for (Method method : clazz.getMethods()) {
RuntimeReflection.register(method);
LifeCycleHookBinding lifeCycleHookBinding = method.getAnnotation(LifeCycleHookBinding.class);
if (lifeCycleHookBinding != null) {
hooks.add(lifeCycleHookBinding.hook());
}
}
});
results.addAll(hooks);
// Sort
List<Class<?>> ordered = new ArrayList<>(results);
ordered.sort((left, right) -> {
return left.getName().compareTo(right.getName());
});
ordered.forEach(this::register);
}

for (Constructor<?> constructor : clazz.getConstructors()) {
RuntimeReflection.register(constructor);
}
void register(Class<?> clazz) {
System.out.println("Elide registering " + clazz + " for reflection");

for (Field field : clazz.getDeclaredFields()) {
RuntimeReflection.register(field);
}
RuntimeReflection.register(clazz);
for (Field field : clazz.getFields()) {
RuntimeReflection.register(field);
}

for (Method method : clazz.getDeclaredMethods()) {
RuntimeReflection.register(method);
}
for (Method method : clazz.getMethods()) {
RuntimeReflection.register(method);
}

for (Constructor<?> constructor : clazz.getDeclaredConstructors()) {
RuntimeReflection.register(constructor);
}
});
for (Constructor<?> constructor : clazz.getConstructors()) {
RuntimeReflection.register(constructor);
}

for (Field field : clazz.getDeclaredFields()) {
RuntimeReflection.register(field);
}

for (Method method : clazz.getDeclaredMethods()) {
RuntimeReflection.register(method);
}

for (Constructor<?> constructor : clazz.getDeclaredConstructors()) {
RuntimeReflection.register(constructor);
}
}
}
4 changes: 4 additions & 0 deletions elide-core/src/main/java/com/yahoo/elide/core/utils/ClassScannerCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,8 @@ private ClassScannerCache() {
public static Map<String, Set<Class<?>>> getInstance() {
return INSTANCE;
}

public static String[] getCachedAnnotations() {
return CACHE_ANNOTATIONS;
}
}
2 changes: 1 addition & 1 deletion elide-graphql/src/test/java/com/yahoo/elide/graphql/FetcherFetchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void testSubscriptionThrowsError() throws Exception {
+ " }\n"
+ "}";

assertQueryFailsWith(query, "Schema is not configured for subscriptions.");
assertQueryFailsWith(query, "Validation error (UnknownOperation): The &#39;Subscription&#39; operation is not supported by the schema");
}

@Test
Expand Down
81 changes: 41 additions & 40 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,63 +80,64 @@
<delombok.output>${project.basedir}/target/lombok</delombok.output>

<!-- dependency versions -->
<antlr4.version>4.13.1</antlr4.version>
<artemis.version>2.33.0</artemis.version>
<antlr4.version>4.13.2</antlr4.version>
<artemis.version>2.40.0</artemis.version>
<atomikos.version>6.0.0</atomikos.version>
<calcite.version>1.37.0</calcite.version>
<caffeine.version>3.2.0</caffeine.version>
<classgraph.version>4.8.172</classgraph.version>
<calcite.version>1.41.0</calcite.version>
<caffeine.version>3.2.3</caffeine.version>
<classgraph.version>4.8.184</classgraph.version>
<commons-beanutils.version>1.11.0</commons-beanutils.version>
<commons-cli.version>1.9.0</commons-cli.version>
<commons-collections4.version>4.4</commons-collections4.version>
<commons-compress.version>1.26.2</commons-compress.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<commons-cli.version>1.11.0</commons-cli.version>
<commons-collections4.version>4.5.0</commons-collections4.version>
<commons-compress.version>1.28.0</commons-compress.version>
<commons-lang3.version>3.20.0</commons-lang3.version>
<embedded-redis.version>0.11.0</embedded-redis.version>
<encoder.version>1.2.3</encoder.version>
<federation-graphql-java-support-api.version>5.1.0</federation-graphql-java-support-api.version>
<graphql-java.version>22.0</graphql-java.version>
<graal-sdk.version>24.0.1</graal-sdk.version>
<guava.version>33.4.0-jre</guava.version>
<handlebars.version>4.4.0</handlebars.version>
<hibernate.version>6.6.12.Final</hibernate.version>
<hibernate-validator.version>8.0.2.Final</hibernate-validator.version>
<encoder.version>1.4.0</encoder.version>
<federation-graphql-java-support-api.version>5.4.0</federation-graphql-java-support-api.version>
<graphql-java.version>24.3</graphql-java.version>
<graphql-java-extended-scalars.version>24.0</graphql-java-extended-scalars.version>
<graal-sdk.version>25.0.1</graal-sdk.version>
<guava.version>33.5.0-jre</guava.version>
<handlebars.version>4.5.0</handlebars.version>
<hibernate.version>6.6.36.Final</hibernate.version>
<hibernate-validator.version>8.0.3.Final</hibernate-validator.version>
<hibernate-search.version>6.2.4.Final</hibernate-search.version>
<hjson.version>3.1.0</hjson.version>
<httpclient5.version>5.4.3</httpclient5.version>
<gson.version>2.11.0</gson.version>
<httpclient5.version>5.5.1</httpclient5.version>
<gson.version>2.13.2</gson.version>
<h2.version>2.3.232</h2.version>
<hikaricp.version>5.1.0</hikaricp.version>
<jackson-bom.version>2.17.1</jackson-bom.version>
<jakarta-inject.version>2.0.1.MR</jakarta-inject.version>
<hikaricp.version>6.3.3</hikaricp.version>
<jackson-bom.version>2.19.4</jackson-bom.version>
<jakarta-inject.version>2.0.1</jakarta-inject.version>
<jakarta-jms.version>3.1.0</jakarta-jms.version>
<jakarta-persistence.version>3.1.0</jakarta-persistence.version>
<jakarta-transaction.version>2.0.1</jakarta-transaction.version>
<jakarta-websocket.version>2.2.0</jakarta-websocket.version>
<jakarta-ws-rs.version>4.0.0</jakarta-ws-rs.version>
<jakarta-validation.version>3.1.0</jakarta-validation.version>
<jansi.version>2.4.1</jansi.version>
<jersey.version>3.1.8</jersey.version>
<jetty.version>12.0.15</jetty.version>
<jedis.version>5.1.5</jedis.version>
<jansi.version>2.4.2</jansi.version>
<jersey.version>3.1.11</jersey.version>
<jetty.version>12.0.30</jetty.version>
<jedis.version>6.0.0</jedis.version>
<jsonassert.version>1.5.3</jsonassert.version>
<json-path.version>2.9.0</json-path.version>
<json-schema-validator.version>1.5.6</json-schema-validator.version>
<json-path.version>2.10.0</json-path.version>
<json-schema-validator.version>1.5.9</json-schema-validator.version>
<junit.version>5.10.2</junit.version>
<logback.version>1.5.18</logback.version>
<logback.version>1.5.21</logback.version>
<lombok.version>1.18.36</lombok.version>
<poi.version>5.4.0</poi.version>
<rest-assured.version>5.5.1</rest-assured.version>
<reactor-bom.version>2023.0.6</reactor-bom.version>
<poi.version>5.5.1</poi.version>
<rest-assured.version>5.5.6</rest-assured.version>
<reactor-bom.version>2024.0.12</reactor-bom.version>
<rsql-parser.version>2.1.0</rsql-parser.version>
<slf4j.version>2.0.17</slf4j.version>
<spring-boot.version>3.4.1</spring-boot.version>
<spring-framework.version>6.1.10</spring-framework.version>
<spring-cloud-commons.version>4.1.4</spring-cloud-commons.version>
<springdoc.version>2.8.5</springdoc.version>
<swagger-api.version>2.2.29</swagger-api.version>
<spring-boot.version>3.5.8</spring-boot.version>
<spring-framework.version>6.2.14</spring-framework.version>
<spring-cloud-commons.version>4.3.0</spring-cloud-commons.version>
<springdoc.version>2.8.14</springdoc.version>
<swagger-api.version>2.2.41</swagger-api.version>
<system-lambda.version>1.2.1</system-lambda.version>
<tomcat.version>11.0.6</tomcat.version>
<mockito.version>5.12.0</mockito.version>
<tomcat.version>11.0.14</tomcat.version>
<mockito.version>5.20.0</mockito.version>
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<checkstyle.version>10.21.4</checkstyle.version>
Expand Down Expand Up @@ -271,7 +272,7 @@
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-java-extended-scalars</artifactId>
<version>${graphql-java.version}</version>
<version>${graphql-java-extended-scalars.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down