From cfc9f44ac65eb3e4a29506fa77170d318d121f84 Mon Sep 17 00:00:00 2001
From: izzat5233 <izzat5233@gmail.com>
Date: Tue, 27 Jun 2023 17:17:32 +0300
Subject: [PATCH] Update

---
 .../openai/chatagent/Response.java            |  3 +++
 .../openai/chatagent/util/FileUtility.java    | 22 -------------------
 .../chatagent/config/RequestsConfig.java      | 19 +++++++++++-----
 3 files changed, 16 insertions(+), 28 deletions(-)
 delete mode 100644 src/main/java/com/izzatalsharif/openai/chatagent/util/FileUtility.java

diff --git a/src/main/java/com/izzatalsharif/openai/chatagent/Response.java b/src/main/java/com/izzatalsharif/openai/chatagent/Response.java
index fd0efd2..de0a61f 100644
--- a/src/main/java/com/izzatalsharif/openai/chatagent/Response.java
+++ b/src/main/java/com/izzatalsharif/openai/chatagent/Response.java
@@ -2,6 +2,9 @@
 
 import java.util.List;
 
+/**
+ * OpenAI chat completion maps to this exact object.
+ */
 public record Response(
         String id,
         String object,
diff --git a/src/main/java/com/izzatalsharif/openai/chatagent/util/FileUtility.java b/src/main/java/com/izzatalsharif/openai/chatagent/util/FileUtility.java
deleted file mode 100644
index 19a6ca3..0000000
--- a/src/main/java/com/izzatalsharif/openai/chatagent/util/FileUtility.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.izzatalsharif.openai.chatagent.util;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.nio.file.Files;
-
-@RequiredArgsConstructor
-@Component
-public class FileUtility {
-
-    private final ResourceLoader resourceLoader;
-
-    public String readFile(String resourcePath) throws IOException {
-        var resource = resourceLoader.getResource("classpath:" + resourcePath);
-        var path = resource.getFile().toPath();
-        return Files.readString(path);
-    }
-
-}
diff --git a/src/test/java/com/izzatalsharif/openai/chatagent/config/RequestsConfig.java b/src/test/java/com/izzatalsharif/openai/chatagent/config/RequestsConfig.java
index 6ef4e0a..ccafd57 100644
--- a/src/test/java/com/izzatalsharif/openai/chatagent/config/RequestsConfig.java
+++ b/src/test/java/com/izzatalsharif/openai/chatagent/config/RequestsConfig.java
@@ -1,19 +1,26 @@
 package com.izzatalsharif.openai.chatagent.config;
 
-import com.izzatalsharif.openai.chatagent.util.FileUtility;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
+import org.springframework.core.io.ResourceLoader;
 
 import java.io.IOException;
+import java.nio.file.Files;
 
+@RequiredArgsConstructor
 @Configuration
-@Import(FileUtility.class)
 public class RequestsConfig {
 
     @Autowired
-    private FileUtility fileUtility;
+    private final ResourceLoader resourceLoader;
+
+    private String readFile(String resourcePath) throws IOException {
+        var resource = resourceLoader.getResource("classpath:" + resourcePath);
+        var path = resource.getFile().toPath();
+        return Files.readString(path);
+    }
 
     /**
      * @return A simple invalid request that chat completion rejects.
@@ -28,7 +35,7 @@ public String badRequest() {
      */
     @Bean
     public String validRequest() throws IOException {
-        return fileUtility.readFile("agent/simpleRequest.json");
+        return readFile("agent/simpleRequest.json");
     }
 
     /**
@@ -38,7 +45,7 @@ public String validRequest() throws IOException {
      */
     @Bean
     public String testAgentRequest() throws IOException {
-        return fileUtility.readFile("agent/testAgent.json");
+        return readFile("agent/testAgent.json");
     }
 
 }