renamed project() -> projectId()

elastic · Oct 1, 2018 · 38cdcc0 · 38cdcc0
1 parent 1159638
commit 38cdcc0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceInstancesService.java b/plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceInstancesService.java
@@ -76,7 +76,7 @@ public interface GceInstancesService extends Closeable {
      */
     Collection<Instance> instances();
 
-    String project();
+    String projectId();
 
     List<String> zones();
 }
diff --git a/plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceInstancesServiceImpl.java b/plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceInstancesServiceImpl.java
@@ -235,7 +235,7 @@ public synchronized Compute client() {
     }
 
     @Override
-    public String project() {
+    public String projectId() {
         return project;
     }
 

diff --git a/.../discovery-gce/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java b/.../discovery-gce/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java
@@ -79,7 +79,7 @@ public GceUnicastHostsProvider(Settings settings, GceInstancesService gceInstanc
         this.networkService = networkService;
 
         this.refreshInterval = GceInstancesService.REFRESH_SETTING.get(settings);
-        this.project = gceInstancesService.project();
+        this.project = gceInstancesService.projectId();
         this.zones = gceInstancesService.zones();
 
         this.tags = TAGS_SETTING.get(settings);

diff --git a/plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoverTests.java b/plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoverTests.java
@@ -171,7 +171,7 @@ public Collection<Instance> instances() {
                 }
 
                 @Override
-                public String project() {
+                public String projectId() {
                     return PROJECT_SETTING.get(settings);
                 }
 

diff --git a/plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTests.java b/plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTests.java
@@ -274,7 +274,7 @@ public void testNoRegionReturnsEmptyList() {
     public void testMetadataServerValues() {
         Settings nodeSettings = Settings.EMPTY;
         mock = new GceInstancesServiceMock(nodeSettings);
-        assertThat(mock.project(), not(projectName));
+        assertThat(mock.projectId(), not(projectName));
 
         List<TransportAddress> dynamicHosts = buildDynamicNodes(mock, nodeSettings);
         assertThat(dynamicHosts, hasSize(1));