Skip to content

Commit 90fb7a8

Browse files
author
liaochong
committed
fix bug
1 parent 430d6b8 commit 90fb7a8

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>com.github.liaochong</groupId>
1313
<artifactId>myexcel</artifactId>
14-
<version>4.5.5</version>
14+
<version>4.5.6</version>
1515
<packaging>jar</packaging>
1616

1717
<name>myexcel</name>

src/main/java/com/github/liaochong/myexcel/core/converter/writer/MappingWriteConverter.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package com.github.liaochong.myexcel.core.converter.writer;
1616

1717
import com.github.liaochong.myexcel.core.ExcelColumnMapping;
18-
import com.github.liaochong.myexcel.core.cache.WeakCache;
1918
import com.github.liaochong.myexcel.core.container.Pair;
2019
import com.github.liaochong.myexcel.core.converter.ConvertContext;
2120
import com.github.liaochong.myexcel.core.converter.WriteConverter;
@@ -30,8 +29,6 @@
3029
*/
3130
public class MappingWriteConverter implements WriteConverter {
3231

33-
private final WeakCache<String, Pair<Class, Object>> mappingCache = new WeakCache<>();
34-
3532
@Override
3633
public boolean support(Field field, Class<?> fieldType, Object fieldVal, ConvertContext convertContext) {
3734
ExcelColumnMapping mapping = convertContext.excelColumnMappingMap.get(field);
@@ -41,18 +38,11 @@ public boolean support(Field field, Class<?> fieldType, Object fieldVal, Convert
4138
@Override
4239
public Pair<Class, Object> convert(Field field, Class<?> fieldType, Object fieldVal, ConvertContext convertContext) {
4340
ExcelColumnMapping excelColumnMapping = convertContext.excelColumnMappingMap.get(field);
44-
String cacheKey = excelColumnMapping.mapping + "->" + fieldVal;
45-
Pair<Class, Object> mapping = mappingCache.get(cacheKey);
46-
if (mapping != null) {
47-
return mapping;
48-
}
4941
Properties properties = PropertyUtil.getProperties(excelColumnMapping);
5042
String property = properties.getProperty(fieldVal.toString());
5143
if (property == null) {
5244
return Pair.of(fieldType, fieldVal);
5345
}
54-
Pair<Class, Object> result = Pair.of(String.class, property);
55-
mappingCache.cache(cacheKey, result);
56-
return result;
46+
return Pair.of(String.class, property);
5747
}
5848
}

0 commit comments

Comments
 (0)