这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/main/java/co/com/bancolombia/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ public final class Constants {
public static final String PATH_GRAPHQL = "/graphql";
// dependencies
public static final String SECRETS_VERSION = "4.4.31";
public static final String SPRING_BOOT_VERSION = "3.4.6";
public static final String SPRING_BOOT_VERSION = "3.5.0";
public static final String LOMBOK_VERSION = "1.18.38";
public static final String REACTIVE_COMMONS_VERSION = "5.4.0";
public static final String REACTIVE_COMMONS_MAPPER_VERSION = "0.1.0";
public static final String BLOCK_HOUND_VERSION = "1.0.11.RELEASE";
public static final String AWS_BOM_VERSION = "2.31.48";
public static final String AWS_BOM_VERSION = "2.31.56";
public static final String COMMONS_JMS_VERSION = "2.4.0";
public static final String GRAPHQL_KICKSTART_VERSION = "15.1.0";
public static final String ARCH_UNIT_VERSION = "1.4.0";
Expand All @@ -35,7 +35,7 @@ public final class Constants {
public static final String DEPENDENCY_CHECK_VERSION = "12.1.1";
public static final String PITEST_VERSION = "1.15.0";
// custom
public static final String GRADLE_WRAPPER_VERSION = "8.14.1";
public static final String GRADLE_WRAPPER_VERSION = "8.14";

@NoArgsConstructor(access = AccessLevel.PRIVATE)
public static class MainFiles {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import lombok.Getter;
import lombok.Setter;

{{/lombok}}
{{/include-secret}}
{{^include-secret}}
{{#lombok}}
import lombok.Builder;
import lombok.Getter;

{{/lombok}}
{{/include-secret}}
{{#include-secret}}
Expand All @@ -29,9 +31,9 @@ import lombok.Getter;
{{/lombok}}
{{/include-secret}}
public class MongoDBSecret {
private {{^include-secret}}final {{/include-secret}}String uri;

private {{^include-secret}}final {{/include-secret}}String uri;
{{^lombok}}

public MongoDBSecret(String uri) {
this.uri = uri;
}
Expand All @@ -46,6 +48,6 @@ private {{^include-secret}}final {{/include-secret}}String uri;
"uri='" + uri + '\'' +
'}';
}
{{/lombok}}

{{/lombok}}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.mongo.MongoConnectionDetails;
import org.springframework.boot.autoconfigure.mongo.MongoProperties;
import org.springframework.boot.autoconfigure.mongo.PropertiesMongoConnectionDetails;
import org.springframework.boot.ssl.SslBundles;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import java.util.ArrayList;
import java.util.List;

@Configuration
public class MongoConfig {

Expand All @@ -34,9 +32,9 @@ public class MongoConfig {
{{/include-secret}}

@Bean
public MongoConnectionDetails mongoProperties(MongoDBSecret secret) {
public MongoConnectionDetails mongoProperties(MongoDBSecret secret, SslBundles sslBundles) {
MongoProperties properties = new MongoProperties();
properties.setUri(secret.getUri());
return new PropertiesMongoConnectionDetails(properties);
return new PropertiesMongoConnectionDetails(properties, sslBundles);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,16 @@ import co.com.bancolombia.secretsmanager.api.GenericManagerAsync;
{{/include-secret}}
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
{{#include-secret}}
import org.mockito.Mock;
{{/include-secret}}
import org.mockito.MockitoAnnotations;
import org.springframework.boot.autoconfigure.mongo.MongoConnectionDetails;
import org.springframework.boot.ssl.SslBundles;
{{#include-secret}}

import reactor.core.publisher.Mono;
{{/include-secret}}

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand Down Expand Up @@ -57,9 +63,10 @@ class MongoConfigTest {
@Test
void testMongoProperties() {
MongoDBSecret secret = mock(MongoDBSecret.class);
SslBundles sslBundles = mock(SslBundles.class);
when(secret.getUri()).thenReturn("uri");

MongoConnectionDetails result = mongoConfigUnderTest.mongoProperties(secret);
MongoConnectionDetails result = mongoConfigUnderTest.mongoProperties(secret, sslBundles);

assertNotNull(result);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.mongo.MongoConnectionDetails;
import org.springframework.boot.autoconfigure.mongo.MongoProperties;
import org.springframework.boot.autoconfigure.mongo.PropertiesMongoConnectionDetails;
import org.springframework.boot.ssl.SslBundles;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import java.util.ArrayList;
import java.util.List;

@Configuration
public class MongoConfig {

Expand All @@ -34,9 +32,9 @@ public class MongoConfig {
{{/include-secret}}

@Bean
public MongoConnectionDetails mongoProperties(MongoDBSecret secret) {
public MongoConnectionDetails mongoProperties(MongoDBSecret secret, SslBundles sslBundles) {
MongoProperties properties = new MongoProperties();
properties.setUri(secret.getUri());
return new PropertiesMongoConnectionDetails(properties);
return new PropertiesMongoConnectionDetails(properties, sslBundles);
}
}