- changed to Java 17 Switch Expression
- replace switch-statements by if/else-statements where suitable

Co-authored-by: Hannes Wellmann <wellmann.hannes1@gmx.net>