feat: adopt switch expression

Author: jmarkerink

core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/Expression.java

@@ -388,33 +388,16 @@ private BsonType getBsonType(Object to) {
 
         private Object convert(Object inputValue, BsonType bsonType, Document document, Document convertDocument) {
             try {
-                switch (bsonType) {
-                    case DOUBLE:
-                        return $toDouble.apply(inputValue, document);
-                    case STRING:
-                        return $toString.apply(inputValue, document);
-                    case OBJECT_ID:
-                        return $toObjectId.apply(inputValue, document);
-                    case BOOL:
-                        return $toBool.apply(inputValue, document);
-                    case DATE:
-                        return $toDate.apply(inputValue, document);
-                    case INT:
-                        return $toInt.apply(inputValue, document);
-                    case LONG:
-                        return $toLong.apply(inputValue, document);
-                    case OBJECT:
-                    case ARRAY:
-                    case BIN_DATA:
-                    case NULL:
-                    case REGEX:
-                    case TIMESTAMP:
-                    case DECIMAL128:
-                    case MIN_KEY:
-                    case MAX_KEY:
-                    default:
-                        throw new UnsupportedOperationException("Unsupported conversion to type " + bsonType);
-                }
+                return switch (bsonType) {
+                    case DOUBLE -> $toDouble.apply(inputValue, document);
+                    case STRING -> $toString.apply(inputValue, document);
+                    case OBJECT_ID -> $toObjectId.apply(inputValue, document);
+                    case BOOL -> $toBool.apply(inputValue, document);
+                    case DATE -> $toDate.apply(inputValue, document);
+                    case INT -> $toInt.apply(inputValue, document);
+                    case LONG -> $toLong.apply(inputValue, document);
+                    default -> throw new UnsupportedOperationException("Unsupported conversion to type " + bsonType);
+                };
             } catch (MongoServerError e) {
                 if (e.hasCode(ErrorCode.ConversionFailure)) {
                     if (convertDocument.containsKey("onError")) {

core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/accumulator/Accumulator.java

@@ -33,24 +33,16 @@ public static Map<String, Supplier<Accumulator>> parse(Document configuration) {
             });
             String groupOperator = aggregation.getKey();
             Object expression = aggregation.getValue();
-            if (groupOperator.equals("$sum")) {
-                accumulators.put(field, () -> new SumAccumulator(field, expression));
-            } else if (groupOperator.equals("$min")) {
-                accumulators.put(field, () -> new MinAccumulator(field, expression));
-            } else if (groupOperator.equals("$max")) {
-                accumulators.put(field, () -> new MaxAccumulator(field, expression));
-            } else if (groupOperator.equals("$avg")) {
-                accumulators.put(field, () -> new AvgAccumulator(field, expression));
-            } else if (groupOperator.equals("$addToSet")) {
-                accumulators.put(field, () -> new AddToSetAccumulator(field, expression));
-            } else if (groupOperator.equals("$push")) {
-                accumulators.put(field, () -> new PushAccumulator(field, expression));
-            } else if (groupOperator.equals("$first")) {
-                accumulators.put(field, () -> new FirstAccumulator(field, expression));
-            } else if (groupOperator.equals("$last")) {
-                accumulators.put(field, () -> new LastAccumulator(field, expression));
-            } else {
-                throw new MongoServerError(15952, "unknown group operator '" + groupOperator + "'");
+            switch (groupOperator) {
+                case "$sum" -> accumulators.put(field, () -> new SumAccumulator(field, expression));
+                case "$min" -> accumulators.put(field, () -> new MinAccumulator(field, expression));
+                case "$max" -> accumulators.put(field, () -> new MaxAccumulator(field, expression));
+                case "$avg" -> accumulators.put(field, () -> new AvgAccumulator(field, expression));
+                case "$addToSet" -> accumulators.put(field, () -> new AddToSetAccumulator(field, expression));
+                case "$push" -> accumulators.put(field, () -> new PushAccumulator(field, expression));
+                case "$first" -> accumulators.put(field, () -> new FirstAccumulator(field, expression));
+                case "$last" -> accumulators.put(field, () -> new LastAccumulator(field, expression));
+                default -> throw new MongoServerError(15952, "unknown group operator '" + groupOperator + "'");
             }
         }
         return accumulators;

core/src/main/java/de/bwaldvogel/mongo/oplog/OperationType.java

@@ -40,18 +40,12 @@ static OperationType fromCode(String code) {
     }
 
     String getDescription() {
-        switch (this) {
-            case DELETE:
-                return "delete";
-            case INSERT:
-                return "insert";
-            case UPDATE:
-                return "update";
-            case COMMAND:
-                return "command";
-            case INVALIDATE:
-                return "invalidate";
-        }
-        return null;
+        return switch (this) {
+            case DELETE -> "delete";
+            case INSERT -> "insert";
+            case UPDATE -> "update";
+            case COMMAND -> "command";
+            case INVALIDATE -> "invalidate";
+        };
     }
 }