Commit adfbbcc0 authored by Matthias Stock's avatar Matthias Stock Committed by Stephane Nicoll

Simplify validation pattern of EndpointId

See gh-19584
parent bdffa860
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -40,9 +40,9 @@ public final class EndpointId {
private static Set<String> loggedWarnings = new HashSet<>();
private static final Pattern VALID_PATTERN = Pattern.compile("[a-zA-Z0-9\\.\\-]+");
private static final Pattern VALID_PATTERN = Pattern.compile("[a-zA-Z0-9.-]+");
private static final Pattern WARNING_PATTERN = Pattern.compile("[\\.\\-]+");
private static final Pattern WARNING_PATTERN = Pattern.compile("[.-]+");
private final String value;
......
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -51,6 +51,12 @@ public class EndpointIdTests {
.withMessage("Value must only contain valid chars");
}
@Test
public void ofWhenContainsBackslashThrowsException() {
assertThatIllegalArgumentException().isThrownBy(() -> EndpointId.of("foo\\bar"))
.withMessage("Value must only contain valid chars");
}
@Test
public void ofWhenHasBadCharThrowsException() {
assertThatIllegalArgumentException().isThrownBy(() -> EndpointId.of("foo!bar"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment