From d629b626036a1ef1bc37e2b9aa5b5d2fcad1be66 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Fri, 14 Oct 2022 09:30:31 +0000 Subject: Remove the apache commons-lang dependency in aai-common Issue-ID: AAI-3551 Signed-off-by: Fiete Ostkamp Change-Id: Ib68b6fb43044532abf39c1ac088ef969c5aa00c2 --- .../org/onap/aai/aaf/filters/GremlinFilter.java | 21 +++++++++++---------- .../aaf/filters/PayloadBufferingRequestWrapper.java | 9 +++++---- 2 files changed, 16 insertions(+), 14 deletions(-) (limited to 'aai-aaf-auth') diff --git a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/GremlinFilter.java b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/GremlinFilter.java index 23ff0c6d..ce96acf1 100644 --- a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/GremlinFilter.java +++ b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/GremlinFilter.java @@ -19,23 +19,24 @@ */ package org.onap.aai.aaf.filters; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.regex.Pattern; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.commons.io.IOUtils; import org.onap.aai.aaf.auth.ResponseFormatter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.regex.Pattern; - @Component @Profile({ AafProfiles.AAF_CERT_AUTHENTICATION, diff --git a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/PayloadBufferingRequestWrapper.java b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/PayloadBufferingRequestWrapper.java index eb8a61dd..138189e4 100644 --- a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/PayloadBufferingRequestWrapper.java +++ b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/PayloadBufferingRequestWrapper.java @@ -19,14 +19,15 @@ */ package org.onap.aai.aaf.filters; -import org.apache.commons.io.IOUtils; -import org.onap.aaf.cadi.BufferedServletInputStream; +import java.io.ByteArrayInputStream; +import java.io.IOException; import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import java.io.ByteArrayInputStream; -import java.io.IOException; + +import org.apache.commons.io.IOUtils; +import org.onap.aaf.cadi.BufferedServletInputStream; /** * This class buffers the payload of the servlet request. The reason is that we access the payload multiple times, -- cgit 1.2.3-korg