You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2026/08/14 07:59:54 UTC

(poi) branch trunk updated: Java 17: modern switch statements (#1213)

This is an automated email from the ASF dual-hosted git repository.

pjfanning pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/poi.git


The following commit(s) were added to refs/heads/trunk by this push:
     new bbd7875969 Java 17: modern switch statements (#1213)
bbd7875969 is described below

commit bbd78759691a95a24e6a50c01adc8eb04329c903
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Fri Aug 14 08:59:49 2026 +0100

    Java 17: modern switch statements (#1213)
---
 .../org/apache/poi/xssf/model/ThemesTable.java     |  33 +++--
 .../org/apache/poi/hssf/record/UnknownRecord.java  | 164 +++++++++++----------
 .../hssf/record/aggregates/PageSettingsBlock.java  |  14 +-
 .../poi/ss/formula/atp/YearFracCalculator.java     |  16 +-
 .../poi/ss/formula/constant/ErrorConstant.java     |  23 +--
 .../formula/functions/CalendarFieldFunction.java   |   8 +-
 .../apache/poi/ss/formula/functions/Errortype.java |  21 ++-
 .../apache/poi/ss/formula/functions/Subtotal.java  |  50 +++----
 .../java/org/apache/poi/ss/formula/ptg/Ptg.java    |  56 +++----
 .../org/apache/poi/ss/usermodel/FontUnderline.java |  26 +---
 10 files changed, 203 insertions(+), 208 deletions(-)

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java
index f9141284c5..d4ec2a8bfa 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java
@@ -142,21 +142,24 @@ public class ThemesTable extends POIXMLDocumentPart implements Themes {
         // i.e. these keys are NOT the same as the order in which theme colors appear
         // in theme1.xml. They are keys to a mapped color.
         CTColorScheme colorScheme = theme.getTheme().getThemeElements().getClrScheme();
-        CTColor ctColor;
-        switch (ThemeElement.byId(idx)) {
-            case LT1: ctColor = colorScheme.getLt1(); break;
-            case DK1: ctColor = colorScheme.getDk1(); break;
-            case LT2: ctColor = colorScheme.getLt2(); break;
-            case DK2: ctColor = colorScheme.getDk2(); break;
-            case ACCENT1: ctColor = colorScheme.getAccent1(); break;
-            case ACCENT2: ctColor = colorScheme.getAccent2(); break;
-            case ACCENT3: ctColor = colorScheme.getAccent3(); break;
-            case ACCENT4: ctColor = colorScheme.getAccent4(); break;
-            case ACCENT5: ctColor = colorScheme.getAccent5(); break;
-            case ACCENT6: ctColor = colorScheme.getAccent6(); break;
-            case HLINK:   ctColor = colorScheme.getHlink();   break;
-            case FOLHLINK:ctColor = colorScheme.getFolHlink();break;
-            default: return null;
+        CTColor ctColor = switch (ThemeElement.byId(idx)) {
+            case LT1     -> colorScheme.getLt1();
+            case DK1     -> colorScheme.getDk1();
+            case LT2     -> colorScheme.getLt2();
+            case DK2     -> colorScheme.getDk2();
+            case ACCENT1 -> colorScheme.getAccent1();
+            case ACCENT2 -> colorScheme.getAccent2();
+            case ACCENT3 -> colorScheme.getAccent3();
+            case ACCENT4 -> colorScheme.getAccent4();
+            case ACCENT5 -> colorScheme.getAccent5();
+            case ACCENT6 -> colorScheme.getAccent6();
+            case HLINK   -> colorScheme.getHlink();
+            case FOLHLINK-> colorScheme.getFolHlink();
+            default -> { yield null; }
+        };
+
+        if (ctColor == null) {
+            return null;
         }
 
         byte[] rgb;
diff --git a/poi/src/main/java/org/apache/poi/hssf/record/UnknownRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/UnknownRecord.java
index 59bcd95f7a..1fc13a0480 100644
--- a/poi/src/main/java/org/apache/poi/hssf/record/UnknownRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/UnknownRecord.java
@@ -114,87 +114,89 @@ public final class UnknownRecord extends StandardRecord {
         // Note to POI developers:
         // Make sure you delete the corresponding entry from
         // this method any time a new Record subclass is created.
-        switch (sid) {
-            case PRINTSIZE_0033: return "PRINTSIZE";
-            case PLS_004D: return "PLS";
-            case 0x0050: return "DCON"; // Data Consolidation Information
-            case 0x007F: return "IMDATA";
-            case SHEETPR_0081: return "SHEETPR";
-            case SORT_0090: return "SORT"; // Sorting Options
-            case 0x0094: return "LHRECORD"; // .WK? File Conversion Information
-            case STANDARDWIDTH_0099: return "STANDARDWIDTH"; //Standard Column Width
-            case SCL_00A0: return "SCL"; // Window Zoom Magnification
-            case 0x00AE: return "SCENMAN"; // Scenario Output Data
-
-            case 0x00B2: return "SXVI";        // (pivot table) View Item
-            case 0x00B4: return "SXIVD";       // (pivot table) Row/Column Field IDs
-            case 0x00B5: return "SXLI";        // (pivot table) Line Item Array
-
-            case 0x00D3: return "OBPROJ";
-            case 0x00DC: return "PARAMQRY";
-            case 0x00DE: return "OLESIZE";
-            case BITMAP_00E9: return "BITMAP";
-            case PHONETICPR_00EF: return "PHONETICPR";
-            case 0x00F1: return "SXEX";        // PivotTable View Extended Information
-
-            case LABELRANGES_015F: return "LABELRANGES";
-            case 0x01BA: return "CODENAME";
-            case 0x01A9: return "USERBVIEW";
-            case 0x01AD: return "QSI";
-
-            case 0x01C0: return "EXCEL9FILE";
-
-            case 0x0802: return "QSISXTAG";   // Pivot Table and Query Table Extensions
-            case 0x0803: return "DBQUERYEXT";
-            case 0x0805: return "TXTQUERY";
-            case 0x0810: return "SXVIEWEX9";  // Pivot Table Extensions
-
-            case 0x0812: return "CONTINUEFRT";
-            case QUICKTIP_0800: return "QUICKTIP";
-            case SHEETEXT_0862: return "SHEETEXT";
-            case 0x0863: return "BOOKEXT";
-            case 0x0864: return "SXADDL";    // Pivot Table Additional Info
-            case SHEETPROTECTION_0867: return "SHEETPROTECTION";
-            case 0x086B: return "DATALABEXTCONTENTS";
-            case 0x086C: return "CELLWATCH";
-            case FeatRecord.v11_sid: return "SHARED FEATURE v11";
-            case 0x0874: return "DROPDOWNOBJIDS";
-            case 0x0876: return "DCONN";
-            case FeatRecord.v12_sid: return "SHARED FEATURE v12";
-            case 0x087B: return "CFEX";
-            case 0x087C: return "XFCRC";
-            case 0x087D: return "XFEXT";
-            case 0x087F: return "CONTINUEFRT12";
-            case 0x088B: return "PLV";
-            case 0x088C: return "COMPAT12";
-            case 0x088D: return "DXF";
-            case 0x0892: return "STYLEEXT";
-            case 0x0896: return "THEME";
-            case 0x0897: return "GUIDTYPELIB";
-            case 0x089A: return "MTRSETTINGS";
-            case 0x089B: return "COMPRESSPICTURES";
-            case HEADER_FOOTER_089C: return "HEADERFOOTER";
-            case 0x089D: return "CRTLAYOUT12";
-            case 0x089E: return "CRTMLFRT";
-            case 0x089F: return "CRTMLFRTCONTINUE";
-            case 0x08A1: return "SHAPEPROPSSTREAM";
-            case 0x08A3: return "FORCEFULLCALCULATION";
-            case 0x08A4: return "SHAPEPROPSSTREAM";
-            case 0x08A5: return "TEXTPROPSSTREAM";
-            case 0x08A6: return "RICHTEXTSTREAM";
-            case 0x08A7: return "CRTLAYOUT12A";
-
-            case 0x08C8: return "PLV{Mac Excel}";
-
-            case 0x1001: return "UNITS";
-            case 0x1006: return "CHARTDATAFORMAT";
-            case 0x1007: return "CHARTLINEFORMAT";
-        }
-        if (isObservedButUnknown(sid)) {
-            return "UNKNOWN-" + Integer.toHexString(sid).toUpperCase(Locale.ROOT);
-        }
-
-        return null;
+        return switch (sid) {
+            case PRINTSIZE_0033 -> "PRINTSIZE";
+            case PLS_004D -> "PLS";
+            case 0x0050 -> "DCON"; // Data Consolidation Information
+            case 0x007F -> "IMDATA";
+            case SHEETPR_0081 -> "SHEETPR";
+            case SORT_0090 -> "SORT"; // Sorting Options
+            case 0x0094 -> "LHRECORD"; // .WK? File Conversion Information
+            case STANDARDWIDTH_0099 -> "STANDARDWIDTH"; //Standard Column Width
+            case SCL_00A0 -> "SCL"; // Window Zoom Magnification
+            case 0x00AE -> "SCENMAN"; // Scenario Output Data
+
+            case 0x00B2 -> "SXVI";        // (pivot table) View Item
+            case 0x00B4 -> "SXIVD";       // (pivot table) Row/Column Field IDs
+            case 0x00B5 -> "SXLI";        // (pivot table) Line Item Array
+
+            case 0x00D3 -> "OBPROJ";
+            case 0x00DC -> "PARAMQRY";
+            case 0x00DE -> "OLESIZE";
+            case BITMAP_00E9 -> "BITMAP";
+            case PHONETICPR_00EF -> "PHONETICPR";
+            case 0x00F1 -> "SXEX";        // PivotTable View Extended Information
+
+            case LABELRANGES_015F -> "LABELRANGES";
+            case 0x01BA -> "CODENAME";
+            case 0x01A9 -> "USERBVIEW";
+            case 0x01AD -> "QSI";
+
+            case 0x01C0 -> "EXCEL9FILE";
+
+            case 0x0802 -> "QSISXTAG";   // Pivot Table and Query Table Extensions
+            case 0x0803 -> "DBQUERYEXT";
+            case 0x0805 -> "TXTQUERY";
+            case 0x0810 -> "SXVIEWEX9";  // Pivot Table Extensions
+
+            case 0x0812 -> "CONTINUEFRT";
+            case QUICKTIP_0800 -> "QUICKTIP";
+            case SHEETEXT_0862 -> "SHEETEXT";
+            case 0x0863 -> "BOOKEXT";
+            case 0x0864 -> "SXADDL";    // Pivot Table Additional Info
+            case SHEETPROTECTION_0867 -> "SHEETPROTECTION";
+            case 0x086B -> "DATALABEXTCONTENTS";
+            case 0x086C -> "CELLWATCH";
+            case FeatRecord.v11_sid -> "SHARED FEATURE v11";
+            case 0x0874 -> "DROPDOWNOBJIDS";
+            case 0x0876 -> "DCONN";
+            case FeatRecord.v12_sid -> "SHARED FEATURE v12";
+            case 0x087B -> "CFEX";
+            case 0x087C -> "XFCRC";
+            case 0x087D -> "XFEXT";
+            case 0x087F -> "CONTINUEFRT12";
+            case 0x088B -> "PLV";
+            case 0x088C -> "COMPAT12";
+            case 0x088D -> "DXF";
+            case 0x0892 -> "STYLEEXT";
+            case 0x0896 -> "THEME";
+            case 0x0897 -> "GUIDTYPELIB";
+            case 0x089A -> "MTRSETTINGS";
+            case 0x089B -> "COMPRESSPICTURES";
+            case HEADER_FOOTER_089C -> "HEADERFOOTER";
+            case 0x089D -> "CRTLAYOUT12";
+            case 0x089E -> "CRTMLFRT";
+            case 0x089F -> "CRTMLFRTCONTINUE";
+            case 0x08A1 -> "SHAPEPROPSSTREAM";
+            case 0x08A3 -> "FORCEFULLCALCULATION";
+            case 0x08A4 -> "SHAPEPROPSSTREAM";
+            case 0x08A5 -> "TEXTPROPSSTREAM";
+            case 0x08A6 -> "RICHTEXTSTREAM";
+            case 0x08A7 -> "CRTLAYOUT12A";
+
+            case 0x08C8 -> "PLV{Mac Excel}";
+
+            case 0x1001 -> "UNITS";
+            case 0x1006 -> "CHARTDATAFORMAT";
+            case 0x1007 -> "CHARTLINEFORMAT";
+
+            default -> {
+                if (isObservedButUnknown(sid)) {
+                    yield "UNKNOWN-" + Integer.toHexString(sid).toUpperCase(Locale.ROOT);
+                }
+                yield null;
+            }
+        };
     }
 
     /**
diff --git a/poi/src/main/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java
index 3b2a71cdbc..d10338a7ca 100644
--- a/poi/src/main/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java
@@ -421,13 +421,13 @@ public final class PageSettingsBlock extends RecordAggregate {
         if (m != null) {
             return m.getMargin();
         }
-        switch (margin) {
-            case InternalSheet.LeftMargin:   return .75;
-            case InternalSheet.RightMargin:  return .75;
-            case InternalSheet.TopMargin:    return 1.0;
-            case InternalSheet.BottomMargin: return 1.0;
-        }
-        throw new IllegalArgumentException( "Unknown margin constant:  " + margin );
+        return switch (margin) {
+            case InternalSheet.LeftMargin   -> .75;
+            case InternalSheet.RightMargin  -> .75;
+            case InternalSheet.TopMargin    -> 1.0;
+            case InternalSheet.BottomMargin -> 1.0;
+            default -> throw new IllegalArgumentException( "Unknown margin constant:  " + margin );
+        };
     }
 
     /**
diff --git a/poi/src/main/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
index f2d2184cc8..b614c463e3 100644
--- a/poi/src/main/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
@@ -74,14 +74,14 @@ final class YearFracCalculator {
             endDateVal = temp;
         }
 
-        switch (basis) {
-            case 0: return basis0(startDateVal, endDateVal);
-            case 1: return basis1(startDateVal, endDateVal);
-            case 2: return basis2(startDateVal, endDateVal);
-            case 3: return basis3(startDateVal, endDateVal);
-            case 4: return basis4(startDateVal, endDateVal);
-        }
-        throw new IllegalStateException("cannot happen");
+        return switch (basis) {
+            case 0 -> basis0(startDateVal, endDateVal);
+            case 1 -> basis1(startDateVal, endDateVal);
+            case 2 -> basis2(startDateVal, endDateVal);
+            case 3 -> basis3(startDateVal, endDateVal);
+            case 4 -> basis4(startDateVal, endDateVal);
+            default -> throw new IllegalStateException("cannot happen");
+        };
     }
 
 
diff --git a/poi/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java b/poi/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java
index 97dd696c14..e35994c033 100644
--- a/poi/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java
@@ -58,16 +58,19 @@ public final class ErrorConstant {
 
     public static ErrorConstant valueOf(int errorCode) {
         if (FormulaError.isValidCode(errorCode)) {
-            switch (FormulaError.forInt(errorCode)) {
-                case NULL:  return NULL;
-                case DIV0:  return DIV_0;
-                case VALUE: return VALUE;
-                case REF:   return REF;
-                case NAME:  return NAME;
-                case NUM:   return NUM;
-                case NA:    return NA;
-                default:    break;
-            }
+            return switch (FormulaError.forInt(errorCode)) {
+                case NULL  -> NULL;
+                case DIV0  -> DIV_0;
+                case VALUE -> VALUE;
+                case REF   -> REF;
+                case NAME  -> NAME;
+                case NUM   -> NUM;
+                case NA    -> NA;
+                default    -> {
+                    LOG.atWarn().log("Warning - unexpected error code ({})", box(errorCode));
+                    yield new ErrorConstant(errorCode);
+                }
+            };
         }
         LOG.atWarn().log("Warning - unexpected error code ({})", box(errorCode));
         return new ErrorConstant(errorCode);
diff --git a/poi/src/main/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java
index 1d8e7e4571..74d829c6bb 100644
--- a/poi/src/main/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java
@@ -65,11 +65,11 @@ public final class CalendarFieldFunction extends Fixed1ArgFunction {
        //  as the non-existent 1900-01-00
         if (MathUtil.safeDoubleToInt(serialDate) == 0) {
             switch (_dateFieldId) {
-                case Calendar.YEAR: return 1900;
-                case Calendar.MONTH: return 1;
-                case Calendar.DAY_OF_MONTH: return 0;
+                case Calendar.YEAR -> { return 1900; }
+                case Calendar.MONTH -> { return 1; }
+                case Calendar.DAY_OF_MONTH -> { return 0; }
+                default -> {} // They want time, that's normal
             }
-            // They want time, that's normal
         }
 
         // TODO Figure out if we're in 1900 or 1904
diff --git a/poi/src/main/java/org/apache/poi/ss/formula/functions/Errortype.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Errortype.java
index 3bace0a8aa..9406dbce53 100644
--- a/poi/src/main/java/org/apache/poi/ss/formula/functions/Errortype.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Errortype.java
@@ -62,17 +62,16 @@ public final class Errortype extends Fixed1ArgFunction {
     }
 
     private int translateErrorCodeToErrorTypeValue(int errorCode) {
-        switch (FormulaError.forInt(errorCode)) {
-            case NULL:  return 1;
-            case DIV0:  return 2;
-            case VALUE: return 3;
-            case REF:   return 4;
-            case NAME:  return 5;
-            case NUM:   return 6;
-            case NA:    return 7;
-            default:
-                throw new IllegalArgumentException("Invalid error code (" + errorCode + ")");
-        }
+        return switch (FormulaError.forInt(errorCode)) {
+            case NULL  -> 1;
+            case DIV0  -> 2;
+            case VALUE -> 3;
+            case REF   -> 4;
+            case NAME  -> 5;
+            case NUM   -> 6;
+            case NA    -> 7;
+            default    -> throw new IllegalArgumentException("Invalid error code (" + errorCode + ")");
+        };
     }
 
 }
diff --git a/poi/src/main/java/org/apache/poi/ss/formula/functions/Subtotal.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Subtotal.java
index 07e3424f34..ef589b69c4 100644
--- a/poi/src/main/java/org/apache/poi/ss/formula/functions/Subtotal.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Subtotal.java
@@ -73,31 +73,31 @@ import org.apache.poi.ss.formula.eval.ValueEval;
 public class Subtotal implements Function {
 
     private static Function findFunction(int functionCode) throws EvaluationException {
-        switch (functionCode) {
-            case 1: return subtotalInstance(AggregateFunction.AVERAGE, true);
-            case 2: return Count.subtotalInstance(true);
-            case 3: return Counta.subtotalInstance(true);
-            case 4: return subtotalInstance(AggregateFunction.MAX, true);
-            case 5: return subtotalInstance(AggregateFunction.MIN, true);
-            case 6: return subtotalInstance(AggregateFunction.PRODUCT, true);
-            case 7: return subtotalInstance(AggregateFunction.STDEV, true);
-            case 8: return subtotalInstance(AggregateFunction.STDEVP, true);
-            case 9: return subtotalInstance(AggregateFunction.SUM, true);
-            case 10: return subtotalInstance(AggregateFunction.VAR, true);
-            case 11: return subtotalInstance(AggregateFunction.VARP, true);
-            case 101: return subtotalInstance(AggregateFunction.AVERAGE, false);
-            case 102: return Count.subtotalInstance(false);
-            case 103: return Counta.subtotalInstance(false);
-            case 104: return subtotalInstance(AggregateFunction.MAX, false);
-            case 105: return subtotalInstance(AggregateFunction.MIN, false);
-            case 106: return subtotalInstance(AggregateFunction.PRODUCT, false);
-            case 107: return subtotalInstance(AggregateFunction.STDEV, false);
-            case 108: return subtotalInstance(AggregateFunction.STDEVP, false);
-            case 109: return subtotalInstance(AggregateFunction.SUM, false);
-            case 110: return subtotalInstance(AggregateFunction.VAR, false);
-            case 111: return subtotalInstance(AggregateFunction.VARP, false);
-        }
-        throw EvaluationException.invalidValue();
+        return switch (functionCode) {
+            case 1 -> subtotalInstance(AggregateFunction.AVERAGE, true);
+            case 2 -> Count.subtotalInstance(true);
+            case 3 -> Counta.subtotalInstance(true);
+            case 4 -> subtotalInstance(AggregateFunction.MAX, true);
+            case 5 -> subtotalInstance(AggregateFunction.MIN, true);
+            case 6 -> subtotalInstance(AggregateFunction.PRODUCT, true);
+            case 7 -> subtotalInstance(AggregateFunction.STDEV, true);
+            case 8 -> subtotalInstance(AggregateFunction.STDEVP, true);
+            case 9 -> subtotalInstance(AggregateFunction.SUM, true);
+            case 10 -> subtotalInstance(AggregateFunction.VAR, true);
+            case 11 -> subtotalInstance(AggregateFunction.VARP, true);
+            case 101 -> subtotalInstance(AggregateFunction.AVERAGE, false);
+            case 102 -> Count.subtotalInstance(false);
+            case 103 -> Counta.subtotalInstance(false);
+            case 104 -> subtotalInstance(AggregateFunction.MAX, false);
+            case 105 -> subtotalInstance(AggregateFunction.MIN, false);
+            case 106 -> subtotalInstance(AggregateFunction.PRODUCT, false);
+            case 107 -> subtotalInstance(AggregateFunction.STDEV, false);
+            case 108 -> subtotalInstance(AggregateFunction.STDEVP, false);
+            case 109 -> subtotalInstance(AggregateFunction.SUM, false);
+            case 110 -> subtotalInstance(AggregateFunction.VAR, false);
+            case 111 -> subtotalInstance(AggregateFunction.VARP, false);
+            default -> throw EvaluationException.invalidValue();
+        };
     }
 
     @Override
diff --git a/poi/src/main/java/org/apache/poi/ss/formula/ptg/Ptg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Ptg.java
index c1b9c86222..134a9d3066 100644
--- a/poi/src/main/java/org/apache/poi/ss/formula/ptg/Ptg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Ptg.java
@@ -108,29 +108,29 @@ public abstract class Ptg implements Duplicatable, GenericRecord {
 
         int baseId = id & 0x1F | 0x20;
 
-        switch (baseId) {
-            case ArrayPtg.sid:    return new ArrayInitialPtg(in);//0x20, 0x40, 0x60
-            case FuncPtg.sid:     return FuncPtg.create(in);  // 0x21, 0x41, 0x61
-            case FuncVarPtg.sid:  return FuncVarPtg.create(in);//0x22, 0x42, 0x62
-            case NamePtg.sid:     return new NamePtg(in);     // 0x23, 0x43, 0x63
-            case RefPtg.sid:      return new RefPtg(in);      // 0x24, 0x44, 0x64
-            case AreaPtg.sid:     return new AreaPtg(in);     // 0x25, 0x45, 0x65
-            case MemAreaPtg.sid:  return new MemAreaPtg(in);  // 0x26, 0x46, 0x66
-            case MemErrPtg.sid:   return new MemErrPtg(in);   // 0x27, 0x47, 0x67
-            case MemFuncPtg.sid:  return new MemFuncPtg(in);  // 0x29, 0x49, 0x69
-            case RefErrorPtg.sid: return new RefErrorPtg(in); // 0x2a, 0x4a, 0x6a
-            case AreaErrPtg.sid:  return new AreaErrPtg(in);  // 0x2b, 0x4b, 0x6b
-            case RefNPtg.sid:     return new RefNPtg(in);     // 0x2c, 0x4c, 0x6c
-            case AreaNPtg.sid:    return new AreaNPtg(in);    // 0x2d, 0x4d, 0x6d
-
-            case NameXPtg.sid:    return new NameXPtg(in);    // 0x39, 0x49, 0x79
-            case Ref3DPtg.sid:    return new Ref3DPtg(in);    // 0x3a, 0x5a, 0x7a
-            case Area3DPtg.sid:   return new Area3DPtg(in);   // 0x3b, 0x5b, 0x7b
-            case DeletedRef3DPtg.sid:  return new DeletedRef3DPtg(in);   // 0x3c, 0x5c, 0x7c
-            case DeletedArea3DPtg.sid: return  new DeletedArea3DPtg(in); // 0x3d, 0x5d, 0x7d
-        }
-        throw new UnsupportedOperationException(" Unknown Ptg in Formula: 0x"+
+        return switch (baseId) {
+            case ArrayPtg.sid    -> new ArrayInitialPtg(in);//0x20, 0x40, 0x60
+            case FuncPtg.sid     -> FuncPtg.create(in);  // 0x21, 0x41, 0x61
+            case FuncVarPtg.sid  -> FuncVarPtg.create(in);//0x22, 0x42, 0x62
+            case NamePtg.sid     -> new NamePtg(in);     // 0x23, 0x43, 0x63
+            case RefPtg.sid      -> new RefPtg(in);      // 0x24, 0x44, 0x64
+            case AreaPtg.sid     -> new AreaPtg(in);     // 0x25, 0x45, 0x65
+            case MemAreaPtg.sid  -> new MemAreaPtg(in);  // 0x26, 0x46, 0x66
+            case MemErrPtg.sid   -> new MemErrPtg(in);   // 0x27, 0x47, 0x67
+            case MemFuncPtg.sid  -> new MemFuncPtg(in);  // 0x29, 0x49, 0x69
+            case RefErrorPtg.sid -> new RefErrorPtg(in); // 0x2a, 0x4a, 0x6a
+            case AreaErrPtg.sid  -> new AreaErrPtg(in);  // 0x2b, 0x4b, 0x6b
+            case RefNPtg.sid     -> new RefNPtg(in);     // 0x2c, 0x4c, 0x6c
+            case AreaNPtg.sid    -> new AreaNPtg(in);    // 0x2d, 0x4d, 0x6d
+
+            case NameXPtg.sid    -> new NameXPtg(in);    // 0x39, 0x49, 0x79
+            case Ref3DPtg.sid    -> new Ref3DPtg(in);    // 0x3a, 0x5a, 0x7a
+            case Area3DPtg.sid   -> new Area3DPtg(in);   // 0x3b, 0x5b, 0x7b
+            case DeletedRef3DPtg.sid  -> new DeletedRef3DPtg(in);   // 0x3c, 0x5c, 0x7c
+            case DeletedArea3DPtg.sid -> new DeletedArea3DPtg(in); // 0x3d, 0x5d, 0x7d
+            default -> throw new UnsupportedOperationException(" Unknown Ptg in Formula: 0x"+
                     Integer.toHexString(id) + " (" + ( int ) id + ")");
+        };
     }
 
     private static Ptg createBasePtg(byte id, LittleEndianInput in) {
@@ -274,12 +274,12 @@ public abstract class Ptg implements Duplicatable, GenericRecord {
         if (isBaseToken()) {
             return '.';
         }
-        switch (ptgClass) {
-            case Ptg.CLASS_REF:   return 'R';
-            case Ptg.CLASS_VALUE: return 'V';
-            case Ptg.CLASS_ARRAY: return 'A';
-        }
-        throw new IllegalArgumentException("Unknown operand class (" + ptgClass + ")");
+        return switch (ptgClass) {
+            case Ptg.CLASS_REF   -> 'R';
+            case Ptg.CLASS_VALUE -> 'V';
+            case Ptg.CLASS_ARRAY -> 'A';
+            default -> throw new IllegalArgumentException("Unknown operand class (" + ptgClass + ")");
+        };
     }
 
     public abstract byte getDefaultOperandClass();
diff --git a/poi/src/main/java/org/apache/poi/ss/usermodel/FontUnderline.java b/poi/src/main/java/org/apache/poi/ss/usermodel/FontUnderline.java
index 5089d4ed0c..42e471aaa9 100644
--- a/poi/src/main/java/org/apache/poi/ss/usermodel/FontUnderline.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/FontUnderline.java
@@ -95,25 +95,13 @@ public enum FontUnderline {
     }
 
     public static FontUnderline valueOf(byte value){
-        FontUnderline val;
-        switch (value) {
-            case Font.U_DOUBLE:
-                val = FontUnderline.DOUBLE;
-                break;
-            case Font.U_DOUBLE_ACCOUNTING:
-                val = FontUnderline.DOUBLE_ACCOUNTING;
-                break;
-            case Font.U_SINGLE_ACCOUNTING:
-                val = FontUnderline.SINGLE_ACCOUNTING;
-                break;
-            case Font.U_SINGLE:
-                val = FontUnderline.SINGLE;
-                break;
-            default:
-                val = FontUnderline.NONE;
-                break;
-        }
-        return val;
+        return switch (value) {
+            case Font.U_DOUBLE             -> FontUnderline.DOUBLE;
+            case Font.U_DOUBLE_ACCOUNTING  -> FontUnderline.DOUBLE_ACCOUNTING;
+            case Font.U_SINGLE_ACCOUNTING  -> FontUnderline.SINGLE_ACCOUNTING;
+            case Font.U_SINGLE             -> FontUnderline.SINGLE;
+            default                        -> FontUnderline.NONE;
+        };
     }
 
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org