Revert "Merge pull request #12060 from vespa-engine/revert-12040-bratseth/anonymous-query-profile-types-take-2"

This reverts commit 558506aa9008c5255f849892f476c819391f06a7, reversing
changes made to 17e572d4dad3c9e5040544072dbdc9f7a703e7bd.

2 files changed, 7 insertions, 1 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
index d67df3a5239..8ea53172200 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
@@ -10,6 +10,8 @@ import com.yahoo.searchdefinition.parser.ParseException;
 import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels;
 import com.yahoo.vespa.configmodel.producers.DocumentManager;
 import com.yahoo.vespa.configmodel.producers.DocumentTypes;
+import com.yahoo.vespa.model.container.search.QueryProfiles;
+import com.yahoo.vespa.model.test.utils.DeployLoggerStub;
 
 import java.io.File;
 import java.io.IOException;
@@ -53,6 +55,7 @@ public abstract class AbstractExportingTestCase extends SearchDefinitionTestCase
         String path = exportConfig(name, config);
         DerivedConfiguration.exportDocuments(new DocumentManager().produce(builder.getModel(), new DocumentmanagerConfig.Builder()), path);
         DerivedConfiguration.exportDocuments(new DocumentTypes().produce(builder.getModel(), new DocumenttypesConfig.Builder()), path);
+        DerivedConfiguration.exportQueryProfiles(builder.getQueryProfileRegistry(), path);
         return config;
     }
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NeuralNetTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/NeuralNetTestCase.java
index b299c7fa299..5229485c8f9 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NeuralNetTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/NeuralNetTestCase.java
@@ -6,11 +6,14 @@ import org.junit.Test;
 
 import java.io.IOException;
 
+import com.yahoo.component.ComponentId;
+
 public class NeuralNetTestCase extends AbstractExportingTestCase {
 
     @Test
     public void testNeuralNet() throws IOException, ParseException {
-        assertCorrectDeriving("neuralnet");
+        ComponentId.resetGlobalCountersForTests();
+        DerivedConfiguration c = assertCorrectDeriving("neuralnet");
     }
 
 }