Update airbase to 175

Requires updating a lots of other dependencies
trinodb · Sep 19, 2024 · 732acf5 · 732acf5
1 parent fe3bad3
commit 732acf5
Show file tree

Hide file tree

Showing 27 changed files with 191 additions and 241 deletions.
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
diff --git a/benchto-driver/pom.xml b/benchto-driver/pom.xml
@@ -45,16 +45,16 @@
             <artifactId>trino-jdbc</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
         </dependency>
         <dependency>
             <groupId>org.freemarker</groupId>

diff --git a/benchto-driver/src/main/java/io/trino/benchto/driver/DriverApp.java b/benchto-driver/src/main/java/io/trino/benchto/driver/DriverApp.java
@@ -22,7 +22,6 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.apache.http.impl.client.HttpClients;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.WebApplicationType;
@@ -159,7 +158,7 @@ public RestTemplate restTemplate()
     {
         RestTemplate restTemplate = new RestTemplate();
         restTemplate.getMessageConverters().add(new MappingJackson2HttpMessageConverter());
-        restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory(HttpClients.createDefault()));
+        restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory());
         return restTemplate;
     }
 

diff --git a/benchto-driver/src/main/java/io/trino/benchto/driver/execution/ExecutionSynchronizer.java b/benchto-driver/src/main/java/io/trino/benchto/driver/execution/ExecutionSynchronizer.java
@@ -16,13 +16,12 @@
 import io.trino.benchto.driver.Benchmark;
 import io.trino.benchto.driver.graphite.GraphiteProperties;
 import io.trino.benchto.driver.utils.TimeUtils;
+import jakarta.annotation.PreDestroy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PreDestroy;
-
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;

diff --git a/benchto-driver/src/main/java/io/trino/benchto/driver/graphite/GraphiteMetricsLoader.java b/benchto-driver/src/main/java/io/trino/benchto/driver/graphite/GraphiteMetricsLoader.java
@@ -19,6 +19,7 @@
 import io.trino.benchto.driver.execution.QueryExecutionResult;
 import io.trino.benchto.driver.listeners.measurements.PostExecutionMeasurementProvider;
 import io.trino.benchto.driver.service.Measurement;
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 import org.apache.commons.math3.stat.descriptive.StatisticalSummary;
 import org.apache.commons.math3.stat.descriptive.StatisticalSummaryValues;
@@ -28,8 +29,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
-
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.List;

diff --git a/benchto-driver/src/main/java/io/trino/benchto/driver/loader/BenchmarkLoader.java b/benchto-driver/src/main/java/io/trino/benchto/driver/loader/BenchmarkLoader.java
@@ -26,14 +26,13 @@
 import io.trino.benchto.driver.utils.CartesianProductUtils;
 import io.trino.benchto.driver.utils.NaturalOrderComparator;
 import io.trino.benchto.driver.utils.YamlUtils;
+import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;

diff --git a/benchto-it/src/test/java/io/trino/benchto/integrationtest/TrinoIntegrationTest.java b/benchto-it/src/test/java/io/trino/benchto/integrationtest/TrinoIntegrationTest.java
@@ -53,7 +53,7 @@ public class TrinoIntegrationTest
 
     protected static void startBenchtoService(Network network)
     {
-        postgres = new PostgreSQLContainer<>("postgres:11")
+        postgres = new PostgreSQLContainer<>("postgres:16")
                 .withNetwork(network)
                 .withNetworkAliases("postgres");
         postgres.start();

diff --git a/benchto-service/pom.xml b/benchto-service/pom.xml
@@ -26,9 +26,10 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-hibernate5</artifactId>
+            <artifactId>jackson-datatype-hibernate6</artifactId>
         </dependency>
 
         <!-- Utils -->
@@ -38,22 +39,30 @@
         </dependency>
         <dependency>
             <groupId>com.vladmihalcea</groupId>
-            <artifactId>hibernate-types-52</artifactId>
+            <artifactId>hibernate-types-60</artifactId>
         </dependency>
+
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
 
         <!-- JSR303-validation -->
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.transaction</groupId>
+            <artifactId>jta</artifactId>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
@@ -65,7 +74,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
         </dependency>
 
@@ -157,18 +166,25 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- ehcache -->
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-database-postgresql</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-ehcache</artifactId>
-            <version>${dep.hibernate.version}</version>
+            <version>6.0.0.Alpha7</version>
             <scope>runtime</scope>
         </dependency>
+
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>runtime</scope>
         </dependency>
+
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>

diff --git a/benchto-service/src/main/java/io/trino/benchto/service/ServiceApp.java b/benchto-service/src/main/java/io/trino/benchto/service/ServiceApp.java
@@ -13,7 +13,7 @@
  */
 package io.trino.benchto.service;
 
-import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
+import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module;
 import io.trino.benchto.service.rest.converters.ZonedDateTimeConverter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -22,7 +22,7 @@
 import org.springframework.retry.annotation.EnableRetry;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-import static com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module.Feature.USE_TRANSIENT_ANNOTATION;
+import static com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module.Feature.USE_TRANSIENT_ANNOTATION;
 
 @EnableScheduling
 @EnableRetry
@@ -37,7 +37,7 @@ public static void main(String[] args)
     @Bean
     public Jackson2ObjectMapperBuilder configureObjectMapper()
     {
-        Hibernate5Module hibernate5Module = new Hibernate5Module();
+        Hibernate6Module hibernate5Module = new Hibernate6Module();
         hibernate5Module.disable(USE_TRANSIENT_ANNOTATION);
         return new Jackson2ObjectMapperBuilder()
                 .modulesToInstall(hibernate5Module);

diff --git a/benchto-service/src/main/java/io/trino/benchto/service/WebSecurityConfig.java b/benchto-service/src/main/java/io/trino/benchto/service/WebSecurityConfig.java
@@ -15,16 +15,19 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.web.SecurityFilterChain;
+
+import static org.springframework.security.config.Customizer.withDefaults;
 
 @Configuration
 @EnableWebSecurity
 public class WebSecurityConfig
-        extends WebSecurityConfigurerAdapter
 {
     private static final String API_WRITE_ROLE = "API_WRITE_ROLE";
 
@@ -37,28 +40,30 @@ public class WebSecurityConfig
     @Value("${benchto.security.api.password:}")
     private String userPassword;
 
-    @Override
-    protected void configure(HttpSecurity http)
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http)
             throws Exception
     {
         if (isApiProtected) {
-            http.csrf().disable()
-                    .authorizeRequests().antMatchers("/**")
+            http.csrf(AbstractHttpConfigurer::disable)
+                    .authorizeRequests()
+                    .requestMatchers("/**")
                     .permitAll()
                     .and()
-                    .antMatcher("/v1/**")
                     .authorizeRequests()
                     .requestMatchers((httpServletRequest) -> httpServletRequest.getMethod().equalsIgnoreCase("POST"))
                     .hasAnyRole(API_WRITE_ROLE)
                     .and()
-                    .httpBasic();
+                    .httpBasic(withDefaults());
         }
         else {
-            http.csrf().disable()
+            http.csrf(AbstractHttpConfigurer::disable)
                     .authorizeRequests()
                     .anyRequest()
                     .permitAll();
         }
+
+        return http.build();
     }
 
     @Autowired

diff --git a/benchto-service/src/main/java/io/trino/benchto/service/model/BenchmarkRun.java b/benchto-service/src/main/java/io/trino/benchto/service/model/BenchmarkRun.java
@@ -16,33 +16,32 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import jakarta.persistence.UniqueConstraint;
+import jakarta.persistence.Version;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Cache;
 
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.UniqueConstraint;
-import javax.persistence.Version;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
 import java.io.Serializable;
 import java.time.ZonedDateTime;
 import java.util.Map;
@@ -52,8 +51,8 @@
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.collect.Maps.newHashMap;
 import static com.google.common.collect.Sets.newHashSet;
+import static jakarta.persistence.FetchType.EAGER;
 import static java.util.stream.Collectors.toMap;
-import static javax.persistence.FetchType.EAGER;
 import static org.hibernate.annotations.CacheConcurrencyStrategy.TRANSACTIONAL;
 
 @Entity