Browse Source

final修饰的list改为不可变集合,CellFormatResultWrapper改为静态内部类

pull/2758/head
dragonTour 2 years ago
parent
commit
a6274842f2
  1. 8
      easyexcel-core/src/main/java/com/alibaba/excel/analysis/csv/CsvExcelReadExecutor.java
  2. 10
      easyexcel-core/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java
  3. 2
      easyexcel-core/src/main/java/com/alibaba/excel/metadata/format/DataFormatter.java

8
easyexcel-core/src/main/java/com/alibaba/excel/analysis/csv/CsvExcelReadExecutor.java

@ -3,11 +3,7 @@ package com.alibaba.excel.analysis.csv;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.ArrayList; import java.util.*;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import com.alibaba.excel.analysis.ExcelReadExecutor; import com.alibaba.excel.analysis.ExcelReadExecutor;
import com.alibaba.excel.context.csv.CsvReadContext; import com.alibaba.excel.context.csv.CsvReadContext;
@ -49,7 +45,7 @@ public class CsvExcelReadExecutor implements ExcelReadExecutor {
@Override @Override
public List<ReadSheet> sheetList() { public List<ReadSheet> sheetList() {
return sheetList; return (this.sheetList != null ? Collections.unmodifiableList(this.sheetList) : Collections.emptyList());
} }
@Override @Override

10
easyexcel-core/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java

@ -3,13 +3,7 @@ package com.alibaba.excel.analysis.v07;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParser;
@ -211,7 +205,7 @@ public class XlsxSaxAnalyser implements ExcelReadExecutor {
@Override @Override
public List<ReadSheet> sheetList() { public List<ReadSheet> sheetList() {
return sheetList; return (this.sheetList != null ? Collections.unmodifiableList(this.sheetList) : Collections.emptyList());
} }
private void parseXmlSource(InputStream inputStream, ContentHandler handler) { private void parseXmlSource(InputStream inputStream, ContentHandler handler) {

2
easyexcel-core/src/main/java/com/alibaba/excel/metadata/format/DataFormatter.java

@ -851,7 +851,7 @@ public class DataFormatter {
* non-cachable wrapper around a * non-cachable wrapper around a
* {@link CellFormatResult} * {@link CellFormatResult}
*/ */
private final class CellFormatResultWrapper extends Format { private static final class CellFormatResultWrapper extends Format {
private final CellFormatResult result; private final CellFormatResult result;
private CellFormatResultWrapper(CellFormatResult result) { private CellFormatResultWrapper(CellFormatResult result) {

Loading…
Cancel
Save