Skip to content

feat: Adjust to newer spring version and add migration framework #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 17, 2023
Merged

feat: Adjust to newer spring version and add migration framework #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b724b7c
feat: Adjust to newer spring version and add migration framework
hofmeister Oct 16, 2023
e59b722
add license and ensure lombok version that can do java 21
hofmeister Oct 16, 2023
8d348f9
use java 19
hofmeister Oct 17, 2023
e3dc1f5
bump
hofmeister Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2023 Kapeta

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
17 changes: 14 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.kapeta</groupId>
<artifactId>nosql-mongodb</artifactId>
<version>0.0.7</version>
<version>0.1.0</version>

<name>${project.groupId}:${project.artifactId}</name>
<description>MongoDB support for Kapeta Spring Boot SDK</description>
Expand Down Expand Up @@ -111,7 +111,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.5</version>
<version>3.1.4</version>
</parent>

<properties>
Expand All @@ -135,11 +135,22 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>[1.18.30,)</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.4.2</version>
<version>2.15.3</version>
</dependency>
<dependency>
<groupId>io.mongock</groupId>
<artifactId>mongock-springboot</artifactId>
<version>5.3.0</version>
</dependency>
<dependency>
<groupId>io.mongock</groupId>
<artifactId>mongodb-springdata-v4-driver</artifactId>
<version>5.3.0</version>
</dependency>
<dependency>
<groupId>com.kapeta</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/kapeta/spring/annotation/KapetaEnableMongoDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.kapeta.spring.annotation;

import io.mongock.runner.springboot.EnableMongock;
import org.springframework.data.mongodb.config.EnableMongoAuditing;

import java.lang.annotation.*;

