[refactor] FunReplace and FunAnalyzeString

- use enhanced switch for readability - add general error code to default case
eXist-db · Apr 26, 2023 · 5f97429 · 5f97429
1 parent 1cfe2c1
commit 5f97429
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/exist-core/src/main/java/org/exist/xquery/functions/fn/FunAnalyzeString.java b/exist-core/src/main/java/org/exist/xquery/functions/fn/FunAnalyzeString.java
@@ -151,14 +151,10 @@ private void analyzeString(final MemTreeBuilder builder, final String input, Str
  }
  } catch (final net.sf.saxon.trans.XPathException e) {
  switch (e.getErrorCodeLocalPart()) {
- case "FORX0001":
- throw new XPathException(this, ErrorCodes.FORX0001, e.getMessage());
- case "FORX0002":
- throw new XPathException(this, ErrorCodes.FORX0002, e.getMessage());
- case "FORX0003":
- throw new XPathException(this, ErrorCodes.FORX0003, e.getMessage());
- default:
- throw new XPathException(this, e.getMessage());
+ case "FORX0001" -> throw new XPathException(this, ErrorCodes.FORX0001, e.getMessage());
+ case "FORX0002" -> throw new XPathException(this, ErrorCodes.FORX0002, e.getMessage());
+ case "FORX0003" -> throw new XPathException(this, ErrorCodes.FORX0003, e.getMessage());
+ default -> throw new XPathException(this, e.getMessage());
  }
  }
  }

diff --git a/exist-core/src/main/java/org/exist/xquery/functions/fn/FunReplace.java b/exist-core/src/main/java/org/exist/xquery/functions/fn/FunReplace.java
@@ -137,16 +137,11 @@ public Sequence eval(final Sequence[] args, final Sequence contextSequence) thro
 
  } catch (final net.sf.saxon.trans.XPathException e) {
  switch (e.getErrorCodeLocalPart()) {
- case "FORX0001":
- throw new XPathException(this, ErrorCodes.FORX0001, e.getMessage());
- case "FORX0002":
- throw new XPathException(this, ErrorCodes.FORX0002, e.getMessage());
- case "FORX0003":
- throw new XPathException(this, ErrorCodes.FORX0003, e.getMessage());
- case "FORX0004":
- throw new XPathException(this, ErrorCodes.FORX0004, e.getMessage());
- default:
- throw new XPathException(this, e.getMessage());
+ case "FORX0001" -> throw new XPathException(this, ErrorCodes.FORX0001, e.getMessage());
+ case "FORX0002" -> throw new XPathException(this, ErrorCodes.FORX0002, e.getMessage());
+ case "FORX0003" -> throw new XPathException(this, ErrorCodes.FORX0003, e.getMessage());
+ case "FORX0004" -> throw new XPathException(this, ErrorCodes.FORX0004, e.getMessage());
+ default -> throw new XPathException(this, ErrorCodes.ERROR, e.getMessage());
  }
  }
  }