From 06d41227e6e745cf9dfbe8df2b29fd67992060da Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Tue, 18 Sep 2018 19:22:30 -0400
Subject: 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>
---
 PolicyEngineUtils/pom.xml                                              | 1 -
 PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'PolicyEngineUtils')

diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 052d63785..e2fc598cd 100644
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -56,7 +56,6 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>com.github.fge</groupId>
diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java
index 06263853e..67210c814 100644
--- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java
@@ -196,7 +196,7 @@ public class PolicyUtils {
      * @return
      */
     public static boolean containsNonAsciiEmptyChars(String value) {
-        return (value == null|| value.contains(" ") || "".equals(value.trim())|| !CharMatcher.ASCII.matchesAllOf((CharSequence) value))? true:false;
+        return (value == null || value.contains(" ") || "".equals(value.trim()) || !CharMatcher.ascii().matchesAllOf((CharSequence) value)) ? true : false;
     }
     
     /**
-- 
cgit 1.2.3-korg