/**
Expand All @@ -11,12 +11,12 @@
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited

@EnableMongoAuditing(
auditorAwareRef = "mongoAuditor",
modifyOnCreate = true,
setDates = true
)
@EnableMongock
public @interface KapetaEnableMongoDB {

}
136 changes: 36 additions & 100 deletions src/main/java/com/kapeta/spring/mongo/AbstractMongoDBConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,28 @@

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.kapeta.spring.cluster.KapetaClusterService;
import com.mongodb.*;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
import com.mongodb.client.MongoDatabase;
import com.kapeta.spring.config.providers.KapetaConfigurationProvider;
import com.mongodb.ConnectionString;
import com.mongodb.MongoClientSettings;
import com.mongodb.MongoCredential;
import lombok.extern.slf4j.Slf4j;
import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.mongo.MongoClientSettingsBuilderCustomizer;
import org.springframework.boot.autoconfigure.mongo.MongoConnectionDetails;
import org.springframework.boot.autoconfigure.mongo.MongoProperties;
import org.springframework.boot.autoconfigure.mongo.PropertiesMongoConnectionDetails;
import org.springframework.context.annotation.Bean;
import org.springframework.core.convert.converter.Converter;
import org.springframework.data.convert.ReadingConverter;
import org.springframework.data.convert.WritingConverter;
import org.springframework.data.mongodb.MongoDatabaseFactory;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
import org.springframework.data.mongodb.core.convert.*;
import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
import org.springframework.data.mongodb.MongoTransactionManager;
import org.springframework.data.mongodb.core.convert.MongoCustomConversions;

import java.util.Arrays;
import java.util.Collections;
import java.util.Optional;

/**
Expand All @@ -37,7 +38,7 @@ abstract public class AbstractMongoDBConfig {
private static final String PORT_TYPE = "mongodb";

@Autowired
private KapetaClusterService kapetaConfigSource;
private KapetaConfigurationProvider configurationProvider;

@Autowired
private ObjectMapper objectMapper;
Expand All @@ -47,120 +48,55 @@ abstract public class AbstractMongoDBConfig {

private final String resourceName;

private String databaseName;

private String dbAuthDB;

protected AbstractMongoDBConfig(String resourceName) {
this.resourceName = resourceName;
}

@Bean("mongoInfo")
public KapetaConfigurationProvider.ResourceInfo mongoInfo() {
return configurationProvider.getResourceInfo(RESOURCE_TYPE, PORT_TYPE, resourceName);
}
@Bean
public MongoClient createClient() {
final KapetaClusterService.ResourceInfo mongoInfo = kapetaConfigSource.getResourceInfo(RESOURCE_TYPE, PORT_TYPE, resourceName);
Optional<String> dbUsername = Optional.ofNullable(mongoInfo.getCredentials().get("username"));
Optional<String> dbPassword = Optional.ofNullable(mongoInfo.getCredentials().get("password"));

dbAuthDB = String.valueOf(mongoInfo.getOptions().getOrDefault("authdb", "admin"));
databaseName = String.valueOf(mongoInfo.getOptions().getOrDefault("dbName", resourceName));

ServerAddress serverAddress = new ServerAddress(mongoInfo.getHost(), Integer.parseInt(mongoInfo.getPort()));

log.info("Connecting to mongodb server: {}:{} for db: {}", mongoInfo.getHost(), mongoInfo.getPort(), databaseName);

MongoClientSettings.Builder options = MongoClientSettings.builder()
.writeConcern(WriteConcern.JOURNALED)
.applicationName(applicationName)
.applyToClusterSettings(cluster -> {
cluster.hosts(Collections.singletonList(serverAddress));
});

if (dbUsername.isPresent() &&
!dbUsername.get().trim().isEmpty()) {
options.credential(
MongoCredential.createCredential(
dbUsername.get(),
dbAuthDB,
dbPassword.orElse("").toCharArray()
)
);
}

return MongoClients.create(options.build());
public PropertiesMongoConnectionDetails mongoConnectionDetails(KapetaConfigurationProvider.ResourceInfo mongoInfo) {
String databaseName = String.valueOf(mongoInfo.getOptions().getOrDefault("dbName", resourceName));
String dbAuthDB = String.valueOf(mongoInfo.getOptions().getOrDefault("authdb", "admin"));
MongoProperties properties = new MongoProperties();
properties.setDatabase(databaseName);
properties.setHost(mongoInfo.getHost());
properties.setPort(Integer.valueOf(mongoInfo.getPort()));
properties.setUsername(mongoInfo.getCredentials().get("username"));
properties.setPassword(mongoInfo.getCredentials().getOrDefault("password","").toCharArray());
properties.setAuthenticationDatabase(dbAuthDB);
properties.setAutoIndexCreation(true);
return new PropertiesMongoConnectionDetails(properties);
}

@Bean
public MongoDatabaseFactory mongoDbFactory(MongoClient mongoClient) {
final SimpleMongoClientDatabaseFactory simpleMongoDbFactory = new SimpleMongoClientDatabaseFactory(mongoClient, databaseName);

log.info("Using mongodb database: {}", databaseName);

return simpleMongoDbFactory;
public MongoClientSettingsBuilderCustomizer customizer() {
return settings -> settings.applicationName(applicationName);
}

@Bean
public MongoConverter mongoConverter(MongoDatabaseFactory factory) {
public MongoTransactionManager transactionManager(MongoDatabaseFactory dbFactory) {
return new MongoTransactionManager(dbFactory);
}

DbRefResolver dbRefResolver = new DefaultDbRefResolver(factory);
@Bean
public MongoCustomConversions objectNodeConverters() {

MongoCustomConversions conversions = new MongoCustomConversions(Arrays.asList(
return new MongoCustomConversions(Arrays.asList(
new MongoToJackson(),
new JacksonToMongo()
));

MongoMappingContext mappingContext = new MongoMappingContext();
mappingContext.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
mappingContext.afterPropertiesSet();

MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, mappingContext);

converter.setCustomConversions(conversions);
converter.afterPropertiesSet();

return converter;
}

@Bean
public MongoTemplate mongoTemplate(MongoDatabaseFactory factory, MongoConverter mongoConverter) {
return new MongoTemplate(factory, mongoConverter);
}

@Bean("adminDb")
public MongoDatabase adminDb(MongoTemplate template) {
final MongoDatabase adminDb = template.getMongoDatabaseFactory().getMongoDatabase(dbAuthDB);

enableSharding(adminDb, template);

return adminDb;
}

@Bean("mongoAuditor")
public MongoAuditor mongoAuditor() {
return new MongoAuditor();
}


private void enableSharding(MongoDatabase adminDb, MongoTemplate mongoTemplate) {

try {

BasicDBObject enableShardingCmd = new BasicDBObject("enableSharding", mongoTemplate.getDb().getName());
adminDb.runCommand(enableShardingCmd);
} catch (MongoCommandException ex) {
if (ex.getErrorCode() == -1) {
log.info("Sharding already enabled for db: {}", mongoTemplate.getDb().getName());
return;
}

if (ex.getErrorCode() == 59) {
log.warn("Command not found - not connected to cluster (mongos)? [Error: {}] Continuing...", ex.getErrorMessage());
return;
}

throw ex;
}
}

@ReadingConverter
private class MongoToJackson implements Converter<Document, ObjectNode> {

Expand Down