Skip to content

Version 8.0 #606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 12 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 7 additions & 66 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ commands:
parameters:
docker-img:
type: 'string'
default: 'docker.io/arangodb/arangodb:latest'
default: 'docker.io/arangodb/enterprise:latest'
topology:
type: 'string'
default: 'single'
Expand Down Expand Up @@ -109,13 +109,6 @@ commands:
- run:
name: Deploy to Apache Maven Central
command: mvn -s .circleci/maven-release-settings.xml -Dmaven.test.skip deploy
release:
steps:
- run:
name: Release to Apache Maven Central
command: mvn -s .circleci/maven-release-settings.xml -Dmaven.test.skip nexus-staging:release
environment:
MAVEN_OPTS: "--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED"

executors:
j17:
Expand All @@ -131,7 +124,7 @@ jobs:
parameters:
docker-img:
type: 'string'
default: 'docker.io/arangodb/arangodb:latest'
default: 'docker.io/arangodb/enterprise:latest'
topology:
type: 'string'
default: 'single'
Expand Down Expand Up @@ -199,7 +192,7 @@ jobs:
parameters:
docker-img:
type: 'string'
default: 'docker.io/arangodb/arangodb:latest'
default: 'docker.io/arangodb/enterprise:latest'
topology:
type: 'string'
default: 'single'
Expand Down Expand Up @@ -432,18 +425,6 @@ jobs:
- deploy
- store_cache

release:
executor: 'j17'
steps:
- timeout:
duration: '30m'
- checkout
- load_cache
- config_gpg
- deploy
- release
- store_cache

workflows:
test-adb-version:
when:
Expand All @@ -454,9 +435,6 @@ workflows:
matrix:
parameters:
docker-img:
- 'docker.io/arangodb/arangodb:3.11'
- 'docker.io/arangodb/arangodb:3.12'
- 'docker.io/arangodb/enterprise:3.11'
- 'docker.io/arangodb/enterprise:3.12'
topology:
- 'single'
Expand All @@ -467,9 +445,6 @@ workflows:
matrix:
parameters:
docker-img:
- 'docker.io/arangodb/arangodb:3.11'
- 'docker.io/arangodb/arangodb:3.12'
- 'docker.io/arangodb/enterprise:3.11'
- 'docker.io/arangodb/enterprise:3.12'
topology:
- 'cluster'
Expand Down Expand Up @@ -528,9 +503,7 @@ workflows:
tags:
only: /^v.*/
branches:
only:
- main
- next
ignore: /.*/
- test:
name: test-jackson-<<matrix.args>>
matrix:
Expand All @@ -549,9 +522,7 @@ workflows:
tags:
only: /^v.*/
branches:
only:
- main
- next
ignore: /.*/
- test:
name: test-native-ssl=<<matrix.ssl>>-<<matrix.graalvm-version>>
matrix:
Expand All @@ -570,9 +541,7 @@ workflows:
tags:
only: /^v.*/
branches:
only:
- main
- next
ignore: /.*/
- test-shaded:
name: test-native-shaded-ssl=<<matrix.ssl>>-<<matrix.graalvm-version>>
matrix:
Expand All @@ -591,25 +560,7 @@ workflows:
tags:
only: /^v.*/
branches:
only:
- main
- next
- test:
name: test-activefailover-<<matrix.docker-img>>
matrix:
parameters:
docker-img:
- 'docker.io/arangodb/arangodb:3.11'
- 'docker.io/arangodb/enterprise:3.11'
topology:
- 'activefailover'
filters:
tags:
only: /^v.*/
branches:
only:
- main
- next
ignore: /.*/

test-non-func:
when:
Expand Down Expand Up @@ -651,13 +602,3 @@ workflows:
only: /^deploy.*/
branches:
ignore: /.*/

