Skip to content

Commit 9566d10

Browse files
committed
Upgrade to jackson-datatype-hibernate7 and add cache support
Replaced jackson-datatype-hibernate5-jakarta with jackson-datatype-hibernate7 (version 2.20.1) across modules for compatibility with Hibernate 7. Added spring-boot-starter-cache and spring-boot-starter-hazelcast dependencies to connector-app for caching support. Updated entity models with @JsonIgnoreProperties to prevent serialization issues. Minor script updates for environment variables and logging configuration.
1 parent 1658cb0 commit 9566d10

File tree

8 files changed

+38
-11
lines changed

8 files changed

+38
-11
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
set TURING_URL=http://localhost:2700
2-
set TURING_API_KEY=f6685e35af8b459bbf085dea2
2+
set TURING_API_KEY=09feeee9b7ce4b9eaee55aee3

aem/aem-plugin-sample/scripts/wknd/run.cmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ java -Dloader.path=%~dp0libs ^
44
-Dturing.url=%TURING_URL% ^
55
-Dturing.apiKey=%TURING_API_KEY% ^
66
-Dspring.h2.console.enabled=true ^
7+
-Dlogging.config=classpath:logback-spring.xml ^
78
-jar %~dp0dumont-connector.jar

aem/aem-plugin/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
</dependency>
4444
<dependency>
4545
<groupId>com.fasterxml.jackson.datatype</groupId>
46-
<artifactId>jackson-datatype-hibernate5-jakarta</artifactId>
46+
<artifactId>jackson-datatype-hibernate7</artifactId>
47+
<version>2.20.1</version>
4748
</dependency>
4849
<dependency>
4950
<groupId>io.swagger.core.v3</groupId>

aem/aem-plugin/src/main/java/com/viglet/dumont/connector/plugin/aem/persistence/model/DumAemSourceAttribute.java

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,25 @@
1818

1919
package com.viglet.dumont.connector.plugin.aem.persistence.model;
2020

21-
import jakarta.persistence.*;
22-
import lombok.*;
23-
import org.hibernate.annotations.UuidGenerator;
24-
2521
import java.io.Serial;
2622
import java.io.Serializable;
2723

24+
import org.hibernate.annotations.UuidGenerator;
25+
26+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
27+
28+
import jakarta.persistence.Column;
29+
import jakarta.persistence.Entity;
30+
import jakarta.persistence.Id;
31+
import jakarta.persistence.JoinColumn;
32+
import jakarta.persistence.ManyToOne;
33+
import jakarta.persistence.Table;
34+
import lombok.AllArgsConstructor;
35+
import lombok.Builder;
36+
import lombok.Getter;
37+
import lombok.NoArgsConstructor;
38+
import lombok.Setter;
39+
2840
/**
2941
* @author Alexandre Oliveira
3042
* @since 0.3.9
@@ -36,6 +48,7 @@
3648
@Setter
3749
@Entity
3850
@Table(name = "aem_source_attribute")
51+
@JsonIgnoreProperties({ "dumAemTargetAttribute" })
3952
public class DumAemSourceAttribute implements Serializable {
4053

4154
@Serial

aem/aem-plugin/src/main/java/com/viglet/dumont/connector/plugin/aem/persistence/model/DumAemTargetAttribute.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.hibernate.annotations.OnDelete;
2727
import org.hibernate.annotations.OnDeleteAction;
2828

29+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2930
import com.viglet.dumont.spring.jpa.DumUuid;
3031

3132
import jakarta.persistence.CascadeType;
@@ -54,6 +55,7 @@
5455
@Setter
5556
@Entity
5657
@Table(name = "aem_target_attribute")
58+
@JsonIgnoreProperties({ "dumAemModel" })
5759
public class DumAemTargetAttribute implements Serializable {
5860

5961
@Serial

connector/connector-app/pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,14 @@
9494
<groupId>org.springframework.boot</groupId>
9595
<artifactId>spring-boot-starter-mongodb</artifactId>
9696
</dependency>
97+
<dependency>
98+
<groupId>org.springframework.boot</groupId>
99+
<artifactId>spring-boot-starter-cache</artifactId>
100+
</dependency>
101+
<dependency>
102+
<groupId>org.springframework.boot</groupId>
103+
<artifactId>spring-boot-starter-hazelcast</artifactId>
104+
</dependency>
97105
<dependency>
98106
<groupId>org.springframework.boot</groupId>
99107
<artifactId>spring-boot-starter-test</artifactId>
@@ -122,7 +130,8 @@
122130
</dependency>
123131
<dependency>
124132
<groupId>com.fasterxml.jackson.datatype</groupId>
125-
<artifactId>jackson-datatype-hibernate5-jakarta</artifactId>
133+
<artifactId>jackson-datatype-hibernate7</artifactId>
134+
<version>2.20.1</version>
126135
</dependency>
127136
<dependency>
128137
<groupId>org.jetbrains</groupId>

connector/connector-app/src/main/java/com/viglet/dumont/connector/DumConnectorApplication.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.springframework.web.filter.CharacterEncodingFilter;
1313

1414
import com.fasterxml.jackson.databind.Module;
15-
import com.fasterxml.jackson.datatype.hibernate5.jakarta.Hibernate5JakartaModule;
15+
import com.fasterxml.jackson.datatype.hibernate7.Hibernate7Module;
1616

1717
import lombok.extern.slf4j.Slf4j;
1818

@@ -40,7 +40,7 @@ FilterRegistrationBean<CharacterEncodingFilter> filterRegistrationBean() {
4040
}
4141

4242
@Bean
43-
Module hibernate5Module() {
44-
return new Hibernate5JakartaModule();
43+
Module hibernate7Module() {
44+
return new Hibernate7Module();
4545
}
4646
}

web-crawler/wc-plugin/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
</dependency>
4040
<dependency>
4141
<groupId>com.fasterxml.jackson.datatype</groupId>
42-
<artifactId>jackson-datatype-hibernate5-jakarta</artifactId>
42+
<artifactId>jackson-datatype-hibernate7</artifactId>
43+
<version>2.20.1</version>
4344
</dependency>
4445
<dependency>
4546
<groupId>com.viglet.turing</groupId>

0 commit comments

Comments
 (0)