From 5dba3d59abf1c81f2fc41c9b425d161cb6321c66 Mon Sep 17 00:00:00 2001
From: radhay <radhay.anand@cred.club>
Date: Sat, 18 Mar 2023 21:48:31 +0530
Subject: [PATCH] Migrated to Java17, SpringBoot3 and Graal

---
 .idea/.gitignore                              |  3 +++
 .idea/compiler.xml                            | 18 +++++++++++++++++
 .idea/encodings.xml                           |  6 ++++++
 .idea/jarRepositories.xml                     | 20 +++++++++++++++++++
 .idea/misc.xml                                | 12 +++++++++++
 .idea/vcs.xml                                 |  6 ++++++
 pom.xml                                       | 19 +++++++++++++++---
 .../com/uci/utils/UtilAppConfiguration.java   |  2 +-
 .../com/uci/utils/kafka/SimpleProducer.java   | 19 ++----------------
 9 files changed, 84 insertions(+), 21 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/jarRepositories.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..c6dc836
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="utils" />
+      </profile>
+    </annotationProcessing>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="utils" options="-parameters" />
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..63e9001
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..712ab9d
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..253f888
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="graalvm-17" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bb4b11d..ddad296 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.7</version>
+		<version>3.0.0</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.uci</groupId>
@@ -17,7 +17,7 @@
 	<name>utils</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 		<mockwebserver.version>4.7.2</mockwebserver.version>
 		<okhttp3.version>4.7.2</okhttp3.version>
 	</properties>
@@ -87,7 +87,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.12</version>
+			<version>1.18.22</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -117,6 +117,7 @@
 		<dependency>
 			<groupId>io.r2dbc</groupId>
 			<artifactId>r2dbc-postgresql</artifactId>
+			<version>0.8.12.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>
@@ -208,6 +209,18 @@
 			<artifactId>azure-storage-blob</artifactId>
 			<version>12.14.4</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-properties-migrator</artifactId>
+			<version>3.0.3</version>
+			<scope>runtime</scope>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api -->
+		<dependency>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
+			<version>3.0.2</version>
+		</dependency>
 		<!-- Azure Dependencies - End -->
 	</dependencies>
 
diff --git a/src/main/java/com/uci/utils/UtilAppConfiguration.java b/src/main/java/com/uci/utils/UtilAppConfiguration.java
index e76b8c9..090ac52 100644
--- a/src/main/java/com/uci/utils/UtilAppConfiguration.java
+++ b/src/main/java/com/uci/utils/UtilAppConfiguration.java
@@ -38,7 +38,7 @@ public class UtilAppConfiguration {
 	@Value("${spring.redis.db}")
 	private String redisDb;
 	
-	@Value("${spring.redis.host}")
+	@Value("${spring.data.redis.host}")
 	private String redisHost;
 	
 	@Value("${spring.redis.number.port}")
diff --git a/src/main/java/com/uci/utils/kafka/SimpleProducer.java b/src/main/java/com/uci/utils/kafka/SimpleProducer.java
index 84b62c9..443607d 100644
--- a/src/main/java/com/uci/utils/kafka/SimpleProducer.java
+++ b/src/main/java/com/uci/utils/kafka/SimpleProducer.java
@@ -1,16 +1,12 @@
 package com.uci.utils.kafka;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.support.SendResult;
 import org.springframework.stereotype.Service;
-import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.concurrent.ListenableFutureCallback;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Service
 @Slf4j
@@ -24,17 +20,6 @@ public SimpleProducer(KafkaTemplate<String, String> simpleProducer1) {
 
     public void send(String topic, String message) {
         simpleProducer
-                .send(topic, message)
-                .addCallback(new ListenableFutureCallback<SendResult<String, String>>() {
-                    @Override
-                    public void onFailure(@NotNull Throwable throwable) {
-                        log.error("Unable to push {} to {} topic due to {}", message, topic, throwable.getMessage());
-                    }
-
-                    @Override
-                    public void onSuccess(SendResult<String, String> stringStringSendResult) {
-                        log.info("Pushed to topic {}", topic);
-                    }
-                });
+                .send(topic, message);
     }
 }
\ No newline at end of file