Skip to content
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

Jump to bottom

Upgrading to spring boot 3.1 #154

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrading to spring boot 3.1 #154

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
2 changes: 1 addition & 1 deletion docker/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ java \
"-Xmx${JASPER_HEAP:-512m}" \
"-Xms${JASPER_HEAP:-512m}" \
-XX:+UseStringDeduplication \
org.springframework.boot.loader.JarLauncher
org.springframework.boot.loader.launch.JarLauncher
36 changes: 19 additions & 17 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.18</version>
<version>3.1.12</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>jasper</groupId>
Expand All @@ -28,18 +28,19 @@
<testcontainers.version>1.20.1</testcontainers.version>
<mapstruct.version>1.6.2</mapstruct.version>
<jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
<hibernate-types-55.version>2.21.1</hibernate-types-55.version>
<jsontypedef.version>0.2.2</jsontypedef.version>
<json-patch.version>1.13</json-patch.version>
<jjwt.version>0.12.5</jjwt.version>
<spring-cloud.version>2021.0.9</spring-cloud.version>
<problem-spring-web.version>0.27.0</problem-spring-web.version>
<spring-cloud.version>2022.0.5</spring-cloud.version>
<problem-spring-web.version>0.29.1</problem-spring-web.version>
<springdoc-openapi.version>1.8.0</springdoc-openapi.version>
<openapi-generator-maven-plugin.version>5.4.0</openapi-generator-maven-plugin.version>
<commons.collections4.version>4.4</commons.collections4.version>
<javatuples.version>1.2</javatuples.version>
<rome.version>2.1.0</rome.version>
<apache-httpclient.version>4.5.14</apache-httpclient.version>
<apache-httpclient.version>5.2.1</apache-httpclient.version>
<commons-io.version>2.17.0</commons-io.version>
<varv.version>0.10.4</varv.version>
<jsoup.version>1.18.1</jsoup.version>
<scim2-client.version>2.3.8</scim2-client.version>
<fabric8.version>6.4.1</fabric8.version>
Expand Down Expand Up @@ -85,16 +86,16 @@
<artifactId>liquibase-core</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-hibernate5</artifactId>
<artifactId>jackson-datatype-hibernate5-jakarta</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
Expand Down Expand Up @@ -129,12 +130,18 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>${commons.collections4.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>io.vavr</groupId>
<artifactId>vavr</artifactId>
<version>${varv.version}</version>
</dependency>
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
Expand All @@ -151,23 +158,18 @@
<version>${json-patch.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
<dependency>
<groupId>com.vladmihalcea</groupId>
<artifactId>hibernate-types-55</artifactId>
<version>${hibernate-types-55.version}</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
Expand Down Expand Up @@ -260,8 +262,8 @@
<version>${rome.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>${apache-httpclient.version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/jasper/component/Backup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import io.micrometer.core.annotation.Counted;
import io.micrometer.core.annotation.Timed;
import jakarta.persistence.EntityManager;
import jasper.config.Props;
import jasper.domain.Ext;
import jasper.domain.Plugin;
Expand All @@ -30,7 +31,6 @@
import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.util.StreamUtils;

import javax.persistence.EntityManager;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/jasper/component/ConfigCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import jakarta.annotation.PostConstruct;
import jasper.component.dto.ComponentDtoMapper;
import jasper.config.Config.SecurityConfig;
import jasper.config.Config.ServerConfig;
Expand All @@ -23,7 +24,6 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.PostConstruct;
import java.util.List;
import java.util.Optional;
import java.util.Set;
Expand Down
15 changes: 7 additions & 8 deletions src/main/java/jasper/component/Ingest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package jasper.component;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import io.micrometer.core.annotation.Timed;
import jakarta.persistence.EntityExistsException;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceException;
import jasper.config.Props;
import jasper.domain.Ref;
import jasper.errors.AlreadyExistsException;
Expand All @@ -20,9 +22,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionTemplate;

import javax.persistence.EntityExistsException;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceException;
import java.time.Clock;
import java.time.Instant;

Expand Down Expand Up @@ -125,7 +124,7 @@ void ensureCreateUniqueModified(Ref ref) {
break;
} catch (DataIntegrityViolationException | PersistenceException e) {
if (e instanceof EntityExistsException) throw new AlreadyExistsException();
if (e.getCause() instanceof ConstraintViolationException c) {
if (e instanceof ConstraintViolationException c) {
if ("ref_pkey".equals(c.getConstraintName())) throw new AlreadyExistsException();
if ("ref_modified_origin_key".equals(c.getConstraintName())) {
if (count > props.getIngestMaxRetry()) throw new DuplicateModifiedDateException();
Expand All @@ -152,9 +151,9 @@ void ensureUpdateUniqueModified(Ref ref) {
ref.getOrigin(),
ref.getTitle(),
ref.getComment(),
ref.getTags() == null ? null : objectMapper.convertValue(ref.getTags(), ArrayNode.class),
ref.getSources() == null ? null : objectMapper.convertValue(ref.getSources(), ArrayNode.class),
ref.getAlternateUrls() == null ? null : objectMapper.convertValue(ref.getAlternateUrls(), ArrayNode.class),
ref.getTags(),
ref.getSources(),
ref.getAlternateUrls(),
ref.getPlugins(),
ref.getMetadata(),
ref.getPublished(),
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/jasper/component/IngestExt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package jasper.component;

import io.micrometer.core.annotation.Timed;
import jakarta.persistence.EntityExistsException;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceException;
import jasper.config.Props;
import jasper.domain.Ext;
import jasper.errors.AlreadyExistsException;
Expand All @@ -17,16 +20,12 @@
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;

import javax.persistence.EntityExistsException;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceException;
import java.time.Clock;
import java.time.Instant;

import static jasper.component.Replicator.deletedTag;
import static jasper.component.Replicator.deletorTag;
import static jasper.component.Replicator.isDeletorTag;
import static org.apache.commons.lang3.StringUtils.isNotBlank;

@Component
public class IngestExt {
Expand Down Expand Up @@ -109,7 +108,7 @@ void ensureCreateUniqueModified(Ext ext) {
break;
} catch (DataIntegrityViolationException | PersistenceException e) {
if (e instanceof EntityExistsException) throw new AlreadyExistsException();
if (e.getCause() instanceof ConstraintViolationException c) {
if (e instanceof ConstraintViolationException c) {
if ("ext_pkey".equals(c.getConstraintName())) throw new AlreadyExistsException();
if ("ext_modified_origin_key".equals(c.getConstraintName())) {
if (count > props.getIngestMaxRetry()) throw new DuplicateModifiedDateException();
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/jasper/component/IngestPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package jasper.component;

import io.micrometer.core.annotation.Timed;
import jakarta.persistence.EntityExistsException;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceException;
import jasper.config.Props;
import jasper.domain.Plugin;
import jasper.errors.AlreadyExistsException;
Expand All @@ -17,9 +20,6 @@
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;

import javax.persistence.EntityExistsException;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceException;
import java.time.Clock;
import java.time.Instant;

Expand Down Expand Up @@ -107,7 +107,7 @@ void ensureCreateUniqueModified(Plugin plugin) {
break;
} catch (DataIntegrityViolationException | PersistenceException e) {
if (e instanceof EntityExistsException) throw new AlreadyExistsException();
if (e.getCause() instanceof ConstraintViolationException c) {
if (e instanceof ConstraintViolationException c) {
if ("plugin_pkey".equals(c.getConstraintName())) throw new AlreadyExistsException();
if ("plugin_modified_origin_key".equals(c.getConstraintName())) {
if (count > props.getIngestMaxRetry()) throw new DuplicateModifiedDateException();
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/jasper/component/IngestTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package jasper.component;

import io.micrometer.core.annotation.Timed;
import jakarta.persistence.EntityExistsException;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceException;
import jasper.config.Props;
import jasper.domain.Template;
import jasper.errors.AlreadyExistsException;
Expand All @@ -17,9 +20,6 @@
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;

import javax.persistence.EntityExistsException;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceException;
import java.time.Clock;
import java.time.Instant;

Expand Down Expand Up @@ -107,7 +107,7 @@ void ensureCreateUniqueModified(Template template) {
break;
} catch (DataIntegrityViolationException | PersistenceException e) {
if (e instanceof EntityExistsException) throw new AlreadyExistsException();
if (e.getCause() instanceof ConstraintViolationException c) {
if (e instanceof ConstraintViolationException c) {
if ("template_pkey".equals(c.getConstraintName())) throw new AlreadyExistsException();
if ("template_modified_origin_key".equals(c.getConstraintName())) {
if (count > props.getIngestMaxRetry()) throw new DuplicateModifiedDateException();
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/jasper/component/IngestUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package jasper.component;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import io.micrometer.core.annotation.Timed;
import jakarta.persistence.EntityExistsException;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceException;
import jasper.config.Props;
import jasper.domain.User;
import jasper.errors.AlreadyExistsException;
Expand All @@ -19,16 +21,14 @@
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;

import javax.persistence.EntityExistsException;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceException;
import java.time.Clock;
import java.time.Instant;

import static jasper.component.Replicator.deletedTag;
import static jasper.component.Replicator.deletorTag;
import static jasper.component.Replicator.isDeletorTag;


@Component
public class IngestUser {
private static final Logger logger = LoggerFactory.getLogger(IngestUser.class);
Expand Down Expand Up @@ -106,7 +106,7 @@ void ensureCreateUniqueModified(User user) {
break;
} catch (DataIntegrityViolationException | PersistenceException e) {
if (e instanceof EntityExistsException) throw new AlreadyExistsException();
if (e.getCause() instanceof ConstraintViolationException c) {
if (e instanceof ConstraintViolationException c) {
if ("users_pkey".equals(c.getConstraintName())) throw new AlreadyExistsException();
if ("users_modified_origin_key".equals(c.getConstraintName())) {
if (count > props.getIngestMaxRetry()) throw new DuplicateModifiedDateException();
Expand All @@ -133,10 +133,10 @@ void ensureUpdateUniqueModified(User user) {
user.getOrigin(),
user.getName(),
user.getRole(),
user.getReadAccess() == null ? null : objectMapper.convertValue(user.getReadAccess(), ArrayNode.class),
user.getWriteAccess() == null ? null : objectMapper.convertValue(user.getWriteAccess(), ArrayNode.class),
user.getTagReadAccess() == null ? null : objectMapper.convertValue(user.getTagReadAccess(), ArrayNode.class),
user.getTagWriteAccess() == null ? null : objectMapper.convertValue(user.getTagWriteAccess(), ArrayNode.class),
user.getReadAccess(),
user.getWriteAccess(),
user.getTagReadAccess(),
user.getTagWriteAccess(),
user.getModified(),
user.getKey(),
user.getPubKey(),
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/jasper/component/Preload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package jasper.component;

import io.micrometer.core.annotation.Counted;
import jakarta.annotation.PostConstruct;
import jasper.config.Props;
import jasper.domain.*;
import jasper.repository.*;
Expand All @@ -10,7 +11,6 @@
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
import java.time.Duration;
import java.time.Instant;
import java.util.Optional;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/jasper/component/Scraper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.mdimension.jchronic.Options;
import com.mdimension.jchronic.tags.Pointer;
import io.micrometer.core.annotation.Timed;
import jakarta.persistence.EntityManager;
import jasper.component.dto.JsonLd;
import jasper.domain.Ref;
import jasper.plugin.Scrape;
Expand All @@ -19,7 +20,6 @@
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;

import javax.persistence.EntityManager;
import java.io.IOException;
import java.net.URISyntaxException;
import java.time.Instant;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/jasper/component/channel/Push.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import io.vavr.Tuple;
import io.vavr.Tuple2;
import jakarta.annotation.PostConstruct;
import jasper.component.ConfigCache;
import jasper.component.Replicator;
import jasper.config.Props;
Expand All @@ -15,7 +16,6 @@
import org.springframework.scheduling.TaskScheduler;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
import java.time.Instant;
import java.util.HashMap;
import java.util.HashSet;
Expand Down
Loading
Loading