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

4
mirror-core/src/main/java/ru/di9/mirror/core/repository/ArtifactRepository.java → mirror-core/src/main/java/ru/di9/mirror/core/dao/ArtifactDao.java
View File

@@ -1,8 +1,8 @@
package ru.di9.mirror.core.repository;
package ru.di9.mirror.core.dao;
import ru.di9.mirror.core.entity.ArtifactEntity;
public interface ArtifactRepository {
public interface ArtifactDao {
ArtifactEntity save(ArtifactEntity artifactEntity);
}

6
mirror-core/src/main/java/ru/di9/mirror/core/handler/IndexOfHandler.java
View File

@@ -2,17 +2,17 @@ package ru.di9.mirror.core.handler;
import lombok.RequiredArgsConstructor;
import ru.di9.mirror.core.domain.FileItem;
import ru.di9.mirror.core.repository.FileStorageRepository;
import ru.di9.mirror.core.storage.FileStorage;
import java.util.List;
@RequiredArgsConstructor
public class IndexOfHandler {
private final FileStorageRepository fileStorageRepository;
private final FileStorage fileStorage;
public List<FileItem> walker(String path) {
return fileStorageRepository.list("/local/" + path);
return fileStorage.list("/local/" + path);
}
}

18
mirror-core/src/main/java/ru/di9/mirror/core/handler/MavenHandler.java
View File

@@ -5,8 +5,8 @@ import lombok.extern.slf4j.Slf4j;
import ru.di9.mirror.core.domain.FileInfo;
import ru.di9.mirror.core.entity.ArtifactEntity;
import ru.di9.mirror.core.handler.response.GetFileResponse;
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.io.InputStream;
@@ -17,9 +17,9 @@ import java.util.Optional;
@RequiredArgsConstructor
public class MavenHandler {
private final FileStorageRepository fileStorageRepository;
private final FileStorage fileStorage;
private final List<ExternalMavenService> externalMavenServices;
private final ArtifactRepository repository;
private final ArtifactDao repository;
public Optional<GetFileResponse> getFile(String path) {
var fileInfo = FileInfo.of(path.substring(path.lastIndexOf("/") + 1));
@@ -32,7 +32,7 @@ public class MavenHandler {
log.info(artifactEntity.toString());
}
Optional<InputStream> optionalInputStream = fileStorageRepository.findByName("/local/" + path);
Optional<InputStream> optionalInputStream = fileStorage.findByName("/local/" + path);
if (optionalInputStream.isPresent()) {
return optionalInputStream
.map(inputStream -> new GetFileResponse(fileInfo.name(), inputStream));
@@ -46,7 +46,7 @@ public class MavenHandler {
for (ExternalMavenService externalMavenService : externalMavenServices) {
final String nameForStore = "/" + externalMavenService.getId() + "/" + path;
result = fileStorageRepository.findByName(nameForStore);
result = fileStorage.findByName(nameForStore);
if (result.isPresent()) {
return result
.map(inputStream -> new GetFileResponse(fileName, inputStream));
@@ -57,8 +57,8 @@ public class MavenHandler {
repository.save(artifactEntity);
}
fileStorageRepository.save(nameForStore, result.get());
return fileStorageRepository.findByName(nameForStore)
fileStorage.save(nameForStore, result.get());
return fileStorage.findByName(nameForStore)
.map(inputStream -> new GetFileResponse(fileName, inputStream));
}
}
@@ -77,6 +77,6 @@ public class MavenHandler {
log.info(artifactEntity.toString());
}
fileStorageRepository.save("/local/" + path, inputStream);
fileStorage.save("/local/" + path, inputStream);
}
}

4
mirror-core/src/main/java/ru/di9/mirror/core/repository/FileStorageRepository.java → mirror-core/src/main/java/ru/di9/mirror/core/storage/FileStorage.java
View File

@@ -1,4 +1,4 @@
package ru.di9.mirror.core.repository;
package ru.di9.mirror.core.storage;
import ru.di9.mirror.core.domain.FileItem;
@@ -6,7 +6,7 @@ import java.io.InputStream;
import java.util.List;
import java.util.Optional;
public interface FileStorageRepository {
public interface FileStorage {
Optional<InputStream> findByName(String name);