Revert <?>. Can not be used with components and injection.

2 files changed, 6 insertions, 6 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
index 8aca45ef900..b2f907c1e89 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
@@ -87,7 +87,7 @@ public class FederationSearcher extends ForkingSearcher {
 
     @Inject
     public FederationSearcher(FederationConfig config, SchemaInfo schemaInfo,
-                              ComponentRegistry<TargetSelector<?>> targetSelectors) {
+                              ComponentRegistry<TargetSelector> targetSelectors) {
         this(createResolver(config),
              createVirtualSourceResolver(config),
              resolveSelector(config.targetSelector(), targetSelectors),
@@ -102,7 +102,7 @@ public class FederationSearcher extends ForkingSearcher {
 
     private FederationSearcher(SearchChainResolver searchChainResolver,
                                VirtualSourceResolver virtualSourceResolver,
-                               TargetSelector<?> targetSelector,
+                               TargetSelector targetSelector,
                                Map<String, List<String>> schema2Clusters) {
         this.searchChainResolver = searchChainResolver;
         sourceRefResolver = new SourceRefResolver(searchChainResolver, schema2Clusters);
@@ -114,8 +114,8 @@ public class FederationSearcher extends ForkingSearcher {
         return VirtualSourceResolver.of(config.target().stream().map(FederationConfig.Target::id).collect(Collectors.toUnmodifiableSet()));
     }
 
-    private static TargetSelector<?> resolveSelector(String selectorId,
-                                                  ComponentRegistry<TargetSelector<?>> targetSelectors) {
+    private static TargetSelector resolveSelector(String selectorId,
+                                                  ComponentRegistry<TargetSelector> targetSelectors) {
         if (selectorId.isEmpty()) return null;
         return checkNotNull(targetSelectors.getComponent(selectorId),
                 "Missing target selector with id '" + selectorId + "'");
diff --git a/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTest.java b/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTest.java
index b46457cf6b3..1ac6dcbe1b6 100644
--- a/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTest.java
+++ b/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTest.java
@@ -163,7 +163,7 @@ public class FederationSearcherTest {
     @Test
     void custom_federation_target() {
         ComponentId targetSelectorId = ComponentId.fromString("TargetSelector");
-        ComponentRegistry<TargetSelector<?>> targetSelectors = new ComponentRegistry<>();
+        ComponentRegistry<TargetSelector> targetSelectors = new ComponentRegistry<>();
         targetSelectors.register(targetSelectorId, new TestTargetSelector());
 
         FederationSearcher searcher = new FederationSearcher(
@@ -182,7 +182,7 @@ public class FederationSearcherTest {
     @Test
     void target_selectors_can_have_multiple_targets() {
         ComponentId targetSelectorId = ComponentId.fromString("TestMultipleTargetSelector");
-        ComponentRegistry<TargetSelector<?>> targetSelectors = new ComponentRegistry<>();
+        ComponentRegistry<TargetSelector> targetSelectors = new ComponentRegistry<>();
         targetSelectors.register(targetSelectorId, new TestMultipleTargetSelector());
 
         FederationSearcher searcher = new FederationSearcher(