From 8da9df180a20e2deb86eb5cd1f05e2049ff773b2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 19 Aug 2025 07:26:36 +0100 Subject: [PATCH] Correct test for Mongo UUID representation alignment Closes gh-46859 --- .../mongo/MongoAutoConfigurationTests.java | 6 -- .../mongo/MongoPropertiesTests.java | 55 +++++++++++++++++++ 2 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java index 8587fcf61c5..ca3ca28b7ef 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java @@ -243,12 +243,6 @@ class MongoAutoConfigurationTests { .doesNotHaveBean(PropertiesMongoConnectionDetails.class)); } - @Test - void uuidRepresentationDefaultsAreAligned() { - this.contextRunner.run((context) -> assertThat(getSettings(context).getUuidRepresentation()) - .isEqualTo(new MongoProperties().getUuidRepresentation())); - } - private MongoClientSettings getSettings(AssertableApplicationContext context) { assertThat(context).hasSingleBean(MongoClient.class); MongoClientImpl client = (MongoClientImpl) context.getBean(MongoClient.class); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java new file mode 100644 index 00000000000..e0700fafc1c --- /dev/null +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java @@ -0,0 +1,55 @@ +/* + * Copyright 2012-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.autoconfigure.mongo; + +import org.bson.UuidRepresentation; +import org.junit.jupiter.api.Test; + +import org.springframework.data.mongodb.config.MongoConfigurationSupport; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link MongoProperties}. + * + * @author Andy Wilkinson + */ +class MongoPropertiesTests { + + @Test + void defaultUUidRepresentationIsAlignedWithSpringData() { + UuidRepresentation springDataDefault = springDataDefaultUuidRepresentation(); + UuidRepresentation springBootDefault = new MongoProperties().getUuidRepresentation(); + assertThat(springBootDefault).isEqualTo(springDataDefault); + } + + private UuidRepresentation springDataDefaultUuidRepresentation() { + return new MongoConfigurationSupport() { + + @Override + protected String getDatabaseName() { + return "test"; + } + + UuidRepresentation defaultUuidRepresentation() { + return mongoClientSettings().getUuidRepresentation(); + } + + }.defaultUuidRepresentation(); + } + +}