Rename method and defensively copy in constructor

4 files changed, 10 insertions, 10 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index cda6be11279..99f628e69be 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -661,12 +661,12 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
 
     public HttpResponse checkServiceForConfigConvergence(ApplicationId applicationId, String hostAndPort, URI uri,
                                                          Duration timeout, Optional<Version> vespaVersion) {
-        return convergeChecker.getServiceConfigGenerationJson(getApplication(applicationId, vespaVersion), hostAndPort, uri, timeout);
+        return convergeChecker.getServiceConfigGenerationResponse(getApplication(applicationId, vespaVersion), hostAndPort, uri, timeout);
     }
 
     public HttpResponse servicesToCheckForConfigConvergence(ApplicationId applicationId, URI uri,
                                                             Duration timeoutPerService, Optional<Version> vespaVersion) {
-        return convergeChecker.getServiceConfigGenerationsJson(getApplication(applicationId, vespaVersion), uri, timeoutPerService);
+        return convergeChecker.getServiceConfigGenerationsResponse(getApplication(applicationId, vespaVersion), uri, timeoutPerService);
     }
 
     // ---------------- Logs ----------------------------------------------------------------
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java
index aceabbd12de..6b316c06b54 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java
@@ -82,7 +82,7 @@ public class ConfigConvergenceChecker extends AbstractComponent {
     }
 
     /** Check all services in given application. Returns the minimum current generation of all services */
-    public ServiceListResponse getServiceConfigGenerationsJson(Application application, URI requestUrl, Duration timeoutPerService) {
+    public ServiceListResponse getServiceConfigGenerationsResponse(Application application, URI requestUrl, Duration timeoutPerService) {
         Map<ServiceInfo, Long> currentGenerations = getServiceConfigGenerations(application, timeoutPerService);
         long currentGeneration = currentGenerations.values().stream().mapToLong(Long::longValue).min().orElse(-1);
         return new ServiceListResponse(200, currentGenerations, requestUrl, application.getApplicationGeneration(),
@@ -90,7 +90,7 @@ public class ConfigConvergenceChecker extends AbstractComponent {
     }
 
     /** Check service identified by host and port in given application */
-    public ServiceResponse getServiceConfigGenerationJson(Application application, String hostAndPortToCheck, URI requestUrl, Duration timeout) {
+    public ServiceResponse getServiceConfigGenerationResponse(Application application, String hostAndPortToCheck, URI requestUrl, Duration timeout) {
         Long wantedGeneration = application.getApplicationGeneration();
         try {
             if ( ! hostInApplication(application, hostAndPortToCheck))
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ReindexingStatus.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ReindexingStatus.java
index ead1ec88474..465fe3a670c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ReindexingStatus.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ReindexingStatus.java
@@ -25,7 +25,7 @@ public class ReindexingStatus implements Reindexing {
 
     ReindexingStatus(Map<String, Long> pending, Map<String, Status> ready) {
         this.pending = Map.copyOf(pending);
-        this.ready = ready;
+        this.ready = Map.copyOf(ready);
     }
 
     /** No reindexing pending or ready. */
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java
index 2d749649ce1..6aeb774d2b0 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java
@@ -77,7 +77,7 @@ public class ConfigConvergenceCheckerTest {
             String serviceName = hostAndPort(this.service);
             URI requestUrl = testServer().resolve("/serviceconverge/" + serviceName);
             wireMock.stubFor(get(urlEqualTo("/state/v1/config")).willReturn(okJson("{\"config\":{\"generation\":3}}")));
-            HttpResponse serviceResponse = checker.getServiceConfigGenerationJson(application, hostAndPort(this.service), requestUrl, clientTimeout);
+            HttpResponse serviceResponse = checker.getServiceConfigGenerationResponse(application, hostAndPort(this.service), requestUrl, clientTimeout);
             assertResponse("{\n" +
                            "  \"url\": \"" + requestUrl.toString() + "\",\n" +
                            "  \"host\": \"" + hostAndPort(this.service) + "\",\n" +
@@ -92,7 +92,7 @@ public class ConfigConvergenceCheckerTest {
         { // Missing service
             String serviceName = "notPresent:1337";
             URI requestUrl = testServer().resolve("/serviceconverge/" + serviceName);
-            HttpResponse response = checker.getServiceConfigGenerationJson(application, "notPresent:1337", requestUrl, clientTimeout);
+            HttpResponse response = checker.getServiceConfigGenerationResponse(application, "notPresent:1337", requestUrl, clientTimeout);
             assertResponse("{\n" +
                            "  \"url\": \"" + requestUrl.toString() + "\",\n" +
                            "  \"host\": \"" + serviceName + "\",\n" +
@@ -111,7 +111,7 @@ public class ConfigConvergenceCheckerTest {
             URI requestUrl = testServer().resolve("/serviceconverge");
             URI serviceUrl = testServer().resolve("/serviceconverge/" + serviceName);
             wireMock.stubFor(get(urlEqualTo("/state/v1/config")).willReturn(okJson("{\"config\":{\"generation\":3}}")));
-            HttpResponse response = checker.getServiceConfigGenerationsJson(application, requestUrl, clientTimeout);
+            HttpResponse response = checker.getServiceConfigGenerationsResponse(application, requestUrl, clientTimeout);
             assertResponse("{\n" +
                            "  \"services\": [\n" +
                            "    {\n" +
@@ -148,7 +148,7 @@ public class ConfigConvergenceCheckerTest {
             URI requestUrl = testServer().resolve("/serviceconverge");
             URI serviceUrl = testServer().resolve("/serviceconverge/" + hostAndPort(service));
             URI serviceUrl2 = testServer().resolve("/serviceconverge/" + hostAndPort(service2));
-            HttpResponse response = checker.getServiceConfigGenerationsJson(application, requestUrl, clientTimeout);
+            HttpResponse response = checker.getServiceConfigGenerationsResponse(application, requestUrl, clientTimeout);
             assertResponse("{\n" +
                            "  \"services\": [\n" +
                            "    {\n" +
@@ -182,7 +182,7 @@ public class ConfigConvergenceCheckerTest {
         wireMock.stubFor(get(urlEqualTo("/state/v1/config")).willReturn(aResponse()
                                                                                 .withFixedDelay((int) clientTimeout.plus(Duration.ofSeconds(1)).toMillis())
                                                                                 .withBody("response too slow")));
-        HttpResponse response = checker.getServiceConfigGenerationJson(application, hostAndPort(service), requestUrl, Duration.ofMillis(1));
+        HttpResponse response = checker.getServiceConfigGenerationResponse(application, hostAndPort(service), requestUrl, Duration.ofMillis(1));
         // Message contained in a SocketTimeoutException may differ across platforms, so we do a partial match of the response here
         assertResponse((responseBody) -> assertTrue("Response matches", responseBody.startsWith(
                 "{\"url\":\"" + requestUrl.toString() + "\",\"host\":\"" + hostAndPort(requestUrl) +