refactoring

This commit is contained in:
2022-05-07 20:04:30 +03:00
parent 07eb599f12
commit b79ae4f76b

View File

@@ -23,17 +23,23 @@ public class MavenHandler {
return optionalInputStream return optionalInputStream
.map(inputStream -> new GetFileResponse(fileName, inputStream)); .map(inputStream -> new GetFileResponse(fileName, inputStream));
} else { } else {
return findInMirrors(path, fileName);
}
}
private Optional<GetFileResponse> findInMirrors(String path, String fileName) {
Optional<InputStream> result;
for (ExternalMavenService externalMavenService : externalMavenServices) { for (ExternalMavenService externalMavenService : externalMavenServices) {
final String nameForStore = "/" + externalMavenService.getId() + "/" + path; final String nameForStore = "/" + externalMavenService.getId() + "/" + path;
optionalInputStream = minioService.get(nameForStore); result = minioService.get(nameForStore);
if (optionalInputStream.isPresent()) { if (result.isPresent()) {
return optionalInputStream return result
.map(inputStream -> new GetFileResponse(fileName, inputStream)); .map(inputStream -> new GetFileResponse(fileName, inputStream));
} else { } else {
optionalInputStream = externalMavenService.getFile(path); result = externalMavenService.getFile(path);
if (optionalInputStream.isPresent()) { if (result.isPresent()) {
minioService.put(nameForStore, optionalInputStream.get()); minioService.put(nameForStore, result.get());
return minioService.get(nameForStore) return minioService.get(nameForStore)
.map(inputStream -> new GetFileResponse(fileName, inputStream)); .map(inputStream -> new GetFileResponse(fileName, inputStream));
} }
@@ -42,7 +48,6 @@ public class MavenHandler {
return Optional.empty(); return Optional.empty();
} }
}
public void putFile(String path, InputStream inputStream) { public void putFile(String path, InputStream inputStream) {
minioService.put("/local/" + path, inputStream); minioService.put("/local/" + path, inputStream);