Merge pull request #35 from pugwoo/develop-fix-jakarta

release 1.2.4

CHANGELOG

@@ -1,3 +1,6 @@
+2023年11月3日
+v1.2.4 - [fix] 修复因同时支持javax.servlet-api和jakarta.servlet-api而导致方法使用时，缺少任何一个包会编译报错的问题
+
 2023年11月2日
 v1.2.3 - [enhance] 因为同时需要支持javax.servlet-api和jakarta.servlet-api，故引入两者api
 

README.md

@@ -6,6 +6,6 @@
 <dependency>
     <groupId>com.pugwoo</groupId>
     <artifactId>woo-utils</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
 </dependency>
 ```

pom.xml

@@ -6,7 +6,7 @@
 	<groupId>com.pugwoo</groupId>
 	<artifactId>woo-utils</artifactId>
 	<packaging>jar</packaging>
-	<version>1.2.3</version>
+	<version>1.2.4</version>
 
 	<name>woo-utils</name>
 	<description>the common utils</description>

src/main/java/com/pugwoo/wooutils/net/Browser.java

@@ -198,7 +198,7 @@ public void addRequestHeader(HttpServletRequest request) {
 	 * 设置HttpServletRequest的所有头部信息
 	 * @param request HttpServletRequest
 	 */
-	public void addRequestHeader(jakarta.servlet.http.HttpServletRequest request) {
+	public void addRequestHeaderForJakarta(jakarta.servlet.http.HttpServletRequest request) {
 		Enumeration<String> headerNames = request.getHeaderNames();
 		while(headerNames.hasMoreElements()) {
 			String headerName = headerNames.nextElement();

src/main/java/com/pugwoo/wooutils/net/CookieUtils.java

@@ -55,7 +55,7 @@ public static String getCookieValue(HttpServletRequest request, String name) {
 	 * @param name
 	 * @return
 	 */
-	public static String getCookieValue(jakarta.servlet.http.HttpServletRequest request, String name) {
+	public static String getCookieValueForJakarta(jakarta.servlet.http.HttpServletRequest request, String name) {
 		if(name == null) {
 			return null;
 		}
@@ -108,7 +108,7 @@ public static List<String> getCookieValues(HttpServletRequest request, String na
 	 * @param name
 	 * @return
 	 */
-	public static List<String> getCookieValues(jakarta.servlet.http.HttpServletRequest request, String name) {
+	public static List<String> getCookieValuesForJakarta(jakarta.servlet.http.HttpServletRequest request, String name) {
 		if(name == null) {
 			return null;
 		}
@@ -167,7 +167,7 @@ public static void addCookie(HttpServletResponse response, String name, String v
 	 * @param domain 指定域名，null表示不指定
 	 * @param expireSeconds cookie生命周期 以秒为单位，当设置为0时，cookie默认有效期10年；如果删除，请用removeCookie方法
 	 */
-	public static void addCookie(jakarta.servlet.http.HttpServletResponse response, String name, String value,
+	public static void addCookieForJakarta(jakarta.servlet.http.HttpServletResponse response, String name, String value,
 								 String domain, int expireSeconds) {
 		try {
 			value = value == null ? null : URLEncoder.encode(value, "UTF-8");
@@ -208,9 +208,9 @@ public static void addCookie(HttpServletResponse response, String name, String v
 	 * @param value
 	 * @param domain
 	 */
-	public static void addCookie(jakarta.servlet.http.HttpServletResponse response, String name, String value,
+	public static void addCookieForJakarta(jakarta.servlet.http.HttpServletResponse response, String name, String value,
 								 String domain) {
-		addCookie(response, name, value, domain, 0);
+		addCookieForJakarta(response, name, value, domain, 0);
 	}
 
 	/**
@@ -235,7 +235,7 @@ public static void removeCookie(HttpServletResponse response, String name, Strin
 	 * @param name
 	 * @param domain 当为null时表示不指定
 	 */
-	public static void removeCookie(jakarta.servlet.http.HttpServletResponse response, String name, String domain) {
+	public static void removeCookieForJakarta(jakarta.servlet.http.HttpServletResponse response, String name, String domain) {
 		jakarta.servlet.http.Cookie cookie = new jakarta.servlet.http.Cookie(name, "");
 		cookie.setPath("/");
 		if(domain != null) {

src/main/java/com/pugwoo/wooutils/net/NetUtils.java

@@ -62,7 +62,7 @@ public static String getRemoteIp(HttpServletRequest request) {
 	 * 获得客户端的ip地址，请配合nginx配置使用
 	 * @return 可能返回多个ip，以逗号分隔
 	 */
-	public static String getRemoteIp(jakarta.servlet.http.HttpServletRequest request) {
+	public static String getRemoteIpForJakarta(jakarta.servlet.http.HttpServletRequest request) {
 		String ip = request.getHeader("X-Forwarded-For");
 		if(StringTools.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
 			ip = request.getHeader("Proxy-Client-IP");
@@ -101,7 +101,7 @@ public static boolean isWeixinBrowser(HttpServletRequest request) {
 	 * @param request
 	 * @return
 	 */
-	public static boolean isWeixinBrowser(jakarta.servlet.http.HttpServletRequest request) {
+	public static boolean isWeixinBrowserForJakarta(jakarta.servlet.http.HttpServletRequest request) {
 		String userAgent = request.getHeader("user-agent");
 		if(userAgent != null && userAgent.toLowerCase().contains("micromessenger")) {
 			return true;
@@ -127,7 +127,7 @@ public static boolean isMobileBrowser(HttpServletRequest request) {
 	 * @param request
 	 * @return
 	 */
-	public static boolean isMobileBrowser(jakarta.servlet.http.HttpServletRequest request) {
+	public static boolean isMobileBrowserForJakarta(jakarta.servlet.http.HttpServletRequest request) {
 		String userAgent = request.getHeader("user-agent");
 		if(userAgent != null && userAgent.contains("Mobile")) {
 			return true;
@@ -152,7 +152,7 @@ public static String getHttpRootURL(HttpServletRequest request) {
 	 * @param request
 	 * @return 例如http://www.abc.com，不带根/
 	 */
-	public static String getHttpRootURL(jakarta.servlet.http.HttpServletRequest request) {
+	public static String getHttpRootURLForJakarta(jakarta.servlet.http.HttpServletRequest request) {
 		return request.getScheme() + "://" + request.getServerName()
 				+ ("http".equalsIgnoreCase(request.getScheme()) && request.getServerPort() == 80
 				|| "https".equalsIgnoreCase(request.getScheme()) && request.getServerPort() == 443 ? ""
@@ -173,7 +173,7 @@ public static String getHostname(HttpServletRequest request) {
 	 * @param request
 	 * @return
 	 */
-	public static String getHostname(jakarta.servlet.http.HttpServletRequest request) {
+	public static String getHostnameForJakarta(jakarta.servlet.http.HttpServletRequest request) {
 		return request.getServerName();
 	}
 
@@ -193,7 +193,7 @@ public static String getHostnameWithPort(HttpServletRequest request) {
 	 * @param request
 	 * @return
 	 */
-	public static String getHostnameWithPort(jakarta.servlet.http.HttpServletRequest request) {
+	public static String getHostnameWithPortForJakarta(jakarta.servlet.http.HttpServletRequest request) {
 		return request.getServerName() + ":" + request.getServerPort();
 	}
 
@@ -214,8 +214,8 @@ public static String getFullUrlWithParam(HttpServletRequest request) {
 	 * @param request
 	 * @return
 	 */
-	public static String getFullUrlWithParam(jakarta.servlet.http.HttpServletRequest request) {
-		String domain = getHttpRootURL(request);
+	public static String getFullUrlWithParamForJakarta(jakarta.servlet.http.HttpServletRequest request) {
+		String domain = getHttpRootURLForJakarta(request);
 		String path = request.getRequestURI();
 		String queryString = request.getQueryString();
 		return domain + path + (queryString == null ? "" : "?" + queryString);
@@ -235,7 +235,7 @@ public static String getUrlPath(HttpServletRequest request) {
 	 * @param request
 	 * @return
 	 */
-	public static String getUrlPath(jakarta.servlet.http.HttpServletRequest request) {
+	public static String getUrlPathForJakarta(jakarta.servlet.http.HttpServletRequest request) {
 		return request.getRequestURI();
 	}
 
@@ -306,7 +306,7 @@ public static String getContextPath(HttpServletRequest request) {
 	 * @param request
 	 * @return
 	 */
-	public static String getContextPath(jakarta.servlet.http.HttpServletRequest request) {
+	public static String getContextPathForJakarta(jakarta.servlet.http.HttpServletRequest request) {
 		return request.getContextPath();
 	}
 }