feat(testcontainers): refactor vshard and cartridge testcontainers#64
Merged
feat(testcontainers): refactor vshard and cartridge testcontainers#64
Conversation
Alex-pvl
force-pushed
the
crud_tests_refactor
branch
12 times, most recently
from
8da9e80 to
b3bed3d
Compare
nickkkccc
requested changes
Apr 3, 2026
testcontainers/src/main/java/org/testcontainers/containers/TarantoolConfigParser.java
Outdated
Show resolved
Hide resolved
testcontainers/src/main/java/org/testcontainers/containers/VshardClusterContainer.java
Outdated
Show resolved
Hide resolved
...iners/src/main/java/org/testcontainers/containers/cluster/vshard/VshardClusterContainer.java
Show resolved
Hide resolved
Comment on lines
+487
to
+510
| protected String getFileName(String filePath) { | ||
| if (filePath == null || filePath.isEmpty()) { | ||
| throw new IllegalArgumentException("File path must not be null or empty"); | ||
| } | ||
| int idx = filePath.lastIndexOf('/'); | ||
| return idx >= 0 ? filePath.substring(idx + 1) : filePath; | ||
| } | ||
|
|
||
| private List<String> parseInstanceNames(String instancesPath) { | ||
| try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream(instancesPath)) { | ||
| if (inputStream == null) { | ||
| throw new IllegalArgumentException( | ||
| String.format("No resource path found for the specified resource %s", instancesPath)); | ||
| } | ||
| Object parsed = new Yaml().load(inputStream); | ||
| if (!(parsed instanceof Map<?, ?>)) { | ||
| return Collections.emptyList(); | ||
| } | ||
| return ((Map<?, ?>) parsed) | ||
| .keySet().stream().map(String::valueOf).collect(Collectors.toList()); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
Лучше вообще убрать Yaml зависимость, более эффективно использовать Jackson.
Для путей и директорий лучше всегда использовать Path, начиная с Java 8
testcontainers/src/main/java/org/testcontainers/containers/VshardClusterContainer.java
Outdated
Show resolved
Hide resolved
testcontainers/src/main/java/org/testcontainers/containers/TarantoolConfigParser.java
Outdated
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment.
Почему решил не использовать org.testcontainers.containers.tarantool.config.ConfigurationUtils, в котором есть уже удобные методы для работы с конфигурацией Tarantool 3.x?
Contributor
There was a problem hiding this comment.
Идея была сделать единообразный интерфейс взаимодействия с кластером тестовым посредством конфигураторов (пример таких - TDGConfigurator). И чтобы контейнеры имели один и тот же API
Contributor
Author
There was a problem hiding this comment.
Добавил конфигураторы
| import org.testcontainers.containers.utils.SslContext; | ||
| import org.testcontainers.containers.utils.TarantoolContainerClientHelper; | ||
| import org.testcontainers.images.builder.ImageFromDockerfile; | ||
| import org.yaml.snakeyaml.Yaml; |
Contributor
There was a problem hiding this comment.
Нужно использовать Jackson
Contributor
There was a problem hiding this comment.
Кажется это не относится к этому МР
Alex-pvl
force-pushed
the
crud_tests_refactor
branch
2 times, most recently
from
ce81b4e to
ff598a9
Compare
Alex-pvl
force-pushed
the
crud_tests_refactor
branch
from
ff598a9 to
3f29d9b
Compare
nickkkccc
approved these changes
Apr 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I haven't forgotten about:
Related issues: