From d61cf8f57e351f33aaf5ef5656d08974b89a6876 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Jan 2022 11:01:27 +0100 Subject: [PATCH] Polishing. Simplify assertions, reformat code. See #3921 Original pull request: #3930. --- .../mongodb/core/convert/QueryMapper.java | 17 +++---- .../core/convert/UpdateMapperUnitTests.java | 46 +++++++++---------- 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java index 1013628de..ac1794b87 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2021 the original author or authors. + * Copyright 2011-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1412,11 +1412,11 @@ public class QueryMapper { } String nextToken() { - return pathParts.get(currentIndex+1); + return pathParts.get(currentIndex + 1); } boolean hasNexToken() { - return pathParts.size() > currentIndex+1; + return pathParts.size() > currentIndex + 1; } /** @@ -1428,24 +1428,25 @@ public class QueryMapper { protected String mapPropertyName(MongoPersistentProperty property) { StringBuilder mappedName = new StringBuilder(PropertyToFieldNameConverter.INSTANCE.convert(property)); - if(!hasNexToken()) { + if (!hasNexToken()) { return mappedName.toString(); } String nextToken = nextToken(); - if(isPositionalParameter(nextToken)) { + if (isPositionalParameter(nextToken)) { mappedName.append(".").append(nextToken); - currentIndex+=2; + currentIndex += 2; return mappedName.toString(); } - if(property.isMap()) { + if (property.isMap()) { mappedName.append(".").append(nextToken); - currentIndex+=2; + currentIndex += 2; return mappedName.toString(); } + currentIndex++; return mappedName.toString(); } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java index 28d522fba..3e744f675 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2021 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1208,7 +1208,7 @@ class UpdateMapperUnitTests { Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(EntityWithNestedMap.class)); - assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set",new org.bson.Document("levelOne.a.b.d","e"))); + assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set", new org.bson.Document("levelOne.a.b.d", "e"))); } @Test // GH-3775 @@ -1218,7 +1218,7 @@ class UpdateMapperUnitTests { Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(EntityWithNestedMap.class)); - assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set",new org.bson.Document("levelOne.0.1.3","4"))); + assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set", new org.bson.Document("levelOne.0.1.3", "4"))); } @Test // GH-3775 @@ -1228,7 +1228,7 @@ class UpdateMapperUnitTests { Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(EntityWithNestedMap.class)); - assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set",new org.bson.Document("levelOne.0.1.c","4"))); + assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set", new org.bson.Document("levelOne.0.1.c", "4"))); } @Test // GH-3775 @@ -1238,7 +1238,7 @@ class UpdateMapperUnitTests { Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(EntityWithNestedMap.class)); - assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set",new org.bson.Document("levelOne.0a.1b.3c","4"))); + assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set", new org.bson.Document("levelOne.0a.1b.3c", "4"))); } @Test // GH-3688 @@ -1262,7 +1262,7 @@ class UpdateMapperUnitTests { Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(WithDocumentReference.class)); - assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set",new org.bson.Document("sample","s1"))); + assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set", new org.bson.Document("sample", "s1"))); } @Test // GH-3853 @@ -1276,7 +1276,8 @@ class UpdateMapperUnitTests { Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(WithDocumentReference.class)); - assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set",new org.bson.Document("samples",Arrays.asList("s1")))); + assertThat(mappedUpdate) + .isEqualTo(new org.bson.Document("$set", new org.bson.Document("samples", Arrays.asList("s1")))); } @Test // GH-3853 @@ -1291,7 +1292,7 @@ class UpdateMapperUnitTests { Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(WithDocumentReference.class)); - assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set",new org.bson.Document("customer","c-name"))); + assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set", new org.bson.Document("customer", "c-name"))); } @Test // GH-3853 @@ -1306,7 +1307,8 @@ class UpdateMapperUnitTests { Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(WithDocumentReference.class)); - assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set",new org.bson.Document("customers", Arrays.asList("c-name")))); + assertThat(mappedUpdate) + .isEqualTo(new org.bson.Document("$set", new org.bson.Document("customers", Arrays.asList("c-name")))); } @Test // GH-3921 @@ -1316,7 +1318,7 @@ class UpdateMapperUnitTests { Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(TestData.class)); - assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set",new org.bson.Document("testInnerData.testMap.1.intValue","4"))); + assertThat(mappedUpdate).isEqualTo("{ $set: { 'testInnerData.testMap.1.intValue': '4' }}"); } @Test // GH-3921 @@ -1326,7 +1328,7 @@ class UpdateMapperUnitTests { Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(TestData.class)); - assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set",new org.bson.Document("testInnerData.imaginaryMap.1.noExistingProperty","4"))); + assertThat(mappedUpdate).isEqualTo("{ $set: { 'testInnerData.imaginaryMap.1.nonExistingProperty': '4' }}"); } @Test // GH-3921 @@ -1336,7 +1338,7 @@ class UpdateMapperUnitTests { Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(TestData.class)); - assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set",new org.bson.Document("testInnerData.testMap.1.nonExistingProperty.2.someValue","4"))); + assertThat(mappedUpdate).isEqualTo("{ $set: { 'testInnerData.testMap.1.nonExistingProperty.2.someValue': '4' }}"); } static class DomainTypeWrappingConcreteyTypeHavingListOfInterfaceTypeAttributes { @@ -1575,7 +1577,7 @@ class UpdateMapperUnitTests { Map concreteMap; } - static class EntityWithIntKeyedMap{ + static class EntityWithIntKeyedMap { Map intKeyedMap; } @@ -1711,8 +1713,7 @@ class UpdateMapperUnitTests { static class Customer { - @Id - private ObjectId id; + @Id private ObjectId id; private String name; } @@ -1727,23 +1728,18 @@ class UpdateMapperUnitTests { private String name; - @DocumentReference(lookup = "{ 'name' : ?#{#target} }") - private Customer customer; + @DocumentReference(lookup = "{ 'name' : ?#{#target} }") private Customer customer; - @DocumentReference(lookup = "{ 'name' : ?#{#target} }") - private List customers; + @DocumentReference(lookup = "{ 'name' : ?#{#target} }") private List customers; - @DocumentReference - private Sample sample; + @DocumentReference private Sample sample; - @DocumentReference - private List samples; + @DocumentReference private List samples; } @Data private static class TestData { - @Id - private String id; + @Id private String id; private TestInnerData testInnerData; }