From 0af8d6839e965b04717aa17f483a70af13c23a52 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 14 Sep 2021 09:11:32 +0200 Subject: [PATCH] Polishing. Reformat code, fix ticket references in tests. See #3820 Original pull request: #3821. --- .../mongodb/core/MongoServerApiFactoryBean.java | 2 +- .../config/MongoClientNamespaceTests.java | 5 +++-- .../core/MongoServerApiFactoryBeanTests.java | 16 ++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoServerApiFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoServerApiFactoryBean.java index e2a2fecae..c93016b09 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoServerApiFactoryBean.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoServerApiFactoryBean.java @@ -35,7 +35,7 @@ public class MongoServerApiFactoryBean implements FactoryBean { private @Nullable Boolean deprecationErrors; private @Nullable Boolean strict; - /** + /** * @param version the version string either as the enum name or the server version value. * @see ServerApiVersion */ diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientNamespaceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientNamespaceTests.java index abdd00c2b..127e3d102 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientNamespaceTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientNamespaceTests.java @@ -21,10 +21,10 @@ import static org.springframework.test.util.ReflectionTestUtils.*; import java.util.Collections; import java.util.concurrent.TimeUnit; -import com.mongodb.ServerApiVersion; import org.bson.UuidRepresentation; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.mongodb.core.MongoClientFactoryBean; @@ -35,6 +35,7 @@ import com.mongodb.ConnectionString; import com.mongodb.MongoClientSettings; import com.mongodb.MongoCredential; import com.mongodb.ServerAddress; +import com.mongodb.ServerApiVersion; import com.mongodb.connection.ClusterType; /** @@ -149,7 +150,7 @@ public class MongoClientNamespaceTests { assertThat(settings.getUuidRepresentation()).isEqualTo(UuidRepresentation.STANDARD); } - @Test // DATAMONGO-2427 + @Test // GH-3820 public void clientWithServerVersion() { assertThat(ctx.containsBean("client-with-server-api-settings")).isTrue(); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoServerApiFactoryBeanTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoServerApiFactoryBeanTests.java index 0c79478fe..d584b6cfb 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoServerApiFactoryBeanTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoServerApiFactoryBeanTests.java @@ -17,24 +17,24 @@ package org.springframework.data.mongodb.core; import static org.assertj.core.api.Assertions.*; -import com.mongodb.ServerApi; -import com.mongodb.ServerApiVersion; import org.junit.jupiter.api.Test; + import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.test.util.ReflectionTestUtils; -import com.mongodb.AutoEncryptionSettings; +import com.mongodb.ServerApi; +import com.mongodb.ServerApiVersion; /** * Integration tests for {@link MongoServerApiFactoryBean}. * * @author Christoph Strobl */ -public class MongoServerApiFactoryBeanTests { +class MongoServerApiFactoryBeanTests { - @Test // DATAMONGO-2306 - public void createsServerApiForVersionString() { + @Test // GH-3820 + void createsServerApiForVersionString() { RootBeanDefinition definition = new RootBeanDefinition(MongoServerApiFactoryBean.class); definition.getPropertyValues().addPropertyValue("version", "V1"); @@ -52,8 +52,8 @@ public class MongoServerApiFactoryBeanTests { assertThat(target.getStrict()).isNotPresent(); } - @Test // DATAMONGO-2306 - public void createsServerApiForVersionNumber() { + @Test // GH-3820 + void createsServerApiForVersionNumber() { RootBeanDefinition definition = new RootBeanDefinition(MongoServerApiFactoryBean.class); definition.getPropertyValues().addPropertyValue("version", "1");