code refactoring

alexcheng1982 · alexcheng1982 · commit 587d29f2e999 · 2025-02-22T04:14:10.000+13:00
diff --git a/core/src/main/java/com/javaaidev/agenticpatterns/core/Utils.java b/core/src/main/java/com/javaaidev/agenticpatterns/core/Utils.java
@@ -9,7 +9,7 @@
 import org.jspecify.annotations.Nullable;
 import org.springframework.core.io.ClassPathResource;
 
-public class PromptTemplateHelper {
+public class Utils {
 
   public static String loadPromptTemplateFromClasspath(String resource) {
     try {
diff --git a/examples/src/main/java/com/javaaidev/agenticpatterns/examples/evaluatoroptimizer/CodeGenerationAgent.java b/examples/src/main/java/com/javaaidev/agenticpatterns/examples/evaluatoroptimizer/CodeGenerationAgent.java
@@ -1,6 +1,6 @@
 package com.javaaidev.agenticpatterns.examples.evaluatoroptimizer;
 
-import com.javaaidev.agenticpatterns.core.PromptTemplateHelper;
+import com.javaaidev.agenticpatterns.core.Utils;
 import com.javaaidev.agenticpatterns.evaluatoroptimizer.PromptBasedEvaluatorOptimizerAgent;
 import com.javaaidev.agenticpatterns.examples.evaluatoroptimizer.CodeGenerationAgent.CodeGenerationRequest;
 import com.javaaidev.agenticpatterns.examples.evaluatoroptimizer.CodeGenerationAgent.CodeGenerationResponse;
@@ -30,35 +30,33 @@ protected ChatClient getEvaluationChatClient() {
 
   @Override
   protected String getInitialResultPromptTemplate() {
-    return PromptTemplateHelper.loadPromptTemplateFromClasspath(
+    return Utils.loadPromptTemplateFromClasspath(
         "prompt_template/code-generator/initial-result.st");
   }
 
   @Override
   protected @Nullable Map<String, Object> buildInitialResultPromptContext(
       @Nullable CodeGenerationRequest codeGenerationRequest) {
-    var input = Optional.ofNullable(codeGenerationRequest).map(CodeGenerationRequest::input)
-        .orElse("");
-    return Map.of("input", input);
+    return Map.of("input",
+        Utils.safeGet(codeGenerationRequest, CodeGenerationRequest::input, ""));
   }
 
   @Override
   protected String getEvaluationPromptTemplate() {
-    return PromptTemplateHelper.loadPromptTemplateFromClasspath(
+    return Utils.loadPromptTemplateFromClasspath(
         "prompt_template/code-generator/evaluation.st");
   }
 
   @Override
   protected @Nullable Map<String, Object> buildEvaluationPromptContext(
       @Nullable CodeGenerationResponse codeGenerationResponse) {
-    var code = Optional.ofNullable(codeGenerationResponse).map(CodeGenerationResponse::code)
-        .orElse("");
-    return Map.of("code", code);
+    return Map.of("code",
+        Utils.safeGet(codeGenerationResponse, CodeGenerationResponse::code, ""));
   }
 
   @Override
   protected String getOptimizationPromptTemplate() {
-    return PromptTemplateHelper.loadPromptTemplateFromClasspath(
+    return Utils.loadPromptTemplateFromClasspath(
         "prompt_template/code-generator/optimization.st");
   }
 
diff --git a/examples/src/main/java/com/javaaidev/agenticpatterns/examples/parallelizationworkflow/AlgorithmArticleGenerationAgent.java b/examples/src/main/java/com/javaaidev/agenticpatterns/examples/parallelizationworkflow/AlgorithmArticleGenerationAgent.java
@@ -1,13 +1,13 @@
 package com.javaaidev.agenticpatterns.examples.parallelizationworkflow;
 
+import com.javaaidev.agenticpatterns.core.Utils;
 import com.javaaidev.agenticpatterns.examples.parallelizationworkflow.AlgorithmArticleGenerationAgent.AlgorithmArticleGenerationRequest;
 import com.javaaidev.agenticpatterns.examples.parallelizationworkflow.AlgorithmArticleGenerationAgent.AlgorithmArticleGenerationResponse;
 import com.javaaidev.agenticpatterns.examples.parallelizationworkflow.SampleCodeGenerationAgent.SampleCodeGenerationRequest;
 import com.javaaidev.agenticpatterns.examples.parallelizationworkflow.SampleCodeGenerationAgent.SampleCodeGenerationResponse;
 import com.javaaidev.agenticpatterns.parallelizationworkflow.ParallelizationWorkflowAgent;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 import org.jspecify.annotations.Nullable;
 import org.springframework.ai.chat.client.ChatClient;
@@ -37,9 +37,8 @@ protected String getPromptTemplate() {
   @Override
   protected @Nullable Map<String, Object> getParentPromptContext(
       @Nullable AlgorithmArticleGenerationRequest request) {
-    var algorithm = Optional.ofNullable(request).map(AlgorithmArticleGenerationRequest::algorithm)
-        .orElse("");
-    return Map.of("algorithm", algorithm);
+    return Map.of("algorithm",
+        Utils.safeGet(request, AlgorithmArticleGenerationRequest::algorithm, ""));
   }
 
   @Override
@@ -57,8 +56,8 @@ protected String getPromptTemplate() {
   @Override
   protected @Nullable List<SubtaskCreationRequest<AlgorithmArticleGenerationRequest>> createTasks(
       @Nullable AlgorithmArticleGenerationRequest request) {
-    var languages = Optional.ofNullable(request).map(AlgorithmArticleGenerationRequest::languages)
-        .orElse(List.of());
+    var languages = Utils.safeGet(request,
+        AlgorithmArticleGenerationRequest::languages, List.of());
     if (CollectionUtils.isEmpty(languages)) {
       return List.of();
     }
diff --git a/examples/src/main/java/com/javaaidev/agenticpatterns/examples/parallelizationworkflow/SampleCodeGenerationAgent.java b/examples/src/main/java/com/javaaidev/agenticpatterns/examples/parallelizationworkflow/SampleCodeGenerationAgent.java
@@ -1,10 +1,10 @@
 package com.javaaidev.agenticpatterns.examples.parallelizationworkflow;
 
+import com.javaaidev.agenticpatterns.core.Utils;
 import com.javaaidev.agenticpatterns.examples.parallelizationworkflow.SampleCodeGenerationAgent.SampleCodeGenerationRequest;
 import com.javaaidev.agenticpatterns.examples.parallelizationworkflow.SampleCodeGenerationAgent.SampleCodeGenerationResponse;
 import com.javaaidev.agenticpatterns.taskexecution.TaskExecutionAgent;
 import java.util.Map;
-import java.util.Optional;
 import org.jspecify.annotations.Nullable;
 import org.springframework.ai.chat.client.ChatClient;
 
@@ -29,13 +29,11 @@ protected String getPromptTemplate() {
   @Override
   protected @Nullable Map<String, Object> getPromptContext(
       @Nullable SampleCodeGenerationRequest request) {
-    var language = Optional.ofNullable(request)
-        .map(SampleCodeGenerationRequest::language).orElse("java");
-    var description = Optional.ofNullable(request)
-        .map(SampleCodeGenerationRequest::description).orElse("");
     return Map.of(
-        "language", language,
-        "description", description
+        "language",
+        Utils.safeGet(request, SampleCodeGenerationRequest::language, "java"),
+        "description",
+        Utils.safeGet(request, SampleCodeGenerationRequest::description, "")
     );
   }
 
diff --git a/examples/src/main/java/com/javaaidev/agenticpatterns/examples/routingworkflow/CustomerSupportAgent.java b/examples/src/main/java/com/javaaidev/agenticpatterns/examples/routingworkflow/CustomerSupportAgent.java
@@ -1,6 +1,6 @@
 package com.javaaidev.agenticpatterns.examples.routingworkflow;
 
-import com.javaaidev.agenticpatterns.core.PromptTemplateHelper;
+import com.javaaidev.agenticpatterns.core.Utils;
 import com.javaaidev.agenticpatterns.examples.routingworkflow.CustomerSupportAgent.CustomerSupportRequest;
 import com.javaaidev.agenticpatterns.examples.routingworkflow.CustomerSupportAgent.CustomerSupportResponse;
 import com.javaaidev.agenticpatterns.routingworkflow.RoutingWorkflowAgent;
@@ -26,14 +26,19 @@ protected CustomerSupportAgent(ChatClient chatClient) {
   }
 
   private void initRoutes() {
-    addRoutingChoice(new RoutingChoice<>("payment", "Handle requests about payment and refund",
+    addRoutingChoice(new RoutingChoice<>("payment", "Handle queries about payment and refund",
         new PaymentSupportAgent(chatClient)));
-    addRoutingChoice(new RoutingChoice<>("shipping", "Handle requests about shipping",
+    addRoutingChoice(new RoutingChoice<>("shipping", "Handle queries about shipping",
         new ShippingSupportAgent(chatClient)));
-    addRoutingChoice(new RoutingChoice<>("general", "Handle general requests",
+    addRoutingChoice(new RoutingChoice<>("general", "Handle general queries",
         new GeneralSupportAgent(chatClient)));
   }
 
+  @Override
+  protected String formatRequest(@Nullable CustomerSupportRequest request) {
+    return Utils.safeGet(request, CustomerSupportRequest::question, "");
+  }
+
   public record CustomerSupportRequest(String question) {
 
   }
@@ -59,13 +64,13 @@ protected String getPromptTemplate() {
         @Nullable CustomerSupportRequest customerSupportRequest) {
       return Map.of(
           "question",
-          PromptTemplateHelper.safeGet(customerSupportRequest, CustomerSupportRequest::question, "")
+          Utils.safeGet(customerSupportRequest, CustomerSupportRequest::question, "")
       );
     }
 
     @Override
     protected void updateRequest(ChatClientRequestSpec spec) {
-      spec.system("Pretend to be a customer support agent for payment, be polite and helper");
+      spec.system("You are a customer support agent for payment, be polite and helper");
     }
   }
 
@@ -86,13 +91,13 @@ protected String getPromptTemplate() {
         @Nullable CustomerSupportRequest customerSupportRequest) {
       return Map.of(
           "question",
-          PromptTemplateHelper.safeGet(customerSupportRequest, CustomerSupportRequest::question, "")
+          Utils.safeGet(customerSupportRequest, CustomerSupportRequest::question, "")
       );
     }
 
     @Override
     protected void updateRequest(ChatClientRequestSpec spec) {
-      spec.system("Pretend to be a customer support agent for shipping, be polite and helper");
+      spec.system("You are a customer support agent for shipping, be polite and helper");
     }
   }
 
@@ -113,14 +118,14 @@ protected String getPromptTemplate() {
         @Nullable CustomerSupportRequest customerSupportRequest) {
       return Map.of(
           "question",
-          PromptTemplateHelper.safeGet(customerSupportRequest, CustomerSupportRequest::question, "")
+          Utils.safeGet(customerSupportRequest, CustomerSupportRequest::question, "")
       );
     }
 
     @Override
     protected void updateRequest(ChatClientRequestSpec spec) {
       spec.system(
-          "Pretend to be a customer support agent for general questions, be polite and helper");
+          "You are a customer support agent for general questions, be polite and helper");
     }
   }
 }
diff --git a/examples/src/main/java/com/javaaidev/agenticpatterns/examples/taskexecution/UserGenerationAgent.java b/examples/src/main/java/com/javaaidev/agenticpatterns/examples/taskexecution/UserGenerationAgent.java
@@ -1,11 +1,10 @@
 package com.javaaidev.agenticpatterns.examples.taskexecution;
 
-import com.javaaidev.agenticpatterns.core.PromptTemplateHelper;
+import com.javaaidev.agenticpatterns.core.Utils;
 import com.javaaidev.agenticpatterns.examples.taskexecution.UserGenerationAgent.UserGenerationRequest;
 import com.javaaidev.agenticpatterns.taskexecution.TaskExecutionAgent;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import org.jspecify.annotations.Nullable;
 import org.springframework.ai.chat.client.ChatClient;
 
@@ -17,14 +16,14 @@ public UserGenerationAgent(ChatClient chatClient) {
 
   @Override
   protected String getPromptTemplate() {
-    return PromptTemplateHelper.loadPromptTemplateFromClasspath("prompt_template/generate-user.st");
+    return Utils.loadPromptTemplateFromClasspath("prompt_template/generate-user.st");
   }
 
   @Override
   protected @Nullable Map<String, Object> getPromptContext(
       @Nullable UserGenerationRequest userGenerationRequest) {
-    var count = Optional.ofNullable(userGenerationRequest).map(UserGenerationRequest::count)
-        .orElse(1);
+    var count = Utils.safeGet(userGenerationRequest, UserGenerationRequest::count,
+        1);
     return Map.of(
         "count", Math.max(1, count)
     );
diff --git a/parallelization-workflow/src/main/java/com/javaaidev/agenticpatterns/parallelizationworkflow/ParallelizationWorkflowAgent.java b/parallelization-workflow/src/main/java/com/javaaidev/agenticpatterns/parallelizationworkflow/ParallelizationWorkflowAgent.java
@@ -1,6 +1,6 @@
 package com.javaaidev.agenticpatterns.parallelizationworkflow;
 
-import com.javaaidev.agenticpatterns.core.PromptTemplateHelper;
+import com.javaaidev.agenticpatterns.core.Utils;
 import com.javaaidev.agenticpatterns.taskexecution.TaskExecutionAgent;
 import java.lang.reflect.Type;
 import java.time.Duration;
@@ -187,7 +187,7 @@ public PromptBasedAssembling(ChatClient chatClient, @Nullable Type responseType)
 
     @Override
     protected @Nullable Map<String, Object> getPromptContext(@Nullable Request request) {
-      return PromptTemplateHelper.mergeMap(getParentPromptContext(request),
+      return Utils.mergeMap(getParentPromptContext(request),
           getSubtasksPromptContext(runSubtasks(request)));
     }
   }
diff --git a/routing-workflow/src/main/java/com/javaaidev/agenticpatterns/routingworkflow/RoutingWorkflowAgent.java b/routing-workflow/src/main/java/com/javaaidev/agenticpatterns/routingworkflow/RoutingWorkflowAgent.java
@@ -68,15 +68,19 @@ protected String getRoutingPromptTemplate() {
         """;
   }
 
+  protected String formatRequest(@Nullable Request request) {
+    return Objects.toString(request, "");
+  }
+
   protected @Nullable Map<String, Object> getRoutingPromptContext(
       @Nullable RoutingRequest<Request, Response> routingRequest) {
     Assert.notNull(routingRequest, "routing request cannot be null");
     var choices = routingChoices.stream().map(choice ->
-            "- %s: %s\n".formatted(choice.name(), choice.description()))
-        .collect(Collectors.joining("\n\n"));
+            "- %s: %s".formatted(choice.name(), choice.description()))
+        .collect(Collectors.joining("\n"));
     return Map.of(
         "choices", choices,
-        "input", Objects.toString(routingRequest.request(), "")
+        "input", formatRequest(routingRequest.request())
     );
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package com.javaaidev.agenticpatterns.examples.routingworkflow;`
`2`	`2`
`3`		`-import com.javaaidev.agenticpatterns.core.PromptTemplateHelper;`
	`3`	`+import com.javaaidev.agenticpatterns.core.Utils;`
`4`	`4`	`import com.javaaidev.agenticpatterns.examples.routingworkflow.CustomerSupportAgent.CustomerSupportRequest;`
`5`	`5`	`import com.javaaidev.agenticpatterns.examples.routingworkflow.CustomerSupportAgent.CustomerSupportResponse;`
`6`	`6`	`import com.javaaidev.agenticpatterns.routingworkflow.RoutingWorkflowAgent;`
`@@ -26,14 +26,19 @@ protected CustomerSupportAgent(ChatClient chatClient) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`private void initRoutes() {`
`29`		`- addRoutingChoice(new RoutingChoice<>("payment", "Handle requests about payment and refund",`
	`29`	`+ addRoutingChoice(new RoutingChoice<>("payment", "Handle queries about payment and refund",`
`30`	`30`	`new PaymentSupportAgent(chatClient)));`
`31`		`- addRoutingChoice(new RoutingChoice<>("shipping", "Handle requests about shipping",`
	`31`	`+ addRoutingChoice(new RoutingChoice<>("shipping", "Handle queries about shipping",`
`32`	`32`	`new ShippingSupportAgent(chatClient)));`
`33`		`- addRoutingChoice(new RoutingChoice<>("general", "Handle general requests",`
	`33`	`+ addRoutingChoice(new RoutingChoice<>("general", "Handle general queries",`
`34`	`34`	`new GeneralSupportAgent(chatClient)));`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ @Override`
	`38`	`+ protected String formatRequest(@Nullable CustomerSupportRequest request) {`
	`39`	`+ return Utils.safeGet(request, CustomerSupportRequest::question, "");`
	`40`	`+ }`
	`41`	`+`
`37`	`42`	`public record CustomerSupportRequest(String question) {`
`38`	`43`
`39`	`44`	`}`
`@@ -59,13 +64,13 @@ protected String getPromptTemplate() {`
`59`	`64`	`@Nullable CustomerSupportRequest customerSupportRequest) {`
`60`	`65`	`return Map.of(`
`61`	`66`	`"question",`
`62`		`- PromptTemplateHelper.safeGet(customerSupportRequest, CustomerSupportRequest::question, "")`
	`67`	`+ Utils.safeGet(customerSupportRequest, CustomerSupportRequest::question, "")`
`63`	`68`	`);`
`64`	`69`	`}`
`65`	`70`
`66`	`71`	`@Override`
`67`	`72`	`protected void updateRequest(ChatClientRequestSpec spec) {`
`68`		`- spec.system("Pretend to be a customer support agent for payment, be polite and helper");`
	`73`	`+ spec.system("You are a customer support agent for payment, be polite and helper");`
`69`	`74`	`}`
`70`	`75`	`}`
`71`	`76`
`@@ -86,13 +91,13 @@ protected String getPromptTemplate() {`
`86`	`91`	`@Nullable CustomerSupportRequest customerSupportRequest) {`
`87`	`92`	`return Map.of(`
`88`	`93`	`"question",`
`89`		`- PromptTemplateHelper.safeGet(customerSupportRequest, CustomerSupportRequest::question, "")`
	`94`	`+ Utils.safeGet(customerSupportRequest, CustomerSupportRequest::question, "")`
`90`	`95`	`);`
`91`	`96`	`}`
`92`	`97`
`93`	`98`	`@Override`
`94`	`99`	`protected void updateRequest(ChatClientRequestSpec spec) {`
`95`		`- spec.system("Pretend to be a customer support agent for shipping, be polite and helper");`
	`100`	`+ spec.system("You are a customer support agent for shipping, be polite and helper");`
`96`	`101`	`}`
`97`	`102`	`}`
`98`	`103`
`@@ -113,14 +118,14 @@ protected String getPromptTemplate() {`
`113`	`118`	`@Nullable CustomerSupportRequest customerSupportRequest) {`
`114`	`119`	`return Map.of(`
`115`	`120`	`"question",`
`116`		`- PromptTemplateHelper.safeGet(customerSupportRequest, CustomerSupportRequest::question, "")`
	`121`	`+ Utils.safeGet(customerSupportRequest, CustomerSupportRequest::question, "")`
`117`	`122`	`);`
`118`	`123`	`}`
`119`	`124`
`120`	`125`	`@Override`
`121`	`126`	`protected void updateRequest(ChatClientRequestSpec spec) {`
`122`	`127`	`spec.system(`
`123`		`- "Pretend to be a customer support agent for general questions, be polite and helper");`
	`128`	`+ "You are a customer support agent for general questions, be polite and helper");`
`124`	`129`	`}`
`125`	`130`	`}`
`126`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package com.javaaidev.agenticpatterns.parallelizationworkflow;`
`2`	`2`
`3`		`-import com.javaaidev.agenticpatterns.core.PromptTemplateHelper;`
	`3`	`+import com.javaaidev.agenticpatterns.core.Utils;`
`4`	`4`	`import com.javaaidev.agenticpatterns.taskexecution.TaskExecutionAgent;`
`5`	`5`	`import java.lang.reflect.Type;`
`6`	`6`	`import java.time.Duration;`
`@@ -187,7 +187,7 @@ public PromptBasedAssembling(ChatClient chatClient, @Nullable Type responseType)`
`187`	`187`
`188`	`188`	`@Override`
`189`	`189`	`protected @Nullable Map<String, Object> getPromptContext(@Nullable Request request) {`
`190`		`- return PromptTemplateHelper.mergeMap(getParentPromptContext(request),`
	`190`	`+ return Utils.mergeMap(getParentPromptContext(request),`
`191`	`191`	`getSubtasksPromptContext(runSubtasks(request)));`
`192`	`192`	`}`
`193`	`193`	`}`