- GC unused ancient code. documents selection validation is

  done correctly in ContentCluster. GC old leftower from 5.0.

2 files changed, 9 insertions, 65 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java
index 75884c298fb..8f9102801c2 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java
@@ -28,42 +28,19 @@ public class MockSearchClusters {
 
         @Override
         public void deriveFromSchemas(DeployState deployState) { }
+        @Override public List<DocumentDatabase> getDocumentDbs() {return List.of();}
+        @Override public void getConfig(AttributesConfig.Builder builder) {}
+        @Override public void getConfig(DocumentdbInfoConfig.Builder builder) {}
+        @Override public void getConfig(RankProfilesConfig.Builder builder) {}
+        @Override public void getConfig(IndexInfoConfig.Builder builder) {}
+        @Override public void getConfig(IlscriptsConfig.Builder builder) {}
+        @Override public void getConfig(SchemaInfoConfig.Builder builder) {}
 
         @Override
-        public List<DocumentDatabase> getDocumentDbs() {
-            return List.of();
+        protected SearchCluster.IndexingMode getIndexingMode() {
+            return streaming ? SearchCluster.IndexingMode.STREAMING : SearchCluster.IndexingMode.REALTIME;
         }
 
-        @Override
-        public void defaultDocumentsConfig() {}
-
-        @Override
-        public void getConfig(AttributesConfig.Builder builder) {
-        }
-
-        @Override
-        public void getConfig(DocumentdbInfoConfig.Builder builder) {
-        }
-
-        @Override
-        public void getConfig(RankProfilesConfig.Builder builder) {
-        }
-
-        @Override
-        public void getConfig(IndexInfoConfig.Builder builder) {
-        }
-
-        @Override
-        public void getConfig(IlscriptsConfig.Builder builder) {
-        }
-
-        @Override
-        public void getConfig(SchemaInfoConfig.Builder builder) {
-        }
-
-        @Override
-        protected SearchCluster.IndexingMode getIndexingMode() { return streaming ? SearchCluster.IndexingMode.STREAMING : SearchCluster.IndexingMode.REALTIME; }
-
     }
 
     public static SearchCluster mockSearchCluster(AbstractConfigProducerRoot root, String clusterName, int clusterIndex, boolean isStreaming) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentSelectionConverterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentSelectionConverterTest.java
deleted file mode 100644
index f495de2c6a4..00000000000
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentSelectionConverterTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.search.test;
-
-import com.yahoo.document.select.parser.ParseException;
-import com.yahoo.vespa.model.search.DocumentSelectionConverter;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-/**
- * Unit tests for RemoveSelection.
- * @author Ulf Lilleengen
- */
-public class DocumentSelectionConverterTest {
-    @Test
-    void testQueryConversion() throws ParseException, IllegalArgumentException, UnsupportedOperationException {
-        DocumentSelectionConverter converter = new DocumentSelectionConverter("music.expire>now() - 3600 and video.expire > now() - 300");
-        assertEquals("expire:>now(3600)", converter.getQuery("music"));
-        assertEquals("expire:<now(3600)", converter.getInvertedQuery("music"));
-        assertEquals("expire:>now(300)", converter.getQuery("video"));
-        assertEquals("expire:<now(300)", converter.getInvertedQuery("video"));
-        assertNull(converter.getQuery("book"));
-        assertNull(converter.getInvertedQuery("book"));
-    }
-
-    @Test
-    void testSelection() throws ParseException, IllegalArgumentException, UnsupportedOperationException {
-        DocumentSelectionConverter converter = new DocumentSelectionConverter("music.expire>music.expire.nowdate");
-        assertNull(converter.getQuery("music"));
-        assertNull(converter.getInvertedQuery("music"));
-    }
-}