aboutsummaryrefslogtreecommitdiffstats
path: root/gson
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-05-07 15:35:55 -0400
committerJim Hahn <jrh3@att.com>2021-05-07 15:42:10 -0400
commitc7d24b07377cb00ce4c0c531c6d3dff25e04dc12 (patch)
treea1c32b52d2d92321745824e6d4fe29fb441a5835 /gson
parent1d0aaaa5b31719c1718700bb0d1a99c413fd513c (diff)
Change java.util.regex to re2j
Sonar complains about java.util.regex. Thought I used re2j when creating all of the patterns, but apparently not. Fixed that oversight. Issue-ID: POLICY-3284 Change-Id: Idbec112ab0d4c3b477ce357f8a556d95e4dea083 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'gson')
-rw-r--r--gson/pom.xml4
-rw-r--r--gson/src/main/java/org/onap/policy/common/gson/internal/Adapter.java4
2 files changed, 6 insertions, 2 deletions
diff --git a/gson/pom.xml b/gson/pom.xml
index 53489bac..309ce342 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -34,6 +34,10 @@
<dependencies>
<dependency>
+ <groupId>com.google.re2j</groupId>
+ <artifactId>re2j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
diff --git a/gson/src/main/java/org/onap/policy/common/gson/internal/Adapter.java b/gson/src/main/java/org/onap/policy/common/gson/internal/Adapter.java
index 64a51d0b..c15ccb7d 100644
--- a/gson/src/main/java/org/onap/policy/common/gson/internal/Adapter.java
+++ b/gson/src/main/java/org/onap/policy/common/gson/internal/Adapter.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP
* ================================================================================
- * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,11 +24,11 @@ import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.TypeAdapter;
import com.google.gson.reflect.TypeToken;
+import com.google.re2j.Pattern;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.function.Supplier;
-import java.util.regex.Pattern;
import org.onap.policy.common.gson.annotation.GsonJsonProperty;
/**