honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix build (settings cannot be prefixed with `.`) 

Original commit: elastic/x-pack-elasticsearch@62178e1e82
This commit is contained in:
uboness 2016-01-21 11:50:53 +01:00
parent e6832e5881
commit 617c51cc86
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesConsumerPluginIntegrationTestCase.java
View File

@ -44,7 +44,7 @@ public abstract class AbstractLicensesConsumerPluginIntegrationTestCase extends
return Settings.settingsBuilder() return Settings.settingsBuilder()
.put(super.nodeSettings(nodeOrdinal)) .put(super.nodeSettings(nodeOrdinal))
// this setting is only used in tests // this setting is only used in tests
.put(".trial_license_duration_in_seconds", trialLicenseDurationInSeconds) .put("_trial_license_duration_in_seconds", trialLicenseDurationInSeconds)
.build(); .build();
} }

2
elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/LicensesPluginIntegrationTests.java
View File

@ -37,7 +37,7 @@ public class LicensesPluginIntegrationTests extends AbstractLicensesIntegrationT
return Settings.settingsBuilder() return Settings.settingsBuilder()
.put(super.nodeSettings(nodeOrdinal)) .put(super.nodeSettings(nodeOrdinal))
// this setting is only used in tests // this setting is only used in tests
.put(".trial_license_duration_in_seconds", trialLicenseDurationInSeconds) .put("_trial_license_duration_in_seconds", trialLicenseDurationInSeconds)
.build(); .build();
} }

2
elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/LicensesPluginsIntegrationTests.java
View File

@ -42,7 +42,7 @@ public class LicensesPluginsIntegrationTests extends AbstractLicensesIntegration
return Settings.settingsBuilder() return Settings.settingsBuilder()
.put(super.nodeSettings(0)) .put(super.nodeSettings(0))
// this setting is only used in tests // this setting is only used in tests
.put(".trial_license_duration_in_seconds", trialLicenseDuration) .put("_trial_license_duration_in_seconds", trialLicenseDuration)
.build(); .build();
} }

4
elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/LicensesServiceClusterTests.java
View File

@ -61,9 +61,9 @@ public class LicensesServiceClusterTests extends AbstractLicensesIntegrationTest
.put("node.data", true) .put("node.data", true)
.put("format", "json") .put("format", "json")
// this setting is only used in tests // this setting is only used in tests
.put(".trial_license_duration_in_seconds", 9) .put("_trial_license_duration_in_seconds", 9)
// this setting is only used in tests // this setting is only used in tests
.put(".grace_duration_in_seconds", 9) .put("_grace_duration_in_seconds", 9)
.put(Node.HTTP_ENABLED, true); .put(Node.HTTP_ENABLED, true);
} }

4
elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/consumer/TestPluginServiceBase.java
View File

@ -33,11 +33,11 @@ public abstract class TestPluginServiceBase extends AbstractLifecycleComponent<T
super(settings); super(settings);
this.eagerLicenseRegistration = eagerLicenseRegistration; this.eagerLicenseRegistration = eagerLicenseRegistration;
this.licensesClientService = licensesClientService; this.licensesClientService = licensesClientService;
int trialDurationInSec = settings.getAsInt(".trial_license_duration_in_seconds", -1); int trialDurationInSec = settings.getAsInt("_trial_license_duration_in_seconds", -1);
if (trialDurationInSec != -1) { if (trialDurationInSec != -1) {
licensesClientService.setTrialLicenseDuration(TimeValue.timeValueSeconds(trialDurationInSec)); licensesClientService.setTrialLicenseDuration(TimeValue.timeValueSeconds(trialDurationInSec));
} }
int graceDurationInSec = settings.getAsInt(".grace_duration_in_seconds", 5); int graceDurationInSec = settings.getAsInt("_grace_duration_in_seconds", 5);
licensesClientService.setGracePeriodDuration(TimeValue.timeValueSeconds(graceDurationInSec)); licensesClientService.setGracePeriodDuration(TimeValue.timeValueSeconds(graceDurationInSec));
if (!eagerLicenseRegistration) { if (!eagerLicenseRegistration) {
this.clusterService = clusterService; this.clusterService = clusterService;