From ce1028954094d009b892c6a6d1f284909c28900a Mon Sep 17 00:00:00 2001 From: Areek Zillur Date: Tue, 5 Jul 2016 11:29:30 -0400 Subject: [PATCH] update to master Original commit: elastic/x-pack-elasticsearch@9bc098f879c431c20515bafb5442441b5cddc57b --- .../elasticsearch/license/plugin/core/ExpirationCallback.java | 2 +- .../elasticsearch/license/plugin/core/LicensesService.java | 2 +- .../license/plugin/core/AbstractLicenseServiceTestCase.java | 4 ++-- .../license/plugin/core/LicenseClusterChangeTests.java | 4 ++-- .../license/plugin/core/LicensesManagerServiceTests.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/core/ExpirationCallback.java b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/core/ExpirationCallback.java index 709c423a402..d63539c2fb7 100644 --- a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/core/ExpirationCallback.java +++ b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/core/ExpirationCallback.java @@ -14,7 +14,7 @@ import java.util.UUID; public abstract class ExpirationCallback { - final static String EXPIRATION_JOB_PREFIX = ".license_expiration_job_"; + static final String EXPIRATION_JOB_PREFIX = ".license_expiration_job_"; public enum Orientation {PRE, POST} diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java index 1ae4512073c..0efbd6966d0 100644 --- a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java +++ b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java @@ -118,7 +118,7 @@ public class LicensesService extends AbstractLifecycleComponent implements Clust */ public static final TimeValue GRACE_PERIOD_DURATION = days(7); - private final static String LICENSE_JOB = "licenseJob"; + private static final String LICENSE_JOB = "licenseJob"; private static final FormatDateTimeFormatter DATE_FORMATTER = Joda.forPattern("EEEE, MMMMM dd, yyyy", Locale.ROOT); diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/core/AbstractLicenseServiceTestCase.java b/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/core/AbstractLicenseServiceTestCase.java index b2c7039db08..c9f9e97656c 100644 --- a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/core/AbstractLicenseServiceTestCase.java +++ b/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/core/AbstractLicenseServiceTestCase.java @@ -14,7 +14,7 @@ import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.component.Lifecycle; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.transport.DummyTransportAddress; +import org.elasticsearch.common.transport.LocalTransportAddress; import org.elasticsearch.license.core.License; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.transport.TransportService; @@ -57,7 +57,7 @@ public abstract class AbstractLicenseServiceTestCase extends ESTestCase { when(metaData.custom(LicensesMetaData.TYPE)).thenReturn(new LicensesMetaData(license)); when(state.metaData()).thenReturn(metaData); final DiscoveryNodes discoveryNodes = mock(DiscoveryNodes.class); - final DiscoveryNode mockNode = new DiscoveryNode("b", DummyTransportAddress.INSTANCE, emptyMap(), emptySet(), Version.CURRENT); + final DiscoveryNode mockNode = new DiscoveryNode("b", LocalTransportAddress.buildUnique(), emptyMap(), emptySet(), Version.CURRENT); when(discoveryNodes.getMasterNode()).thenReturn(mockNode); when(state.nodes()).thenReturn(discoveryNodes); when(clusterService.state()).thenReturn(state); diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/core/LicenseClusterChangeTests.java b/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/core/LicenseClusterChangeTests.java index 9f7fc34ac01..8aeec1fd457 100644 --- a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/core/LicenseClusterChangeTests.java +++ b/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/core/LicenseClusterChangeTests.java @@ -12,7 +12,7 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.node.DiscoveryNodes; -import org.elasticsearch.common.transport.DummyTransportAddress; +import org.elasticsearch.common.transport.LocalTransportAddress; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.license.core.License; import org.elasticsearch.license.plugin.TestUtils; @@ -67,7 +67,7 @@ public class LicenseClusterChangeTests extends AbstractLicenseServiceTestCase { } public void testTrialLicenseGeneration() throws Exception { - DiscoveryNode master = new DiscoveryNode("b", DummyTransportAddress.INSTANCE, emptyMap(), emptySet(), Version.CURRENT); + DiscoveryNode master = new DiscoveryNode("b", LocalTransportAddress.buildUnique(), emptyMap(), emptySet(), Version.CURRENT); ClusterState oldState = ClusterState.builder(new ClusterName("a")) .nodes(DiscoveryNodes.builder().masterNodeId(master.getId()).put(master)).build(); ClusterState newState = ClusterState.builder(oldState).build(); diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/core/LicensesManagerServiceTests.java b/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/core/LicensesManagerServiceTests.java index 6729548d51d..2b604681327 100644 --- a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/core/LicensesManagerServiceTests.java +++ b/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/core/LicensesManagerServiceTests.java @@ -14,7 +14,7 @@ import org.elasticsearch.xpack.graph.Graph; import org.elasticsearch.license.core.License; import org.elasticsearch.license.plugin.TestUtils; import org.elasticsearch.license.plugin.action.delete.DeleteLicenseRequest; -import org.elasticsearch.marvel.Monitoring; +import org.elasticsearch.xpack.monitoring.Monitoring; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.xpack.security.Security; import org.elasticsearch.test.ESSingleNodeTestCase;