summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2019-04-02 07:59:56 +0100
committerGitHub <noreply@github.com>2019-04-02 07:59:56 +0100
commitda41894e5b4f7525ee59d9c69838bdc21735d0f2 (patch)
tree27e661bf00cda485be7b6445182d0bd6032fae85 /container-core
parent2a1cd9b08a9ba150a2a295c368c30b40386971f5 (diff)
parent601d71793fc14b2d943d4e6f10f2fe455f826fca (diff)
Merge pull request #8973 from vespa-engine/mpolden/deployment-warnings-metric
Report deployment warnings metric
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/main/java/com/yahoo/restapi/Path.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/container-core/src/main/java/com/yahoo/restapi/Path.java b/container-core/src/main/java/com/yahoo/restapi/Path.java
index 79f70168696..764fa64f954 100644
--- a/container-core/src/main/java/com/yahoo/restapi/Path.java
+++ b/container-core/src/main/java/com/yahoo/restapi/Path.java
@@ -4,7 +4,6 @@ package com.yahoo.restapi;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* A path which is able to match strings containing bracketed placeholders and return the
@@ -50,7 +49,7 @@ public class Path {
this.elements = path.split("/");
}
- private boolean matches_inner(String pathSpec) {
+ private boolean matchesInner(String pathSpec) {
values.clear();
String[] specElements = pathSpec.split("/");
boolean matchPrefix = false;
@@ -98,9 +97,9 @@ public class Path {
* @return true if the string matches, false otherwise
*/
public boolean matches(String pathSpec) {
- if (matches_inner(pathSpec)) return true;
+ if (matchesInner(pathSpec)) return true;
if (optionalPrefix.isEmpty()) return false;
- return matches_inner(optionalPrefix + pathSpec);
+ return matchesInner(optionalPrefix + pathSpec);
}
/**
@@ -123,7 +122,7 @@ public class Path {
@Override
public String toString() {
- return "path '" + Arrays.stream(elements).collect(Collectors.joining("/")) + "'";
+ return "path '" + String.join("/", elements) + "'";
}
}