summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2021-09-23 13:20:17 +0200
committerMorten Tokle <mortent@verizonmedia.com>2021-09-23 13:20:17 +0200
commit7f69cf4acc3a6c785dff0ab956f90e87dbbbaa87 (patch)
treebf1e395ad81a1c849199044fe9af478b98bc9d49 /node-repository
parent279a79ac651dc6a84440984b66866b0323512083 (diff)
fix after review
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java5
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/TrustStoreItem.java6
2 files changed, 8 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
index 0f11361827d..df3ac00ce7f 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
+import java.util.stream.Collectors;
/**
* A node in the node repository. The identity of a node is given by its id.
@@ -99,7 +100,7 @@ public final class Node implements Nodelike {
this.exclusiveToApplicationId = Objects.requireNonNull(exclusiveToApplicationId, "exclusiveToApplicationId cannot be null");
this.exclusiveToClusterType = Objects.requireNonNull(exclusiveToClusterType, "exclusiveToClusterType cannot be null");
this.switchHostname = requireNonEmptyString(switchHostname, "switchHostname cannot be null");
- this.trustStoreItems = trustStoreItems;
+ this.trustStoreItems = trustStoreItems.stream().distinct().collect(Collectors.toUnmodifiableList());
if (state == State.active)
requireNonEmpty(ipConfig.primary(), "Active node " + hostname + " must have at least one valid IP address");
@@ -211,7 +212,7 @@ public final class Node implements Nodelike {
return switchHostname;
}
- /** Returns the trusted Certificates for this host if any. */
+ /** Returns the trusted certificates for this host if any. */
public List<TrustStoreItem> trustedCertificates() {
return trustStoreItems;
}
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/TrustStoreItem.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/TrustStoreItem.java
index ec212c89661..6fb94d0bc62 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/TrustStoreItem.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/TrustStoreItem.java
@@ -8,7 +8,11 @@ import com.yahoo.slime.Inspector;
import java.time.Instant;
import java.util.Objects;
-
+/**
+ * Contains the fingerprint and expiry of certificates in a hosts truststore.
+ *
+ * @author mortent
+ */
public class TrustStoreItem {
private static final String FINGERPRINT_FIELD = "fingerprint";
private static final String EXPIRY_FIELD = "expiry";