Implement review fixes

* Rename packages and classes to Mongo prefix from MongoDb.
* Drop already provided dependency on client

Signed-off-by: Łukasz Jernaś <[email protected]>

Author: deejay1

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-mongodb/pom.xml

@@ -53,11 +53,6 @@
 			<optional>true</optional>
 		</dependency>
 
-		<dependency>
-			<groupId>org.mongodb</groupId>
-			<artifactId>mongodb-driver-sync</artifactId>
-		</dependency>
-
 		<!-- Test dependencies -->
 		<dependency>
 			<groupId>org.springframework.ai</groupId>

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-mongodb/src/main/java/org/springframework/ai/model/chat/memory/mongodb/autoconfigure/MongoDbChatMemoryAutoConfiguration.java renamed to auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-mongodb/src/main/java/org/springframework/ai/model/chat/memory/mongo/autoconfigure/MongoChatMemoryAutoConfiguration.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.model.chat.memory.mongodb.autoconfigure;
+package org.springframework.ai.model.chat.memory.mongo.autoconfigure;
 
-import org.springframework.ai.chat.memory.mongodb.MongoDbChatMemory;
-import org.springframework.ai.chat.memory.mongodb.MongoDbChatMemoryConfig;
+import org.springframework.ai.chat.memory.mongo.MongoChatMemory;
+import org.springframework.ai.chat.memory.mongo.MongoChatMemoryConfig;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
@@ -26,20 +26,20 @@
 import org.springframework.data.mongodb.core.MongoTemplate;
 
 /**
- * Spring Boot auto-configuration for {@link MongoDbChatMemory}.
+ * Spring Boot auto-configuration for {@link MongoChatMemory}.
  *
  * @author Łukasz Jernaś
  * @since 1.0.0
  */
 @AutoConfiguration(after = MongoAutoConfiguration.class)
