Skip to content

Commit ae9d872

Browse files
Copilotgortazar
andauthored
Fix all remaining compilation failures: Jackson 3.x, Hibernate 7, Spring Security 7, Spring Session 4.x, CI workflow
Agent-Logs-Url: https://github.com/codeurjc/dad2425/sessions/63ada7cb-c19d-454b-9ff6-ea5c62f687b3 Co-authored-by: gortazar <203272+gortazar@users.noreply.github.com>
1 parent b78feb5 commit ae9d872

16 files changed

Lines changed: 73 additions & 117 deletions

File tree

.github/workflows/maven-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ jobs:
101101
- 'parte_4/tema_4.2/ejer8'
102102

103103
# Parte 4 - Docker Projects
104-
- 'parte_4/tema_4.3/ejemplo-1/comunicacion-rabbitmq-ejem2-consumer'
105-
- 'parte_4/tema_4.3/ejemplo-1/comunicacion-rabbitmq-ejem2-producer'
104+
- 'parte_4/tema_4.3/ejemplo-1/comunicacion-rabbitmq-ejem3-consumer'
105+
- 'parte_4/tema_4.3/ejemplo-1/comunicacion-rabbitmq-ejem3-producer'
106106
- 'parte_4/tema_4.3/ejemplo-2'
107107
- 'parte_4/tema_4.3/ejemplo-3'
108108
- 'parte_4/tema_4.3/ejercicio-1-enunciado'

parte_2/tema_2.5_db/bd_ejem22/src/main/java/es/codeurjc/board/controller/PostController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.sql.SQLException;
88
import java.util.List;
99

10-
import org.hibernate.engine.jdbc.BlobProxy;
10+
import org.hibernate.engine.jdbc.proxy.BlobProxy;
1111
import org.springframework.beans.factory.annotation.Autowired;
1212
import org.springframework.core.io.InputStreamResource;
1313
import org.springframework.core.io.Resource;

parte_3/tema_3.2_colas/comunicacion-rabbitmq-ejem2-consumer/src/main/java/es/codeurjc/mastercloudapps/amqp/ExampleData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package es.codeurjc.mastercloudapps.amqp;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import tools.jackson.databind.ObjectMapper;
44

55
public class ExampleData {
66
private String data;

parte_3/tema_3.2_colas/comunicacion-rabbitmq-ejem2-producer/src/main/java/es/codeurjc/mastercloudapps/amqp/ExampleData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package es.codeurjc.mastercloudapps.amqp;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import tools.jackson.databind.ObjectMapper;
44

55
public class ExampleData {
66
private String data;

parte_3/tema_3.2_colas/comunicacion-rabbitmq-ejem3-client/src/main/java/es/codeurjc/mastercloudapps/amqp/ExampleData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package es.codeurjc.mastercloudapps.amqp;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import tools.jackson.databind.ObjectMapper;
44

55
public class ExampleData {
66
private String data;

parte_3/tema_3.2_colas/comunicacion-rabbitmq-ejem3-service/src/main/java/es/codeurjc/mastercloudapps/amqp/ExampleData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package es.codeurjc.mastercloudapps.amqp;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import tools.jackson.databind.ObjectMapper;
44

55
public class ExampleData {
66
private String data;

parte_4/tema_4.3/ejemplo-1/comunicacion-rabbitmq-ejem3-consumer/src/main/java/es/codeurjc/mastercloudapps/amqp/ExampleData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package es.codeurjc.mastercloudapps.amqp;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import tools.jackson.databind.ObjectMapper;
44

55
public class ExampleData {
66
private String data;

parte_4/tema_4.3/ejemplo-1/comunicacion-rabbitmq-ejem3-consumer/src/main/java/es/codeurjc/mastercloudapps/amqp/WebSocketHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import org.springframework.web.socket.WebSocketSession;
1111
import org.springframework.web.socket.handler.AbstractWebSocketHandler;
1212

13-
import com.fasterxml.jackson.core.JsonProcessingException;
14-
import com.fasterxml.jackson.databind.ObjectMapper;
13+
import tools.jackson.core.JacksonException;
14+
import tools.jackson.databind.ObjectMapper;
1515

1616
@Component
1717
public class WebSocketHandler extends AbstractWebSocketHandler {
@@ -50,7 +50,7 @@ public void sendMessage(ExampleData data) {
5050
try {
5151
json = new ObjectMapper().writeValueAsString(data);
5252
websocketSession.sendMessage(new TextMessage(json));
53-
} catch (JsonProcessingException e) {
53+
} catch (JacksonException e) {
5454
logger.error("Cannot convert to json: " + data.getData());
5555
throw new RuntimeException();
5656
} catch (IOException e) {

parte_4/tema_4.3/ejemplo-1/comunicacion-rabbitmq-ejem3-producer/src/main/java/es/codeurjc/mastercloudapps/amqp/ExampleData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package es.codeurjc.mastercloudapps.amqp;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import tools.jackson.databind.ObjectMapper;
44

55
public class ExampleData {
66
private String data;

parte_5/ejem3-cache-distribuida/pom.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,10 @@
4141
<artifactId>h2</artifactId>
4242
</dependency>
4343

44-
<!-- Hazelcast for distributed session storage -->
44+
<!-- Distributed session storage -->
4545
<dependency>
4646
<groupId>org.springframework.session</groupId>
47-
<artifactId>spring-session-hazelcast</artifactId>
48-
</dependency>
49-
<dependency>
50-
<groupId>com.hazelcast</groupId>
51-
<artifactId>hazelcast</artifactId>
47+
<artifactId>spring-session-jdbc</artifactId>
5248
</dependency>
5349

5450
</dependencies>

0 commit comments

Comments
 (0)