summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahooinc.com>2021-12-13 12:03:49 +0000
committerArne H Juul <arnej@yahooinc.com>2021-12-13 12:13:17 +0000
commit4d9acffcaceed08ab6b0c03f9dad24ecbe93723c (patch)
tree0ee5e0efe1f7f4368e76a79b58a507477cc7f409 /config-model
parentffd3ca149d178a901846ab1d93cae8936d040216 (diff)
use consistent naming from feature flag
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java6
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java8
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java2
3 files changed, 8 insertions, 8 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
index 523cadda4eb..27286a7dbbe 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
@@ -78,11 +78,11 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra
}
private boolean useV8GeoPositions = false;
- private boolean generateDocTypeConfig = false;
+ private boolean useV8DocManagerCfg = false;
public void useFeatureFlags(ModelContext.FeatureFlags featureFlags) {
this.useV8GeoPositions = featureFlags.useV8GeoPositions();
- this.generateDocTypeConfig = featureFlags.useV8DocManagerCfg();
+ this.useV8DocManagerCfg = featureFlags.useV8DocManagerCfg();
}
/**
@@ -162,7 +162,7 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra
public void getConfig(DocumentmanagerConfig.Builder builder) {
new DocumentManager()
.useV8GeoPositions(this.useV8GeoPositions)
- .generateDocTypeConfig(this.generateDocTypeConfig)
+ .useV8DocManagerCfg(this.useV8DocManagerCfg)
.produce(documentModel, builder);
}
diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java
index 591b89785db..7be0fe5ed7a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java
+++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java
@@ -28,21 +28,21 @@ import java.util.Set;
public class DocumentManager {
private boolean useV8GeoPositions = false;
- private boolean generateDocTypeConfig = false;
+ private boolean useV8DocManagerCfg = false;
public DocumentManager useV8GeoPositions(boolean value) {
this.useV8GeoPositions = value;
return this;
}
- public DocumentManager generateDocTypeConfig(boolean value) {
- this.generateDocTypeConfig = value;
+ public DocumentManager useV8DocManagerCfg(boolean value) {
+ this.useV8DocManagerCfg = value;
return this;
}
public DocumentmanagerConfig.Builder produce(DocumentModel model,
DocumentmanagerConfig.Builder documentConfigBuilder)
{
- if (generateDocTypeConfig) {
+ if (useV8DocManagerCfg) {
return produceDocTypes(model, documentConfigBuilder);
} else {
return produceDataTypes(model, documentConfigBuilder);
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 a60269a6ea1..8b54455d176 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
@@ -66,7 +66,7 @@ public abstract class AbstractExportingTestCase extends AbstractSchemaTestCase {
private DerivedConfiguration export(String name, SchemaBuilder builder, DerivedConfiguration config) throws IOException {
String path = exportConfig(name, config);
- DerivedConfiguration.exportDocuments(new DocumentManager().generateDocTypeConfig(useV8DocManagerCfg())
+ DerivedConfiguration.exportDocuments(new DocumentManager().useV8DocManagerCfg(useV8DocManagerCfg())
.produce(builder.getModel(), new DocumentmanagerConfig.Builder()), path);
DerivedConfiguration.exportDocuments(new DocumentTypes().produce(builder.getModel(), new DocumenttypesConfig.Builder()), path);
DerivedConfiguration.exportQueryProfiles(builder.getQueryProfileRegistry(), path);