SONAR-9741 fix types of fields in response of WS

diff --git a/server/sonar-cluster/src/main/java/org/sonar/cluster/health/NodeDetails.java b/server/sonar-cluster/src/main/java/org/sonar/cluster/health/NodeDetails.java
index 000030f8796f89cac8ed9788873d5d386c8e9449..be127000e7d51789cd34fff27ee272d2e03f28e4 100644 (file)
--- a/server/sonar-cluster/src/main/java/org/sonar/cluster/health/NodeDetails.java
+++ b/server/sonar-cluster/src/main/java/org/sonar/cluster/health/NodeDetails.java
@@ -37,7 +37,7 @@ public class NodeDetails implements Externalizable {
   private String name;
   private String host;
   private int port;
-  private long started;
+  private long startedAt;
 
   /**
    * Required for Serialization
@@ -50,7 +50,7 @@ public class NodeDetails implements Externalizable {
     this.name = builder.name;
     this.host = builder.host;
     this.port = builder.port;
-    this.started = builder.started;
+    this.startedAt = builder.startedAt;
   }
 
   public static Builder newNodeDetailsBuilder() {
@@ -73,8 +73,8 @@ public class NodeDetails implements Externalizable {
     return port;
   }
 
-  public long getStarted() {
-    return started;
+  public long getStartedAt() {
+    return startedAt;
   }
 
   @Override
@@ -84,7 +84,7 @@ public class NodeDetails implements Externalizable {
       ", name='" + name + '\'' +
       ", host='" + host + '\'' +
       ", port=" + port +
-      ", started=" + started +
+      ", startedAt=" + startedAt +
       '}';
   }
 
@@ -94,7 +94,7 @@ public class NodeDetails implements Externalizable {
     out.writeUTF(name);
     out.writeUTF(host);
     out.writeInt(port);
-    out.writeLong(started);
+    out.writeLong(startedAt);
   }
 
   @Override
@@ -103,7 +103,7 @@ public class NodeDetails implements Externalizable {
     this.name = in.readUTF();
     this.host = in.readUTF();
     this.port = in.readInt();
-    this.started = in.readLong();
+    this.startedAt = in.readLong();
   }
 
   @Override
@@ -116,7 +116,7 @@ public class NodeDetails implements Externalizable {
     }
     NodeDetails that = (NodeDetails) o;
     return port == that.port &&
-      started == that.started &&
+      startedAt == that.startedAt &&
       type == that.type &&
       name.equals(that.name) &&
       host.equals(that.host);
@@ -124,7 +124,7 @@ public class NodeDetails implements Externalizable {
 
   @Override
   public int hashCode() {
-    return Objects.hash(type, name, host, port, started);
+    return Objects.hash(type, name, host, port, startedAt);
   }
 
   public static class Builder {
@@ -132,7 +132,7 @@ public class NodeDetails implements Externalizable {
     private String name;
     private String host;
     private int port;
-    private long started;
+    private long startedAt;
 
     private Builder() {
       // use static factory method
@@ -159,9 +159,9 @@ public class NodeDetails implements Externalizable {
       return this;
     }
 
-    public Builder setStarted(long started) {
-      checkStarted(started);
-      this.started = started;
+    public Builder setStartedAt(long startedAt) {
+      checkStartedAt(startedAt);
+      this.startedAt = startedAt;
       return this;
     }
 
@@ -170,7 +170,7 @@ public class NodeDetails implements Externalizable {
       checkString(name, "name");
       checkString(host, "host");
       checkPort(port);
-      checkStarted(started);
+      checkStartedAt(startedAt);
       return new NodeDetails(this);
     }
 
@@ -189,8 +189,8 @@ public class NodeDetails implements Externalizable {
       checkArgument(port > 0, "port must be > 0");
     }
 
-    private static void checkStarted(long started) {
-      checkArgument(started > 0, "started must be > 0");
+    private static void checkStartedAt(long startedAt) {
+      checkArgument(startedAt > 0, "startedAt must be > 0");
     }
   }
 

diff --git a/server/sonar-cluster/src/test/java/org/sonar/cluster/health/NodeDetailsTest.java b/server/sonar-cluster/src/test/java/org/sonar/cluster/health/NodeDetailsTest.java
index 6ce0be0334916e1fcbb0347cb141712aa6dc2597..ede86a42577bf5d9c57e6bc57fa39b259e711af4 100644 (file)
--- a/server/sonar-cluster/src/test/java/org/sonar/cluster/health/NodeDetailsTest.java
+++ b/server/sonar-cluster/src/test/java/org/sonar/cluster/health/NodeDetailsTest.java
@@ -107,9 +107,9 @@ public class NodeDetailsTest {
   @Test
   public void setStarted_throws_IAE_if_arg_is_less_than_1() {
     expectedException.expect(IllegalArgumentException.class);
-    expectedException.expectMessage("started must be > 0");
+    expectedException.expectMessage("startedAt must be > 0");
 
-    builderUnderTest.setStarted(-random.nextInt(5));
+    builderUnderTest.setStartedAt(-random.nextInt(5));
   }
 
   @Test
@@ -165,7 +165,7 @@ public class NodeDetailsTest {
       .setPort(1 + random.nextInt(33));
 
     expectedException.expect(IllegalArgumentException.class);
-    expectedException.expectMessage("started must be > 0");
+    expectedException.expectMessage("startedAt must be > 0");
 
     builderUnderTest.build();
   }
@@ -209,18 +209,18 @@ public class NodeDetailsTest {
     String name = randomAlphanumeric(3);
     String host = randomAlphanumeric(10);
     int port = 1 + random.nextInt(10);
-    int started = 1 + random.nextInt(666);
+    long startedAt = 1 + random.nextInt(666);
 
     NodeDetails underTest = builderUnderTest
       .setType(randomType)
       .setName(name)
       .setHost(host)
       .setPort(port)
-      .setStarted(started)
+      .setStartedAt(startedAt)
       .build();
 
     assertThat(underTest.toString())
-      .isEqualTo("NodeDetails{type=" + randomType + ", name='" + name + "', host='" + host + "', port=" + port + ", started=" + started + "}");
+      .isEqualTo("NodeDetails{type=" + randomType + ", name='" + name + "', host='" + host + "', port=" + port + ", startedAt=" + startedAt + "}");
   }
 
   @Test
@@ -228,20 +228,20 @@ public class NodeDetailsTest {
     String name = randomAlphanumeric(3);
     String host = randomAlphanumeric(10);
     int port = 1 + random.nextInt(10);
-    int started = 1 + random.nextInt(666);
+    long startedAt = 1 + random.nextInt(666);
 
     NodeDetails underTest = builderUnderTest
       .setType(randomType)
       .setName(name)
       .setHost(host)
       .setPort(port)
-      .setStarted(started)
+      .setStartedAt(startedAt)
       .build();
 
     assertThat(underTest.getType()).isEqualTo(randomType);
     assertThat(underTest.getName()).isEqualTo(name);
     assertThat(underTest.getHost()).isEqualTo(host);
     assertThat(underTest.getPort()).isEqualTo(port);
-    assertThat(underTest.getStarted()).isEqualTo(started);
+    assertThat(underTest.getStartedAt()).isEqualTo(startedAt);
   }
 }

diff --git a/server/sonar-cluster/src/test/java/org/sonar/cluster/health/NodeDetailsTestSupport.java b/server/sonar-cluster/src/test/java/org/sonar/cluster/health/NodeDetailsTestSupport.java
index 7337f3ec0b3c3cc5695a5fa07e6c14b96ebd78c1..100627db98a8a034d084b113d317c1814a820629 100644 (file)
--- a/server/sonar-cluster/src/test/java/org/sonar/cluster/health/NodeDetailsTestSupport.java
+++ b/server/sonar-cluster/src/test/java/org/sonar/cluster/health/NodeDetailsTestSupport.java
@@ -71,7 +71,7 @@ public class NodeDetailsTestSupport {
       .setName(randomAlphanumeric(3))
       .setHost(randomAlphanumeric(10))
       .setPort(1 + random.nextInt(10))
-      .setStarted(1 + random.nextInt(666));
+      .setStartedAt(1 + random.nextInt(666));
   }
 
   NodeDetails.Type randomType() {

diff --git a/server/sonar-cluster/src/test/java/org/sonar/cluster/health/SharedHealthStateImplTest.java b/server/sonar-cluster/src/test/java/org/sonar/cluster/health/SharedHealthStateImplTest.java
index 9c3c5d92e9c80f1f24128ead07b04c677c21ada0..0b0ec193d55de9a00f76ebe73423b334faaa99c5 100644 (file)
--- a/server/sonar-cluster/src/test/java/org/sonar/cluster/health/SharedHealthStateImplTest.java
+++ b/server/sonar-cluster/src/test/java/org/sonar/cluster/health/SharedHealthStateImplTest.java
@@ -245,7 +245,7 @@ public class SharedHealthStateImplTest {
         .setName(randomAlphanumeric(30))
         .setHost(randomAlphanumeric(10))
         .setPort(1 + random.nextInt(666))
-        .setStarted(1 + random.nextInt(852))
+        .setStartedAt(1 + random.nextInt(852))
         .build())
       .build();
   }

diff --git a/server/sonar-main/src/main/java/org/sonar/application/health/SearchNodeHealthProvider.java b/server/sonar-main/src/main/java/org/sonar/application/health/SearchNodeHealthProvider.java
index 93657803762316391c5299c73ee822ef8681d085..b1f650602fc33d51294ecbef78f3bf2342c83af7 100644 (file)
--- a/server/sonar-main/src/main/java/org/sonar/application/health/SearchNodeHealthProvider.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/health/SearchNodeHealthProvider.java
@@ -43,7 +43,7 @@ public class SearchNodeHealthProvider implements NodeHealthProvider {
       .setName(props.nonNullValue(CLUSTER_NODE_NAME))
       .setHost(getHost(props, networkUtils))
       .setPort(Integer.valueOf(props.nonNullValue(CLUSTER_NODE_PORT)))
-      .setStarted(system2.now())
+      .setStartedAt(system2.now())
       .build();
   }
 

diff --git a/server/sonar-main/src/test/java/org/sonar/application/health/SearchNodeHealthProviderTest.java b/server/sonar-main/src/test/java/org/sonar/application/health/SearchNodeHealthProviderTest.java
index ae3084db84f53140b8cb12c49662974975d65078..ce6fc6ec450dbb9e8f3dc811b149de01b7afa452 100644 (file)
--- a/server/sonar-main/src/test/java/org/sonar/application/health/SearchNodeHealthProviderTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/health/SearchNodeHealthProviderTest.java
@@ -190,14 +190,14 @@ public class SearchNodeHealthProviderTest {
 
     NodeHealth nodeHealth = underTest.get();
 
-    assertThat(nodeHealth.getDetails().getStarted()).isEqualTo(now);
+    assertThat(nodeHealth.getDetails().getStartedAt()).isEqualTo(now);
 
     // change now
     when(system2.now()).thenReturn(now);
 
     NodeHealth newNodeHealth = underTest.get();
 
-    assertThat(newNodeHealth.getDetails().getStarted()).isEqualTo(now);
+    assertThat(newNodeHealth.getDetails().getStartedAt()).isEqualTo(now);
   }
 
   @Test

diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthProviderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthProviderImpl.java
index 1829c36421c63374f3c67d3e8e6289612830ef02..f350b267184b74f500b15c1468a69c2f38ebd6d5 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthProviderImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthProviderImpl.java
@@ -47,7 +47,7 @@ public class NodeHealthProviderImpl implements NodeHealthProvider {
       .setType(NodeDetails.Type.APPLICATION)
       .setHost(computeHost(configuration, networkUtils))
       .setPort(computePort(configuration))
-      .setStarted(server.getStartedAt().getTime())
+      .setStartedAt(server.getStartedAt().getTime())
       .build();
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/HealthActionSupport.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/HealthActionSupport.java
index 9df0678a9fc02a4cb5733f7cac7d30340dbd8d64..f1459808df10ae8edf72c8e8b7be6320df442037 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/HealthActionSupport.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/HealthActionSupport.java
@@ -29,7 +29,6 @@ import org.sonar.server.health.Health;
 import org.sonar.server.health.HealthChecker;
 import org.sonarqube.ws.WsSystem;
 
-import static java.lang.String.valueOf;
 import static org.sonar.api.utils.DateUtils.formatDateTime;
 
 public class HealthActionSupport {
@@ -102,8 +101,8 @@ public class HealthActionSupport {
       .setType(WsSystem.NodeType.valueOf(details.getType().name()))
       .setName(details.getName())
       .setHost(details.getHost())
-      .setPort(valueOf(details.getPort()))
-      .setStarted(formatDateTime(details.getStarted()));
+      .setPort(details.getPort())
+      .setStartedAt(formatDateTime(details.getStartedAt()));
     return nodeBuilder.build();
   }
 

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-health.json b/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-health.json
index b1e98f92032d58332ba9b6de9186873dc6c890d1..28c8b37cc84c94a2e0d97c621bf1d1a182597065 100644 (file)
--- a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-health.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-health.json
@@ -10,8 +10,8 @@
       "name": "app-1",
       "type": "APPLICATION",
       "host": "192.168.1.1",
-      "port": "999",
-      "started": "2015-08-13T23:34:59+0200",
+      "port": 999,
+      "startedAt": "2015-08-13T23:34:59+0200",
       "health": "RED",
       "causes": [
         {
@@ -23,8 +23,8 @@
       "name": "app-2",
       "type": "APPLICATION",
       "host": "192.168.1.2",
-      "port": "999",
-      "started": "2015-08-13T23:34:59+0200",
+      "port": 999,
+      "startedAt": "2015-08-13T23:34:59+0200",
       "health": "YELLOW",
       "causes": [
         {
@@ -36,8 +36,8 @@
       "name": "es-1",
       "type": "SEARCH",
       "host": "192.168.1.3",
-      "port": "999",
-      "started": "2015-08-13T23:34:59+0200",
+      "port": 999,
+      "startedAt": "2015-08-13T23:34:59+0200",
       "health": "GREEN",
       "causes": []
     },
@@ -45,8 +45,8 @@
       "name": "es-2",
       "type": "SEARCH",
       "host": "192.168.1.4",
-      "port": "999",
-      "started": "2015-08-13T23:34:59+0200",
+      "port": 999,
+      "startedAt": "2015-08-13T23:34:59+0200",
       "health": "GREEN",
       "causes": []
     },
@@ -54,8 +54,8 @@
       "name": "es-3",
       "type": "SEARCH",
       "host": "192.168.1.5",
-      "port": "999",
-      "started": "2015-08-13T23:34:59+0200",
+      "port": 999,
+      "startedAt": "2015-08-13T23:34:59+0200",
       "health": "GREEN",
       "causes": []
     }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/AppNodeClusterCheckTest.java b/server/sonar-server/src/test/java/org/sonar/server/health/AppNodeClusterCheckTest.java
index f10c1e5ff52053f9826ccf868290b3617e373168..b435cff9be328f04222c39a1d84a0de2c7e3fa5e 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/health/AppNodeClusterCheckTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/health/AppNodeClusterCheckTest.java
@@ -277,7 +277,7 @@ public class AppNodeClusterCheckTest {
         .setHost(randomAlphanumeric(32))
         .setName(randomAlphanumeric(32))
         .setPort(1 + random.nextInt(88))
-        .setStarted(1 + random.nextInt(54))
+        .setStartedAt(1 + random.nextInt(54))
         .build())
       .build();
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/ClusterHealthTest.java b/server/sonar-server/src/test/java/org/sonar/server/health/ClusterHealthTest.java
index 8d60966d08f95babab4394de65eda5944673ccdf..494eaf2de5aace2c7030c937698f4eb5c20bbfb1 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/health/ClusterHealthTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/health/ClusterHealthTest.java
@@ -116,7 +116,7 @@ public class ClusterHealthTest {
           .setName(randomAlphanumeric(3))
           .setHost(randomAlphanumeric(4))
           .setPort(1 + random.nextInt(344))
-          .setStarted(1 + random.nextInt(999))
+          .setStartedAt(1 + random.nextInt(999))
           .build())
       .build()).collect(Collectors.toSet());
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java b/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java
index 11a02c20ea1627f152eaf8ddca9c968dc84aff80..d24dce584cd9c4f25cabec6b880959aa93c0cd84 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java
@@ -50,7 +50,7 @@ public class EsStatusClusterCheckTest {
           .setName(randomAlphanumeric(23))
           .setHost(randomAlphanumeric(23))
           .setPort(1 + random.nextInt(96))
-          .setStarted(1 + random.nextInt(966))
+          .setStartedAt(1 + random.nextInt(966))
           .build())
         .build())
       .collect(Collectors.toSet());

diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/HealthCheckerImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/health/HealthCheckerImplTest.java
index 3c4a89aa4332da2aa909d8a15d44ee2475bb8435..a3e191951c7b7b1030d0fae4579bee513eb00a50 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/health/HealthCheckerImplTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/health/HealthCheckerImplTest.java
@@ -249,7 +249,7 @@ public class HealthCheckerImplTest {
         .setName(randomAlphanumeric(10))
         .setHost(randomAlphanumeric(5))
         .setPort(1 + random.nextInt(333))
-        .setStarted(1 + random.nextInt(444))
+        .setStartedAt(1 + random.nextInt(444))
         .build())
       .build();
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/NodeHealthProviderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/health/NodeHealthProviderImplTest.java
index 02a0df617c86ecc61eaceccdbb8b83e6eed5e11f..5cb9914f4b7a69512d0db4a30d197731674fb341 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/health/NodeHealthProviderImplTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/health/NodeHealthProviderImplTest.java
@@ -221,14 +221,14 @@ public class NodeHealthProviderImplTest {
 
     NodeHealth nodeHealth = underTest.get();
 
-    assertThat(nodeHealth.getDetails().getStarted()).isEqualTo(date.getTime());
+    assertThat(nodeHealth.getDetails().getStartedAt()).isEqualTo(date.getTime());
 
     // change startedAt value
     setStartedAt();
 
     NodeHealth newNodeHealth = underTest.get();
 
-    assertThat(newNodeHealth.getDetails().getStarted()).isEqualTo(date.getTime());
+    assertThat(newNodeHealth.getDetails().getStartedAt()).isEqualTo(date.getTime());
   }
 
   private void setStartedAt() {

diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/SearchNodeClusterCheckTest.java b/server/sonar-server/src/test/java/org/sonar/server/health/SearchNodeClusterCheckTest.java
index 59135f2bfab9442ce86b6b1a824ce6a891beb693..88145389f87c66b630abce908922eff06f19e48c 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/health/SearchNodeClusterCheckTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/health/SearchNodeClusterCheckTest.java
@@ -513,7 +513,7 @@ public class SearchNodeClusterCheckTest {
         .setHost(randomAlphanumeric(32))
         .setName(randomAlphanumeric(32))
         .setPort(1 + random.nextInt(88))
-        .setStarted(1 + random.nextInt(54))
+        .setStartedAt(1 + random.nextInt(54))
         .build())
       .build();
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/HealthActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/HealthActionTest.java
index ab70215d87bbefa5435f692971efd54fa5d07843..11522e7aabffee56f9e2273b53010f50a94946a5 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/HealthActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/HealthActionTest.java
@@ -96,7 +96,7 @@ public class HealthActionTest {
                   .setType(NodeDetails.Type.APPLICATION)
                   .setHost("192.168.1.1")
                   .setPort(999)
-                  .setStarted(time)
+                  .setStartedAt(time)
                   .build())
               .build(),
             newNodeHealthBuilder()
@@ -108,7 +108,7 @@ public class HealthActionTest {
                   .setType(NodeDetails.Type.APPLICATION)
                   .setHost("192.168.1.2")
                   .setPort(999)
-                  .setStarted(time)
+                  .setStartedAt(time)
                   .build())
               .build(),
             newNodeHealthBuilder()
@@ -119,7 +119,7 @@ public class HealthActionTest {
                   .setType(NodeDetails.Type.SEARCH)
                   .setHost("192.168.1.3")
                   .setPort(999)
-                  .setStarted(time)
+                  .setStartedAt(time)
                   .build())
               .build(),
             newNodeHealthBuilder()
@@ -130,7 +130,7 @@ public class HealthActionTest {
                   .setType(NodeDetails.Type.SEARCH)
                   .setHost("192.168.1.4")
                   .setPort(999)
-                  .setStarted(time)
+                  .setStartedAt(time)
                   .build())
               .build(),
             newNodeHealthBuilder()
@@ -141,7 +141,7 @@ public class HealthActionTest {
                   .setType(NodeDetails.Type.SEARCH)
                   .setHost("192.168.1.5")
                   .setPort(999)
-                  .setStarted(time)
+                  .setStartedAt(time)
                   .build())
               .build())));
 
@@ -201,8 +201,8 @@ public class HealthActionTest {
       .containsOnly(nodeHealth.getCauses().stream().toArray(String[]::new));
     assertThat(node.getName()).isEqualTo(nodeHealth.getDetails().getName());
     assertThat(node.getHost()).isEqualTo(nodeHealth.getDetails().getHost());
-    assertThat(node.getPort()).isEqualTo(String.valueOf(nodeHealth.getDetails().getPort()));
-    assertThat(node.getStarted()).isEqualTo(formatDateTime(nodeHealth.getDetails().getStarted()));
+    assertThat(node.getPort()).isEqualTo(nodeHealth.getDetails().getPort());
+    assertThat(node.getStartedAt()).isEqualTo(formatDateTime(nodeHealth.getDetails().getStartedAt()));
     assertThat(node.getType().name()).isEqualTo(nodeHealth.getDetails().getType().name());
   }
 
@@ -225,7 +225,7 @@ public class HealthActionTest {
       randomNodeHealth(NodeDetails.Type.SEARCH, "2_name", "1_host", 2, 28),
       randomNodeHealth(NodeDetails.Type.SEARCH, "2_name", "2_host", 1, 66),
       randomNodeHealth(NodeDetails.Type.SEARCH, "2_name", "2_host", 2, 77)));
-    String[] expected = nodeHealths.stream().map(s -> formatDateTime(new Date(s.getDetails().getStarted()))).toArray(String[]::new);
+    String[] expected = nodeHealths.stream().map(s -> formatDateTime(new Date(s.getDetails().getStartedAt()))).toArray(String[]::new);
     Collections.shuffle(nodeHealths);
 
     when(webServer.isStandalone()).thenReturn(false);
@@ -234,7 +234,7 @@ public class HealthActionTest {
     WsSystem.HealthResponse response = underTest.newRequest().executeProtobuf(WsSystem.HealthResponse.class);
 
     assertThat(response.getNodes().getNodesList())
-      .extracting(WsSystem.Node::getStarted)
+      .extracting(WsSystem.Node::getStartedAt)
       .containsExactly(expected);
   }
 
@@ -248,7 +248,7 @@ public class HealthActionTest {
         .setName(randomAlphanumeric(3))
         .setHost(randomAlphanumeric(4))
         .setPort(1 + random.nextInt(3))
-        .setStarted(1 + random.nextInt(23))
+        .setStartedAt(1 + random.nextInt(23))
         .build())
       .build();
   }
@@ -263,7 +263,7 @@ public class HealthActionTest {
         .setName(name)
         .setHost(host)
         .setPort(port)
-        .setStarted(started)
+        .setStartedAt(started)
         .build())
       .build();
   }

diff --git a/sonar-ws/src/main/protobuf/ws-system.proto b/sonar-ws/src/main/protobuf/ws-system.proto
index 874d838ffc9f7ee6007ee679bdb3b229c3b41cf8..5a6cddfe4e8360e893c9b688c6b79b416924f31b 100644 (file)
--- a/sonar-ws/src/main/protobuf/ws-system.proto
+++ b/sonar-ws/src/main/protobuf/ws-system.proto
@@ -65,8 +65,8 @@ message Node {
   optional string name = 1;
   optional NodeType type = 2;
   optional string host = 3;
-  optional string port = 4;
-  optional string started = 5;
+  optional int32 port = 4;
+  optional string startedAt = 5;
   optional Health health = 6;
   repeated Cause causes = 7;
 }