From a06f9a95c9d5dfe2a5b3f9ff2b301be31c8d1f91 Mon Sep 17 00:00:00 2001 From: Benedikt Waldvogel Date: Tue, 17 Nov 2026 20:15:19 +0100 Subject: [PATCH] Various code simplifications and cleanups --- .../java/de/bwaldvogel/mongo/MongoServer.java | 2 +- .../mongo/backend/AbstractMongoBackend.java | 3 +- .../backend/AbstractMongoCollection.java | 47 +++++------- .../mongo/backend/AbstractMongoDatabase.java | 4 +- .../mongo/backend/AbstractUniqueIndex.java | 2 +- .../mongo/backend/ArrayFilters.java | 13 +--- .../mongo/backend/DefaultQueryMatcher.java | 31 ++++---- .../mongo/backend/DocumentWithPosition.java | 13 +--- .../mongo/backend/FieldUpdates.java | 10 +-- .../de/bwaldvogel/mongo/backend/Index.java | 6 +- .../de/bwaldvogel/mongo/backend/KeyValue.java | 4 + .../bwaldvogel/mongo/backend/LimitedList.java | 25 ------ .../mongo/backend/LinkedTreeSet.java | 2 +- .../bwaldvogel/mongo/backend/Projection.java | 11 ++- .../mongo/backend/QueryParameters.java | 35 +-------- .../bwaldvogel/mongo/backend/QueryResult.java | 6 ++ .../mongo/backend/ReadOnlyProxy.java | 2 +- .../de/bwaldvogel/mongo/backend/Utils.java | 23 ++---- .../mongo/backend/ValueComparator.java | 2 +- .../mongo/backend/aggregation/Expression.java | 76 +++++++------------ .../backend/aggregation/ExpressionTraits.java | 2 +- .../aggregation/stage/BucketStage.java | 4 +- .../de/bwaldvogel/mongo/bson/Document.java | 7 ++ .../mongo/oplog/CollectionBackedOplog.java | 15 ++-- .../mongo/wire/MongoDatabaseHandler.java | 8 +- .../mongo/wire/MongoWireProtocolHandler.java | 17 ++--- .../mongo/backend/InMemoryCursorTest.java | 2 +- .../mongo/backend/h2/H2Collection.java | 4 +- .../AbstractBackendSpringDataTest.java | 2 +- .../mongo/backend/AbstractOplogTest.java | 2 +- 30 files changed, 134 insertions(+), 246 deletions(-) delete mode 100644 core/src/main/java/de/bwaldvogel/mongo/backend/LimitedList.java diff --git a/core/src/main/java/de/bwaldvogel/mongo/MongoServer.java b/core/src/main/java/de/bwaldvogel/mongo/MongoServer.java index 2c3bf8055..46aa65065 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/MongoServer.java +++ b/core/src/main/java/de/bwaldvogel/mongo/MongoServer.java @@ -92,7 +92,7 @@ public void bind(SocketAddress socketAddress, int numberOfBossThreads, int numbe .childOption(ChannelOption.TCP_NODELAY, Boolean.TRUE) .childHandler(new ChannelInitializer() { @Override - public void initChannel(SocketChannel ch) throws Exception { + public void initChannel(SocketChannel ch) { MongoServer.this.initChannel(ch); } }); diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoBackend.java b/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoBackend.java index cf9d3c278..ca42bf9f1 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoBackend.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoBackend.java @@ -369,7 +369,6 @@ protected Document handleKillCursors(Document query) { } protected Document handleGetMore(String databaseName, String command, Document query) { - MongoDatabase mongoDatabase = resolveDatabase(databaseName); String collectionName = (String) query.get("collection"); long cursorId = ((Number) query.get(command)).longValue(); int batchSize = ((Number) query.getOrDefault("batchSize", 0)).intValue(); @@ -400,7 +399,7 @@ protected Document handleDropDatabase(String databaseName) { public Document handleMessage(MongoMessage message) { String databaseName = message.getDatabaseName(); Document query = message.getDocument(); - DatabaseCommand command = DatabaseCommand.of(query.keySet().iterator().next()); + DatabaseCommand command = DatabaseCommand.of(query.getFirstKey()); return handleCommand(databaseName, command, query); } diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoCollection.java b/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoCollection.java index e623f1c82..a82390997 100755 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoCollection.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoCollection.java @@ -7,7 +7,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -110,7 +109,7 @@ protected QueryResult matchDocumentsFromStream(Document query, Stream documentStream = documentStream.limit(limit); } - if (fieldSelector != null && !fieldSelector.keySet().isEmpty()) { + if (fieldSelector != null && !fieldSelector.isEmpty()) { Projection projection = new Projection(fieldSelector, getIdField()); documentStream = documentStream.map(projection::projectDocument); } @@ -129,8 +128,8 @@ protected QueryResult matchDocuments(Document query, Iterable

positions, Docu } protected static boolean isNaturalDescending(Document orderBy) { - if (orderBy != null && !orderBy.keySet().isEmpty()) { - if (orderBy.keySet().iterator().next().equals("$natural")) { + if (orderBy != null && !orderBy.isEmpty()) { + if (orderBy.getFirstKey().equals("$natural")) { Number sortValue = (Number) orderBy.get("$natural"); if (sortValue.intValue() == -1) { return true; @@ -145,8 +144,8 @@ protected static boolean isNaturalDescending(Document orderBy) { } protected static DocumentComparator deriveComparator(Document orderBy) { - if (orderBy != null && !orderBy.keySet().isEmpty()) { - if (orderBy.keySet().iterator().next().equals("$natural")) { + if (orderBy != null && !orderBy.isEmpty()) { + if (orderBy.getFirstKey().equals("$natural")) { // already sorted } else { return new DocumentComparator(orderBy); @@ -218,12 +217,12 @@ public void addIndex(Index

index) { if (index.isEmpty()) { try { streamAllDocumentsWithPosition().forEach(documentWithPosition -> { - Document document = documentWithPosition.getDocument(); + Document document = documentWithPosition.document(); index.checkAdd(document, this); }); streamAllDocumentsWithPosition().forEach(documentWithPosition -> { - Document document = documentWithPosition.getDocument(); - P position = documentWithPosition.getPosition(); + Document document = documentWithPosition.document(); + P position = documentWithPosition.position(); index.add(document, position, this); }); } catch (MongoServerError e) { @@ -265,7 +264,7 @@ public void dropIndex(String indexName) { private void modifyField(Document document, String modifier, Document update, ArrayFilters arrayFilters, Integer matchPos, boolean isUpsert) { Document change = (Document) update.get(modifier); - UpdateOperator updateOperator = getUpdateOperator(modifier, change); + UpdateOperator updateOperator = getUpdateOperator(modifier); FieldUpdates updates = new FieldUpdates(document, updateOperator, getIdField(), isUpsert, matchPos, arrayFilters); updates.apply(change, modifier); } @@ -274,7 +273,7 @@ protected String getIdField() { return options.getIdField(); } - private UpdateOperator getUpdateOperator(String modifier, Document change) { + private UpdateOperator getUpdateOperator(String modifier) { final UpdateOperator op; try { op = UpdateOperator.fromValue(modifier); @@ -348,7 +347,7 @@ private Document calculateUpdateDocument(Document oldDocument, Document update, if (numStartsWithDollar == 0) { applyUpdate(newDocument, update); - } else if (numStartsWithDollar == update.keySet().size()) { + } else if (numStartsWithDollar == update.size()) { validateUpdateQuery(update); oldDocument.cloneInto(newDocument); for (String key : update.keySet()) { @@ -482,7 +481,7 @@ public synchronized MongoServerError getCause() { public QueryResult handleQuery(QueryParameters queryParameters) { final Document query; final Document orderBy; - Document querySelector = queryParameters.getQuerySelector(); + Document querySelector = queryParameters.querySelector(); if (querySelector.containsKey("query")) { query = (Document) querySelector.get("query"); orderBy = (Document) querySelector.get("orderby"); @@ -494,8 +493,8 @@ public QueryResult handleQuery(QueryParameters queryParameters) { orderBy = null; } - return queryDocuments(query, orderBy, queryParameters.getNumberToSkip(), queryParameters.getLimit(), - queryParameters.getBatchSize(), queryParameters.getProjection()); + return queryDocuments(query, orderBy, queryParameters.numberToSkip(), queryParameters.limit(), + queryParameters.batchSize(), queryParameters.projection()); } @Override @@ -688,7 +687,7 @@ private void convertSelectorToDocument(Document selector, Document document) { } else if (key.equals("$or")) { List orValues = (List) value; if (orValues.size() == 1) { - convertSelectorToDocument((Document) orValues.get(0), document); + convertSelectorToDocument((Document) orValues.getFirst(), document); } continue; } else if (key.startsWith("$")) { @@ -728,7 +727,7 @@ public List> getIndexes() { @Override public int count(Document query, int skip, int limit) { - if (query == null || query.keySet().isEmpty()) { + if (query == null || query.isEmpty()) { int count = count(); if (skip > 0) { count = Math.max(0, count - skip); @@ -740,13 +739,9 @@ public int count(Document query, int skip, int limit) { } int numberToReturn = Math.max(limit, 0); - int count = 0; - Iterator it = queryDocuments(query, null, skip, numberToReturn, 0, new Document(getIdField(), 1)).iterator(); - while (it.hasNext()) { - it.next(); - count++; - } - return count; + Document fieldSelector = new Document(getIdField(), 1); + long count = queryDocuments(query, null, skip, numberToReturn, 0, fieldSelector).stream().count(); + return Math.toIntExact(count); } @Override @@ -846,8 +841,8 @@ public void renameTo(MongoDatabase newDatabase, String newCollectionName) { protected P findDocumentPosition(Document document) { return streamAllDocumentsWithPosition() - .filter(match -> documentMatchesQuery(match.getDocument(), document)) - .map(DocumentWithPosition::getPosition) + .filter(match -> documentMatchesQuery(match.document(), document)) + .map(DocumentWithPosition::position) .findFirst() .orElse(null); } diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoDatabase.java b/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoDatabase.java index a0179b0e2..b2665af52 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoDatabase.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoDatabase.java @@ -375,7 +375,7 @@ private void dropIndexes(MongoCollection

collection, Document query) { if (index instanceof String indexName) { nsQuery.append("name", indexName); } else { - nsQuery.append("key", (Document) index); + nsQuery.append("key", index); } Document indexToDrop = CollectionUtils.getSingleElement(indexCollection.handleQuery(nsQuery), () -> createIndexNotFoundException(index)); @@ -525,7 +525,7 @@ private Document commandAggregate(String command, Document query, DatabaseResolv Object pipelineObject = Aggregation.parse(query.get("pipeline")); List pipeline = Aggregation.parse(pipelineObject); if (!pipeline.isEmpty()) { - Document changeStream = (Document) pipeline.get(0).get("$changeStream"); + Document changeStream = (Document) pipeline.getFirst().get("$changeStream"); if (changeStream != null) { Aggregation aggregation = getAggregation(pipeline.subList(1, pipeline.size()), query, databaseResolver, collection, oplog); aggregation.validate(query); diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractUniqueIndex.java b/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractUniqueIndex.java index 9050b0e2a..834d2788a 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractUniqueIndex.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/AbstractUniqueIndex.java @@ -191,7 +191,7 @@ public synchronized Iterable

getPositions(Document query) { for (Entry entry : getIterable()) { KeyValue obj = entry.getKey(); if (obj.size() == 1) { - Object o = obj.get(0); + Object o = obj.getFirst(); if (o instanceof String) { BsonRegularExpression regularExpression = BsonRegularExpression.convertToRegularExpression(queriedValue); Matcher matcher = regularExpression.matcher(o.toString()); diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/ArrayFilters.java b/core/src/main/java/de/bwaldvogel/mongo/backend/ArrayFilters.java index db52147b4..2acb3fa92 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/ArrayFilters.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/ArrayFilters.java @@ -42,7 +42,7 @@ private static ArrayFilters parse(List arrayFilters, Document updateQu if (topLevelFieldNames.size() > 1) { throw new FailedToParseException("Error parsing array filter :: caused by ::" + - " Expected a single top-level field name, found '" + topLevelFieldNames.get(0) + "' and '" + topLevelFieldNames.get(1) + "'"); + " Expected a single top-level field name, found '" + topLevelFieldNames.getFirst() + "' and '" + topLevelFieldNames.get(1) + "'"); } String topLevelFieldName = CollectionUtils.getSingleElement(topLevelFieldNames); @@ -80,15 +80,6 @@ private static Object createFilter(Document arrayFilter) { return filter; } - private static Object createFilter(List pathFragments, Object query) { - List tail = Utils.getTail(pathFragments); - if (tail.isEmpty()) { - return query; - } else { - return new Document(Utils.joinPath(tail), query); - } - } - private static void validate(Document updateQuery, Map arrayFilterMap) { Set allKeys = updateQuery.values().stream() .filter(Document.class::isInstance) @@ -153,7 +144,7 @@ private List calculateKeys(Object object, List pathFragments, St if (pathFragments.isEmpty()) { return List.of(path); } - String fragment = pathFragments.get(0); + String fragment = pathFragments.getFirst(); if (!isPositionalOperator(fragment)) { String nextPath = Utils.joinPath(path, fragment); diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/DefaultQueryMatcher.java b/core/src/main/java/de/bwaldvogel/mongo/backend/DefaultQueryMatcher.java index 5ccc2ff73..00d6355f0 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/DefaultQueryMatcher.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/DefaultQueryMatcher.java @@ -49,7 +49,7 @@ private void validateQueryValue(Object queryValue, String key) { if (BsonRegularExpression.isRegularExpression(queryValue)) { return; } - if (!queryObject.keySet().isEmpty() && queryObject.keySet().iterator().next().startsWith("$")) { + if (!queryObject.isEmpty() && queryObject.getFirstKey().startsWith("$")) { for (String operator : queryObject.keySet()) { if (Constants.REFERENCE_KEYS.contains(operator)) { continue; @@ -99,7 +99,7 @@ private boolean checkMatch(Object queryValue, List keys, Object value) { throw new MongoServerException("illegal keys: " + keys); } - String firstKey = keys.get(0); + String firstKey = keys.getFirst(); if (firstKey.equals("$comment")) { log.debug("query comment: '{}'", queryValue); @@ -265,26 +265,26 @@ private boolean checkMatch(Object queryValue, QueryFilter filter, Object documen } } - switch (filter) { - case AND: + return switch (filter) { + case AND -> { for (Object subqueryValue : list) { if (!matches((Document) document, (Document) subqueryValue)) { - return false; + yield false; } } - return true; - case OR: + yield true; + } + case OR -> { for (Object subqueryValue : list) { if (matches((Document) document, (Document) subqueryValue)) { - return true; + yield true; } } - return false; - case NOR: - return !checkMatch(queryValue, QueryFilter.OR, document); - default: - throw new MongoServerException("illegal query filter: " + filter + ". must not happen"); - } + yield false; + } + case NOR -> !checkMatch(queryValue, QueryFilter.OR, document); + default -> throw new MongoServerException("illegal query filter: " + filter + ". must not happen"); + }; } @SuppressWarnings("unchecked") @@ -367,12 +367,11 @@ private boolean checkMatchesValue(Object queryValue, Object value, boolean requi } private boolean checkMatchesAllValues(Object queryValue, Object values) { - if (!(queryValue instanceof Collection)) { + if (!(queryValue instanceof Collection queryValues)) { return false; } Collection list = (Collection) values; - Collection queryValues = (Collection) queryValue; if (queryValues.isEmpty()) { return false; diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/DocumentWithPosition.java b/core/src/main/java/de/bwaldvogel/mongo/backend/DocumentWithPosition.java index 0b86ebb8d..6c5edc2b6 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/DocumentWithPosition.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/DocumentWithPosition.java @@ -4,22 +4,11 @@ import de.bwaldvogel.mongo.bson.Document; -public class DocumentWithPosition

{ - - private final Document document; - private final P position; +public record DocumentWithPosition

(Document document, P position) { public DocumentWithPosition(Document document, P position) { this.document = Objects.requireNonNull(document); this.position = Objects.requireNonNull(position); } - public Document getDocument() { - return document; - } - - public P getPosition() { - return position; - } - } diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/FieldUpdates.java b/core/src/main/java/de/bwaldvogel/mongo/backend/FieldUpdates.java index 269e33de9..3c6c25b33 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/FieldUpdates.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/FieldUpdates.java @@ -228,7 +228,7 @@ private void handleAddToSet(String key, Object changeValue) { "Cannot apply $addToSet to non-array field. Field named '" + key + "' has non-array type " + describeType(value))); Collection pushValues = new ArrayList<>(); - if (changeValue instanceof Document addToSetDocument && addToSetDocument.keySet().iterator().next().equals("$each")) { + if (changeValue instanceof Document addToSetDocument && addToSetDocument.getFirstKey().equals("$each")) { for (String modifier : addToSetDocument.keySet()) { if (!modifier.equals("$each")) { throw new BadValueException("Found unexpected fields after $each in $addToSet: " + addToSetDocument.toString(true, "{ ", " }")); @@ -349,11 +349,10 @@ private void handleIncMul(Document change, String key, Object changeObject) { " of non-numeric type " + describeType(value)); } - if (!(changeObject instanceof Number)) { + if (!(changeObject instanceof Number changeValue)) { String operation = (updateOperator == UpdateOperator.INC) ? "increment" : "multiply"; throw new TypeMismatchException("Cannot " + operation + " with non-numeric argument: " + change.toString(true)); } - Number changeValue = (Number) changeObject; final Number newValue; if (updateOperator == UpdateOperator.INC) { newValue = NumericUtils.addNumbers(number, changeValue); @@ -410,10 +409,9 @@ private void handleCurrentDate(String key, Object typeSpecification) { private void handleRename(String key, Object toField) { assertNotKeyField(key); - if (!(toField instanceof String)) { + if (!(toField instanceof String newKey)) { throw new BadValueException("The 'to' field for $rename must be a string: " + key + ": " + toField); } - String newKey = (String) toField; assertNotKeyField(newKey); if (renames.containsKey(key) || renames.containsValue(key)) { @@ -455,7 +453,7 @@ private Object getSubdocumentValue(Object document, String key) { private static Object getSubdocumentValue(Object document, String key, AtomicReference matchPos) { List pathFragments = splitPath(key); - String mainKey = pathFragments.get(0); + String mainKey = pathFragments.getFirst(); if (pathFragments.size() == 1) { return Utils.getFieldValueListSafe(document, mainKey); } diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/Index.java b/core/src/main/java/de/bwaldvogel/mongo/backend/Index.java index 89a94c8cd..974c1407f 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/Index.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/Index.java @@ -69,7 +69,7 @@ Set getKeyValues(Document document, boolean normalize) { .map(value -> (Collection) value) .collect(Collectors.toList()); - if (collectionValues.size() > 0) { + if (!collectionValues.isEmpty()) { validateHasNoParallelArrays(document); return CollectionUtils.multiplyWithOtherElements(valuesPerKey.values(), collectionValues).stream() .map(KeyValue::new) @@ -98,7 +98,7 @@ private void validateHasNoParallelArrays(Document document) { private static List getPathToFirstCollection(Document document, String key) { List fragments = Utils.splitPath(key); List remainingFragments = Utils.getTail(fragments); - return getPathToFirstCollection(document, remainingFragments, List.of(fragments.get(0))); + return getPathToFirstCollection(document, remainingFragments, List.of(fragments.getFirst())); } private static List getPathToFirstCollection(Document document, List remainingFragments, List path) { @@ -110,7 +110,7 @@ private static List getPathToFirstCollection(Document document, List newPath = new ArrayList<>(path); - newPath.add(remainingFragments.get(0)); + newPath.add(remainingFragments.getFirst()); return getPathToFirstCollection(document, Utils.getTail(remainingFragments), newPath); } diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/KeyValue.java b/core/src/main/java/de/bwaldvogel/mongo/backend/KeyValue.java index bb197b455..f8078409b 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/KeyValue.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/KeyValue.java @@ -35,6 +35,10 @@ public int size() { return values.size(); } + public Object getFirst() { + return get(0); + } + public Object get(int index) { return values.get(index); } diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/LimitedList.java b/core/src/main/java/de/bwaldvogel/mongo/backend/LimitedList.java deleted file mode 100644 index 5675919d7..000000000 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/LimitedList.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.bwaldvogel.mongo.backend; - -import java.io.Serial; -import java.util.ArrayList; - -public class LimitedList extends ArrayList { - - @Serial - private static final long serialVersionUID = -4265811949513159615L; - - private final int limit; - - LimitedList(int limit) { - this.limit = limit; - } - - @Override - public boolean add(E o) { - super.add(o); - while (size() > limit) { - super.remove(0); - } - return true; - } -} diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/LinkedTreeSet.java b/core/src/main/java/de/bwaldvogel/mongo/backend/LinkedTreeSet.java index adb05c59b..a00f9707b 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/LinkedTreeSet.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/LinkedTreeSet.java @@ -65,7 +65,7 @@ private void removeFromOrderedElements(Object o) { @Override public Iterator iterator() { - return new Iterator() { + return new Iterator<>() { private final Iterator delegate = orderedElements.iterator(); private E currentElement; diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/Projection.java b/core/src/main/java/de/bwaldvogel/mongo/backend/Projection.java index 144e6607c..6bd5c794d 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/Projection.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/Projection.java @@ -96,7 +96,7 @@ private boolean onlyExclusions(Document fields) { if (!inclusions.isEmpty() && !exclusions.isEmpty()) { List includedFields = nonIdInclusionsAndExclusions.get(Type.INCLUSIONS); - throw new MongoServerError(31253, "Cannot do inclusion on field " + includedFields.get(0) + " in exclusion projection"); + throw new MongoServerError(31253, "Cannot do inclusion on field " + includedFields.getFirst() + " in exclusion projection"); } return inclusions.isEmpty(); } @@ -105,7 +105,7 @@ private static void projectField(Document document, Document newDocument, String if (key.contains(Utils.PATH_DELIMITER)) { List pathFragments = Utils.splitPath(key); - String mainKey = pathFragments.get(0); + String mainKey = pathFragments.getFirst(); String subKey = Utils.joinTail(pathFragments); Object object = document.get(mainKey); @@ -119,7 +119,7 @@ private static void projectField(Document document, Document newDocument, String List newprojectedValues = (List) newDocument.computeIfAbsent(mainKey, k -> new ArrayList<>()); if ("$".equals(subKey) && !values.isEmpty()) { - Object firstValue = values.get(0); + Object firstValue = values.getFirst(); if (firstValue instanceof Document) { newprojectedValues.add(firstValue); } @@ -188,11 +188,10 @@ private static void projectElemMatch(Document newDocument, Document elemMatch, S } private static void projectSlice(Document newDocument, Object slice, String key, Object value) { - if (!(value instanceof List)) { + if (!(value instanceof List values)) { newDocument.put(key, value); return; } - List values = (List) value; int fromIndex = 0; int toIndex = values.size(); if (slice instanceof Integer) { @@ -208,7 +207,7 @@ private static void projectSlice(Document newDocument, Object slice, String key, } if (!(sliceParams.get(0) instanceof Number)) { - throw new MongoServerError(28724, "First argument to $slice must be an array, but is of type: " + Utils.describeType(sliceParams.get(0))); + throw new MongoServerError(28724, "First argument to $slice must be an array, but is of type: " + Utils.describeType(sliceParams.getFirst())); } if (!(sliceParams.get(1) instanceof Number)) { throw new MongoServerError(28724, "First argument to $slice must be an array, but is of type: int"); diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/QueryParameters.java b/core/src/main/java/de/bwaldvogel/mongo/backend/QueryParameters.java index fd0b6ff1a..b3307d486 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/QueryParameters.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/QueryParameters.java @@ -2,43 +2,10 @@ import de.bwaldvogel.mongo.bson.Document; -public class QueryParameters { - private final Document querySelector; - private final int numberToSkip; - private final int limit; - private final int batchSize; - private final Document projection; - - QueryParameters(Document querySelector, int numberToSkip, int limit, int batchSize, Document projection) { - this.querySelector = querySelector; - this.numberToSkip = numberToSkip; - this.limit = limit; - this.batchSize = batchSize; - this.projection = projection; - } +public record QueryParameters(Document querySelector, int numberToSkip, int limit, int batchSize, Document projection) { public QueryParameters(Document querySelector, int numberToSkip, int limit) { this(querySelector, numberToSkip, limit, 0, null); } - public Document getQuerySelector() { - return querySelector; - } - - public int getNumberToSkip() { - return numberToSkip; - } - - public int getLimit() { - return limit; - } - - public int getBatchSize() { - return batchSize; - } - - public Document getProjection() { - return projection; - } - } diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/QueryResult.java b/core/src/main/java/de/bwaldvogel/mongo/backend/QueryResult.java index 1718df143..48f7d4b7d 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/QueryResult.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/QueryResult.java @@ -4,6 +4,8 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; import de.bwaldvogel.mongo.bson.Document; @@ -46,6 +48,10 @@ public Iterator iterator() { return documents.iterator(); } + public Stream stream() { + return StreamSupport.stream(documents.spliterator(), false); + } + public long getCursorId() { return cursorId; } diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/ReadOnlyProxy.java b/core/src/main/java/de/bwaldvogel/mongo/backend/ReadOnlyProxy.java index fe42bb0d8..c40bd790e 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/ReadOnlyProxy.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/ReadOnlyProxy.java @@ -92,7 +92,7 @@ private static boolean isAllowed(Command command, Document query) { @Override public Document handleMessage(MongoMessage message) { Document document = message.getDocument(); - String command = document.keySet().iterator().next(); + String command = document.getFirstKey(); if (isAllowed(Command.parseString(command), document)) { return backend.handleMessage(message); } diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/Utils.java b/core/src/main/java/de/bwaldvogel/mongo/backend/Utils.java index ead8d799c..81b698574 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/Utils.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/Utils.java @@ -54,7 +54,7 @@ private static Object getSubdocumentValue(Document document, String key, boolean if (pathFragments.size() == 1) { return getFieldValueListSafe(document, CollectionUtils.getSingleElement(pathFragments)); } - String mainKey = pathFragments.get(0); + String mainKey = pathFragments.getFirst(); String subKey = joinTail(pathFragments); Assert.doesNotStartWith(subKey, "$."); Object subObject = getFieldValueListSafe(document, mainKey); @@ -179,11 +179,10 @@ static boolean containsQueryExpression(Object value) { return false; } - if (!(value instanceof Document)) { + if (!(value instanceof Document doc)) { return false; } - Document doc = (Document) value; for (String key : doc.keySet()) { if (key.startsWith("$")) { return true; @@ -240,7 +239,7 @@ private static boolean isNumeric(String value) { static boolean hasSubdocumentValue(Object document, String key) { List pathFragments = splitPath(key); - String mainKey = pathFragments.get(0); + String mainKey = pathFragments.getFirst(); if (pathFragments.size() == 1) { return hasFieldValueListSafe(document, key); } @@ -255,7 +254,7 @@ static boolean hasSubdocumentValue(Object document, String key) { static boolean canFullyTraverseSubkeyForRename(Object document, String key) { List pathFragments = splitPath(key); - String mainKey = pathFragments.get(0); + String mainKey = pathFragments.getFirst(); if (pathFragments.size() == 1) { return true; } @@ -390,7 +389,7 @@ static Object changeSubdocumentValue(Object document, String key, Object newValu private static Object changeSubdocumentValue(Object document, String key, Object newValue, String previousKey, AtomicReference matchPos) { List pathFragments = splitPath(key); - String mainKey = pathFragments.get(0); + String mainKey = pathFragments.getFirst(); if (pathFragments.size() == 1) { return setListSafe(document, key, previousKey, newValue); } @@ -399,7 +398,7 @@ private static Object changeSubdocumentValue(Object document, String key, Object if (subObject instanceof Document || subObject instanceof List) { return changeSubdocumentValue(subObject, subKey, newValue, mainKey, matchPos); } else if (Missing.isNeitherNullNorMissing(subObject)) { - String subKeyFirst = splitPath(subKey).get(0); + String subKeyFirst = splitPath(subKey).getFirst(); throw new PathNotViableException(subKeyFirst, new Document(mainKey, subObject)); } else { Document obj = new Document(); @@ -438,7 +437,7 @@ public static Object removeSubdocumentValue(Object document, String key) { private static Object removeSubdocumentValue(Object document, String key, AtomicReference matchPos) { List pathFragments = splitPath(key); - String mainKey = pathFragments.get(0); + String mainKey = pathFragments.getFirst(); if (pathFragments.size() == 1) { return removeListSafe(document, key); } @@ -491,14 +490,6 @@ static Document firstBatchCursorResponse(String ns, Document... documents) { return firstBatchCursorResponse(ns, List.of(documents)); } - static Document firstBatchCursorResponse(String ns, Iterable documents) { - List firstBatch = new ArrayList<>(); - for (Document document : documents) { - firstBatch.add(document); - } - return firstBatchCursorResponse(ns, firstBatch); - } - static Document firstBatchCursorResponse(String ns, Stream firstBatch) { return firstBatchCursorResponse(ns, firstBatch.collect(Collectors.toList())); } diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/ValueComparator.java b/core/src/main/java/de/bwaldvogel/mongo/backend/ValueComparator.java index b712342cd..ee0bac90b 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/ValueComparator.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/ValueComparator.java @@ -239,7 +239,7 @@ private Object getListValueForComparison(Object value) { return Missing.getInstance(); } values.sort(this); - return values.get(0); + return values.getFirst(); } else { return value; } diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/Expression.java b/core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/Expression.java index 897bef173..8ff16c719 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/Expression.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/Expression.java @@ -105,11 +105,10 @@ Object apply(List expressionValue, Document document) { @Override Object apply(List expressionValue, Document document) { Object valueInCollection = requireSingleValue(expressionValue); - if (!(valueInCollection instanceof Collection)) { + if (!(valueInCollection instanceof Collection collectionInCollection)) { throw new MongoServerError(17041, name() + "'s argument must be an array, but is " + describeType(valueInCollection)); } - Collection collectionInCollection = (Collection) valueInCollection; for (Object value : collectionInCollection) { if (Utils.isTrue(value)) { return true; @@ -123,11 +122,10 @@ Object apply(List expressionValue, Document document) { @Override Object apply(List expressionValue, Document document) { Object parameter = requireSingleValue(expressionValue); - if (!(parameter instanceof Collection)) { + if (!(parameter instanceof Collection collectionInCollection)) { throw new MongoServerError(17040, name() + "'s argument must be an array, but is " + describeType(parameter)); } - Collection collectionInCollection = (Collection) parameter; for (Object value : collectionInCollection) { if (!Utils.isTrue(value)) { return false; @@ -148,16 +146,15 @@ Object apply(List expressionValue, Document document) { Object firstValue = parameters.first(); Object secondValue = parameters.second(); - if (!(firstValue instanceof List)) { + if (!(firstValue instanceof List collection)) { throw new MongoServerError(28689, name() + "'s first argument must be an array, but is " + describeType(firstValue)); } - if (!(secondValue instanceof Number)) { + if (!(secondValue instanceof Number secondNumber)) { throw new MongoServerError(28690, name() + "'s second argument must be a numeric value, but is " + describeType(secondValue)); } - List collection = (List) firstValue; - int index = ((Number) secondValue).intValue(); + int index = secondNumber.intValue(); if (index < 0) { index = collection.size() + index; } @@ -182,11 +179,9 @@ Object apply(List expressionValues, Document document) { if (keyValue.size() != 2) { throw new FailedToOptimizePipelineError(40397, name() + " requires an array of size 2 arrays,found array of size: " + keyValue.size()); } - Object keyObject = keyValue.get(0); - if (!(keyObject instanceof String)) { - throw new FailedToOptimizePipelineError(40395, name() + " requires an array of key-value pairs, where the key must be of type string. Found key type: " + describeType(keyObject)); + if (!(keyValue.get(0) instanceof String key)) { + throw new FailedToOptimizePipelineError(40395, name() + " requires an array of key-value pairs, where the key must be of type string. Found key type: " + describeType(keyValue.getFirst())); } - String key = (String) keyObject; Object value = keyValue.get(1); result.put(key, value); } else if (keyValueObject instanceof Document keyValue) { @@ -197,10 +192,9 @@ Object apply(List expressionValues, Document document) { throw new FailedToOptimizePipelineError(40393, name() + " requires an object with keys 'k' and 'v'. Missing either or both keys from: " + keyValue.toString(true)); } Object keyObject = keyValue.get("k"); - if (!(keyObject instanceof String)) { + if (!(keyObject instanceof String key)) { throw new FailedToOptimizePipelineError(40394, name() + " requires an object with keys 'k' and 'v', where the value of 'k' must be of type string. Found type: " + describeType(keyObject)); } - String key = (String) keyObject; Object value = keyValue.get("v"); result.put(key, value); } else { @@ -332,10 +326,9 @@ Object apply(List expressionValue, Document document) { @Override Object apply(List expression, Document document) { Object expressionValue = CollectionUtils.getSingleElement(expression); - if (!(expressionValue instanceof Document)) { + if (!(expressionValue instanceof Document convertDocument)) { throw new FailedToParseException(name() + " expects an object of named arguments but found: " + describeType(expressionValue)); } - Document convertDocument = (Document) expressionValue; List supportedKeys = asList("input", "to", "onError", "onNull"); for (String key : convertDocument.keySet()) { @@ -449,7 +442,7 @@ Object apply(Object expressionValue, Document document) { Object formatDocument = dateToStringDocument.get("format"); if (formatDocument != null) { if (!(formatDocument instanceof String)) { - throw new MongoServerError(18533, name() + " requires that 'format' be a string, found: " + describeType(formatDocument) + " with value " + formatDocument.toString()); + throw new MongoServerError(18533, name() + " requires that 'format' be a string, found: " + describeType(formatDocument) + " with value " + formatDocument); } format = (String) formatDocument; } @@ -603,12 +596,10 @@ Object apply(Object expressionValue, Document document) { return null; } - if (!(input instanceof Collection)) { + if (!(input instanceof Collection inputCollection)) { throw new MongoServerError(28651, "input to " + name() + " must be an array not " + describeType(input)); } - Collection inputCollection = (Collection) input; - String key = "$" + as; Document documentForCondition = document.clone(); Assert.isFalse(documentForCondition.containsKey(key), () -> "Document already contains '" + key + "'"); @@ -692,11 +683,10 @@ Object apply(List expressionValue, Document document) { if (first == null) { return null; } - if (!(first instanceof List)) { + if (!(first instanceof List elementsToSearchIn)) { throw new MongoServerError(40090, name() + " requires an array as a first argument, found: " + describeType(first)); } - List elementsToSearchIn = (List) first; Range range = indexOf(expressionValue, elementsToSearchIn.size()); @@ -837,12 +827,10 @@ Object apply(Object expressionValue, Document document) { return null; } - if (!(input instanceof Collection)) { + if (!(input instanceof Collection inputCollection)) { throw new MongoServerError(16883, "input to " + name() + " must be an array not " + describeType(input)); } - Collection inputCollection = (Collection) input; - String key = "$" + as; Document documentForCondition = document.clone(); Assert.isFalse(documentForCondition.containsKey(key), () -> "Document already contains '" + key + "'"); @@ -885,12 +873,10 @@ Object apply(Object expressionValue, Document document) { return null; } - if (!(input instanceof Collection)) { + if (!(input instanceof Collection inputCollection)) { throw new MongoServerError(40080, "input to " + name() + " must be an array not " + describeType(input)); } - Collection inputCollection = (Collection) input; - final String thisKey = "$this"; final String valueKey = "$value"; Document documentForReduce = document.clone(); @@ -1075,11 +1061,10 @@ Object apply(List expressionValue, Document document) { if (expressionValue.size() > 1) { throw new MongoServerError(3040501, name() + " does not currently accept arguments"); } else if (expressionValue.size() == 1) { - Object parameter = expressionValue.get(0); - if (!(parameter instanceof Document)) { + Object parameter = expressionValue.getFirst(); + if (!(parameter instanceof Document params)) { throw new MongoServerError(10065, "invalid parameter: expected an object (" + name() + ")"); } - Document params = (Document) parameter; if (!params.isEmpty()) { throw new MongoServerError(3040501, name() + " does not currently accept arguments"); } @@ -1126,10 +1111,9 @@ Object apply(List expressionValue, Document document) { } private int toInt(Object object, int errorCodeIfNotANumber, int errorCodeIfNonInt, String errorMessage) { - if (!(object instanceof Number)) { + if (!(object instanceof Number number)) { throw new MongoServerError(errorCodeIfNotANumber, name() + " requires a numeric " + errorMessage + ", found value of type: " + describeType(object)); } - Number number = (Number) object; int value = number.intValue(); if (number.doubleValue() != value) { throw new MongoServerError(errorCodeIfNonInt, @@ -1226,10 +1210,9 @@ Object apply(List expressionValue, Document document) { if (isNullOrMissing(value)) { return null; } - if (!(value instanceof Collection)) { + if (!(value instanceof Collection values)) { throw new MongoServerError(17047, "All operands of " + name() + " must be arrays. One argument is of type: " + describeType(value)); } - Collection values = (Collection) value; if (result == null) { result = new LinkedTreeSet<>(values); } else { @@ -1298,14 +1281,13 @@ Object apply(List expressionValue, Document document) { throw new MongoServerError(28667, "Expression " + name() + " takes at least 2 arguments, and at most 3, but " + expressionValue.size() + " were passed in."); } - Object first = expressionValue.get(0); + Object first = expressionValue.getFirst(); if (isNullOrMissing(first)) { return null; } - if (!(first instanceof List)) { + if (!(first instanceof List list)) { throw new MongoServerError(28724, "First argument to " + name() + " must be an array, but is of type: " + describeType(first)); } - List list = (List) first; Object second = expressionValue.get(1); if (!(second instanceof Number)) { @@ -1315,11 +1297,10 @@ Object apply(List expressionValue, Document document) { final List result; if (expressionValue.size() > 2) { Object third = expressionValue.get(2); - if (!(third instanceof Number)) { + if (!(third instanceof Number number)) { throw new MongoServerError(28725, "Third argument to " + name() + " must be numeric, but is of type: " + describeType(third)); } - Number number = (Number) third; if (number.intValue() < 0) { throw new MongoServerError(28729, "Third argument to " + name() + " must be positive: " + third); } @@ -1440,23 +1421,20 @@ Object apply(Object expressionValue, Document document) { // Get and validate branches Object branchesValue = switchDocument.get("branches"); - if (!(branchesValue instanceof Collection)) { + if (!(branchesValue instanceof Collection branches)) { throw new MongoServerError(40061, name() + " expected an array for 'branches', found: " + describeType(branchesValue)); } - Collection branches = (Collection) branchesValue; if (branches.isEmpty()) { throw new MongoServerError(40060, name() + " requires at least one branch"); } // Evaluate each branch for (Object branchValue : branches) { - if (!(branchValue instanceof Document)) { + if (!(branchValue instanceof Document branch)) { throw new MongoServerError(40062, name() + " expected each branch to be an object, found: " + describeType(branchValue)); } - Document branch = (Document) branchValue; - // Validate branch has required fields if (!branch.containsKey("case")) { throw new MongoServerError(40064, name() + " requires each branch have a 'case' expression"); @@ -1533,7 +1511,7 @@ Object apply(List expressionValue, Document document) { @Override Object apply(List expressionValue, Document document) { requireCollectionInSize(expressionValue, 3); - String value = convertToString(expressionValue.get(0)); + String value = convertToString(expressionValue.getFirst()); if (value == null || value.isEmpty()) { return ""; } @@ -1776,8 +1754,8 @@ Object apply(List expressionValue, Document document) { private static Collection getValues(List expressionValue) { Collection values = expressionValue; if (expressionValue.size() == 1) { - if (expressionValue.get(0) instanceof Collection) { - values = (Collection) expressionValue.get(0); + if (expressionValue.getFirst() instanceof Collection first) { + values = first; } } return values; @@ -1867,7 +1845,7 @@ private static Object evaluateDocumentExpression(Document expression, Document d String expressionKey = entry.getKey(); Object expressionValue = entry.getValue(); if (expressionKey.startsWith("$")) { - if (expression.keySet().size() > 1) { + if (expression.size() > 1) { throw new MongoServerError(15983, "An object representing an expression must have exactly one field: " + expression); } diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/ExpressionTraits.java b/core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/ExpressionTraits.java index b448f9840..f7008efb9 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/ExpressionTraits.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/ExpressionTraits.java @@ -148,7 +148,7 @@ default Object assertTwoToFourArguments(List expressionValue) { "Expression " + name() + " takes at least 2 arguments, and at most 4, but " + expressionValue.size() + " were passed in."); } - Object first = expressionValue.get(0); + Object first = expressionValue.getFirst(); if (isNullOrMissing(first)) { return null; } diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/stage/BucketStage.java b/core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/stage/BucketStage.java index 27d1c83e3..e30edc324 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/stage/BucketStage.java +++ b/core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/stage/BucketStage.java @@ -85,7 +85,7 @@ private List getAndValidateBoundaries(Object boundaries) { private Object getAndValidateDefault(Object defaultValue) { Assert.notEmpty(boundaries); - if (!(compare(defaultValue, boundaries.get(0)) < 0 + if (!(compare(defaultValue, boundaries.getFirst()) < 0 || compare(defaultValue, CollectionUtils.getLastElement(boundaries)) >= 0)) { throw new MongoServerError(40199, "The $bucket 'default' field must be less than the lowest boundary or greater than or equal to the highest boundary."); } @@ -151,7 +151,7 @@ private List getAccumulators() { } private Object findBucket(Object key) { - if (compare(key, boundaries.get(0)) < 0) { + if (compare(key, boundaries.getFirst()) < 0) { return getDefaultValue(); } for (int i = 1; i < boundaries.size(); i++) { diff --git a/core/src/main/java/de/bwaldvogel/mongo/bson/Document.java b/core/src/main/java/de/bwaldvogel/mongo/bson/Document.java index 897e7158d..67fa220b8 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/bson/Document.java +++ b/core/src/main/java/de/bwaldvogel/mongo/bson/Document.java @@ -87,6 +87,13 @@ public Object getOrMissing(Object key) { return getOrDefault(key, Missing.getInstance()); } + public String getFirstKey() { + if (isEmpty()) { + throw new IllegalStateException("Expected at least one key"); + } + return documentAsMap.firstEntry().getKey(); + } + @Override public void clear() { documentAsMap.clear(); diff --git a/core/src/main/java/de/bwaldvogel/mongo/oplog/CollectionBackedOplog.java b/core/src/main/java/de/bwaldvogel/mongo/oplog/CollectionBackedOplog.java index 63b89a6ee..62be37a65 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/oplog/CollectionBackedOplog.java +++ b/core/src/main/java/de/bwaldvogel/mongo/oplog/CollectionBackedOplog.java @@ -186,15 +186,12 @@ private boolean isOplogCollection(String namespace) { } private Document getFullDocument(Document changeStreamDocument, Document document, OperationType operationType) { - switch (operationType) { - case INSERT: - return getUpdateDocument(document); - case DELETE: - return null; - case UPDATE: - return lookUpUpdateDocument(changeStreamDocument, document); - } - throw new IllegalArgumentException("Invalid operation type"); + return switch (operationType) { + case INSERT -> getUpdateDocument(document); + case DELETE -> null; + case UPDATE -> lookUpUpdateDocument(changeStreamDocument, document); + default -> throw new IllegalArgumentException("Invalid operation type"); + }; } private Document lookUpUpdateDocument(Document changeStreamDocument, Document document) { diff --git a/core/src/main/java/de/bwaldvogel/mongo/wire/MongoDatabaseHandler.java b/core/src/main/java/de/bwaldvogel/mongo/wire/MongoDatabaseHandler.java index 0645430a0..dec9d3f57 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/wire/MongoDatabaseHandler.java +++ b/core/src/main/java/de/bwaldvogel/mongo/wire/MongoDatabaseHandler.java @@ -78,9 +78,9 @@ protected void channelRead0(ChannelHandlerContext ctx, ClientRequest object) { // visible for testing MongoMessage handleMessage(MongoMessage message, SocketAddress remoteAddress) { - Document document = null; + Document document; try { - String command = message.getDocument().keySet().iterator().next(); + String command = message.getDocument().getFirstKey(); if ("whatsmyuri".equalsIgnoreCase(command)) { document = handleWhatsMyUri(remoteAddress); } else { @@ -141,10 +141,10 @@ Document handleCommand(MongoQuery query, SocketAddress remoteAddress) { return new Document("inprog", currentOperations); } else if ("$cmd".equals(collectionName)) { - String command = query.getQuery().keySet().iterator().next(); + String command = query.getQuery().getFirstKey(); if ("$query".equals(command)) { Document actualQuery = (Document) query.getQuery().get("$query"); - command = actualQuery.keySet().iterator().next(); + command = actualQuery.getFirstKey(); return handleCommand(query.getDatabaseName(), DatabaseCommand.of(command), actualQuery, remoteAddress); } return handleCommand(query.getDatabaseName(), DatabaseCommand.of(command), query.getQuery(), remoteAddress); diff --git a/core/src/main/java/de/bwaldvogel/mongo/wire/MongoWireProtocolHandler.java b/core/src/main/java/de/bwaldvogel/mongo/wire/MongoWireProtocolHandler.java index 330ed8acf..1120de443 100644 --- a/core/src/main/java/de/bwaldvogel/mongo/wire/MongoWireProtocolHandler.java +++ b/core/src/main/java/de/bwaldvogel/mongo/wire/MongoWireProtocolHandler.java @@ -77,18 +77,11 @@ protected ClientRequest decode(ChannelHandlerContext ctx, ByteBuf buf) throws Ex throw new IOException("opCode " + opCodeId + " not supported"); } - final ClientRequest request; - - switch (opCode) { - case OP_QUERY: - request = handleQuery(header, in); - break; - case OP_MSG: - request = handleMessage(header, in); - break; - default: - throw new UnsupportedOperationException("unsupported opcode: " + opCode); - } + ClientRequest request = switch (opCode) { + case OP_QUERY -> handleQuery(header, in); + case OP_MSG -> handleMessage(header, in); + default -> throw new UnsupportedOperationException("unsupported opcode: " + opCode); + }; if (in.isReadable()) { throw new IOException(); diff --git a/core/src/test/java/de/bwaldvogel/mongo/backend/InMemoryCursorTest.java b/core/src/test/java/de/bwaldvogel/mongo/backend/InMemoryCursorTest.java index a1b80edbf..0d01fe0d4 100644 --- a/core/src/test/java/de/bwaldvogel/mongo/backend/InMemoryCursorTest.java +++ b/core/src/test/java/de/bwaldvogel/mongo/backend/InMemoryCursorTest.java @@ -50,7 +50,7 @@ void testTakeDocuments_returnsUnmodifiableList() { InMemoryCursor cursor = new InMemoryCursor(123L, List.of(new Document(), new Document())); List documents = cursor.takeDocuments(5); assertThatExceptionOfType(UnsupportedOperationException.class) - .isThrownBy(() -> documents.remove(0)); + .isThrownBy(documents::removeFirst); } @Test diff --git a/h2-backend/src/main/java/de/bwaldvogel/mongo/backend/h2/H2Collection.java b/h2-backend/src/main/java/de/bwaldvogel/mongo/backend/h2/H2Collection.java index 5ad8e67a5..4f47d572b 100644 --- a/h2-backend/src/main/java/de/bwaldvogel/mongo/backend/h2/H2Collection.java +++ b/h2-backend/src/main/java/de/bwaldvogel/mongo/backend/h2/H2Collection.java @@ -105,8 +105,8 @@ protected QueryResult matchDocuments(Document query, Document orderBy, int numbe final Stream documentStream; if (isNaturalDescending(orderBy)) { documentStream = streamAllDocumentsWithPosition() - .sorted((o1, o2) -> ValueComparator.desc().compare(o1.getPosition(), o2.getPosition())) - .map(DocumentWithPosition::getDocument); + .sorted((o1, o2) -> ValueComparator.desc().compare(o1.position(), o2.position())) + .map(DocumentWithPosition::document); } else { documentStream = dataMap.values().stream(); } diff --git a/test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractBackendSpringDataTest.java b/test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractBackendSpringDataTest.java index aca3d5a85..9493ddb9a 100644 --- a/test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractBackendSpringDataTest.java +++ b/test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractBackendSpringDataTest.java @@ -193,7 +193,7 @@ void testAggregation() { Aggregation.group("id").last("value").as("value")); List results = mongoTemplate.aggregate(agg, TestEntity.class, TestEntity.class).getMappedResults(); assertThat(results).hasSize(1); - assertThat(results.get(0).getId()).isEqualTo("1"); + assertThat(results.getFirst().getId()).isEqualTo("1"); } } diff --git a/test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractOplogTest.java b/test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractOplogTest.java index 81d52fbeb..9bc431dd7 100755 --- a/test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractOplogTest.java +++ b/test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractOplogTest.java @@ -85,7 +85,7 @@ void testOplogInsertUpdateAndDelete() { List oplogDocuments = toArray(getOplogCollection().find().sort(json("ts: 1"))); assertThat(oplogDocuments).hasSize(3); - Document insertOplogDocument = oplogDocuments.get(0); + Document insertOplogDocument = oplogDocuments.getFirst(); assertThat(insertOplogDocument).containsKeys("ts", "t", "h", "v", "op", "ns", "ui", "wall", "o"); assertThat(insertOplogDocument.get("ts")).isInstanceOf(BsonTimestamp.class); assertThat(insertOplogDocument.get("t")).isEqualTo(1L);