Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
KNOX-2123 - Setting requestURI using the given servletRequest in case…
… the service is unavailable and logging it with the appropriate action outcome
- Loading branch information
Showing
3 changed files
with
84 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
gateway-server/src/main/java/org/apache/knox/gateway/util/ServletRequestUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.knox.gateway.util; | ||
|
||
import javax.servlet.ServletRequest; | ||
import javax.servlet.http.HttpServletRequest; | ||
|
||
/** | ||
* Provides useful methods to fetch different parts from {@link ServletRequest} and {@link HttpServletRequest} interfaces. | ||
*/ | ||
public class ServletRequestUtils { | ||
|
||
public static String getRequestPath(ServletRequest servletRequest) { | ||
return getRequestPath((HttpServletRequest) servletRequest); | ||
} | ||
|
||
public static String getRequestPath(HttpServletRequest httpServletRequest) { | ||
return emptyOrValue(httpServletRequest.getServletPath()) + emptyOrValue(httpServletRequest.getPathInfo()); | ||
} | ||
|
||
public static String getRequestPathWithQuery(ServletRequest servletRequest) { | ||
return getRequestPathWithQuery((HttpServletRequest) servletRequest); | ||
} | ||
|
||
public static String getRequestPathWithQuery(HttpServletRequest httpServletRequest) { | ||
return getRequestPath(httpServletRequest) + emptyOrValue(httpServletRequest.getQueryString(), "?"); | ||
} | ||
|
||
public static String getContextPathWithQuery(ServletRequest servletRequest) { | ||
return getContextPathWithQuery((HttpServletRequest) servletRequest); | ||
} | ||
|
||
public static String getContextPathWithQuery(HttpServletRequest httpServletRequest) { | ||
return httpServletRequest.getContextPath() + getRequestPathWithQuery(httpServletRequest); | ||
} | ||
|
||
private static String emptyOrValue(String toTest) { | ||
return emptyOrValue(toTest, null); | ||
} | ||
|
||
private static String emptyOrValue(String toTest, String prefix) { | ||
if (toTest == null) { | ||
return ""; | ||
} else { | ||
return prefix == null ? toTest : prefix + toTest; | ||
} | ||
} | ||
|
||
} |