Skip to content

Commit 0198213

Browse files
committed
removed VST tests
1 parent 9b488a9 commit 0198213

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+200
-339
lines changed

core/src/main/java/com/arangodb/ArangoDB.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ public interface ArangoDB extends ArangoSerdeAccessor {
7070
void shutdown();
7171

7272
/**
73-
* Updates the JWT used for requests authorization. It does not change already existing VST connections, since VST
74-
* connections are authenticated during the initialization phase.
73+
* Updates the JWT used for requests authorization.
7574
*
7675
* @param jwt token to use
7776
*/
@@ -511,7 +510,9 @@ public Builder verifyHost(final Boolean verifyHost) {
511510
*
512511
* @param chunkSize size of a chunk in bytes
513512
* @return {@link ArangoDB.Builder}
513+
* @deprecated for removal, no longer supported since ArangoDB 3.12
514514
*/
515+
@Deprecated
515516
public Builder chunkSize(final Integer chunkSize) {
516517
config.setChunkSize(chunkSize);
517518
return this;
@@ -536,7 +537,6 @@ public Builder pipelining(final Boolean pipelining) {
536537
* </p>
537538
*
538539
* <pre>
539-
* {@link Protocol#VST} == 1
540540
* {@link Protocol#HTTP_JSON} == 20
541541
* {@link Protocol#HTTP_VPACK} == 20
542542
* {@link Protocol#HTTP2_JSON} == 1
@@ -570,7 +570,9 @@ public Builder connectionTtl(final Long connectionTtl) {
570570
*
571571
* @param keepAliveInterval interval in seconds
572572
* @return {@link ArangoDB.Builder}
573+
* @deprecated for removal, no longer supported since ArangoDB 3.12
573574
*/
575+
@Deprecated
574576
public Builder keepAliveInterval(final Integer keepAliveInterval) {
575577
config.setKeepAliveInterval(keepAliveInterval);
576578
return this;

core/src/main/java/com/arangodb/ArangoDBAsync.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ public interface ArangoDBAsync extends ArangoSerdeAccessor {
3939
void shutdown();
4040

4141
/**
42-
* Updates the JWT used for requests authorization. It does not change already existing VST connections, since VST
43-
* connections are authenticated during the initialization phase.
42+
* Updates the JWT used for requests authorization.
4443
*
4544
* @param jwt token to use
4645
*/

core/src/main/java/com/arangodb/Protocol.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ public enum Protocol {
2929
* VelocyStream
3030
*
3131
* @see <a href="https://github.com/arangodb/velocystream">VelocyStream specification</a>
32+
* @deprecated for removal, no longer supported since ArangoDB 3.12
3233
*/
34+
@Deprecated
3335
VST,
3436

3537
/**

core/src/main/java/com/arangodb/internal/ArangoDefaults.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
*/
3434
public final class ArangoDefaults {
3535

36-
public static final int INTEGER_BYTES = Integer.SIZE / Byte.SIZE;
37-
public static final int LONG_BYTES = Long.SIZE / Byte.SIZE;
38-
public static final int CHUNK_MIN_HEADER_SIZE = INTEGER_BYTES + INTEGER_BYTES + LONG_BYTES;
39-
public static final int CHUNK_MAX_HEADER_SIZE = CHUNK_MIN_HEADER_SIZE + LONG_BYTES;
4036
public static final int MAX_CONNECTIONS_VST_DEFAULT = 1;
4137
public static final int MAX_CONNECTIONS_HTTP_DEFAULT = 20;
4238
public static final int MAX_CONNECTIONS_HTTP2_DEFAULT = 1;

core/src/main/java/com/arangodb/internal/RequestType.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ public enum RequestType {
3333
PUT(3),
3434
HEAD(4),
3535
PATCH(5),
36-
OPTIONS(6),
37-
VSTREAM_CRED(7),
38-
VSTREAM_REGISTER(8),
39-
VSTREAM_STATUS(9),
40-
ILLEGAL(10);
36+
OPTIONS(6);
4137

4238
private final int type;
4339

core/src/main/java/com/arangodb/internal/config/ArangoConfig.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ public void loadProperties(final ArangoConfigProperties properties) {
7474
pipelining = properties.getPipelining().orElse(ArangoDefaults.DEFAULT_PIPELINING);
7575
// FIXME: make maxConnections field Optional
7676
maxConnections = properties.getMaxConnections().orElse(null);
77-
// FIXME: make connectionTtl field Optional
78-
connectionTtl = properties.getConnectionTtl().orElse(null);
77+
connectionTtl = properties.getConnectionTtl().orElse(ArangoDefaults.DEFAULT_CONNECTION_TTL_HTTP);
7978
// FIXME: make keepAliveInterval field Optional
8079
keepAliveInterval = properties.getKeepAliveInterval().orElse(null);
8180
acquireHostList = properties.getAcquireHostList().orElse(ArangoDefaults.DEFAULT_ACQUIRE_HOST_LIST);
@@ -215,9 +214,6 @@ public void setMaxConnections(Integer maxConnections) {
215214
}
216215

217216
public Long getConnectionTtl() {
218-
if (connectionTtl == null && getProtocol() != Protocol.VST) {
219-
connectionTtl = ArangoDefaults.DEFAULT_CONNECTION_TTL_HTTP;
220-
}
221217
return connectionTtl;
222218
}
223219

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
com.arangodb.http.HttpProtocolProvider
2-
com.arangodb.vst.VstProtocolProvider

spotbugs/spotbugs-exclude.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
<Package name="~.*velocystream.*"/>
2222
</Match>
2323

24-
<Match>
25-
<Package name="~.*vst.*"/>
26-
</Match>
27-
2824
<Match>
2925
<Bug pattern="EI_EXPOSE_REP"/>
3026
</Match>

test-functional/src/test-ssl/java/com/arangodb/ArangoSslTest.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@
2222

2323
import com.arangodb.entity.ArangoDBVersion;
2424
import org.junit.jupiter.params.ParameterizedTest;
25-
import org.junit.jupiter.params.provider.EnumSource;
2625

2726
import javax.net.ssl.SSLHandshakeException;
2827
import java.util.List;
28+
import utils.ProtocolSource;
2929

3030
import static org.assertj.core.api.Assertions.assertThat;
3131
import static org.assertj.core.api.Assertions.catchThrowable;
32-
import static org.junit.jupiter.api.Assumptions.assumeTrue;
3332

3433

3534
/**
@@ -39,10 +38,8 @@
3938
class ArangoSslTest extends BaseTest {
4039

4140
@ParameterizedTest
42-
@EnumSource(Protocol.class)
41+
@ProtocolSource
4342
void connect(Protocol protocol) {
44-
assumeTrue(protocol != Protocol.VST);
45-
4643
final ArangoDB arangoDB = new ArangoDB.Builder()
4744
.protocol(protocol)
4845
.host("172.28.0.1", 8529)
@@ -56,10 +53,8 @@ void connect(Protocol protocol) {
5653
}
5754

5855
@ParameterizedTest
59-
@EnumSource(Protocol.class)
56+
@ProtocolSource
6057
void connectWithoutValidSslContext(Protocol protocol) {
61-
assumeTrue(protocol != Protocol.VST);
62-
6358
final ArangoDB arangoDB = new ArangoDB.Builder()
6459
.protocol(protocol)
6560
.host("172.28.0.1", 8529)

test-functional/src/test-ssl/java/com/arangodb/HttpProxyTest.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@
2626
import io.vertx.core.net.ProxyOptions;
2727
import io.vertx.core.net.ProxyType;
2828
import org.junit.jupiter.params.ParameterizedTest;
29-
import org.junit.jupiter.params.provider.EnumSource;
29+
import utils.ProtocolSource;
3030

3131
import java.util.List;
3232

3333
import static org.assertj.core.api.Assertions.assertThat;
3434
import static org.assertj.core.api.Assertions.catchThrowable;
35-
import static org.junit.jupiter.api.Assumptions.assumeTrue;
3635

3736

3837
/**
@@ -41,10 +40,8 @@
4140
class HttpProxyTest extends BaseTest {
4241

4342
@ParameterizedTest
44-
@EnumSource(Protocol.class)
43+
@ProtocolSource
4544
void httpProxy(Protocol protocol) {
46-
assumeTrue(protocol != Protocol.VST);
47-
4845
final ArangoDB arangoDB = new ArangoDB.Builder()
4946
.protocol(protocol)
5047
.host("172.28.0.1", 8529)
@@ -67,10 +64,8 @@ void httpProxy(Protocol protocol) {
6764

6865

6966
@ParameterizedTest
70-
@EnumSource(Protocol.class)
67+
@ProtocolSource
7168
void httpProxyWrongPassword(Protocol protocol) {
72-
assumeTrue(protocol != Protocol.VST);
73-
7469
final ArangoDB arangoDB = new ArangoDB.Builder()
7570
.protocol(protocol)
7671
.host("172.28.0.1", 8529)

0 commit comments

Comments
 (0)