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

refactory

Browse Source
This commit is contained in:
DmitriyMX
2022-05-10 23:42:25 +03:00
parent 6bb083755c
commit 8f2e416678
11 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,16 +4,16 @@ 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.repository.FileStorageRepository;
import ru.di9.mirror.minio.service.MinioRepository;
import ru.di9.mirror.core.storage.FileStorage;
import ru.di9.mirror.minio.storage.MinioStorage;
@Configuration
public class MinioConfig {
@Bean
public FileStorageRepository fileStorageRepository(MinioClient minioClient,
@Value("${minio.bucket}") String bucket) {
return new MinioRepository(minioClient, bucket);
public FileStorage fileStorage(MinioClient minioClient,
@Value("${minio.bucket}") String bucket) {
return new MinioStorage(minioClient, bucket);
}
@Bean

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

@@ -10,8 +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 ru.di9.mirror.core.dao.ArtifactDao;
import ru.di9.mirror.mongo.dao.MongoArtifactDao;
import java.util.List;
@@ -38,7 +38,7 @@ public class MongoConfig {
}
@Bean
public ArtifactRepository artifactRepository(MongoCollection<Document> artifactCollection) {
return new MongoArtifactRepository(artifactCollection);
public ArtifactDao artifactDao(MongoCollection<Document> artifactCollection) {
return new MongoArtifactDao(artifactCollection);
}
}

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

@@ -5,8 +5,8 @@ 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.repository.FileStorageRepository;
import ru.di9.mirror.core.dao.ArtifactDao;
import ru.di9.mirror.core.storage.FileStorage;
import ru.di9.mirror.core.service.ExternalMavenService;
import java.util.List;
@@ -15,15 +15,15 @@ import java.util.List;
public class WebConfig {
@Bean
public MavenHandler mavenHandler(FileStorageRepository fileStorageRepository,
public MavenHandler mavenHandler(FileStorage fileStorage,
List<ExternalMavenService> externalMavenServices,
ArtifactRepository artifactRepository) {
return new MavenHandler(fileStorageRepository, externalMavenServices, artifactRepository);
ArtifactDao artifactDao) {
return new MavenHandler(fileStorage, externalMavenServices, artifactDao);
}
@Bean
public IndexOfHandler indexOfHandler(FileStorageRepository fileStorageRepository) {
return new IndexOfHandler(fileStorageRepository);
public IndexOfHandler indexOfHandler(FileStorage fileStorage) {
return new IndexOfHandler(fileStorage);
}
@Bean