Fixed PR comments

Author: ashakirin

samples/spring-ai-agent/pom.xml

@@ -30,7 +30,6 @@
         <java.version>21</java.version>
         <spring-ai.version>1.0.0</spring-ai.version>
         <postgresql.version>42.7.5</postgresql.version>
-        <lombok.version>1.18.38</lombok.version>
         <jib-maven-plugin.version>3.4.5</jib-maven-plugin.version>
     </properties>
     <dependencies>
@@ -57,12 +56,6 @@
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

samples/spring-ai-agent/src/main/java/com/aws/workshop/ai/agent/controller/ExternalizedMemoryAgentController.java

@@ -49,7 +49,7 @@ public InputStream chatStream(@RequestBody String prompt) {
 
     @PostMapping("/model")
     public void updateModel(@RequestParam String model) {
-        ChatOptions chatOptions = ChatOptions.builder()
+        var chatOptions = ChatOptions.builder()
                 .model(model).build();
         chatClient = chatClientBuilder
                 .defaultOptions(chatOptions).build();

samples/spring-ai-agent/src/main/java/com/aws/workshop/ai/agent/controller/MemoryAgentController.java

@@ -50,7 +50,7 @@ public InputStream chatStream(@RequestBody String prompt) {
 
     @PostMapping("/model")
     public void updateModel(@RequestParam String model) {
-        ChatOptions chatOptions = ChatOptions.builder()
+        var chatOptions = ChatOptions.builder()
                 .model(model).build();
         chatClient = chatClientBuilder
                 .defaultOptions(chatOptions).build();

samples/spring-ai-agent/src/main/java/com/aws/workshop/ai/agent/controller/StatelessAgentController.java

@@ -38,7 +38,7 @@ public InputStream chatStream(@RequestBody String prompt) {
 
     @PostMapping("/model")
     public void updateModel(@RequestParam String model) {
-        ChatOptions chatOptions = ChatOptions.builder()
+        var chatOptions = ChatOptions.builder()
                 .model(model).build();
         chatClient = chatClientBuilder
                 .defaultOptions(chatOptions).build();

samples/spring-ai-agent/src/main/java/com/aws/workshop/ai/agent/memory/ChatMessageEntity.java

@@ -1,30 +1,72 @@
 package com.aws.workshop.ai.agent.memory;
 
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.time.Instant;
 
 @Entity
 @Table(name = "chat_messages")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
+@SuppressWarnings("unused")
 public class ChatMessageEntity {
+        @Id
+        @GeneratedValue(strategy = GenerationType.IDENTITY)
+        private Long id;
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+        private String conversationId;
 
-    private String conversationId;
+        private String text;
 
-    private String text;
+        private Instant timestamp;
 
-    private Instant timestamp;
+        private String type;
 
-    private String type;
+        public ChatMessageEntity() {
+        }
+
+        public ChatMessageEntity(String conversationId, String text, Instant timestamp, String type) {
+            this.conversationId = conversationId;
+            this.text = text;
+            this.timestamp = timestamp;
+            this.type = type;
+        }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getConversationId() {
+        return conversationId;
+    }
+
+    public void setConversationId(String conversationId) {
+        this.conversationId = conversationId;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public Instant getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(Instant timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }

samples/spring-ai-agent/src/main/java/com/aws/workshop/ai/agent/memory/ExternalChatMemoryRepository.java

@@ -44,12 +44,12 @@ public void saveAll(@NonNull String conversationId, List<Message> messages) {
         List<ChatMessageEntity> entities = messages.stream()
                 // Currently only memory for user messages is supported
                 .filter(msg -> MessageType.USER == msg.getMessageType())
-                .map(msg -> ChatMessageEntity.builder()
-                .conversationId(conversationId)
-                .text(msg.getText())
-                .type(msg.getMessageType().name())
-                .timestamp(Instant.now())
-                .build()).toList();
+                .map(msg -> new ChatMessageEntity(
+                        conversationId,
+                        msg.getText(),
+                        Instant.now(),
+                        msg.getMessageType().name())
+                ).toList();
 
         jpaRepository.saveAll(entities);
     }

samples/spring-ai-agent/src/main/resources/db/changelog/changelog-master.yaml

@@ -1,7 +1,7 @@
 databaseChangeLog:
   - changeSet:
       id: create-chat-messages-table
-      author: andrei.shakirin
+      author: spring-ai.workshop.team.aws
       preConditions:
         - onFail: MARK_RAN
         - not: