Updates to service selector

Author: Milder Hernandez Cagua

semantickernel-api/src/main/java/com/microsoft/semantickernel/services/AIServiceSelector.java

@@ -25,10 +25,7 @@ public interface AIServiceSelector {
      * @param <T>         The type of service to select.
      * @return An {@code AIServiceSelection} containing the selected service and associated
      * PromptExecutionSettings.
-     *
-     * @deprecated Use {@link #trySelectAIService(Class, KernelArguments)} instead.
      */
-    @Deprecated
     @Nullable
     <T extends AIService> AIServiceSelection<T> trySelectAIService(
         Class<T> serviceType,

semantickernel-api/src/main/java/com/microsoft/semantickernel/services/BaseAIServiceSelector.java

@@ -56,9 +56,7 @@ public <T extends AIService> AIServiceSelection<T> trySelectAIService(
      * @param <T>         The type of service to select.
      * @return The selected service, or {@code null} if no service could be selected.
      *
-     * @deprecated Implement {@link #trySelectAIService(Class, KernelArguments)}
      */
-    @Deprecated
     @Nullable
     protected abstract <T extends AIService> AIServiceSelection<T> trySelectAIService(
         Class<T> serviceType,
@@ -84,7 +82,6 @@ protected <T extends AIService> AIServiceSelection<T> trySelectAIService(
             Class<T> serviceType,
             @Nullable KernelArguments arguments,
             Map<Class<? extends AIService>, AIService> services) {
-        throw  new UnsupportedOperationException(
-            "This method is not implemented.");
+        return trySelectAIService(serviceType, null, arguments, services);
     }
 }

semantickernel-api/src/main/java/com/microsoft/semantickernel/services/OrderedAIServiceSelector.java

@@ -57,25 +57,6 @@ private static <T extends AIService> AIServiceSelection<T> castServiceSelection(
         }
     }
 
-    @Nullable
-    private static Map<String, PromptExecutionSettings> settingsFromFunctionSettings(
-        @Nullable KernelFunction function) {
-        if (function != null) {
-            return function.getExecutionSettings();
-        }
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public <T extends AIService> AIServiceSelection<T> trySelectAIService(
-            Class<T> serviceType,
-            @Nullable KernelArguments arguments,
-            Map<Class<? extends AIService>, AIService> services) {
-
-        return selectAIService(serviceType, arguments != null ? arguments.getExecutionSettings() : null);
-    }
-
     @Nullable
     @Override
     public <T extends AIService> AIServiceSelection<T> trySelectAIService(
@@ -84,11 +65,11 @@ public <T extends AIService> AIServiceSelection<T> trySelectAIService(
         @Nullable KernelArguments arguments,
         Map<Class<? extends AIService>, AIService> services) {
 
-        // Allow the execution settings from the kernel arguments to take precedence
-        Map<String, PromptExecutionSettings> executionSettings = settingsFromFunctionSettings(
-            function);
+        if (function == null) {
+            return selectAIService(serviceType, arguments != null ? arguments.getExecutionSettings() : null);
+        }
 
-        return selectAIService(serviceType, executionSettings);
+        return selectAIService(serviceType, function.getExecutionSettings());
     }