Skip to content

Commit f04cd7c

Browse files
wwisserwwisser
committed
refactor: adjust formatting to project standard
1 parent d52602a commit f04cd7c

File tree

2 files changed

+47
-57
lines changed

2 files changed

+47
-57
lines changed

‎modules/valkey/src/main/java/org/testcontainers/valkey/ValkeyContainer.java‎

Lines changed: 27 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
package org.testcontainers.valkey;
22

33
import com.google.common.base.Preconditions;
4-
import java.net.URI;
5-
import java.net.URISyntaxException;
6-
import java.time.Duration;
7-
import java.util.ArrayList;
8-
import java.util.Arrays;
9-
import java.util.List;
104
import lombok.AllArgsConstructor;
115
import lombok.Getter;
126
import org.testcontainers.containers.GenericContainer;
137
import org.testcontainers.containers.wait.strategy.Wait;
148
import org.testcontainers.utility.DockerImageName;
159
import org.testcontainers.utility.MountableFile;
1610

11+
import java.net.URI;
12+
import java.net.URISyntaxException;
13+
import java.time.Duration;
14+
import java.util.ArrayList;
15+
import java.util.Arrays;
16+
import java.util.List;
17+
1718
/**
1819
* Testcontainers implementation for Valkey.
1920
* <p>
@@ -31,22 +32,28 @@ public class ValkeyContainer extends GenericContainer<ValkeyContainer> {
3132
private static class SnapshottingSettings {
3233

3334
int seconds;
35+
3436
int changedKeys;
3537
}
3638

37-
private static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse(
38-
"valkey/valkey:8.1");
39+
private static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse("valkey/valkey:8.1");
3940

4041
private static final String DEFAULT_CONFIG_FILE = "/usr/local/valkey.conf";
4142

4243
private static final int CONTAINER_PORT = 6379;
4344

4445
private String username;
46+
4547
private String password;
48+
4649
private String persistenceVolume;
50+
4751
private String initialImportScriptFile;
52+
4853
private String configFile;
54+
4955
private ValkeyLogLevel logLevel;
56+
5057
private SnapshottingSettings snapshottingSettings;
5158

5259
public ValkeyContainer() {
@@ -59,7 +66,6 @@ public ValkeyContainer(String dockerImageName) {
5966

6067
public ValkeyContainer(DockerImageName dockerImageName) {
6168
super(dockerImageName);
62-
6369
withExposedPorts(CONTAINER_PORT);
6470
withStartupTimeout(Duration.ofMinutes(2));
6571
waitingFor(Wait.forLogMessage(".*Ready to accept connections.*", 1));
@@ -151,21 +157,18 @@ public void start() {
151157
}
152158

153159
if (snapshottingSettings != null) {
154-
command.addAll(Arrays.asList(
155-
"--save",
156-
snapshottingSettings.getSeconds() + " " + snapshottingSettings.getChangedKeys()
157-
));
160+
command.addAll(
161+
Arrays.asList("--save", snapshottingSettings.getSeconds() + " " + snapshottingSettings.getChangedKeys())
162+
);
158163
}
159164

160165
if (logLevel != null) {
161166
command.addAll(Arrays.asList("--loglevel", logLevel.name()));
162167
}
163168

164169
if (initialImportScriptFile != null && !initialImportScriptFile.isEmpty()) {
165-
withCopyToContainer(MountableFile.forHostPath(initialImportScriptFile),
166-
"/tmp/import.valkey");
167-
withCopyToContainer(MountableFile.forClasspathResource("import.sh"),
168-
"/tmp/import.sh");
170+
withCopyToContainer(MountableFile.forHostPath(initialImportScriptFile), "/tmp/import.valkey");
171+
withCopyToContainer(MountableFile.forClasspathResource("import.sh"), "/tmp/import.sh");
169172
}
170173

171174
withCommand(command.toArray(new String[0]));
@@ -188,9 +191,10 @@ public String executeCli(String cmd, String... flags) {
188191
args.add("redis-cli");
189192

190193
if (password != null && !password.isEmpty()) {
191-
args.addAll(username != null && !username.isEmpty()
192-
? Arrays.asList("--user", username, "--pass", password)
193-
: Arrays.asList("--pass", password)
194+
args.addAll(
195+
username != null && !username.isEmpty()
196+
? Arrays.asList("--user", username, "--pass", password)
197+
: Arrays.asList("--pass", password)
194198
);
195199
}
196200

@@ -217,15 +221,7 @@ public String createConnectionUrl() {
217221
}
218222

219223
try {
220-
URI uri = new URI(
221-
"redis",
222-
userInfo,
223-
getHost(),
224-
getPort(),
225-
null,
226-
null,
227-
null
228-
);
224+
URI uri = new URI("redis", userInfo, getHost(), getPort(), null, null, null);
229225
return uri.toString();
230226
} catch (URISyntaxException e) {
231227
throw new RuntimeException("Failed to build Redis URI", e);
@@ -238,16 +234,13 @@ private void evaluateImportScript() {
238234
}
239235

240236
try {
241-
ExecResult result = execInContainer("/bin/sh", "/tmp/import.sh",
242-
password != null ? password : "");
237+
ExecResult result = execInContainer("/bin/sh", "/tmp/import.sh", password != null ? password : "");
243238

244239
if (result.getExitCode() != 0 || result.getStdout().contains("ERR")) {
245-
throw new RuntimeException(
246-
"Could not import initial data: " + result.getStdout());
240+
throw new RuntimeException("Could not import initial data: " + result.getStdout());
247241
}
248242
} catch (Exception e) {
249243
throw new RuntimeException(e);
250244
}
251245
}
252-
253246
}

‎modules/valkey/src/test/java/org/testcontainers/valkey/ValkeyContainerTest.java‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package org.testcontainers.valkey;
22

3-
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
5-
63
import io.valkey.Jedis;
74
import io.valkey.JedisPool;
8-
import java.nio.file.Paths;
95
import org.junit.jupiter.api.Test;
106
import org.junit.jupiter.api.io.TempDir;
117

128
import java.nio.file.Path;
9+
import java.nio.file.Paths;
10+
11+
import static org.assertj.core.api.Assertions.assertThat;
12+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1313

1414
class ValkeyContainerTest {
1515

@@ -18,10 +18,11 @@ class ValkeyContainerTest {
1818

1919
@Test
2020
void shouldWriteAndReadEntry() {
21-
try (ValkeyContainer valkeyContainer = new ValkeyContainer()
22-
.withLogLevel(ValkeyLogLevel.DEBUG)
23-
.withSnapshotting(3, 1)) {
24-
21+
try (
22+
ValkeyContainer valkeyContainer = new ValkeyContainer()
23+
.withLogLevel(ValkeyLogLevel.DEBUG)
24+
.withSnapshotting(3, 1)
25+
) {
2526
valkeyContainer.start();
2627
JedisPool jedisPool = new JedisPool(valkeyContainer.createConnectionUrl());
2728

@@ -34,10 +35,9 @@ void shouldWriteAndReadEntry() {
3435

3536
@Test
3637
void shouldConfigureServiceWithAuthentication() {
37-
try (ValkeyContainer valkeyContainer = new ValkeyContainer()
38-
.withUsername("testuser")
39-
.withPassword("testpass")) {
40-
38+
try (
39+
ValkeyContainer valkeyContainer = new ValkeyContainer().withUsername("testuser").withPassword("testpass")
40+
) {
4141
valkeyContainer.start();
4242
String url = valkeyContainer.createConnectionUrl();
4343
assertThat(url).contains("testuser:testpass");
@@ -55,10 +55,11 @@ void shouldPersistData() {
5555
Path dataDir = tempDir.resolve("valkey-data");
5656
dataDir.toFile().mkdirs();
5757

58-
try (ValkeyContainer valkeyContainer = new ValkeyContainer()
59-
.withPersistenceVolume(dataDir.toString())
60-
.withSnapshotting(1, 1)) {
61-
58+
try (
59+
ValkeyContainer valkeyContainer = new ValkeyContainer()
60+
.withPersistenceVolume(dataDir.toString())
61+
.withSnapshotting(1, 1)
62+
) {
6263
valkeyContainer.start();
6364
JedisPool jedisPool = new JedisPool(valkeyContainer.createConnectionUrl());
6465

@@ -67,8 +68,7 @@ void shouldPersistData() {
6768
}
6869

6970
valkeyContainer.stop();
70-
try (ValkeyContainer restarted = new ValkeyContainer()
71-
.withPersistenceVolume(dataDir.toString())) {
71+
try (ValkeyContainer restarted = new ValkeyContainer().withPersistenceVolume(dataDir.toString())) {
7272
restarted.start();
7373
JedisPool restartedPool = new JedisPool(restarted.createConnectionUrl());
7474

@@ -83,9 +83,7 @@ void shouldPersistData() {
8383
void shouldInitializeDatabaseWithPayload() throws Exception {
8484
Path importFile = Paths.get(getClass().getResource("/initData.valkey").toURI());
8585

86-
try (ValkeyContainer valkeyContainer = new ValkeyContainer()
87-
.withInitialData(importFile.toString())) {
88-
86+
try (ValkeyContainer valkeyContainer = new ValkeyContainer().withInitialData(importFile.toString())) {
8987
valkeyContainer.start();
9088
JedisPool jedisPool = new JedisPool(valkeyContainer.createConnectionUrl());
9189

@@ -111,8 +109,7 @@ void shouldExecuteContainerCmdAndReturnResult() {
111109
void shouldMountValkeyConfigToContainer() throws Exception {
112110
Path configFile = Paths.get(getClass().getResource("/valkey.conf").toURI());
113111

114-
try (ValkeyContainer valkeyContainer = new ValkeyContainer().withConfigFile(
115-
configFile.toString())) {
112+
try (ValkeyContainer valkeyContainer = new ValkeyContainer().withConfigFile(configFile.toString())) {
116113
valkeyContainer.start();
117114

118115
JedisPool jedisPool = new JedisPool(valkeyContainer.createConnectionUrl());

0 commit comments

Comments
 (0)