diff options
author | Pamela Dragosh <pdragosh@research.att.com> | 2018-09-18 19:22:30 -0400 |
---|---|---|
committer | Pamela Dragosh <pdragosh@research.att.com> | 2018-09-18 19:22:35 -0400 |
commit | 06d41227e6e745cf9dfbe8df2b29fd67992060da (patch) | |
tree | eade43d61efb76f71b4cef1470ccc13984cfbf89 /ONAP-PDP-REST | |
parent | 43dd8e5baa16c1fb1e68343b0b4b9ca0cd486500 (diff) |
Fixes for oparent upgrade
Clean up mariadb so that it is consistent, allow jetty to be
defined by oparent, and fixes to fully support google guava
upgrade.
Issue-ID: POLICY-1126
Change-Id: Ic0c2fba5f6f5f1a41e53770b95861606a5b4bbe6
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'ONAP-PDP-REST')
-rw-r--r-- | ONAP-PDP-REST/pom.xml | 1 | ||||
-rw-r--r-- | ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/utils/PolicyApiUtils.java | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index 1aed0700c..04483a16e 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -79,7 +79,6 @@ <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> - <version>2.1.1</version> </dependency> <dependency> <groupId>postgresql</groupId> diff --git a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/utils/PolicyApiUtils.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/utils/PolicyApiUtils.java index 197db26c1..47b6efb2a 100644 --- a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/utils/PolicyApiUtils.java +++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/utils/PolicyApiUtils.java @@ -48,7 +48,7 @@ public class PolicyApiUtils { LOGGER.error("The Value is empty."); return false; } else { - if (CharMatcher.ASCII.matchesAllOf((CharSequence) jsonString)) { + if (CharMatcher.ascii().matchesAllOf((CharSequence) jsonString)) { LOGGER.info("The Value does not contain ASCII Characters"); isValidForm = true; } else { |