Fixing software quality issues

Author: sashirestela

src/demo/java/io/github/sashirestela/openai/demo/AudioDemo.java

@@ -34,11 +34,9 @@ public void demoCallAudioSpeech() {
                 .build();
         var futureSpeech = openAI.audios().speak(speechRequest);
         var speechResponse = futureSpeech.join();
-        try {
-            var audioFile = new FileOutputStream(speechFileName);
+        try (var audioFile = new FileOutputStream(speechFileName)) {
             audioFile.write(speechResponse.readAllBytes());
             System.out.println(audioFile.getChannel().size() + " bytes");
-            audioFile.close();
         } catch (Exception e) {
             e.printStackTrace();
         }

src/demo/java/io/github/sashirestela/openai/demo/ChatDemo.java

@@ -221,7 +221,7 @@ public void demoCallChatWithAudioInputOutput() {
 
     private static void processResponseChunk(Chat responseChunk) {
         var choices = responseChunk.getChoices();
-        if (choices.size() > 0) {
+        if (!choices.isEmpty()) {
             var delta = choices.get(0).getMessage();
             if (delta.getContent() != null) {
                 System.out.print(delta.getContent());

src/demo/java/io/github/sashirestela/openai/demo/CompletionDemo.java

@@ -23,13 +23,12 @@ public void demoCallCompletionStreaming() {
         var futureCompletion = openAI.completions().createStream(completionRequest);
         var completionResponse = futureCompletion.join();
         completionResponse.forEach(CompletionDemo::processResponseChunk);
-        ;
         System.out.println();
     }
 
     private static void processResponseChunk(Completion responseChunk) {
         var choices = responseChunk.getChoices();
-        if (choices.size() > 0) {
+        if (!choices.isEmpty()) {
             var delta = choices.get(0).getText();
             System.out.print(delta);
         }

src/demo/java/io/github/sashirestela/openai/demo/ConversationDemo.java

@@ -52,7 +52,7 @@ public void runConversation() {
         List<ChatMessage> messages = new ArrayList<>();
         var myMessage = System.console().readLine("\nWelcome! Write any message: ");
         messages.add(UserMessage.of(myMessage));
-        while (!myMessage.toLowerCase().equals("exit")) {
+        while (!myMessage.equalsIgnoreCase("exit")) {
             var chatStream = openAI.chatCompletions()
                     .createStream(ChatRequest.builder()
                             .model("gpt-4o-mini")
@@ -93,7 +93,7 @@ private Choice getResponse(Stream<Chat> chatStream) {
 
         chatStream.forEach(responseChunk -> {
             var choices = responseChunk.getChoices();
-            if (choices.size() > 0) {
+            if (!choices.isEmpty()) {
                 var innerChoice = choices.get(0);
                 var delta = innerChoice.getMessage();
                 if (delta.getRole() != null) {
@@ -106,7 +106,7 @@ private Choice getResponse(Stream<Chat> chatStream) {
                 if (delta.getToolCalls() != null) {
                     var toolCall = delta.getToolCalls().get(0);
                     if (toolCall.getIndex() != indexTool) {
-                        if (toolCalls.size() > 0) {
+                        if (!toolCalls.isEmpty()) {
                             toolCalls.get(toolCalls.size() - 1).getFunction().setArguments(functionArgs.toString());
                             functionArgs = new StringBuilder();
                         }
@@ -120,7 +120,7 @@ private Choice getResponse(Stream<Chat> chatStream) {
                     if (content.length() > 0) {
                         chatMsgResponse.setContent(content.toString());
                     }
-                    if (toolCalls.size() > 0) {
+                    if (!toolCalls.isEmpty()) {
                         toolCalls.get(toolCalls.size() - 1).getFunction().setArguments(functionArgs.toString());
                         chatMsgResponse.setToolCalls(toolCalls);
                     }

src/demo/java/io/github/sashirestela/openai/demo/ConversationV2Demo.java

@@ -100,7 +100,7 @@ public void prepareConversation() {
 
     public void runConversation() {
         var myMessage = System.console().readLine("\nWelcome! Write any message: ");
-        while (!myMessage.toLowerCase().equals("exit")) {
+        while (!myMessage.equalsIgnoreCase("exit")) {
             openAI.threadMessages()
                     .create(threadId, ThreadMessageRequest.builder()
                             .role(ThreadMessageRole.USER)

src/demo/java/io/github/sashirestela/openai/demo/ImageDemo.java

@@ -10,13 +10,15 @@
 
 public class ImageDemo extends AbstractDemo {
 
+    private static final String MODEL = "dall-e-2";
+
     public void demoCallImageGeneration() {
         var imageRequest = ImageRequest.builder()
                 .prompt("A cartoon of a hummingbird that is flying around a flower.")
                 .n(2)
                 .size(Size.X256)
                 .responseFormat(ImageResponseFormat.URL)
-                .model("dall-e-2")
+                .model(MODEL)
                 .build();
         var futureImage = openAI.images().create(imageRequest);
         var imageResponse = futureImage.join();
@@ -30,7 +32,7 @@ public void demoCallImageEdits() {
                 .n(1)
                 .size(Size.X256)
                 .responseFormat(ImageResponseFormat.URL)
-                .model("dall-e-2")
+                .model(MODEL)
                 .build();
         var futureImage = openAI.images().createEdits(imageEditsRequest);
         var imageResponse = futureImage.join();
@@ -43,7 +45,7 @@ public void demoCallImageVariations() {
                 .n(1)
                 .size(Size.X256)
                 .responseFormat(ImageResponseFormat.URL)
-                .model("dall-e-2")
+                .model(MODEL)
                 .build();
         var futureImage = openAI.images().createVariations(imageVariationsRequest);
         var imageResponse = futureImage.join();

src/demo/java/io/github/sashirestela/openai/demo/RealtimeDemo.java

@@ -23,7 +23,7 @@ public class RealtimeDemo {
 
     private static final int BUFFER_SIZE = 8192;
 
-    public static void main(String[] args) throws LineUnavailableException, InterruptedException {
+    public static void main(String[] args) throws LineUnavailableException {
         var sound = new Sound();
 
         var openAI = SimpleOpenAI.builder()

src/demo/java/io/github/sashirestela/openai/demo/ThreadRunStepV2Demo.java

@@ -15,13 +15,13 @@
 
 public class ThreadRunStepV2Demo extends AbstractDemo {
 
-    private FunctionExecutor functionExecutor;
     private String assistantId;
     private String threadId;
     private String threadRunId;
     private String threadRunStepId;
 
     private void prepareDemo() {
+        FunctionExecutor functionExecutor;
         List<FunctionDef> functionList = new ArrayList<>();
         functionList.add(FunctionDef.builder()
                 .name("CurrentTemperature")

src/main/java/io/github/sashirestela/openai/OpenAIBeta2.java

@@ -638,7 +638,7 @@ default VectorStore createAndPoll(VectorStoreRequest request) {
                     .timeValue(1)
                     .queryMethod(vs -> getOne(vs.getId()).join())
                     .whileMethod(vs -> !vs.getStatus().equals(VectorStoreStatus.COMPLETED)
-                            || vs.getFileCounts().getCompleted() != vs.getFileCounts().getTotal())
+                            || !vs.getFileCounts().getCompleted().equals(vs.getFileCounts().getTotal()))
                     .build()
                     .execute(vectorStore);
         }

src/main/java/io/github/sashirestela/openai/common/function/FunctionExecutor.java

@@ -30,7 +30,7 @@ public FunctionExecutor(List<FunctionDef> functions) {
     public List<Tool> getToolFunctions() {
         return mapFunctions.values()
                 .stream()
-                .map(func -> Tool.function(func))
+                .map(Tool::function)
                 .collect(Collectors.toList());
     }
 
@@ -63,7 +63,7 @@ public void enrollFunctions(List<FunctionDef> functions) {
             throw new SimpleUncheckedException("No functions were entered.", "", null);
         }
         mapFunctions.clear();
-        functions.forEach(function -> enrollFunction(function));
+        functions.forEach(this::enrollFunction);
     }
 
     @SuppressWarnings("unchecked")