diff options
| -rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/servlets/UserAdminServlet.java | 10 | ||||
| -rw-r--r-- | utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/SdcProxy.java | 9 |
2 files changed, 6 insertions, 13 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/UserAdminServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/UserAdminServlet.java index 2e96b0b77e..75809119f0 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/UserAdminServlet.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/UserAdminServlet.java @@ -30,8 +30,6 @@ import io.swagger.v3.oas.annotations.servers.Server; import io.swagger.v3.oas.annotations.servers.Servers; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tags; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletRequest; @@ -66,7 +64,6 @@ import org.springframework.stereotype.Controller; @Controller public class UserAdminServlet extends BeGenericServlet { - private static final String UTF_8 = "UTF-8"; private static final String ROLE_DELIMITER = ","; private static final Logger log = Logger.getLogger(UserAdminServlet.class); private final UserBusinessLogic userBusinessLogic; @@ -160,12 +157,7 @@ public class UserAdminServlet extends BeGenericServlet { @ApiResponse(responseCode = "500", description = "Internal Server Error")}) @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE) public User authorize(@HeaderParam(value = Constants.USER_ID_HEADER) String userId, @HeaderParam("HTTP_CSP_FIRSTNAME") String firstName, - @HeaderParam("HTTP_CSP_LASTNAME") String lastName, @HeaderParam("HTTP_CSP_EMAIL") String email) - throws UnsupportedEncodingException { - userId = userId != null ? URLDecoder.decode(userId, UTF_8) : null; - firstName = firstName != null ? URLDecoder.decode(firstName, UTF_8) : null; - lastName = lastName != null ? URLDecoder.decode(lastName, UTF_8) : null; - email = email != null ? URLDecoder.decode(email, UTF_8) : null; + @HeaderParam("HTTP_CSP_LASTNAME") String lastName, @HeaderParam("HTTP_CSP_EMAIL") String email) { User authUser = new User(); authUser.setUserId(userId); authUser.setFirstName(firstName); diff --git a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/SdcProxy.java b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/SdcProxy.java index 0637f7e29f..10a6bb8e74 100644 --- a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/SdcProxy.java +++ b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/SdcProxy.java @@ -20,10 +20,11 @@ package org.openecomp.sdc.webseal.simulator; +import static java.nio.charset.StandardCharsets.UTF_8; + import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.net.URLEncoder; @@ -204,7 +205,7 @@ public class SdcProxy extends HttpServlet { return contextPaths; } - private String getUri(HttpServletRequest request, Map<String, String[]> requestParameters) throws UnsupportedEncodingException { + private String getUri(HttpServletRequest request, Map<String, String[]> requestParameters) { String suffix = request.getRequestURI(); if (getContextPaths().stream().anyMatch(request.getRequestURI()::contains)) { suffix = alignUrlProxy(suffix); @@ -316,7 +317,7 @@ public class SdcProxy extends HttpServlet { return SDC1 + requestURI; } - private StringBuilder alignUrlParameters(Map<String, String[]> requestParameters) throws UnsupportedEncodingException { + private StringBuilder alignUrlParameters(Map<String, String[]> requestParameters) { final var query = new StringBuilder(); for (final Entry<String, String[]> entry : requestParameters.entrySet()) { for (final String value : entry.getValue()) { @@ -325,7 +326,7 @@ public class SdcProxy extends HttpServlet { } else { query.append("&"); } - query.append(String.format("&%s=%s", URLEncoder.encode(entry.getKey(), "UTF-8"), URLEncoder.encode(value, "UTF-8"))); + query.append(String.format("&%s=%s", URLEncoder.encode(entry.getKey(), UTF_8), URLEncoder.encode(value, UTF_8))); } } return query; |