Changes to the validation code broke the validation check for the
supportedPolicyTypes field in PdpSubGroup - it no longer supports wild-
cards in the name. Modified the validation annotation in
PfSearchableKey to allow wild-card names.
Issue-ID: POLICY-2648
Change-Id: Ibd2853025ce72ed88697dd9a7d6d5eed2b28475e
Signed-off-by: Jim Hahn <jrh3@att.com>
public static final String WILDCARD_NAME_REGEXP = "^[A-Za-z0-9\\-_\\.]+(?:\\.\\*)?$";
@Column(name = NAME_TOKEN, length = 120)
- @Pattern(regexp = NAME_REGEXP)
+ @Pattern(regexp = WILDCARD_NAME_REGEXP)
private String name;
@Column(name = VERSION_TOKEN, length = 20)
package org.onap.policy.models.base;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
PfSearchableKey someKey4 = new PfSearchableKey("my-name.*", VERSION001);
assertEquals("my-name.*", someKey4.getName());
assertEquals(VERSION001, someKey4.getVersion());
+ assertThat(someKey4.validate("").getResult()).isNull();
}
}