From 193105ce3a95fb1682fef0a17c081c2e6ebb8ff5 Mon Sep 17 00:00:00 2001
From: "Benjamin, Max" <max.benjamin@att.com>
Date: Tue, 10 Sep 2019 13:52:53 -0400
Subject: error message formatter now handles percent

error message formatter now handles percent encoding

Issue-ID: SO-2303
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: If4784ab54023b1df43eb7ee266a2797c9a12731b
---
 common/src/main/java/org/onap/so/client/aai/AAIErrorFormatter.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'common/src/main/java/org/onap')

diff --git a/common/src/main/java/org/onap/so/client/aai/AAIErrorFormatter.java b/common/src/main/java/org/onap/so/client/aai/AAIErrorFormatter.java
index 2fe3910486..e255b297ed 100644
--- a/common/src/main/java/org/onap/so/client/aai/AAIErrorFormatter.java
+++ b/common/src/main/java/org/onap/so/client/aai/AAIErrorFormatter.java
@@ -50,6 +50,8 @@ public class AAIErrorFormatter {
     }
 
     protected String format(String s, List<String> variables) {
-        return String.format(s.replaceAll("%(\\d+)", "%$1\\$s"), variables.toArray());
+        s = s.replaceAll("%(\\d(?!\\d))", "%$1\\$s");
+        s = s.replaceAll("%(\\d{2})", "%%$1");
+        return String.format(s, variables.toArray());
     }
 }
-- 
cgit 1.2.3-korg