Voomra/Project-Mirror
0
Fork 0
Code Issues 2 Releases Activity

отделили реализацию mongodb в отлдельный модуль

Browse Source
This commit is contained in:
DmitriyMX
2022-05-09 19:42:20 +03:00
parent f476c81f4e
commit 6bb083755c
14 changed files with 108 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mirror-web/build.gradle
View File

@@ -4,6 +4,7 @@ apply plugin: 'org.springframework.boot'
dependencies {
implementation(project(':mirror-core'))
implementation(project(':mirror-minio'))
implementation(project(':mirror-mongo'))
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor:${springBootVerson}")
implementation("org.springframework.boot:spring-boot-starter-web:${springBootVerson}")

3
mirror-web/src/main/java/ru/di9/mirror/web/config/MinioConfig.java
View File

@@ -11,7 +11,8 @@ import ru.di9.mirror.minio.service.MinioRepository;
public class MinioConfig {
@Bean
public FileStorageRepository fileStorageRepository(MinioClient minioClient, @Value("${minio.bucket}") String bucket) {
public FileStorageRepository fileStorageRepository(MinioClient minioClient,
@Value("${minio.bucket}") String bucket) {
return new MinioRepository(minioClient, bucket);
}

10
mirror-web/src/main/java/ru/di9/mirror/web/config/MongoConfig.java
View File

@@ -10,6 +10,8 @@ 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.repository.ArtifactRepository;
import ru.di9.mirror.mongo.repository.MongoArtifactRepository;
import java.util.List;
@@ -17,7 +19,8 @@ import java.util.List;
public class MongoConfig {
@Bean
public MongoClient mongoClient(@Value("${mongodb.host}") String host, @Value("${mongodb.port}") int port) {
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());
@@ -33,4 +36,9 @@ public class MongoConfig {
public MongoCollection<Document> artifactCollection(MongoDatabase database) {
return database.getCollection("artifacts");
}
@Bean
public ArtifactRepository artifactRepository(MongoCollection<Document> artifactCollection) {
return new MongoArtifactRepository(artifactCollection);
}
}

8
mirror-web/src/main/java/ru/di9/mirror/web/config/WebConfig.java
View File

@@ -1,15 +1,13 @@
package ru.di9.mirror.web.config;
import com.mongodb.client.MongoCollection;
import okhttp3.OkHttpClient;
import org.bson.Document;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import ru.di9.mirror.core.handler.IndexOfHandler;
import ru.di9.mirror.core.handler.MavenHandler;
import ru.di9.mirror.core.repository.ArtifactRepository;
import ru.di9.mirror.core.service.ExternalMavenService;
import ru.di9.mirror.core.repository.FileStorageRepository;
import ru.di9.mirror.core.service.ExternalMavenService;
import java.util.List;
@@ -41,8 +39,4 @@ public class WebConfig {
return new OkHttpClient();
}
@Bean
public ArtifactRepository artifactRepository(MongoCollection<Document> artifactCollection) {
return new ArtifactRepository(artifactCollection);
}
}