diff --git a/api/src/main/java/com/theokanning/openai/moderation/ModerationCategories.java b/api/src/main/java/com/theokanning/openai/moderation/ModerationCategories.java index 238d0a05..86c38b7a 100644 --- a/api/src/main/java/com/theokanning/openai/moderation/ModerationCategories.java +++ b/api/src/main/java/com/theokanning/openai/moderation/ModerationCategories.java @@ -3,8 +3,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; -import java.util.List; - /** * An object containing the flags for each moderation category * diff --git a/api/src/main/java/com/theokanning/openai/threads/ThreadRequest.java b/api/src/main/java/com/theokanning/openai/threads/ThreadRequest.java index 35fd888a..3e11036e 100644 --- a/api/src/main/java/com/theokanning/openai/threads/ThreadRequest.java +++ b/api/src/main/java/com/theokanning/openai/threads/ThreadRequest.java @@ -1,6 +1,5 @@ package com.theokanning.openai.threads; -import com.fasterxml.jackson.annotation.JsonProperty; import com.theokanning.openai.messages.MessageRequest; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/api/src/test/java/com/theokanning/openai/JsonTest.java b/api/src/test/java/com/theokanning/openai/JsonTest.java index 58b5c5f2..cd3127b8 100644 --- a/api/src/test/java/com/theokanning/openai/JsonTest.java +++ b/api/src/test/java/com/theokanning/openai/JsonTest.java @@ -30,7 +30,7 @@ import java.nio.file.Paths; import static org.junit.jupiter.api.Assertions.*; -public class JsonTest { +class JsonTest { @ParameterizedTest @ValueSource(classes = { diff --git a/client/src/main/java/com/theokanning/openai/client/OpenAiApi.java b/client/src/main/java/com/theokanning/openai/client/OpenAiApi.java index 7342e953..16adebcd 100644 --- a/client/src/main/java/com/theokanning/openai/client/OpenAiApi.java +++ b/client/src/main/java/com/theokanning/openai/client/OpenAiApi.java @@ -1,7 +1,6 @@ package com.theokanning.openai.client; import com.theokanning.openai.DeleteResult; -import com.theokanning.openai.ListSearchParameters; import com.theokanning.openai.OpenAiResponse; import com.theokanning.openai.assistants.*; import com.theokanning.openai.audio.CreateSpeechRequest; diff --git a/service/src/test/java/com/theokanning/openai/service/AssistantFunctionTest.java b/service/src/test/java/com/theokanning/openai/service/AssistantFunctionTest.java index 9ad819a7..0ceb6676 100644 --- a/service/src/test/java/com/theokanning/openai/service/AssistantFunctionTest.java +++ b/service/src/test/java/com/theokanning/openai/service/AssistantFunctionTest.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategy; -import com.theokanning.openai.ListSearchParameters; import com.theokanning.openai.OpenAiResponse; import com.theokanning.openai.assistants.Assistant; import com.theokanning.openai.assistants.AssistantFunction; @@ -21,9 +20,7 @@ import com.theokanning.openai.runs.RequiredAction; import com.theokanning.openai.runs.Run; import com.theokanning.openai.runs.RunCreateRequest; -import com.theokanning.openai.runs.RunStep; import com.theokanning.openai.runs.SubmitToolOutputRequestItem; -import com.theokanning.openai.runs.SubmitToolOutputs; import com.theokanning.openai.runs.SubmitToolOutputsRequest; import com.theokanning.openai.runs.ToolCall; import com.theokanning.openai.threads.Thread; @@ -35,9 +32,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Objects; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; class AssistantFunctionTest { diff --git a/service/src/test/java/com/theokanning/openai/service/AssistantTest.java b/service/src/test/java/com/theokanning/openai/service/AssistantTest.java index 8b687e34..ec684cb4 100644 --- a/service/src/test/java/com/theokanning/openai/service/AssistantTest.java +++ b/service/src/test/java/com/theokanning/openai/service/AssistantTest.java @@ -15,7 +15,7 @@ @TestMethodOrder(MethodOrderer.OrderAnnotation.class) -public class AssistantTest { +class AssistantTest { static OpenAiService service = new OpenAiService(System.getenv("OPENAI_TOKEN")); static String assistantId; @@ -44,8 +44,8 @@ void createAssistant() { assistantId = assistant.getId(); - assertEquals(assistant.getName(), "Math Tutor"); - assertEquals(assistant.getTools().get(0).getType(), AssistantToolsEnum.CODE_INTERPRETER); + assertEquals("Math Tutor", assistant.getName()); + assertEquals(AssistantToolsEnum.CODE_INTERPRETER, assistant.getTools().get(0).getType()); } @Test @@ -53,7 +53,7 @@ void createAssistant() { void retrieveAssistant() { Assistant assistant = service.retrieveAssistant(assistantId); - assertEquals(assistant.getName(), "Math Tutor"); + assertEquals("Math Tutor", assistant.getName()); } @Test @@ -105,7 +105,7 @@ void listAssistantFiles() { assertFalse(files.isEmpty()); assertEquals(files.get(0).getId(), fileId); - assertEquals(files.get(0).getObject(), "assistant.file"); + assertEquals("assistant.file", files.get(0).getObject()); } @Test diff --git a/service/src/test/java/com/theokanning/openai/service/AudioTest.java b/service/src/test/java/com/theokanning/openai/service/AudioTest.java index 9cb083de..d8a8373d 100644 --- a/service/src/test/java/com/theokanning/openai/service/AudioTest.java +++ b/service/src/test/java/com/theokanning/openai/service/AudioTest.java @@ -16,7 +16,7 @@ import static org.junit.jupiter.api.Assertions.*; -public class AudioTest { +class AudioTest { static String englishAudioFilePath = "src/test/resources/hello-world.mp3"; diff --git a/service/src/test/java/com/theokanning/openai/service/CompletionTest.java b/service/src/test/java/com/theokanning/openai/service/CompletionTest.java index c2ad90a1..3aa5d11f 100644 --- a/service/src/test/java/com/theokanning/openai/service/CompletionTest.java +++ b/service/src/test/java/com/theokanning/openai/service/CompletionTest.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.*; -public class CompletionTest { +class CompletionTest { String token = System.getenv("OPENAI_TOKEN"); OpenAiService service = new OpenAiService(token); diff --git a/service/src/test/java/com/theokanning/openai/service/EditTest.java b/service/src/test/java/com/theokanning/openai/service/EditTest.java index 64277bdd..31bc3352 100644 --- a/service/src/test/java/com/theokanning/openai/service/EditTest.java +++ b/service/src/test/java/com/theokanning/openai/service/EditTest.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -public class EditTest { +class EditTest { String token = System.getenv("OPENAI_TOKEN"); com.theokanning.openai.service.OpenAiService service = new OpenAiService(token); diff --git a/service/src/test/java/com/theokanning/openai/service/EmbeddingTest.java b/service/src/test/java/com/theokanning/openai/service/EmbeddingTest.java index 89bb01af..1d81c24a 100644 --- a/service/src/test/java/com/theokanning/openai/service/EmbeddingTest.java +++ b/service/src/test/java/com/theokanning/openai/service/EmbeddingTest.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; -public class EmbeddingTest { +class EmbeddingTest { String token = System.getenv("OPENAI_TOKEN"); com.theokanning.openai.service.OpenAiService service = new OpenAiService(token); diff --git a/service/src/test/java/com/theokanning/openai/service/FileTest.java b/service/src/test/java/com/theokanning/openai/service/FileTest.java index 51dd9407..a8e37c23 100644 --- a/service/src/test/java/com/theokanning/openai/service/FileTest.java +++ b/service/src/test/java/com/theokanning/openai/service/FileTest.java @@ -18,7 +18,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) -public class FileTest { +class FileTest { static String filePath = "src/test/resources/fine-tuning-data.jsonl"; String token = System.getenv("OPENAI_TOKEN"); diff --git a/service/src/test/java/com/theokanning/openai/service/FineTuningTest.java b/service/src/test/java/com/theokanning/openai/service/FineTuningTest.java index c0b98f6f..a4adb109 100644 --- a/service/src/test/java/com/theokanning/openai/service/FineTuningTest.java +++ b/service/src/test/java/com/theokanning/openai/service/FineTuningTest.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.*; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) -public class FineTuningTest { +class FineTuningTest { static OpenAiService service; static String fileId; static String fineTuningJobId; diff --git a/service/src/test/java/com/theokanning/openai/service/ImageTest.java b/service/src/test/java/com/theokanning/openai/service/ImageTest.java index e56b7907..80f8369a 100644 --- a/service/src/test/java/com/theokanning/openai/service/ImageTest.java +++ b/service/src/test/java/com/theokanning/openai/service/ImageTest.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -public class ImageTest { +class ImageTest { static String filePath = "src/test/resources/penguin.png"; static String fileWithAlphaPath = "src/test/resources/penguin_with_alpha.png"; diff --git a/service/src/test/java/com/theokanning/openai/service/MessageTest.java b/service/src/test/java/com/theokanning/openai/service/MessageTest.java index 06a903c0..8a3e20e2 100644 --- a/service/src/test/java/com/theokanning/openai/service/MessageTest.java +++ b/service/src/test/java/com/theokanning/openai/service/MessageTest.java @@ -6,7 +6,6 @@ import com.theokanning.openai.messages.MessageFile; import com.theokanning.openai.messages.MessageRequest; import com.theokanning.openai.messages.ModifyMessageRequest; -import com.theokanning.openai.threads.Thread; import com.theokanning.openai.threads.ThreadRequest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -21,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -public class MessageTest { +class MessageTest { static OpenAiService service; diff --git a/service/src/test/java/com/theokanning/openai/service/ModelTest.java b/service/src/test/java/com/theokanning/openai/service/ModelTest.java index 31d23da9..87eba5ce 100644 --- a/service/src/test/java/com/theokanning/openai/service/ModelTest.java +++ b/service/src/test/java/com/theokanning/openai/service/ModelTest.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; -public class ModelTest { +class ModelTest { String token = System.getenv("OPENAI_TOKEN"); com.theokanning.openai.service.OpenAiService service = new OpenAiService(token); diff --git a/service/src/test/java/com/theokanning/openai/service/ModerationTest.java b/service/src/test/java/com/theokanning/openai/service/ModerationTest.java index f28bc083..06b8cc7e 100644 --- a/service/src/test/java/com/theokanning/openai/service/ModerationTest.java +++ b/service/src/test/java/com/theokanning/openai/service/ModerationTest.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -public class ModerationTest { +class ModerationTest { String token = System.getenv("OPENAI_TOKEN"); com.theokanning.openai.service.OpenAiService service = new OpenAiService(token); diff --git a/service/src/test/java/com/theokanning/openai/service/OpenAiServiceTest.java b/service/src/test/java/com/theokanning/openai/service/OpenAiServiceTest.java index 25902486..97fdccf2 100644 --- a/service/src/test/java/com/theokanning/openai/service/OpenAiServiceTest.java +++ b/service/src/test/java/com/theokanning/openai/service/OpenAiServiceTest.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.*; -public class OpenAiServiceTest { +class OpenAiServiceTest { @Test void assertTokenNotNull() { diff --git a/service/src/test/java/com/theokanning/openai/service/ResponseBodyCallbackTest.java b/service/src/test/java/com/theokanning/openai/service/ResponseBodyCallbackTest.java index 7e22c59c..be5565d8 100644 --- a/service/src/test/java/com/theokanning/openai/service/ResponseBodyCallbackTest.java +++ b/service/src/test/java/com/theokanning/openai/service/ResponseBodyCallbackTest.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -public class ResponseBodyCallbackTest { +class ResponseBodyCallbackTest { @Test void testHappyPath() { diff --git a/service/src/test/java/com/theokanning/openai/service/ThreadTest.java b/service/src/test/java/com/theokanning/openai/service/ThreadTest.java index 212653af..52e70a5f 100644 --- a/service/src/test/java/com/theokanning/openai/service/ThreadTest.java +++ b/service/src/test/java/com/theokanning/openai/service/ThreadTest.java @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.*; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) -public class ThreadTest { +class ThreadTest { String token = System.getenv("OPENAI_TOKEN"); OpenAiService service = new OpenAiService(token);