-@EnableConfigurationProperties(MongoDbChatMemoryProperties.class)
-public class MongoDbChatMemoryAutoConfiguration {
+@EnableConfigurationProperties(MongoChatMemoryProperties.class)
+public class MongoChatMemoryAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public MongoDbChatMemory chatMemory(MongoTemplate mongoTemplate) {
-		var config = MongoDbChatMemoryConfig.builder().withTemplate(mongoTemplate).build();
-		return new MongoDbChatMemory(config);
+	public MongoChatMemory chatMemory(MongoTemplate mongoTemplate) {
+		var config = MongoChatMemoryConfig.builder().withTemplate(mongoTemplate).build();
+		return new MongoChatMemory(config);
 	}
 
 }

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-mongodb/src/main/java/org/springframework/ai/model/chat/memory/mongodb/autoconfigure/MongoDbChatMemoryIndexCreator.java renamed to auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-mongodb/src/main/java/org/springframework/ai/model/chat/memory/mongo/autoconfigure/MongoChatMemoryIndexCreator.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.model.chat.memory.mongodb.autoconfigure;
+package org.springframework.ai.model.chat.memory.mongo.autoconfigure;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.ai.chat.memory.mongodb.Conversation;
+import org.springframework.ai.chat.memory.mongo.Conversation;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
@@ -33,48 +33,48 @@
  * field if the TTL is set in properties.
  *
  * @author Łukasz Jernaś
- * @see MongoDbChatMemoryProperties
+ * @see MongoChatMemoryProperties
  * @since 1.0.0
  */
 @Component
 @ConditionalOnProperty(value = "spring.ai.chat.memory.mongodb.create-indices", havingValue = "true")
-public class MongoDbChatMemoryIndexCreator {
+public class MongoChatMemoryIndexCreator {
 
-	private static final Logger logger = LoggerFactory.getLogger(MongoDbChatMemoryIndexCreator.class);
+	private static final Logger logger = LoggerFactory.getLogger(MongoChatMemoryIndexCreator.class);
 
 	private final MongoTemplate mongoTemplate;
 
-	private final MongoDbChatMemoryProperties mongoDbChatMemoryProperties;
+	private final MongoChatMemoryProperties mongoChatMemoryProperties;
 
-	public MongoDbChatMemoryIndexCreator(MongoTemplate mongoTemplate,
-										 MongoDbChatMemoryProperties mongoDbChatMemoryProperties) {
+	public MongoChatMemoryIndexCreator(MongoTemplate mongoTemplate,
+			MongoChatMemoryProperties mongoChatMemoryProperties) {
 		this.mongoTemplate = mongoTemplate;
-		this.mongoDbChatMemoryProperties = mongoDbChatMemoryProperties;
+		this.mongoChatMemoryProperties = mongoChatMemoryProperties;
 	}
 
 	@EventListener(ContextRefreshedEvent.class)
 	public void initIndicesAfterStartup() {
 		logger.info("Creating MongoDB indices for ChatMemory");
 		// Create a main index
 		mongoTemplate.indexOps(Conversation.class)
-				.ensureIndex(new Index().on("conversationId", Sort.Direction.ASC).on("timestamp", Sort.Direction.DESC));
+			.ensureIndex(new Index().on("conversationId", Sort.Direction.ASC).on("timestamp", Sort.Direction.DESC));
 
 		createOrUpdateTtlIndex();
 	}
 
 	private void createOrUpdateTtlIndex() {
-		if (!this.mongoDbChatMemoryProperties.getTtl().isZero()) {
+		if (!this.mongoChatMemoryProperties.getTtl().isZero()) {
 			// Check for existing TTL index
 			mongoTemplate.indexOps(Conversation.class).getIndexInfo().forEach(idx -> {
 				if (idx.getExpireAfter().isPresent()
-						&& !idx.getExpireAfter().get().equals(this.mongoDbChatMemoryProperties.getTtl())) {
+						&& !idx.getExpireAfter().get().equals(this.mongoChatMemoryProperties.getTtl())) {
 					logger.warn("Dropping existing TTL index, because TTL is different");
 					mongoTemplate.indexOps(Conversation.class).dropIndex(idx.getName());
 				}
 			});
 			mongoTemplate.indexOps(Conversation.class)
-					.ensureIndex(new Index().on("timestamp", Sort.Direction.ASC)
-							.expire(this.mongoDbChatMemoryProperties.getTtl()));
+				.ensureIndex(new Index().on("timestamp", Sort.Direction.ASC)
+					.expire(this.mongoChatMemoryProperties.getTtl()));
 		}
 	}
 

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-mongodb/src/main/java/org/springframework/ai/model/chat/memory/mongodb/autoconfigure/MongoDbChatMemoryProperties.java renamed to auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-mongodb/src/main/java/org/springframework/ai/model/chat/memory/mongo/autoconfigure/MongoChatMemoryProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.model.chat.memory.mongodb.autoconfigure;
+package org.springframework.ai.model.chat.memory.mongo.autoconfigure;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
@@ -24,8 +24,8 @@
  * @author Łukasz Jernaś
  * @since 1.0.0
  */
-@ConfigurationProperties(MongoDbChatMemoryProperties.CONFIG_PREFIX)
-public class MongoDbChatMemoryProperties {
+@ConfigurationProperties(MongoChatMemoryProperties.CONFIG_PREFIX)
+public class MongoChatMemoryProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.chat.memory.mongodb";
 

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-mongodb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-org.springframework.ai.model.chat.memory.mongodb.autoconfigure.MongoDbChatMemoryAutoConfiguration
+org.springframework.ai.model.chat.memory.mongo.autoconfigure.MongoChatMemoryAutoConfiguration

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-mongodb/src/test/java/org/springframework/ai/model/chat/memory/mongodb/autoconfigure/MongoDbChatMemoryAutoConfigurationIT.java renamed to auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-mongodb/src/test/java/org/springframework/ai/model/chat/memory/mongo/autoconfigure/MongoChatMemoryAutoConfigurationIT.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.model.chat.memory.mongodb.autoconfigure;
+package org.springframework.ai.model.chat.memory.mongo.autoconfigure;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.ai.chat.memory.mongodb.MongoDbChatMemory;
+import org.springframework.ai.chat.memory.mongo.MongoChatMemory;
 import org.springframework.ai.chat.messages.AssistantMessage;
 import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.messages.SystemMessage;
@@ -37,17 +37,17 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Testcontainers
-class MongoDbChatMemoryAutoConfigurationIT {
+class MongoChatMemoryAutoConfigurationIT {
 
 	@Container
 	@ServiceConnection
 	static MongoDBContainer mongoDbContainer = new MongoDBContainer("mongo:8.0.6");
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(MongoDbChatMemoryAutoConfiguration.class, MongoAutoConfiguration.class,
-					MongoDataAutoConfiguration.class, MongoDbChatMemoryIndexCreator.class))
-			.withPropertyValues(String.format("spring.data.mongodb.uri=%s/ai_test", mongoDbContainer.getConnectionString()),
-					"spring.ai.chat.memory.mongodb.create-indexes=true", "spring.ai.chat.memory.mongodb.ttl=PT1M");
+		.withConfiguration(AutoConfigurations.of(MongoDbChatMemoryAutoConfiguration.class, MongoAutoConfiguration.class,
+				MongoDataAutoConfiguration.class, MongoChatMemoryIndexCreator.class))
+		.withPropertyValues(String.format("spring.data.mongodb.uri=%s/ai_test", mongoDbContainer.getConnectionString()),
+				"spring.ai.chat.memory.mongodb.create-indexes=true", "spring.ai.chat.memory.mongodb.ttl=PT1M");
 
 	@Test
 	void mongodbChatMemoryBean_exists() {
@@ -57,7 +57,7 @@ void mongodbChatMemoryBean_exists() {
 	@Test
 	void allMethods_shouldExecute() {
 		this.contextRunner.run(context -> {
-			var chatMemory = context.getBean(MongoDbChatMemory.class);
+			var chatMemory = context.getBean(MongoChatMemory.class);
 			var conversationId = UUID.randomUUID().toString();
 			var systemMessage = new SystemMessage("Some system message");
 

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-mongodb/src/test/java/org/springframework/ai/model/chat/memory/mongodb/autoconfigure/MongoDbChatMemoryPropertiesTests.java renamed to auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-mongodb/src/test/java/org/springframework/ai/model/chat/memory/mongo/autoconfigure/MongoChatMemoryPropertiesTests.java

@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.model.chat.memory.mongodb.autoconfigure;
+package org.springframework.ai.model.chat.memory.mongo.autoconfigure;
 
 import org.junit.jupiter.api.Test;
 
 import java.time.Duration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class MongoDbChatMemoryPropertiesTests {
+public class MongoChatMemoryPropertiesTests {
 
 	@Test
 	void defaultValues_set() {
-		var properties = new MongoDbChatMemoryProperties();
+		var properties = new MongoChatMemoryProperties();
 		assertThat(properties.getTtl()).isEqualTo(Duration.ZERO);
 		assertThat(properties.isCreateIndices()).isFalse();
 	}
 
 	@Test
 	void overrideValues() {
-		var properties = new MongoDbChatMemoryProperties();
+		var properties = new MongoChatMemoryProperties();
 		properties.setTtl(Duration.ofMinutes(1));
 		properties.setCreateIndices(true);
 

memory/spring-ai-model-chat-memory-mongodb/src/main/java/org/springframework/ai/chat/memory/mongodb/Conversation.java renamed to memory/spring-ai-model-chat-memory-mongodb/src/main/java/org/springframework/ai/chat/memory/mongo/Conversation.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.chat.memory.mongodb;
+package org.springframework.ai.chat.memory.mongo;
 
 import org.jspecify.annotations.NullMarked;
 import org.springframework.data.mongodb.core.mapping.Document;

memory/spring-ai-model-chat-memory-mongodb/src/main/java/org/springframework/ai/chat/memory/mongodb/MongoDbChatMemory.java renamed to memory/spring-ai-model-chat-memory-mongodb/src/main/java/org/springframework/ai/chat/memory/mongo/MongoChatMemory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.chat.memory.mongodb;
+package org.springframework.ai.chat.memory.mongo;
 
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
@@ -43,26 +43,26 @@
  * @author Łukasz Jernaś
  * @since 1.0.0
  */
-public class MongoDbChatMemory implements ChatMemory {
+public class MongoChatMemory implements ChatMemory {
 
 	private final MongoTemplate mongoTemplate;
 
-	private static final Logger logger = LoggerFactory.getLogger(MongoDbChatMemory.class);
+	private static final Logger logger = LoggerFactory.getLogger(MongoChatMemory.class);
 
-	public MongoDbChatMemory(MongoDbChatMemoryConfig config) {
+	public MongoChatMemory(MongoChatMemoryConfig config) {
 		this.mongoTemplate = config.mongoTemplate;
 	}
 
-	public static MongoDbChatMemory create(MongoDbChatMemoryConfig config) {
-		return new MongoDbChatMemory(config);
+	public static MongoChatMemory create(MongoChatMemoryConfig config) {
+		return new MongoChatMemory(config);
 	}
 
 	@Override
 	public List<Message> get(String conversationId, int lastN) {
 		var messages = mongoTemplate.query(Conversation.class)
-				.matching(query(where("conversationId").is(conversationId)).with(Sort.by("timestamp").descending())
-						.limit(lastN));
-		return messages.stream().map(MongoDbChatMemory::mapMessage).collect(Collectors.toList());
+			.matching(query(where("conversationId").is(conversationId)).with(Sort.by("timestamp").descending())
+				.limit(lastN));
+		return messages.stream().map(MongoChatMemory::mapMessage).collect(Collectors.toList());
 	}
 
 	@Override
@@ -73,9 +73,9 @@ public void clear(String conversationId) {
 	@Override
 	public void add(@NonNull String conversationId, @NonNull List<Message> messages) {
 		var conversations = messages.stream()
-				.map(message -> new Conversation(conversationId,
-						new Conversation.Message(message.getText(), message.getMessageType().name()), Instant.now()))
-				.toList();
+			.map(message -> new Conversation(conversationId,
+					new Conversation.Message(message.getText(), message.getMessageType().name()), Instant.now()))
+			.toList();
 		mongoTemplate.insert(conversations, Conversation.class);
 	}
 

memory/spring-ai-model-chat-memory-mongodb/src/main/java/org/springframework/ai/chat/memory/mongodb/MongoDbChatMemoryConfig.java renamed to memory/spring-ai-model-chat-memory-mongodb/src/main/java/org/springframework/ai/chat/memory/mongo/MongoChatMemoryConfig.java

@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.chat.memory.mongodb;
+package org.springframework.ai.chat.memory.mongo;
 
 import org.jspecify.annotations.NonNull;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.util.Assert;
 
 /**
- * Configuration for {@link MongoDbChatMemory}.
+ * Configuration for {@link MongoChatMemory}.
  *
  * @author Łukasz Jernaś
  * @since 1.0.0
  */
-public class MongoDbChatMemoryConfig {
+public class MongoChatMemoryConfig {
 
 	final MongoTemplate mongoTemplate;
 
-	private MongoDbChatMemoryConfig(Builder builder) {
+	private MongoChatMemoryConfig(Builder builder) {
 		this.mongoTemplate = builder.mongoTemplate;
 	}
 
@@ -52,10 +52,10 @@ public Builder withTemplate(@NonNull MongoTemplate mongoTemplate) {
 			return this;
 		}
 
-		public MongoDbChatMemoryConfig build() {
+		public MongoChatMemoryConfig build() {
 			Assert.notNull(this.mongoTemplate, "MongoTemplate must not be null");
 
-			return new MongoDbChatMemoryConfig(this);
+			return new MongoChatMemoryConfig(this);
 		}
 
 	}

memory/spring-ai-model-chat-memory-mongodb/src/test/java/org/springframework/ai/chat/memory/mongodb/MongoDbChatMemoryConfigTest.java renamed to memory/spring-ai-model-chat-memory-mongodb/src/test/java/org/springframework/ai/chat/memory/mongo/MongoChatMemoryConfigTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.chat.memory.mongodb;
+package org.springframework.ai.chat.memory.mongo;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -26,20 +26,20 @@
 /**
  * @author Łukasz Jernaś
  */
-public class MongoDbChatMemoryConfigTest {
+public class MongoChatMemoryConfigTest {
 
 	@Test
 	void setValues() {
 		var mongoClient = mock(MongoTemplate.class);
-		var config = MongoDbChatMemoryConfig.builder().withTemplate(mongoClient).build();
+		var config = MongoChatMemoryConfig.builder().withTemplate(mongoClient).build();
 
 		assertThat(config.mongoTemplate).isEqualTo(mongoClient);
 
 	}
 
 	@Test
 	void buildWithNullMongoTemplate_shouldThrow() {
-		assertThatThrownBy(() -> MongoDbChatMemoryConfig.builder().build());
+		assertThatThrownBy(() -> MongoChatMemoryConfig.builder().build());
 	}
 
 }