diff --git a/mirror-web/src/main/java/ru/di9/mirror/web/config/MinioConfig.java b/mirror-web/src/main/java/ru/di9/mirror/web/config/MinioConfig.java new file mode 100644 index 0000000..d7b1c04 --- /dev/null +++ b/mirror-web/src/main/java/ru/di9/mirror/web/config/MinioConfig.java @@ -0,0 +1,26 @@ +package ru.di9.mirror.web.config; + +import io.minio.MinioClient; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import ru.di9.mirror.core.service.MinioService; + +@Configuration +public class MinioConfig { + + @Bean + public MinioService minioService(MinioClient minioClient, @Value("${minio.bucket}") String bucket) { + return new MinioService(minioClient, bucket); + } + + @Bean + public MinioClient minioClient(@Value("${minio.url}") String url, + @Value("${minio.accessKey}") String accessKey, + @Value("${minio.secretKey}") String secretKey) { + return MinioClient.builder() + .endpoint(url) + .credentials(accessKey, secretKey) + .build(); + } +} diff --git a/mirror-web/src/main/java/ru/di9/mirror/web/config/MongoConfig.java b/mirror-web/src/main/java/ru/di9/mirror/web/config/MongoConfig.java new file mode 100644 index 0000000..02437f5 --- /dev/null +++ b/mirror-web/src/main/java/ru/di9/mirror/web/config/MongoConfig.java @@ -0,0 +1,36 @@ +package ru.di9.mirror.web.config; + +import com.mongodb.MongoClientSettings; +import com.mongodb.ServerAddress; +import com.mongodb.client.MongoClient; +import com.mongodb.client.MongoClients; +import com.mongodb.client.MongoCollection; +import com.mongodb.client.MongoDatabase; +import org.bson.Document; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.List; + +@Configuration +public class MongoConfig { + + @Bean + public MongoClient mongoClient(@Value("${mongodb.host}") String host, @Value("${mongodb.port}") int port) { + return MongoClients.create(MongoClientSettings.builder() + .applyToClusterSettings(builder -> builder.hosts(List.of(new ServerAddress(host, port)))) + .build()); + } + + @Bean + public MongoDatabase mongoDatabase(MongoClient mongoClient, + @Value("${mongodb.database}") String database) { + return mongoClient.getDatabase(database); + } + + @Bean + public MongoCollection artifactCollection(MongoDatabase database) { + return database.getCollection("artifacts"); + } +} diff --git a/mirror-web/src/main/java/ru/di9/mirror/web/config/WebConfig.java b/mirror-web/src/main/java/ru/di9/mirror/web/config/WebConfig.java index d58d180..c8d6831 100644 --- a/mirror-web/src/main/java/ru/di9/mirror/web/config/WebConfig.java +++ b/mirror-web/src/main/java/ru/di9/mirror/web/config/WebConfig.java @@ -1,15 +1,8 @@ package ru.di9.mirror.web.config; -import com.mongodb.MongoClientSettings; -import com.mongodb.ServerAddress; -import com.mongodb.client.MongoClient; -import com.mongodb.client.MongoClients; import com.mongodb.client.MongoCollection; -import com.mongodb.client.MongoDatabase; -import io.minio.MinioClient; import okhttp3.OkHttpClient; import org.bson.Document; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import ru.di9.mirror.core.handler.IndexOfHandler; @@ -35,21 +28,6 @@ public class WebConfig { return new IndexOfHandler(minioService); } - @Bean - public MinioService minioService(MinioClient minioClient, @Value("${minio.bucket}") String bucket) { - return new MinioService(minioClient, bucket); - } - - @Bean - public MinioClient minioClient(@Value("${minio.url}") String url, - @Value("${minio.accessKey}") String accessKey, - @Value("${minio.secretKey}") String secretKey) { - return MinioClient.builder() - .endpoint(url) - .credentials(accessKey, secretKey) - .build(); - } - @Bean public List externalMavenServices(OkHttpClient okHttpClient, MavenMirrorsProperties mavenMirrorsProperties) { @@ -63,24 +41,6 @@ public class WebConfig { return new OkHttpClient(); } - @Bean - public MongoClient mongoClient(@Value("${mongodb.host}") String host, @Value("${mongodb.port}") int port) { - return MongoClients.create(MongoClientSettings.builder() - .applyToClusterSettings(builder -> builder.hosts(List.of(new ServerAddress(host, port)))) - .build()); - } - - @Bean - public MongoDatabase mongoDatabase(MongoClient mongoClient, - @Value("${mongodb.database}") String database) { - return mongoClient.getDatabase(database); - } - - @Bean - public MongoCollection artifactCollection(MongoDatabase database) { - return database.getCollection("artifacts"); - } - @Bean public ArtifactRepository artifactRepository(MongoCollection artifactCollection) { return new ArtifactRepository(artifactCollection);