fix: start

Author: Angular2Guy

mcp-server/src/main/java/ch/xxx/mcpserver/McpServerApplication.java

@@ -17,11 +17,13 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
+import org.springframework.web.client.RestClient;
 
 import ch.xxx.mcpserver.config.FunctionConfig;
 
 @SpringBootApplication
 public class McpServerApplication {
+
     public static void main(String[] args) {
 		SpringApplication.run(McpServerApplication.class, args);
 	}
@@ -30,4 +32,9 @@ public static void main(String[] args) {
     public ToolCallbackProvider myTools(FunctionConfig functionConfig) {        
         return MethodToolCallbackProvider.builder().toolObjects(functionConfig).build();
     }
+
+	@Bean
+	public RestClient createRestClient() {
+		return RestClient.builder().build();
+	}
 }

mcp-server/src/main/java/ch/xxx/mcpserver/client/OpenLibraryRestClient.java

@@ -32,15 +32,16 @@ public class OpenLibraryRestClient implements OpenLibraryClient {
 	private static final Logger LOGGER = LoggerFactory.getLogger(OpenLibraryRestClient.class);
 	private final String baseUrl = "https://openlibrary.org/search.json";
 	private final RestClient restClient;
+
 	@Value("${openlibrary.result-size:5}")
 	private int resultLimit;
-
+	
 	public OpenLibraryRestClient(RestClient restClient) {
 		this.restClient = restClient;
 	}
-
+	    
 	@Override
-	public Response apply(Request request) {
+	public OpenLibraryClient.Response loadBooks(OpenLibraryClient.Request request) {
 		var authorOpt = this.createParamOpt(request.author(), "author");
 		var titleOpt = this.createParamOpt(request.title(), "title");
 		var subjectOpt = this.createParamOpt(request.subject(), "subject");

mcp-server/src/main/java/ch/xxx/mcpserver/client/TmdbRestClient.java

@@ -39,12 +39,12 @@ public TmdbRestClient(RestClient restClient) {
     //@EventListener
     public void onApplicationEvent(ApplicationReadyEvent event) {
         var request = new Request("Alien");
-        var response = this.apply(request);
+        var response = this.loadMovies(request);
         LOG.info("TMDB Response: {}", toJson(response));
     }
 
     @Override
-    public Response apply(Request request) {
+    public Response loadMovies(Request request) {
         var url = BASE_URL + "search/movie?query=" + request.query();
         var response = restClient.get()
                 .uri(url)

mcp-server/src/main/java/ch/xxx/mcpserver/client/external/OpenLibraryClient.java

@@ -13,7 +13,6 @@
 package ch.xxx.mcpserver.client.external;
 
 import java.util.List;
-import java.util.function.Function;
 
 import org.springframework.ai.tool.annotation.ToolParam;
 
@@ -24,7 +23,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 
-public interface OpenLibraryClient extends Function<OpenLibraryClient.Request, OpenLibraryClient.Response> {
+public interface OpenLibraryClient {
+	Response loadBooks(Request request);
+
 	@JsonIgnoreProperties(ignoreUnknown = true)
 	record Book(@JsonProperty(value = "author_name", required = false) List<String> authorName,
 			@JsonProperty(value = "language", required = false) List<String> languages,

mcp-server/src/main/java/ch/xxx/mcpserver/client/external/TmdbClient.java

@@ -13,15 +13,14 @@
 package ch.xxx.mcpserver.client.external;
 
 import java.util.Map;
-import java.util.function.Function;
 
 import org.springframework.ai.tool.annotation.ToolParam;
 
 /**
  *
  * @author sven
  */
-public interface TmdbClient extends Function<TmdbClient.Request, TmdbClient.Response> {
+public interface TmdbClient {
     public static final Map<Integer, String> GENRE_MAP = Map.ofEntries(
         Map.entry(28, "Action"),
         Map.entry(12, "Adventure"),
@@ -44,6 +43,8 @@ public interface TmdbClient extends Function<TmdbClient.Request, TmdbClient.Resp
         Map.entry(37, "Western")
     );
 
+    Response loadMovies(Request request);
+
     record Request(@ToolParam(description = "The movie title") String query) {
     }
 

mcp-server/src/main/java/ch/xxx/mcpserver/config/FunctionConfig.java

@@ -15,36 +15,34 @@
  */
 package ch.xxx.mcpserver.config;
 
-import java.util.function.Function;
-
 import org.springframework.ai.tool.annotation.Tool;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import ch.xxx.mcpserver.client.external.OpenLibraryClient;
+import ch.xxx.mcpserver.client.OpenLibraryRestClient;
 import ch.xxx.mcpserver.client.external.TmdbClient;
 
 @Configuration
 public class FunctionConfig {
-	private final OpenLibraryClient openLibraryClient;
+	private final OpenLibraryRestClient openLibraryClient;
 	private final TmdbClient tmdbClient;
 	public static final String OPEN_LIBRARY_CLIENT = "openLibraryClient";
 	public static final String THE_MOVIE_DATABASE_CLIENT = "theMovieDatabaseClient";
 
-	public FunctionConfig(OpenLibraryClient openLibraryClient, TmdbClient tmdbClient) {
+	public FunctionConfig(OpenLibraryRestClient openLibraryClient, TmdbClient tmdbClient) {
 		this.openLibraryClient = openLibraryClient;
 		this.tmdbClient = tmdbClient;
 	}
 
 	@Bean(OPEN_LIBRARY_CLIENT)
 	@Tool(description = "Search for books by author, title or subject.")
-	public Function<OpenLibraryClient.Request, OpenLibraryClient.Response> openLibraryClient() {		
-		return this.openLibraryClient::apply;
+	public OpenLibraryRestClient.Response openLibraryClient(OpenLibraryRestClient.Request request) {		
+		return this.openLibraryClient.loadBooks(request);
 	}
 
 	@Bean(THE_MOVIE_DATABASE_CLIENT)
 	@Tool(description = "Search for movies by title.")	
-	public Function<TmdbClient.Request, TmdbClient.Response> theMovieDatabaseClient() {
-		return this.tmdbClient::apply;
+	public TmdbClient.Response theMovieDatabaseClient(TmdbClient.Request request) {
+		return this.tmdbClient.loadMovies(request);
 	}
 }