zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2022-06-18 23:42:51 +08:00
parent 0964bb06fc
commit 8e61da83b9
6 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-extra/src/main/java/cn/hutool/extra/expression/engine/aviator/AviatorEngine.java
View File

@@ -8,7 +8,7 @@ import java.util.Map;
/**
* Aviator引擎封装<br>
* 见：https://github.com/killme2008/aviatorscript
* 见：<a href="https://github.com/killme2008/aviatorscript">https://github.com/killme2008/aviatorscript</a>
*
* @author looly
* @since 5.5.0

7
hutool-extra/src/main/java/cn/hutool/extra/servlet/JakartaServletUtil.java
View File

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.bean.copier.ValueProvider;
import cn.hutool.core.collection.iter.ArrayIter;
import cn.hutool.core.collection.iter.IterUtil;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IORuntimeException;
@@ -20,6 +19,7 @@ import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ObjUtil;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.http.Cookie;
@@ -39,6 +39,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
/**
@@ -429,9 +430,9 @@ public class JakartaServletUtil {
return MapUtil.empty();
}
return IterUtil.toMap(
new ArrayIter<>(httpServletRequest.getCookies()),
return MapUtil.putAll(
new CaseInsensitiveMap<>(),
(Iterator<Cookie>) new ArrayIter<>(httpServletRequest.getCookies()),
Cookie::getName);
}

6
hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java
View File

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.bean.copier.ValueProvider;
import cn.hutool.core.collection.iter.ArrayIter;
import cn.hutool.core.collection.iter.IterUtil;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IORuntimeException;
@@ -39,6 +38,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
/**
@@ -429,9 +429,9 @@ public class ServletUtil {
return MapUtil.empty();
}
return IterUtil.toMap(
new ArrayIter<>(httpServletRequest.getCookies()),
return MapUtil.putAll(
new CaseInsensitiveMap<>(),
(Iterator<Cookie>) new ArrayIter<>(httpServletRequest.getCookies()),
Cookie::getName);
}