pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

make getCachedResultType return enum (#939)

Browse Source
This commit is contained in:
PJ Fanning 2025-11-19 13:58:18 +01:00 committed by GitHub
parent cb520e8046
commit 9fb2c4b03e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
poi/src/main/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
View File

@ -286,12 +286,12 @@ public class OldExcelExtractor implements POITextExtractor {
// Biff 2 and 5+ share the same SID, due to a bug...
if (biffVersion == 5) {
FormulaRecord fr = new FormulaRecord(ris);
if (fr.getCachedResultTypeEnum() == CellType.NUMERIC) {
if (fr.getCachedResultType() == CellType.NUMERIC) {
handleNumericCell(text, fr.getValue());
}
} else {
OldFormulaRecord fr = new OldFormulaRecord(ris);
if (fr.getCachedResultTypeEnum() == CellType.NUMERIC) {
if (fr.getCachedResultType() == CellType.NUMERIC) {
handleNumericCell(text, fr.getValue());
}
}

19
poi/src/main/java/org/apache/poi/hssf/record/FormulaRecord.java
View File

@ -123,28 +123,25 @@ public final class FormulaRecord extends CellRecord {
/**
* @return The type of the cached value or CellType.NUMERIC.getCode() if the cached value is empty
*
* @deprecated POI 5.0.0, will be removed in 6.0, use getCachedResultTypeEnum until switch to enum is fully done
* @since POI 6.0.0
*/
@Deprecated
@Removal(version = "6.0.0")
public int getCachedResultType() {
public CellType getCachedResultType() {
if (specialCachedValue == null) {
return CellType.NUMERIC.getCode();
return CellType.NUMERIC;
}
return specialCachedValue.getValueType();
return specialCachedValue.getValueTypeEnum();
}
/**
* Returns the type of the cached result
*
* @return The type of the cached value or CellType.NUMERIC if the cached value is empty
* @since POI 5.0.0
* @deprecated POI 6.0.0, use {@link #getCachedResultType()} instead
*/
@Deprecated
@Removal(version="7.0.0")
public CellType getCachedResultTypeEnum() {
if (specialCachedValue == null) {
return CellType.NUMERIC;
}
return specialCachedValue.getValueTypeEnum();
return getCachedResultType();
}
public boolean getCachedBooleanValue() {

20
poi/src/main/java/org/apache/poi/hssf/record/OldFormulaRecord.java
View File

@ -24,6 +24,7 @@ import org.apache.poi.ss.formula.Formula;
import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.util.GenericRecordUtil;
import org.apache.poi.util.Removal;
/**
* Formula Record (0x0006 / 0x0206 / 0x0406) - holds a formula in
@ -65,26 +66,27 @@ public final class OldFormulaRecord extends OldCellRecord {
}
/**
* @deprecated POI 5.0.0, will be removed in 5.0, use getCachedResultTypeEnum until switch to enum is fully done
* Returns the type of the cached result
* @return A CellType
* @since POI 6.0.0
*/
@Deprecated
public int getCachedResultType() {
public CellType getCachedResultType() {
if (specialCachedValue == null) {
return CellType.NUMERIC.getCode();
return CellType.NUMERIC;
}
return specialCachedValue.getValueType();
return specialCachedValue.getValueTypeEnum();
}
/**
* Returns the type of the cached result
* @return A CellType
* @since POI 5.0.0
* @deprecated POI 6.0.0, use {@link #getCachedResultType()} instead
*/
@Deprecated
@Removal(version="7.0.0")
public CellType getCachedResultTypeEnum() {
if (specialCachedValue == null) {
return CellType.NUMERIC;
}
return specialCachedValue.getValueTypeEnum();
return getCachedResultType();
}
public boolean getCachedBooleanValue() {

6
poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCell.java
View File

@ -649,7 +649,7 @@ public class HSSFCell extends CellBase {
}
private static void checkFormulaCachedValueType(CellType expectedTypeCode, FormulaRecord fr) {
CellType cachedValueType = fr.getCachedResultTypeEnum();
CellType cachedValueType = fr.getCachedResultType();
if (cachedValueType != expectedTypeCode) {
throw typeMismatch(expectedTypeCode, cachedValueType, true);
}
@ -885,7 +885,7 @@ public class HSSFCell extends CellBase {
}
FormulaRecordAggregate fra = ((FormulaRecordAggregate)_record);
FormulaRecord fr = fra.getFormulaRecord();
switch (fr.getCachedResultTypeEnum()) {
switch (fr.getCachedResultType()) {
case BOOLEAN:
return fr.getCachedBooleanValue() ? "TRUE" : "FALSE";
case STRING:
@ -1188,7 +1188,7 @@ public class HSSFCell extends CellBase {
throw new IllegalStateException("Only formula cells have cached results");
}
return ((FormulaRecordAggregate)_record).getFormulaRecord().getCachedResultTypeEnum();
return ((FormulaRecordAggregate)_record).getFormulaRecord().getCachedResultType();
}
void setCellArrayFormula(CellRangeAddress range) {

3
poi/src/test/java/org/apache/poi/hssf/record/TestFormulaRecord.java
View File

@ -87,8 +87,7 @@ final class TestFormulaRecord {
assertEquals(0, record.getRow(), "Row");
assertEquals(0, record.getColumn(), "Column");
//noinspection deprecation
assertEquals(CellType.ERROR.getCode(), record.getCachedResultType());
assertEquals(CellType.ERROR, record.getCachedResultTypeEnum());
assertEquals(CellType.ERROR, record.getCachedResultType());
byte[] output = record.serialize();
// includes sid+recordlength