aboutsummaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2019-06-11 14:05:22 +0200
committerMartin Polden <mpolden@mpolden.no>2019-06-11 14:20:52 +0200
commit981b9107737e3c8126d0c292ee4c6b21feb4356f (patch)
tree9a671b720addc7639b70cec9c517878c8eec93bb /configserver
parent1307945954b7ca541b640a30fb06e5a27e43fdf3 (diff)
Style fixes and missing author
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpoint.java6
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java4
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointsCache.java4
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java5
4 files changed, 16 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpoint.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpoint.java
index fb1035b5a03..eda320bde8f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpoint.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpoint.java
@@ -8,16 +8,17 @@ import java.util.Objects;
/**
* ContainerEndpoint tracks the service names that a Container Cluster should be
- * known as. This is used during request routing both for regular requests and
+ * known as. This is used during request routing both for regular requests and
* for health checks in traffic distribution.
*
* @author ogronnesby
*/
public class ContainerEndpoint {
+
private final ClusterId clusterId;
private final List<String> names;
- ContainerEndpoint(ClusterId clusterId, List<String> names) {
+ public ContainerEndpoint(ClusterId clusterId, List<String> names) {
this.clusterId = Objects.requireNonNull(clusterId);
this.names = List.copyOf(Objects.requireNonNull(names));
}
@@ -51,4 +52,5 @@ public class ContainerEndpoint {
", names=" + names +
'}';
}
+
}
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java
index 83d65f5b38b..379af7f71ea 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java
@@ -17,9 +17,12 @@ import java.util.List;
* @author ogronnesby
*/
public class ContainerEndpointSerializer {
+
private static final String clusterIdField = "clusterId";
private static final String namesField = "names";
+ private ContainerEndpointSerializer() {}
+
public static ContainerEndpoint endpointFromSlime(Inspector inspector) {
final var clusterId = inspector.field(clusterIdField).asString();
final var namesInspector = inspector.field(namesField);
@@ -73,4 +76,5 @@ public class ContainerEndpointSerializer {
return slime;
}
+
}
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointsCache.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointsCache.java
index 06f93f2006f..5e2cd5bd9d8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointsCache.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointsCache.java
@@ -24,6 +24,7 @@ import java.util.List;
* @author ogronnesby
*/
public class ContainerEndpointsCache {
+
private final Path cachePath;
private final Curator curator;
@@ -37,7 +38,7 @@ public class ContainerEndpointsCache {
return optionalData
.map(SlimeUtils::jsonToSlime)
.map(ContainerEndpointSerializer::endpointListFromSlime)
- .orElse(List.of());
+ .orElseGet(List::of);
}
public void write(ApplicationId applicationId, List<ContainerEndpoint> endpoints) {
@@ -56,4 +57,5 @@ public class ContainerEndpointsCache {
private Path applicationPath(ApplicationId applicationId) {
return cachePath.append(applicationId.serializedForm());
}
+
}
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java
index b4d52e6d37c..aac0b6d1a16 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java
@@ -8,7 +8,11 @@ import java.util.List;
import static org.junit.Assert.assertEquals;
+/**
+ * @author ogronnesby
+ */
public class ContainerEndpointSerializerTest {
+
@Test
public void readSingleEndpoint() {
final var slime = new Slime();
@@ -42,4 +46,5 @@ public class ContainerEndpointSerializerTest {
assertEquals(endpoints, deserialized);
}
+
}