release:
jobs:
- release:
context: java-release
filters:
tags:
only: /^release.*/
branches:
ignore: /.*/
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ The official [ArangoDB](https://www.arangodb.com/) Java Driver.
- [Examples](test-non-functional/src/test/java/example)
- [Documentation and Tutorial](https://docs.arangodb.com/stable/develop/drivers/java/)
- [JavaDoc](https://www.javadoc.io/doc/com.arangodb/arangodb-java-driver/latest/index.html)

2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<relativePath>../release-parent</relativePath>
<groupId>com.arangodb</groupId>
<artifactId>release-parent</artifactId>
<version>7.19.0</version>
<version>7.20.0-SNAPSHOT</version>
</parent>

<name>core</name>
Expand Down
20 changes: 9 additions & 11 deletions core/src/main/java/com/arangodb/ArangoDB.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ public interface ArangoDB extends ArangoSerdeAccessor {
void shutdown();

/**
* Updates the JWT used for requests authorization. It does not change already existing VST connections, since VST
* connections are authenticated during the initialization phase.
* Updates the JWT used for requests authorization.
*
* @param jwt token to use
*/
Expand Down Expand Up @@ -511,7 +510,9 @@ public Builder verifyHost(final Boolean verifyHost) {
*
* @param chunkSize size of a chunk in bytes
* @return {@link ArangoDB.Builder}
* @deprecated for removal, no longer supported since ArangoDB 3.12
*/
@Deprecated
public Builder chunkSize(final Integer chunkSize) {
config.setChunkSize(chunkSize);
return this;
Expand All @@ -536,7 +537,6 @@ public Builder pipelining(final Boolean pipelining) {
* </p>
*
* <pre>
* {@link Protocol#VST} == 1
* {@link Protocol#HTTP_JSON} == 20
* {@link Protocol#HTTP_VPACK} == 20
* {@link Protocol#HTTP2_JSON} == 1
Expand Down Expand Up @@ -570,19 +570,19 @@ public Builder connectionTtl(final Long connectionTtl) {
*
* @param keepAliveInterval interval in seconds
* @return {@link ArangoDB.Builder}
* @deprecated for removal, no longer supported since ArangoDB 3.12
*/
@Deprecated
public Builder keepAliveInterval(final Integer keepAliveInterval) {
config.setKeepAliveInterval(keepAliveInterval);
return this;
}

/**
* Whether the driver should acquire a list of available coordinators in an ArangoDB cluster or a single
* server with active failover. In case of Active-Failover deployment set to {@code true} to enable automatic
* master discovery.
* Whether the driver should acquire a list of available coordinators in an ArangoDB cluster.
*
* <p>
* The host list will be used for failover and load balancing.
* The host list will be used for load balancing.
* </p>
*
* @param acquireHostList whether automatically acquire a list of available hosts (default: false)
Expand All @@ -605,8 +605,7 @@ public Builder acquireHostListInterval(final Integer acquireHostListInterval) {
}

/**
* Sets the load balancing strategy to be used in an ArangoDB cluster setup. In case of Active-Failover
* deployment set to {@link LoadBalancingStrategy#NONE} or not set at all, since that would be the default.
* Sets the load balancing strategy to be used in an ArangoDB cluster setup.
*
* @param loadBalancingStrategy the load balancing strategy to be used (default:
* {@link LoadBalancingStrategy#NONE}
Expand Down Expand Up @@ -767,8 +766,7 @@ protected HostHandler createHostHandler(@UnstableApi final HostResolver hostReso
}

LOG.debug("HostHandler is {}", hostHandler.getClass().getSimpleName());

return new DirtyReadHostHandler(hostHandler, new RoundRobinHostHandler(hostResolver));
return hostHandler;
}

@UnstableApi
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/java/com/arangodb/ArangoDBAsync.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ public interface ArangoDBAsync extends ArangoSerdeAccessor {
void shutdown();

/**
* Updates the JWT used for requests authorization. It does not change already existing VST connections, since VST
* connections are authenticated during the initialization phase.
* Updates the JWT used for requests authorization.
*
* @param jwt token to use
*/
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/com/arangodb/Protocol.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ public enum Protocol {
* VelocyStream
*
* @see <a href="https://github.com/arangodb/velocystream">VelocyStream specification</a>
* @deprecated for removal, no longer supported since ArangoDB 3.12
*/
@Deprecated
VST,

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public final class CollectionPropertiesEntity extends CollectionEntity {
private Collection<String> shardKeys;
private String shardingStrategy; // cluster option
private String smartGraphAttribute;
private String smartJoinAttribute; // enterprise option
private String smartJoinAttribute;
private Integer writeConcern;
private Long count;

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/arangodb/entity/EdgeDefinition.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public Options getOptions() {

/**
* @param satellites collection names that will be used to create SatelliteCollections
* for a Hybrid (Disjoint) SmartGraph (Enterprise Edition only). Each array element
* for a Hybrid (Disjoint) SmartGraph. Each array element
* must be a valid collection name. The collection type cannot be modified later.
* @return this
* @since ArangoDB 3.9.0
Expand Down
11 changes: 5 additions & 6 deletions core/src/main/java/com/arangodb/entity/GraphEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ public String getRev() {
}

/**
* @return The replication factor used for every new collection in the graph. Can also be satellite for a SmartGraph
* (Enterprise Edition only).
* @return The replication factor used for every new collection in the graph. Can also be satellite for a SmartGraph.
*/
public ReplicationFactor getReplicationFactor() {
return replicationFactor;
Expand All @@ -104,28 +103,28 @@ public Integer getWriteConcern() {
}

/**
* @return Whether the graph is a SmartGraph (Enterprise Edition only).
* @return Whether the graph is a SmartGraph.
*/
public Boolean getIsSmart() {
return isSmart;
}

/**
* @return Whether the graph is a Disjoint SmartGraph (Enterprise Edition only).
* @return Whether the graph is a Disjoint SmartGraph.
*/
public Boolean getIsDisjoint() {
return isDisjoint;
}

/**
* @return Name of the sharding attribute in the SmartGraph case (Enterprise Edition only).
* @return Name of the sharding attribute in the SmartGraph case.
*/
public String getSmartGraphAttribute() {
return smartGraphAttribute;
}

/**
* @return Flag if the graph is a SatelliteGraph (Enterprise Edition only) or not.
* @return Flag if the graph is a SatelliteGraph or not.
*/
public Boolean getIsSatellite() {
return isSatellite;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public Boolean getCache() {
* @param cache Enable this option to always cache the field normalization values in memory for this specific field.
* This can improve the performance of scoring and ranking queries. Otherwise, these values are
* memory-mapped and it is up to the operating system to load them from disk into memory and to evict
* them from memory. (Enterprise Edition only)
* them from memory.
* @return this
* @since ArangoDB 3.10.2
*/
Expand Down Expand Up @@ -142,7 +142,7 @@ public Collection<InvertedIndexField> getNested() {
* @param nested Index the specified sub-objects that are stored in an array. Other than with the fields property,
* the values get indexed in a way that lets you query for co-occurring values. For example, you can
* search the sub-objects and all the conditions need to be met by a single sub-object instead of
* across all of them. This property is available in the Enterprise Edition only.
* across all of them.
* @return this
*/
public InvertedIndexField nested(InvertedIndexField... nested) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public Boolean getCache() {
* @param cache If you enable this option, then the primary sort columns are always cached in memory. This can
* improve the performance of queries that utilize the primary sort order. Otherwise, these values are
* memory-mapped and it is up to the operating system to load them from disk into memory and to evict
* them from memory (Enterprise Edition only).
* them from memory.
* @return this
* @since ArangoDB 3.10.2
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public enum AnalyzerFeature {
position,

/**
* enable search highlighting capabilities (Enterprise Edition only). If present, then the `position` and `frequency` features are also required.
* enable search highlighting capabilities. If present, then the `position` and `frequency` features are also required.
* @since ArangoDB 3.10
*/
offset
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public Collection<StoredValue> getStoredValues() {

/**
* @return An array of strings defining optimized sort expressions.
* @since ArangoDB 3.11, Enterprise Edition only
* @since ArangoDB 3.11
*/
public Collection<String> getOptimizeTopK() {
return optimizeTopK;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public CollectionLink inBackground(final Boolean inBackground) {
* and it is up to the operating system to load them from disk into memory and to evict them from
* memory.
* @return link
* @since ArangoDB 3.9.5, Enterprise Edition only
* @since ArangoDB 3.9.5
*/
public CollectionLink cache(final Boolean cache) {
this.cache = cache;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public FieldLink inBackground(final Boolean inBackground) {
* and it is up to the operating system to load them from disk into memory and to evict them from
* memory.
* @return link
* @since ArangoDB 3.9.5, Enterprise Edition only
* @since ArangoDB 3.9.5
*/
public FieldLink cache(final Boolean cache) {
this.cache = cache;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public final class StoredValue {
/**
* @param fields A list of attribute paths. The . character denotes sub-attributes.
* @param compression Defines how to compress the attribute values.
* @param cache Whether to cache stored values in memory. (Since ArangoDB 3.9.5, Enterprise Edition only)
* @param cache Whether to cache stored values in memory. (Since ArangoDB 3.9.5)
*/
@JsonCreator
public StoredValue(@JsonProperty("fields") List<String> fields,
Expand Down
Loading