Push down terminalMessage field from AbstractOpenAiService to GenerateCodeAiService

Signed-off-by: ritvik <rt308602@dal.ca>

Author: ritvik

src/main/java/org/springframework/cli/merger/ai/OpenAiHandler.java

@@ -56,13 +56,13 @@ public void add(String description, String path, boolean preview, boolean rewrit
 			TerminalMessage terminalMessage) {
 		Path projectPath = getProjectPath(path);
 
-		ProjectNameHeuristicAiService projectNameHeuristic = new ProjectNameHeuristicAiService(terminalMessage);
+		ProjectNameHeuristicAiService projectNameHeuristic = new ProjectNameHeuristicAiService();
 		logger.debug("Deriving main Spring project required...");
 		ProjectName projectName = projectNameHeuristic.deriveProjectName(description);
 		logger.debug("Done.  The code will primarily use " + projectName.getSpringProjectName());
 
 		if (rewrite) {
-			DescriptionRewriteAiService descriptionRewriteAiService = new DescriptionRewriteAiService(terminalMessage);
+			DescriptionRewriteAiService descriptionRewriteAiService = new DescriptionRewriteAiService();
 			description = descriptionRewriteAiService.rewrite(description);
 		}
 		terminalMessage.print("");

src/main/java/org/springframework/cli/merger/ai/service/AbstractOpenAiService.java

@@ -35,7 +35,6 @@
 import org.springframework.cli.merger.ai.PromptRequest;
 import org.springframework.cli.runtime.engine.templating.HandlebarsTemplateEngine;
 import org.springframework.cli.util.PropertyFileUtils;
-import org.springframework.cli.util.TerminalMessage;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.StreamUtils;
 
@@ -45,12 +44,6 @@ public abstract class AbstractOpenAiService implements org.springframework.cli.m
 
 	private com.theokanning.openai.service.OpenAiService openAiService;
 
-	private final TerminalMessage terminalMessage;
-
-	public AbstractOpenAiService(TerminalMessage terminalMessage) {
-		this.terminalMessage = terminalMessage;
-	}
-
 	protected ChatCompletionRequest getChatCompletionRequest(PromptRequest promptRequest) {
 		createOpenAiService();
 		ChatCompletionRequest chatCompletionRequest = ChatCompletionRequest.builder()
@@ -79,10 +72,6 @@ public HandlebarsTemplateEngine getHandlebarsTemplateEngine() {
 		return handlebarsTemplateEngine;
 	}
 
-	public TerminalMessage getTerminalMessage() {
-		return terminalMessage;
-	}
-
 	protected Map<String, String> getContext(String description) {
 		Map<String, String> context = new HashMap<>();
 		context.put("description", description);
@@ -97,12 +86,11 @@ protected String getPrompt(Map<String, String> context, String promptType) {
 			return getHandlebarsTemplateEngine().process(promptRaw, context);
 		}
 		catch (FileNotFoundException ex) {
-			throw new SpringCliException("Resource file note found:" + resourceFileName);
+			throw new SpringCliException("Resource file not found:" + resourceFileName);
 		}
 		catch (IOException ex) {
-			throw new SpringCliException("Could read file " + resourceFileName, ex);
+			throw new SpringCliException("Could not read file " + resourceFileName, ex);
 		}
-
 	}
 
 	protected PromptRequest createPromptRequest(Map<String, String> context, String promptFamilyName) {

src/main/java/org/springframework/cli/merger/ai/service/DescriptionRewriteAiService.java

@@ -21,14 +21,9 @@
 import com.theokanning.openai.completion.chat.ChatCompletionRequest;
 
 import org.springframework.cli.merger.ai.PromptRequest;
-import org.springframework.cli.util.TerminalMessage;
 
 public class DescriptionRewriteAiService extends AbstractOpenAiService {
 
-	public DescriptionRewriteAiService(TerminalMessage terminalMessage) {
-		super(terminalMessage);
-	}
-
 	public String rewrite(String description) {
 		Map<String, String> context = getContext(description);
 		return generate(context);

src/main/java/org/springframework/cli/merger/ai/service/GenerateCodeAiService.java

@@ -30,14 +30,16 @@
 
 public class GenerateCodeAiService extends AbstractOpenAiService {
 
+	private final TerminalMessage terminalMessage;
+
 	public GenerateCodeAiService(TerminalMessage terminalMessage) {
-		super(terminalMessage);
+		this.terminalMessage = terminalMessage;
 	}
 
 	public String generate(Map<String, String> context) {
 		PromptRequest promptRequest = createPromptRequest(context, "ai-add");
 		String completionEstimate = getCompletionEstimate();
-		getTerminalMessage()
+		terminalMessage
 			.print("Generating code.  This will take a few minutes ..." + " Check back around " + completionEstimate);
 		ChatCompletionRequest chatCompletionRequest = getChatCompletionRequest(promptRequest);
 		String response = getResponse(chatCompletionRequest);

src/main/java/org/springframework/cli/merger/ai/service/ProjectNameHeuristicAiService.java

@@ -26,15 +26,10 @@
 import org.springframework.cli.SpringCliException;
 import org.springframework.cli.merger.ai.ProjectName;
 import org.springframework.cli.merger.ai.PromptRequest;
-import org.springframework.cli.util.TerminalMessage;
 import org.springframework.util.StringUtils;
 
 public class ProjectNameHeuristicAiService extends AbstractOpenAiService {
 
-	public ProjectNameHeuristicAiService(TerminalMessage terminalMessage) {
-		super(terminalMessage);
-	}
-
 	public ProjectName deriveProjectName(String description) {
 		Map<String, String> context = getContext(description);
 		String response = generate(context);
@@ -67,7 +62,6 @@ private ProjectName createProjectName(String response) {
 			shortName = "ai";
 		}
 		return new ProjectName(shortName.toLowerCase(), springProjectName);
-
 	}
 
 }

src/test/java/org/springframework/cli/merger/ai/ProjectNameHeuristicAiServiceTests.java

@@ -21,7 +21,6 @@
 
 import org.springframework.cli.CliTags;
 import org.springframework.cli.merger.ai.service.ProjectNameHeuristicAiService;
-import org.springframework.cli.util.TerminalMessage;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -30,7 +29,7 @@ class ProjectNameHeuristicAiServiceTests {
 	@Test
 	@Tag(CliTags.AI)
 	void deriveProjectName() {
-		ProjectNameHeuristicAiService projectNameHeuristic = new ProjectNameHeuristicAiService(TerminalMessage.noop());
+		ProjectNameHeuristicAiService projectNameHeuristic = new ProjectNameHeuristicAiService();
 
 		ProjectName projectName = projectNameHeuristic.deriveProjectName("jpa");