Skip to content

Commit 8e83549

Browse files
committed
Remove cartridge-java from dependencies
- [breaking change] Remove io.tarantool.cartridge-driver dependency - [breaking change] Update executeScript and executeCommand methods to execute code viva execInContainer (now it returns yaml string in Container.ExecResult not CompletableFuture) - Add executeScriptDecoded and executeCommandDecoded methods to return parsed yaml not string. - Add SslContext class - Add withSslContext method to TarantoolContainer and TarantoolCartridgeContainer. - Update org.yaml.snakeyaml to 2.0 version. Closes #69
1 parent 5621fae commit 8e83549

7 files changed

+10
-13
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
- Bump testcontainers to 1.18.0
66
- Move rocks building to the build phase
77
- **[breaking change]** Remove io.tarantool.cartridge-driver dependency
8-
- **[breaking change]** Update executeScript and executeCommand methods to execute code viva execInContainer
9-
(now it returns yaml string in Container.ExecResult not CompletableFuture)
8+
- **[breaking change]** Update executeScript and executeCommand methods to execute code via execInContainer
9+
(now it returns **yaml** string in Container.ExecResult instead of CompletableFuture)
1010
- Add executeScriptDecoded and executeCommandDecoded methods to return parsed yaml not string.
1111
- Add SslContext class
1212
- Add withSslContext method to TarantoolContainer and TarantoolCartridgeContainer.

src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
* specified in the http_port options, will be exposed.
8181
*
8282
* @author Alexey Kuzin
83-
* @authorm Artyom Dubinin
83+
* @author Artyom Dubinin
8484
* @author Ivan Dneprov
8585
*
8686
*/

src/main/java/org/testcontainers/containers/TarantoolContainerClientHelper.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,23 +100,20 @@ public Container.ExecResult executeCommand(String command, SslContext sslContext
100100
command = command.replace("\'", "\\\'");
101101

102102
String bashCommand;
103-
// No SSL
104-
if (sslContext == null) {
103+
if (sslContext == null) { // No SSL
105104
bashCommand = String.format(COMMAND_TEMPLATE,
106105
container.getHost(), container.getInternalPort(),
107106
container.getUsername(), container.getPassword(),
108107
command
109108
);
110-
// mTLS
111-
} else if (sslContext.getKeyFile() != null && sslContext.getCertFile() != null) {
109+
} else if (sslContext.getKeyFile() != null && sslContext.getCertFile() != null) { // mTLS
112110
bashCommand = String.format(MTLS_COMMAND_TEMPLATE,
113111
container.getHost(), container.getInternalPort(),
114112
sslContext.getKeyFile(), sslContext.getCertFile(),
115113
container.getUsername(), container.getPassword(),
116114
command
117115
);
118-
// SSL
119-
} else {
116+
} else { // SSL
120117
bashCommand = String.format(SSL_COMMAND_TEMPLATE,
121118
container.getHost(), container.getInternalPort(),
122119
container.getUsername(), container.getPassword(),

src/main/java/org/testcontainers/containers/TarantoolContainerOperations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public interface TarantoolContainerOperations<T extends Container<T>> extends Co
4646
String getInstanceDir();
4747

4848
/**
49-
* Get the Tarantool server internal port for connecting the client to
49+
* Get the Tarantool server internal port for client connections
5050
*
5151
* @return a port
5252
*/

src/test/java/org/testcontainers/containers/Enterprise/TarantoolMTlsContainerTestEnterprise.java renamed to src/test/java/org/testcontainers/containers/enterprise/TarantoolMTlsContainerTestEnterprise.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.testcontainers.containers.Enterprise;
1+
package org.testcontainers.containers.enterprise;
22

33
import org.junit.jupiter.api.BeforeAll;
44
import org.junit.jupiter.api.Test;

src/test/java/org/testcontainers/containers/Enterprise/TarantoolSdkContainerTestEnterprise.java renamed to src/test/java/org/testcontainers/containers/enterprise/TarantoolSdkContainerTestEnterprise.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.testcontainers.containers.Enterprise;
1+
package org.testcontainers.containers.enterprise;
22

33
import org.junit.jupiter.api.Assertions;
44
import org.junit.jupiter.api.Test;

src/test/java/org/testcontainers/containers/Enterprise/TarantoolSslContainerTestEnterprise.java renamed to src/test/java/org/testcontainers/containers/enterprise/TarantoolSslContainerTestEnterprise.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.testcontainers.containers.Enterprise;
1+
package org.testcontainers.containers.enterprise;
22

33
import org.junit.jupiter.api.BeforeAll;
44
import org.junit.jupiter.api.Test;

0 commit comments

Comments
 (0)