diff --git a/ChangeLog.md b/ChangeLog.md index a160ae4..1d86fa9 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -6,6 +6,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ## [Unreleased] +### Fixed + +- custom serde not always used + +### Added + +- split `GraphDocumentReadOptions` from `DocumentReadOptions` (breaking change) +- added `ArangoCollection#getResponsibleShard(Object)` +- added support for Analyzers +- added support for Stream Transactions +- added support for named indices +- added support for TTL indices +- added minReplicationAttribute for collections and graphs + ## [5.1.0] - 2019-28-08 ### Fixed diff --git a/pom.xml b/pom.xml index c0e2cc1..9644803 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.arangodb arangodb-java-driver-async - 5.1.0 + 6.0.0-SNAPSHOT 2016 jar @@ -22,11 +22,14 @@ UTF-8 - 1.1.3 + 1.2.3 1.3 4.12 - 5.0.7 + 6.1.0 1.1.0 + + + @@ -76,7 +79,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.5 + 1.6.8 true ossrh @@ -85,56 +88,27 @@ false - - - org.apache.maven.plugins - maven-assembly-plugin - 2.4.1 - - - assembly - package - - single - - - - - - ${project.artifactId}-${project.version}-standalone - - false - false - - jar-with-dependencies - - - - org.apache.maven.plugins maven-compiler-plugin - 3.2 + 3.8.1 1.8 1.8 - - org.apache.maven.plugins maven-resources-plugin - 2.7 + 3.1.0 UTF-8 - org.apache.maven.plugins maven-source-plugin - 2.4 + 3.1.0 @@ -147,7 +121,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + 3.1.1 attach-javadocs @@ -155,7 +129,7 @@ jar - ${javadoc.opts} + ${javadoc.opts} com.arangodb.internal @@ -164,7 +138,7 @@ maven-surefire-plugin - 2.19.1 + 2.22.2 **/*Test.java @@ -185,7 +159,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 1.6 sign-artifacts @@ -225,6 +199,12 @@ hamcrest-all test + + com.arangodb + jackson-dataformat-velocypack + 0.1.4 + test + diff --git a/src/main/java/com/arangodb/ArangoCollectionAsync.java b/src/main/java/com/arangodb/ArangoCollectionAsync.java index 136ee92..826f86e 100644 --- a/src/main/java/com/arangodb/ArangoCollectionAsync.java +++ b/src/main/java/com/arangodb/ArangoCollectionAsync.java @@ -23,30 +23,8 @@ import java.util.Collection; import java.util.concurrent.CompletableFuture; -import com.arangodb.entity.CollectionEntity; -import com.arangodb.entity.CollectionPropertiesEntity; -import com.arangodb.entity.CollectionRevisionEntity; -import com.arangodb.entity.DocumentCreateEntity; -import com.arangodb.entity.DocumentDeleteEntity; -import com.arangodb.entity.DocumentImportEntity; -import com.arangodb.entity.DocumentUpdateEntity; -import com.arangodb.entity.IndexEntity; -import com.arangodb.entity.MultiDocumentEntity; -import com.arangodb.entity.Permissions; -import com.arangodb.model.CollectionCreateOptions; -import com.arangodb.model.CollectionPropertiesOptions; -import com.arangodb.model.DocumentCreateOptions; -import com.arangodb.model.DocumentDeleteOptions; -import com.arangodb.model.DocumentExistsOptions; -import com.arangodb.model.DocumentImportOptions; -import com.arangodb.model.DocumentReadOptions; -import com.arangodb.model.DocumentReplaceOptions; -import com.arangodb.model.DocumentUpdateOptions; -import com.arangodb.model.FulltextIndexOptions; -import com.arangodb.model.GeoIndexOptions; -import com.arangodb.model.HashIndexOptions; -import com.arangodb.model.PersistentIndexOptions; -import com.arangodb.model.SkiplistIndexOptions; +import com.arangodb.entity.*; +import com.arangodb.model.*; /** * Interface for operations on ArangoDB collection level. @@ -535,6 +513,17 @@ CompletableFuture ensureFulltextIndex( final Iterable fields, final FulltextIndexOptions options); + /** + * Creates a ttl index for the collection, if it does not already exist. + * + * @param fields A list of attribute paths + * @param options Additional options, can be null + * @return information about the index + * @see API + * Documentation + */ + CompletableFuture ensureTtlIndex(Iterable fields, TtlIndexOptions options); + /** * Returns all indexes of the collection * @@ -554,16 +543,25 @@ CompletableFuture ensureFulltextIndex( /** * Removes all documents from the collection, but leaves the indexes intact - * + * * @see API * Documentation * @return information about the collection */ CompletableFuture truncate(); + /** + * Removes all documents from the collection, but leaves the indexes intact + * + * @see API + * Documentation + * @return information about the collection + */ + CompletableFuture truncate(CollectionTruncateOptions options); + /** * Counts the documents in a collection - * + * * @see API * Documentation @@ -571,6 +569,16 @@ CompletableFuture ensureFulltextIndex( */ CompletableFuture count(); + /** + * Counts the documents in a collection + * + * @see API + * Documentation + * @return information about the collection, including the number of documents + */ + CompletableFuture count(CollectionCountOptions options); + /** * Creates the collection * @@ -676,6 +684,19 @@ CompletableFuture ensureFulltextIndex( */ CompletableFuture rename(final String newName); + /** + * Returns the responsible shard for the document. + * Please note that this API is only meaningful and available on a cluster coordinator. + * + * @param value A projection of the document containing at least the shard key (_key or a custom attribute) for + * which the responsible shard should be determined + * @return information about the responsible shard + * @see + * API Documentation + * @since ArangoDB 3.5.0 + */ + CompletableFuture getResponsibleShard(final Object value); + /** * Retrieve the collections revision * diff --git a/src/main/java/com/arangodb/ArangoDatabaseAsync.java b/src/main/java/com/arangodb/ArangoDatabaseAsync.java index 01a06b3..ab3a65a 100644 --- a/src/main/java/com/arangodb/ArangoDatabaseAsync.java +++ b/src/main/java/com/arangodb/ArangoDatabaseAsync.java @@ -24,706 +24,723 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; -import com.arangodb.entity.AqlExecutionExplainEntity; -import com.arangodb.entity.AqlFunctionEntity; -import com.arangodb.entity.AqlParseEntity; -import com.arangodb.entity.ArangoDBVersion; -import com.arangodb.entity.CollectionEntity; -import com.arangodb.entity.DatabaseEntity; -import com.arangodb.entity.EdgeDefinition; -import com.arangodb.entity.GraphEntity; -import com.arangodb.entity.IndexEntity; -import com.arangodb.entity.Permissions; -import com.arangodb.entity.QueryCachePropertiesEntity; -import com.arangodb.entity.QueryEntity; -import com.arangodb.entity.QueryTrackingPropertiesEntity; -import com.arangodb.entity.TraversalEntity; -import com.arangodb.entity.ViewEntity; -import com.arangodb.entity.ViewType; -import com.arangodb.model.AqlFunctionCreateOptions; -import com.arangodb.model.AqlFunctionDeleteOptions; -import com.arangodb.model.AqlFunctionGetOptions; -import com.arangodb.model.AqlQueryExplainOptions; -import com.arangodb.model.AqlQueryOptions; -import com.arangodb.model.CollectionCreateOptions; -import com.arangodb.model.CollectionsReadOptions; -import com.arangodb.model.DocumentReadOptions; -import com.arangodb.model.GraphCreateOptions; -import com.arangodb.model.TransactionOptions; -import com.arangodb.model.TraversalOptions; +import com.arangodb.entity.*; +import com.arangodb.entity.arangosearch.AnalyzerEntity; +import com.arangodb.model.*; +import com.arangodb.model.arangosearch.AnalyzerDeleteOptions; import com.arangodb.model.arangosearch.ArangoSearchCreateOptions; /** * Interface for operations on ArangoDB database level. - * + * + * @author Mark Vollmary * @see Databases API Documentation * @see Query API Documentation - * @author Mark Vollmary */ public interface ArangoDatabaseAsync extends ArangoSerializationAccessor { - /** - * Return the main entry point for the ArangoDB driver - * - * @return main entry point - */ - ArangoDBAsync arango(); - - /** - * Returns the name of the database - * - * @return database name - */ - String name(); - - /** - * Returns the server name and version number. - * - * @see API - * Documentation - * @return the server version, number - */ - CompletableFuture getVersion(); - - /** - * Checks whether the database exists - * - * @return true if the database exists, otherwise false - */ - CompletableFuture exists(); - - /** - * Retrieves a list of all databases the current user can access - * - * @see API - * Documentation - * @return a list of all databases the current user can access - */ - CompletableFuture> getAccessibleDatabases(); - - /** - * Returns a handler of the collection by the given name - * - * @param name - * Name of the collection - * @return collection handler - */ - ArangoCollectionAsync collection(final String name); - - /** - * Creates a collection - * - * @see API - * Documentation - * @param name - * The name of the collection - * @param options - * Additional options, can be null - * @return information about the collection - */ - CompletableFuture createCollection(final String name); - - /** - * Creates a collection - * - * @see API - * Documentation - * @param name - * The name of the collection - * @param options - * Additional options, can be null - * @return information about the collection - */ - CompletableFuture createCollection(final String name, final CollectionCreateOptions options); - - /** - * Returns all collections - * - * @see API - * Documentation - * @return list of information about all collections - */ - CompletableFuture> getCollections(); - - /** - * Returns all collections - * - * @see API - * Documentation - * @param options - * Additional options, can be null - * @return list of information about all collections - */ - CompletableFuture> getCollections(final CollectionsReadOptions options); - - /** - * Returns an index - * - * @see API Documentation - * @param id - * The index-handle - * @return information about the index - */ - CompletableFuture getIndex(final String id); - - /** - * Deletes an index - * - * @see API Documentation - * @param id - * The index handle - * @return the id of the index - */ - CompletableFuture deleteIndex(final String id); - - /** - * Creates the database - * - * @see API - * Documentation - * @return true if the database was created successfully. - */ - CompletableFuture create(); - - /** - * Drop an existing database - * - * @see API - * Documentation - * @return true if the database was dropped successfully - */ - CompletableFuture drop(); - - /** - * Grants access to the database dbname for user user. You need permission to the _system database in order to - * execute this call. - * - * @see - * API Documentation - * @param user - * The name of the user - * @param permissions - * The permissions the user grant - * @return void - */ - CompletableFuture grantAccess(final String user, final Permissions permissions); - - /** - * Grants access to the database dbname for user user. You need permission to the _system database in order to - * execute this call. - * - * @see - * API Documentation - * @param user - * The name of the user - * @return void - */ - CompletableFuture grantAccess(final String user); - - /** - * Revokes access to the database dbname for user user. You need permission to the _system database in order to - * execute this call. - * - * @see - * API Documentation - * @param user - * The name of the user - * @return void - */ - CompletableFuture revokeAccess(final String user); - - /** - * Clear the database access level, revert back to the default access level. - * - * @see - * API Documentation - * @param user - * The name of the user - * @since ArangoDB 3.2.0 - * @return void - */ - CompletableFuture resetAccess(final String user); - - /** - * Sets the default access level for collections within this database for the user user. You need - * permission to the _system database in order to execute this call. - * - * @param user - * The name of the user - * @param permissions - * The permissions the user grant - * @since ArangoDB 3.2.0 - */ - CompletableFuture grantDefaultCollectionAccess(final String user, final Permissions permissions); - - /** - * Get specific database access level - * - * @see API - * Documentation - * @param user - * The name of the user - * @return permissions of the user - * @since ArangoDB 3.2.0 - */ - CompletableFuture getPermissions(final String user); - - /** - * Performs a database query using the given {@code query} and {@code bindVars}, then returns a new - * {@code ArangoCursor} instance for the result list. - * - * @see API - * Documentation - * @param query - * contains the query string to be executed - * @param bindVars - * key/value pairs representing the bind parameters - * @param options - * Additional options, can be null - * @param type - * The type of the result (POJO class, VPackSlice, String for Json, or Collection/List/Map) - * @return cursor of the results - */ - CompletableFuture> query( - final String query, - final Map bindVars, - final AqlQueryOptions options, - final Class type); - - /** - * Performs a database query using the given {@code query}, then returns a new {@code ArangoCursor} instance for the - * result list. - * - * @see API - * Documentation - * @param query - * contains the query string to be executed - * @param options - * Additional options, can be null - * @param type - * The type of the result (POJO class, VPackSlice, String for Json, or Collection/List/Map) - * @return cursor of the results - */ - CompletableFuture> query( - final String query, - final AqlQueryOptions options, - final Class type); - - /** - * Performs a database query using the given {@code query} and {@code bindVars}, then returns a new - * {@code ArangoCursor} instance for the result list. - * - * @see API - * Documentation - * @param query - * contains the query string to be executed - * @param bindVars - * key/value pairs representing the bind parameters - * @param type - * The type of the result (POJO class, VPackSlice, String for Json, or Collection/List/Map) - * @return cursor of the results - */ - CompletableFuture> query( - final String query, - final Map bindVars, - final Class type); - - /** - * Performs a database query using the given {@code query}, then returns a new {@code ArangoCursor} instance for the - * result list. - * - * @see API - * Documentation - * @param query - * contains the query string to be executed - * @param type - * The type of the result (POJO class, VPackSlice, String for Json, or Collection/List/Map) - * @return cursor of the results - */ - CompletableFuture> query(final String query, final Class type); - - /** - * Return an cursor from the given cursor-ID if still existing - * - * @see API - * Documentation - * @param cursorId - * The ID of the cursor - * @param type - * The type of the result (POJO class, VPackSlice, String for Json, or Collection/List/Map) - * @return cursor of the results - */ - CompletableFuture> cursor(final String cursorId, final Class type); - - /** - * Explain an AQL query and return information about it - * - * @see API - * Documentation - * @param query - * the query which you want explained - * @param bindVars - * key/value pairs representing the bind parameters - * @param options - * Additional options, can be null - * @return information about the query - */ - CompletableFuture explainQuery( - final String query, - final Map bindVars, - final AqlQueryExplainOptions options); - - /** - * Parse an AQL query and return information about it This method is for query validation only. To actually query - * the database, see {@link ArangoDatabaseAsync#query(String, Map, AqlQueryOptions, Class)} - * - * @see API - * Documentation - * @param query - * the query which you want parse - * @return imformation about the query - */ - CompletableFuture parseQuery(final String query); - - /** - * Clears the AQL query cache - * - * @see API - * Documentation - * @return void - */ - CompletableFuture clearQueryCache(); - - /** - * Returns the global configuration for the AQL query cache - * - * @see API - * Documentation - * @return configuration for the AQL query cache - */ - CompletableFuture getQueryCacheProperties(); - - /** - * Changes the configuration for the AQL query cache. Note: changing the properties may invalidate all results in - * the cache. - * - * @see API - * Documentation - * @param properties - * properties to be set - * @return current set of properties - */ - CompletableFuture setQueryCacheProperties(final QueryCachePropertiesEntity properties); - - /** - * Returns the configuration for the AQL query tracking - * - * @see API - * Documentation - * @return configuration for the AQL query tracking - */ - CompletableFuture getQueryTrackingProperties(); - - /** - * Changes the configuration for the AQL query tracking - * - * @see API - * Documentation - * @param properties - * properties to be set - * @return current set of properties - */ - CompletableFuture setQueryTrackingProperties( - final QueryTrackingPropertiesEntity properties); - - /** - * Returns a list of currently running AQL queries - * - * @see API - * Documentation - * @return a list of currently running AQL queries - */ - CompletableFuture> getCurrentlyRunningQueries(); - - /** - * Returns a list of slow running AQL queries - * - * @see API - * Documentation - * @return a list of slow running AQL queries - */ - CompletableFuture> getSlowQueries(); - - /** - * Clears the list of slow AQL queries - * - * @see API - * Documentation - * @return void - */ - CompletableFuture clearSlowQueries(); - - /** - * Kills a running query. The query will be terminated at the next cancelation point. - * - * @see API - * Documentation - * @param id - * The id of the query - * @return void - */ - CompletableFuture killQuery(final String id); - - /** - * Create a new AQL user function - * - * @see API - * Documentation - * @param name - * the fully qualified name of the user functions - * @param code - * a string representation of the function body - * @param options - * Additional options, can be null - * @return void - */ - CompletableFuture createAqlFunction( - final String name, - final String code, - final AqlFunctionCreateOptions options); - - /** - * Remove an existing AQL user function - * - * @see API - * Documentation - * @param name - * the name of the AQL user function - * @param options - * Additional options, can be null - * @return number of deleted functions (since ArangoDB 3.4.0) - */ - CompletableFuture deleteAqlFunction(final String name, final AqlFunctionDeleteOptions options); - - /** - * Gets all reqistered AQL user functions - * - * @see API - * Documentation - * @param options - * Additional options, can be null - * @return all reqistered AQL user functions - */ - CompletableFuture> getAqlFunctions(final AqlFunctionGetOptions options); - - /** - * Returns a handler of the graph by the given name - * - * @param name - * Name of the graph - * @return graph handler - */ - ArangoGraphAsync graph(final String name); - - /** - * Create a new graph in the graph module. The creation of a graph requires the name of the graph and a definition - * of its edges. - * - * @see API - * Documentation - * @param name - * Name of the graph - * @param edgeDefinitions - * An array of definitions for the edge - * @return information about the graph - */ - CompletableFuture createGraph(final String name, final Collection edgeDefinitions); - - /** - * Create a new graph in the graph module. The creation of a graph requires the name of the graph and a definition - * of its edges. - * - * @see API - * Documentation - * @param name - * Name of the graph - * @param edgeDefinitions - * An array of definitions for the edge - * @param options - * Additional options, can be null - * @return information about the graph - */ - CompletableFuture createGraph( - final String name, - final Collection edgeDefinitions, - final GraphCreateOptions options); - - /** - * Lists all graphs known to the graph module - * - * @see API - * Documentation - * @return graphs stored in this database - */ - CompletableFuture> getGraphs(); - - /** - * Execute a server-side transaction - * - * @see API - * Documentation - * @param action - * the actual transaction operations to be executed, in the form of stringified JavaScript code - * @param type - * The type of the result (POJO class, VPackSlice or String for Json) - * @param options - * Additional options, can be null - * @return the result of the transaction if it succeeded - */ - CompletableFuture transaction(final String action, final Class type, final TransactionOptions options); - - /** - * Retrieves information about the current database - * - * @see API - * Documentation - * @return information about the current database - */ - CompletableFuture getInfo(); - - /** - * Execute a server-side traversal - * - * @see API - * Documentation - * @param vertexClass - * The type of the vertex documents (POJO class, VPackSlice or String for Json) - * @param edgeClass - * The type of the edge documents (POJO class, VPackSlice or String for Json) - * @param options - * Additional options - * @return Result of the executed traversal - */ - CompletableFuture> executeTraversal( - final Class vertexClass, - final Class edgeClass, - final TraversalOptions options); - - /** - * Reads a single document - * - * @see API - * Documentation - * @param id - * The id of the document - * @param type - * The type of the document (POJO class, VPackSlice or String for Json) - * @return the document identified by the id - */ - CompletableFuture getDocument(final String id, final Class type) throws ArangoDBException; - - /** - * Reads a single document - * - * @see API - * Documentation - * @param id - * The id of the document - * @param type - * The type of the document (POJO class, VPackSlice or String for Json) - * @param options - * Additional options, can be null - * @return the document identified by the id - */ - CompletableFuture getDocument(final String id, final Class type, final DocumentReadOptions options) - throws ArangoDBException; - - /** - * Reload the routing table. - * - * @see API - * Documentation - * @return void - */ - CompletableFuture reloadRouting(); - - /** - * Returns a new {@link ArangoRouteAsync} instance for the given path (relative to the database) that can be used to - * perform arbitrary requests. - * - * @param path - * The database-relative URL of the route - * @return {@link ArangoRouteAsync} - */ - ArangoRouteAsync route(String... path); - - /** - * Fetches all views from the database and returns an list of view descriptions. - * - * @see API Documentation - * @return list of information about all views - * @since ArangoDB 3.4.0 - */ - CompletableFuture> getViews(); - - /** - * Returns a {@code ArangoViewAsync} instance for the given view name. - * - * @param name - * Name of the view - * @return view handler - * @since ArangoDB 3.4.0 - */ - ArangoViewAsync view(String name); - - /** - * Returns a {@code ArangoSearchAsync} instance for the given ArangoSearch view name. - * - * @param name - * Name of the view - * @return ArangoSearch view handler - * @since ArangoDB 3.4.0 - */ - ArangoSearchAsync arangoSearch(String name); - - /** - * Creates a view of the given {@code type}, then returns view information from the server. - * - * @param name - * The name of the view - * @param type - * The type of the view - * @return information about the view - * @since ArangoDB 3.4.0 - */ - CompletableFuture createView(String name, ViewType type); - - /** - * Creates a ArangoSearch view with the given {@code options}, then returns view information from the server. - * - * @see API - * Documentation - * @param name - * The name of the view - * @param options - * Additional options, can be null - * @return information about the view - * @since ArangoDB 3.4.0 - */ - CompletableFuture createArangoSearch(String name, ArangoSearchCreateOptions options); + /** + * Return the main entry point for the ArangoDB driver + * + * @return main entry point + */ + ArangoDBAsync arango(); + + /** + * Returns the name of the database + * + * @return database name + */ + String name(); + + /** + * Returns the server name and version number. + * + * @return the server version, number + * @see API + * Documentation + */ + CompletableFuture getVersion(); + + /** + * Returns the name of the used storage engine. + * + * @return the storage engine name + * @see API + * Documentation + */ + CompletableFuture getEngine(); + + /** + * Checks whether the database exists + * + * @return true if the database exists, otherwise false + */ + CompletableFuture exists(); + + /** + * Retrieves a list of all databases the current user can access + * + * @return a list of all databases the current user can access + * @see API + * Documentation + */ + CompletableFuture> getAccessibleDatabases(); + + /** + * Returns a handler of the collection by the given name + * + * @param name Name of the collection + * @return collection handler + */ + ArangoCollectionAsync collection(final String name); + + /** + * Creates a collection + * + * @param name The name of the collection + * @param options Additional options, can be null + * @return information about the collection + * @see API + * Documentation + */ + CompletableFuture createCollection(final String name); + + /** + * Creates a collection + * + * @param name The name of the collection + * @param options Additional options, can be null + * @return information about the collection + * @see API + * Documentation + */ + CompletableFuture createCollection(final String name, final CollectionCreateOptions options); + + /** + * Returns all collections + * + * @return list of information about all collections + * @see API + * Documentation + */ + CompletableFuture> getCollections(); + + /** + * Returns all collections + * + * @param options Additional options, can be null + * @return list of information about all collections + * @see API + * Documentation + */ + CompletableFuture> getCollections(final CollectionsReadOptions options); + + /** + * Returns an index + * + * @param id The index-handle + * @return information about the index + * @see API Documentation + */ + CompletableFuture getIndex(final String id); + + /** + * Deletes an index + * + * @param id The index handle + * @return the id of the index + * @see API Documentation + */ + CompletableFuture deleteIndex(final String id); + + /** + * Creates the database + * + * @return true if the database was created successfully. + * @see API + * Documentation + */ + CompletableFuture create(); + + /** + * Drop an existing database + * + * @return true if the database was dropped successfully + * @see API + * Documentation + */ + CompletableFuture drop(); + + /** + * Grants access to the database dbname for user user. You need permission to the _system database in order to + * execute this call. + * + * @param user The name of the user + * @param permissions The permissions the user grant + * @return void + * @see + * API Documentation + */ + CompletableFuture grantAccess(final String user, final Permissions permissions); + + /** + * Grants access to the database dbname for user user. You need permission to the _system database in order to + * execute this call. + * + * @param user The name of the user + * @return void + * @see + * API Documentation + */ + CompletableFuture grantAccess(final String user); + + /** + * Revokes access to the database dbname for user user. You need permission to the _system database in order to + * execute this call. + * + * @param user The name of the user + * @return void + * @see + * API Documentation + */ + CompletableFuture revokeAccess(final String user); + + /** + * Clear the database access level, revert back to the default access level. + * + * @param user The name of the user + * @return void + * @see + * API Documentation + * @since ArangoDB 3.2.0 + */ + CompletableFuture resetAccess(final String user); + + /** + * Sets the default access level for collections within this database for the user user. You need + * permission to the _system database in order to execute this call. + * + * @param user The name of the user + * @param permissions The permissions the user grant + * @since ArangoDB 3.2.0 + */ + CompletableFuture grantDefaultCollectionAccess(final String user, final Permissions permissions); + + /** + * Get specific database access level + * + * @param user The name of the user + * @return permissions of the user + * @see API + * Documentation + * @since ArangoDB 3.2.0 + */ + CompletableFuture getPermissions(final String user); + + /** + * Performs a database query using the given {@code query} and {@code bindVars}, then returns a new + * {@code ArangoCursor} instance for the result list. + * + * @param query contains the query string to be executed + * @param bindVars key/value pairs representing the bind parameters + * @param options Additional options, can be null + * @param type The type of the result (POJO class, VPackSlice, String for Json, or Collection/List/Map) + * @return cursor of the results + * @see API + * Documentation + */ + CompletableFuture> query( + final String query, + final Map bindVars, + final AqlQueryOptions options, + final Class type); + + /** + * Performs a database query using the given {@code query}, then returns a new {@code ArangoCursor} instance for the + * result list. + * + * @param query contains the query string to be executed + * @param options Additional options, can be null + * @param type The type of the result (POJO class, VPackSlice, String for Json, or Collection/List/Map) + * @return cursor of the results + * @see API + * Documentation + */ + CompletableFuture> query( + final String query, + final AqlQueryOptions options, + final Class type); + + /** + * Performs a database query using the given {@code query} and {@code bindVars}, then returns a new + * {@code ArangoCursor} instance for the result list. + * + * @param query contains the query string to be executed + * @param bindVars key/value pairs representing the bind parameters + * @param type The type of the result (POJO class, VPackSlice, String for Json, or Collection/List/Map) + * @return cursor of the results + * @see API + * Documentation + */ + CompletableFuture> query( + final String query, + final Map bindVars, + final Class type); + + /** + * Performs a database query using the given {@code query}, then returns a new {@code ArangoCursor} instance for the + * result list. + * + * @param query contains the query string to be executed + * @param type The type of the result (POJO class, VPackSlice, String for Json, or Collection/List/Map) + * @return cursor of the results + * @see API + * Documentation + */ + CompletableFuture> query(final String query, final Class type); + + /** + * Return an cursor from the given cursor-ID if still existing + * + * @param cursorId The ID of the cursor + * @param type The type of the result (POJO class, VPackSlice, String for Json, or Collection/List/Map) + * @return cursor of the results + * @see API + * Documentation + */ + CompletableFuture> cursor(final String cursorId, final Class type); + + /** + * Explain an AQL query and return information about it + * + * @param query the query which you want explained + * @param bindVars key/value pairs representing the bind parameters + * @param options Additional options, can be null + * @return information about the query + * @see API + * Documentation + */ + CompletableFuture explainQuery( + final String query, + final Map bindVars, + final AqlQueryExplainOptions options); + + /** + * Parse an AQL query and return information about it This method is for query validation only. To actually query + * the database, see {@link ArangoDatabaseAsync#query(String, Map, AqlQueryOptions, Class)} + * + * @param query the query which you want parse + * @return imformation about the query + * @see API + * Documentation + */ + CompletableFuture parseQuery(final String query); + + /** + * Clears the AQL query cache + * + * @return void + * @see API + * Documentation + */ + CompletableFuture clearQueryCache(); + + /** + * Returns the global configuration for the AQL query cache + * + * @return configuration for the AQL query cache + * @see API + * Documentation + */ + CompletableFuture getQueryCacheProperties(); + + /** + * Changes the configuration for the AQL query cache. Note: changing the properties may invalidate all results in + * the cache. + * + * @param properties properties to be set + * @return current set of properties + * @see API + * Documentation + */ + CompletableFuture setQueryCacheProperties(final QueryCachePropertiesEntity properties); + + /** + * Returns the configuration for the AQL query tracking + * + * @return configuration for the AQL query tracking + * @see API + * Documentation + */ + CompletableFuture getQueryTrackingProperties(); + + /** + * Changes the configuration for the AQL query tracking + * + * @param properties properties to be set + * @return current set of properties + * @see API + * Documentation + */ + CompletableFuture setQueryTrackingProperties( + final QueryTrackingPropertiesEntity properties); + + /** + * Returns a list of currently running AQL queries + * + * @return a list of currently running AQL queries + * @see API + * Documentation + */ + CompletableFuture> getCurrentlyRunningQueries(); + + /** + * Returns a list of slow running AQL queries + * + * @return a list of slow running AQL queries + * @see API + * Documentation + */ + CompletableFuture> getSlowQueries(); + + /** + * Clears the list of slow AQL queries + * + * @return void + * @see API + * Documentation + */ + CompletableFuture clearSlowQueries(); + + /** + * Kills a running query. The query will be terminated at the next cancelation point. + * + * @param id The id of the query + * @return void + * @see API + * Documentation + */ + CompletableFuture killQuery(final String id); + + /** + * Create a new AQL user function + * + * @param name the fully qualified name of the user functions + * @param code a string representation of the function body + * @param options Additional options, can be null + * @return void + * @see API + * Documentation + */ + CompletableFuture createAqlFunction( + final String name, + final String code, + final AqlFunctionCreateOptions options); + + /** + * Remove an existing AQL user function + * + * @param name the name of the AQL user function + * @param options Additional options, can be null + * @return number of deleted functions (since ArangoDB 3.4.0) + * @see API + * Documentation + */ + CompletableFuture deleteAqlFunction(final String name, final AqlFunctionDeleteOptions options); + + /** + * Gets all reqistered AQL user functions + * + * @param options Additional options, can be null + * @return all reqistered AQL user functions + * @see API + * Documentation + */ + CompletableFuture> getAqlFunctions(final AqlFunctionGetOptions options); + + /** + * Returns a handler of the graph by the given name + * + * @param name Name of the graph + * @return graph handler + */ + ArangoGraphAsync graph(final String name); + + /** + * Create a new graph in the graph module. The creation of a graph requires the name of the graph and a definition + * of its edges. + * + * @param name Name of the graph + * @param edgeDefinitions An array of definitions for the edge + * @return information about the graph + * @see API + * Documentation + */ + CompletableFuture createGraph(final String name, final Collection edgeDefinitions); + + /** + * Create a new graph in the graph module. The creation of a graph requires the name of the graph and a definition + * of its edges. + * + * @param name Name of the graph + * @param edgeDefinitions An array of definitions for the edge + * @param options Additional options, can be null + * @return information about the graph + * @see API + * Documentation + */ + CompletableFuture createGraph( + final String name, + final Collection edgeDefinitions, + final GraphCreateOptions options); + + /** + * Lists all graphs known to the graph module + * + * @return graphs stored in this database + * @see API + * Documentation + */ + CompletableFuture> getGraphs(); + + /** + * Execute a server-side transaction + * + * @param action the actual transaction operations to be executed, in the form of stringified JavaScript code + * @param type The type of the result (POJO class, VPackSlice or String for Json) + * @param options Additional options, can be null + * @return the result of the transaction if it succeeded + * @see API + * Documentation + */ + CompletableFuture transaction(final String action, final Class type, final TransactionOptions options); + + /** + * Begins a Stream Transaction. + * + * @param options Additional options, can be null + * @return information about the transaction + * @see API + * Documentation + * @since ArangoDB 3.5.0 + */ + CompletableFuture beginStreamTransaction(StreamTransactionOptions options); + + /** + * Aborts a Stream Transaction. + * + * @return information about the transaction + * @see API + * Documentation + */ + CompletableFuture abortStreamTransaction(String id); + + /** + * Gets information about a Stream Transaction. + * + * @return information about the transaction + * @see + * API Documentation + * @since ArangoDB 3.5.0 + */ + CompletableFuture getStreamTransaction(String id); + + /** + * Gets all the currently running Stream Transactions. + * + * @return all the currently running Stream Transactions + * @see + * API Documentation + * @since ArangoDB 3.5.0 + */ + CompletableFuture> getStreamTransactions(); + + /** + * Commits a Stream Transaction. + * + * @return information about the transaction + * @see + * API Documentation + * @since ArangoDB 3.5.0 + */ + CompletableFuture commitStreamTransaction(String id); + + /** + * Retrieves information about the current database + * + * @return information about the current database + * @see API + * Documentation + */ + CompletableFuture getInfo(); + + /** + * Execute a server-side traversal + * + * @param vertexClass The type of the vertex documents (POJO class, VPackSlice or String for Json) + * @param edgeClass The type of the edge documents (POJO class, VPackSlice or String for Json) + * @param options Additional options + * @return Result of the executed traversal + * @see API + * Documentation + */ + CompletableFuture> executeTraversal( + final Class vertexClass, + final Class edgeClass, + final TraversalOptions options); + + /** + * Reads a single document + * + * @param id The id of the document + * @param type The type of the document (POJO class, VPackSlice or String for Json) + * @return the document identified by the id + * @see API + * Documentation + */ + CompletableFuture getDocument(final String id, final Class type) throws ArangoDBException; + + /** + * Reads a single document + * + * @param id The id of the document + * @param type The type of the document (POJO class, VPackSlice or String for Json) + * @param options Additional options, can be null + * @return the document identified by the id + * @see API + * Documentation + */ + CompletableFuture getDocument(final String id, final Class type, final DocumentReadOptions options) + throws ArangoDBException; + + /** + * Reload the routing table. + * + * @return void + * @see API + * Documentation + */ + CompletableFuture reloadRouting(); + + /** + * Returns a new {@link ArangoRouteAsync} instance for the given path (relative to the database) that can be used to + * perform arbitrary requests. + * + * @param path The database-relative URL of the route + * @return {@link ArangoRouteAsync} + */ + ArangoRouteAsync route(String... path); + + /** + * Fetches all views from the database and returns an list of view descriptions. + * + * @return list of information about all views + * @see API Documentation + * @since ArangoDB 3.4.0 + */ + CompletableFuture> getViews(); + + /** + * Returns a {@code ArangoViewAsync} instance for the given view name. + * + * @param name Name of the view + * @return view handler + * @since ArangoDB 3.4.0 + */ + ArangoViewAsync view(String name); + + /** + * Returns a {@code ArangoSearchAsync} instance for the given ArangoSearch view name. + * + * @param name Name of the view + * @return ArangoSearch view handler + * @since ArangoDB 3.4.0 + */ + ArangoSearchAsync arangoSearch(String name); + + /** + * Creates a view of the given {@code type}, then returns view information from the server. + * + * @param name The name of the view + * @param type The type of the view + * @return information about the view + * @since ArangoDB 3.4.0 + */ + CompletableFuture createView(String name, ViewType type); + + /** + * Creates a ArangoSearch view with the given {@code options}, then returns view information from the server. + * + * @param name The name of the view + * @param options Additional options, can be null + * @return information about the view + * @see API + * Documentation + * @since ArangoDB 3.4.0 + */ + CompletableFuture createArangoSearch(String name, ArangoSearchCreateOptions options); + + /** + * Creates an Analyzer + * + * @param options AnalyzerEntity + * @return the created Analyzer + * @see API Documentation + * @since ArangoDB 3.5.0 + */ + CompletableFuture createAnalyzer(AnalyzerEntity options); + + /** + * Gets information about an Analyzer + * + * @param name of the Analyzer without database prefix + * @return information about an Analyzer + * @see API Documentation + * @since ArangoDB 3.5.0 + */ + CompletableFuture getAnalyzer(String name); + + /** + * Retrieves all analyzers definitions. + * + * @return collection of all analyzers definitions + * @see API Documentation + * @since ArangoDB 3.5.0 + */ + CompletableFuture> getAnalyzers(); + + /** + * Deletes an Analyzer + * + * @param name of the Analyzer without database prefix + * @see API Documentation + * @since ArangoDB 3.5.0 + */ + CompletableFuture deleteAnalyzer(String name); + + /** + * Deletes an Analyzer + * + * @param name of the Analyzer without database prefix + * @param options AnalyzerDeleteOptions + * @see API Documentation + * @since ArangoDB 3.5.0 + */ + CompletableFuture deleteAnalyzer(String name, AnalyzerDeleteOptions options); } diff --git a/src/main/java/com/arangodb/ArangoEdgeCollectionAsync.java b/src/main/java/com/arangodb/ArangoEdgeCollectionAsync.java index 5b6b458..395286a 100644 --- a/src/main/java/com/arangodb/ArangoEdgeCollectionAsync.java +++ b/src/main/java/com/arangodb/ArangoEdgeCollectionAsync.java @@ -24,11 +24,7 @@ import com.arangodb.entity.EdgeEntity; import com.arangodb.entity.EdgeUpdateEntity; -import com.arangodb.model.DocumentReadOptions; -import com.arangodb.model.EdgeCreateOptions; -import com.arangodb.model.EdgeDeleteOptions; -import com.arangodb.model.EdgeReplaceOptions; -import com.arangodb.model.EdgeUpdateOptions; +import com.arangodb.model.*; /** * Interface for operations on ArangoDB edge collection level. @@ -98,7 +94,7 @@ public interface ArangoEdgeCollectionAsync extends ArangoSerializationAccessor { * Additional options, can be null * @return the edge identified by the key */ - CompletableFuture getEdge(final String key, final Class type, final DocumentReadOptions options); + CompletableFuture getEdge(final String key, final Class type, final GraphDocumentReadOptions options); /** * Replaces the edge with key with the one in the body, provided there is such a edge and no precondition is diff --git a/src/main/java/com/arangodb/ArangoVertexCollectionAsync.java b/src/main/java/com/arangodb/ArangoVertexCollectionAsync.java index 56a26ef..7167515 100644 --- a/src/main/java/com/arangodb/ArangoVertexCollectionAsync.java +++ b/src/main/java/com/arangodb/ArangoVertexCollectionAsync.java @@ -24,11 +24,7 @@ import com.arangodb.entity.VertexEntity; import com.arangodb.entity.VertexUpdateEntity; -import com.arangodb.model.DocumentReadOptions; -import com.arangodb.model.VertexCreateOptions; -import com.arangodb.model.VertexDeleteOptions; -import com.arangodb.model.VertexReplaceOptions; -import com.arangodb.model.VertexUpdateOptions; +import com.arangodb.model.*; /** * Interface for operations on ArangoDB vertex collection level. @@ -108,7 +104,7 @@ public interface ArangoVertexCollectionAsync extends ArangoSerializationAccessor * Additional options, can be null * @return the vertex identified by the key */ - CompletableFuture getVertex(final String key, final Class type, final DocumentReadOptions options); + CompletableFuture getVertex(final String key, final Class type, final GraphDocumentReadOptions options); /** * Replaces the vertex with key with the one in the body, provided there is such a vertex and no precondition is diff --git a/src/main/java/com/arangodb/internal/ArangoCollectionAsyncImpl.java b/src/main/java/com/arangodb/internal/ArangoCollectionAsyncImpl.java index 7d93e5e..695d9bc 100644 --- a/src/main/java/com/arangodb/internal/ArangoCollectionAsyncImpl.java +++ b/src/main/java/com/arangodb/internal/ArangoCollectionAsyncImpl.java @@ -113,18 +113,22 @@ public CompletableFuture getDocument( final Class type, final DocumentReadOptions options) throws ArangoDBException { DocumentUtil.validateDocumentKey(key); + boolean isCatchException = options != null ? options.isCatchException() : new DocumentReadOptions().isCatchException(); return (CompletableFuture) executor.execute(getDocumentRequest(key, options), type) - .exceptionally(handleGetDocumentExceptions(options != null ? options.isCatchException() : new DocumentReadOptions().isCatchException())); + .exceptionally(handleGetDocumentExceptions(isCatchException)); } private Function handleGetDocumentExceptions(Boolean isCatchException) { return throwable -> { - if (throwable instanceof CompletionException && throwable.getCause() instanceof ArangoDBException) { - ArangoDBException arangoDBException = (ArangoDBException) throwable.getCause(); - if ((arangoDBException.getResponseCode() != null && (arangoDBException.getResponseCode() == 404 || arangoDBException.getResponseCode() == 304 - || arangoDBException.getResponseCode() == 412)) && isCatchException) { - return null; + if (throwable instanceof CompletionException) { + if (throwable.getCause() instanceof ArangoDBException) { + ArangoDBException arangoDBException = (ArangoDBException) throwable.getCause(); + if ((arangoDBException.getResponseCode() != null && (arangoDBException.getResponseCode() == 404 || arangoDBException.getResponseCode() == 304 + || arangoDBException.getResponseCode() == 412)) && isCatchException) { + return null; + } } + throw (CompletionException) throwable; } throw new CompletionException(throwable); }; @@ -247,8 +251,9 @@ public CompletableFuture documentExists(final String key) { @Override public CompletableFuture documentExists(final String key, final DocumentExistsOptions options) { + boolean isCatchException = options != null ? options.isCatchException() : new DocumentExistsOptions().isCatchException(); return executor.execute(documentExistsRequest(key, options), response -> response) - .exceptionally(handleGetDocumentExceptions(options != null ? options.isCatchException() : new DocumentExistsOptions().isCatchException())) + .exceptionally(handleGetDocumentExceptions(isCatchException)) .thenApply(Objects::nonNull); } @@ -295,6 +300,11 @@ public CompletableFuture ensureFulltextIndex( return executor.execute(createFulltextIndexRequest(fields, options), IndexEntity.class); } + @Override + public CompletableFuture ensureTtlIndex(Iterable fields, TtlIndexOptions options) { + return executor.execute(createTtlIndexRequest(fields, options), IndexEntity.class); + } + @Override public CompletableFuture> getIndexes() { return executor.execute(getIndexesRequest(), getIndexesResponseDeserializer()); @@ -307,12 +317,22 @@ public CompletableFuture exists() { @Override public CompletableFuture truncate() { - return executor.execute(truncateRequest(), CollectionEntity.class); + return truncate(null); + } + + @Override + public CompletableFuture truncate(CollectionTruncateOptions options) { + return executor.execute(truncateRequest(options), CollectionEntity.class); } @Override public CompletableFuture count() { - return executor.execute(countRequest(), CollectionPropertiesEntity.class); + return count(null); + } + + @Override + public CompletableFuture count(CollectionCountOptions options) { + return executor.execute(countRequest(options), CollectionPropertiesEntity.class); } @Override @@ -365,6 +385,11 @@ public CompletableFuture rename(final String newName) { return executor.execute(renameRequest(newName), CollectionEntity.class); } + @Override + public CompletableFuture getResponsibleShard(Object value) { + return executor.execute(responsibleShardRequest(value), ShardEntity.class); + } + @Override public CompletableFuture getRevision() { return executor.execute(getRevisionRequest(), CollectionRevisionEntity.class); diff --git a/src/main/java/com/arangodb/internal/ArangoDatabaseAsyncImpl.java b/src/main/java/com/arangodb/internal/ArangoDatabaseAsyncImpl.java index 05a61af..29fceee 100644 --- a/src/main/java/com/arangodb/internal/ArangoDatabaseAsyncImpl.java +++ b/src/main/java/com/arangodb/internal/ArangoDatabaseAsyncImpl.java @@ -34,393 +34,425 @@ import com.arangodb.ArangoRouteAsync; import com.arangodb.ArangoSearchAsync; import com.arangodb.ArangoViewAsync; -import com.arangodb.entity.AqlExecutionExplainEntity; -import com.arangodb.entity.AqlFunctionEntity; -import com.arangodb.entity.AqlParseEntity; -import com.arangodb.entity.ArangoDBVersion; -import com.arangodb.entity.CollectionEntity; -import com.arangodb.entity.CursorEntity; -import com.arangodb.entity.DatabaseEntity; -import com.arangodb.entity.EdgeDefinition; -import com.arangodb.entity.GraphEntity; -import com.arangodb.entity.IndexEntity; -import com.arangodb.entity.Permissions; -import com.arangodb.entity.QueryCachePropertiesEntity; -import com.arangodb.entity.QueryEntity; -import com.arangodb.entity.QueryTrackingPropertiesEntity; -import com.arangodb.entity.TraversalEntity; -import com.arangodb.entity.ViewEntity; -import com.arangodb.entity.ViewType; +import com.arangodb.entity.*; +import com.arangodb.entity.arangosearch.AnalyzerEntity; import com.arangodb.internal.net.HostHandle; import com.arangodb.internal.util.DocumentUtil; -import com.arangodb.model.AqlFunctionCreateOptions; -import com.arangodb.model.AqlFunctionDeleteOptions; -import com.arangodb.model.AqlFunctionGetOptions; -import com.arangodb.model.AqlQueryExplainOptions; -import com.arangodb.model.AqlQueryOptions; -import com.arangodb.model.CollectionCreateOptions; -import com.arangodb.model.CollectionsReadOptions; -import com.arangodb.model.DocumentReadOptions; -import com.arangodb.model.GraphCreateOptions; -import com.arangodb.model.TransactionOptions; -import com.arangodb.model.TraversalOptions; +import com.arangodb.model.*; +import com.arangodb.model.arangosearch.AnalyzerDeleteOptions; import com.arangodb.model.arangosearch.ArangoSearchCreateOptions; import com.arangodb.velocypack.Type; import com.arangodb.velocystream.Request; /** * @author Mark Vollmary - * + * @author Michele Rastelli */ public class ArangoDatabaseAsyncImpl extends InternalArangoDatabase - implements ArangoDatabaseAsync { - - protected ArangoDatabaseAsyncImpl(final ArangoDBAsyncImpl arangoDB, final String name) { - super(arangoDB, name); - } - - @Override - public CompletableFuture getVersion() { - return executor.execute(getVersionRequest(), ArangoDBVersion.class); - } - - @Override - public CompletableFuture exists() { - return getInfo().thenApply(info -> info != null).exceptionally(e -> e == null); - } - - @Override - public CompletableFuture> getAccessibleDatabases() { - return executor.execute(getAccessibleDatabasesRequest(), getDatabaseResponseDeserializer()); - } - - @Override - public ArangoCollectionAsync collection(final String name) { - return new ArangoCollectionAsyncImpl(this, name); - } - - @Override - public CompletableFuture createCollection(final String name) { - return executor.execute(createCollectionRequest(name, new CollectionCreateOptions()), CollectionEntity.class); - } - - @Override - public CompletableFuture createCollection( - final String name, - final CollectionCreateOptions options) { - return executor.execute(createCollectionRequest(name, options), CollectionEntity.class); - } - - @Override - public CompletableFuture> getCollections() { - return executor.execute(getCollectionsRequest(new CollectionsReadOptions()), - getCollectionsResponseDeserializer()); - } - - @Override - public CompletableFuture> getCollections(final CollectionsReadOptions options) { - return executor.execute(getCollectionsRequest(options), getCollectionsResponseDeserializer()); - } - - @Override - public CompletableFuture getIndex(final String id) { - DocumentUtil.validateIndexId(id); - final String[] split = id.split("/"); - return collection(split[0]).getIndex(split[1]); - } - - @Override - public CompletableFuture deleteIndex(final String id) { - DocumentUtil.validateIndexId(id); - final String[] split = id.split("/"); - return collection(split[0]).deleteIndex(split[1]); - } - - @Override - public CompletableFuture create() { - return arango().createDatabase(name()); - } - - @Override - public CompletableFuture drop() { - return executor.execute(dropRequest(), createDropResponseDeserializer()); - } - - @Override - public CompletableFuture grantAccess(final String user, final Permissions permissions) { - return executor.execute(grantAccessRequest(user, permissions), Void.class); - } - - @Override - public CompletableFuture grantAccess(final String user) { - return executor.execute(grantAccessRequest(user, Permissions.RW), Void.class); - } - - @Override - public CompletableFuture revokeAccess(final String user) { - return executor.execute(grantAccessRequest(user, Permissions.NONE), Void.class); - } - - @Override - public CompletableFuture resetAccess(final String user) { - return executor.execute(resetAccessRequest(user), Void.class); - } - - @Override - public CompletableFuture grantDefaultCollectionAccess(final String user, final Permissions permissions) { - return executor.execute(updateUserDefaultCollectionAccessRequest(user, permissions), Void.class); - } - - @Override - public CompletableFuture getPermissions(final String user) { - return executor.execute(getPermissionsRequest(user), getPermissionsResponseDeserialzer()); - } - - @Override - public CompletableFuture> query( - final String query, - final Map bindVars, - final AqlQueryOptions options, - final Class type) { - final Request request = queryRequest(query, bindVars, options); - final HostHandle hostHandle = new HostHandle(); - final CompletableFuture execution = executor.execute(request, CursorEntity.class, hostHandle); - return execution.thenApply(result -> createCursor(result, type, options, hostHandle)); - } - - @Override - public CompletableFuture> query( - final String query, - final AqlQueryOptions options, - final Class type) { - return query(query, null, options, type); - } - - @Override - public CompletableFuture> query( - final String query, - final Map bindVars, - final Class type) { - return query(query, bindVars, null, type); - } - - @Override - public CompletableFuture> query(final String query, final Class type) { - return query(query, null, null, type); - } - - @Override - public CompletableFuture> cursor(final String cursorId, final Class type) { - final HostHandle hostHandle = new HostHandle(); - final CompletableFuture execution = executor.execute(queryNextRequest(cursorId, null, null), CursorEntity.class, hostHandle); - return execution.thenApply(result -> createCursor(result, type, null, hostHandle)); - } - - private ArangoCursorAsync createCursor( - final CursorEntity result, - final Class type, - final AqlQueryOptions options, - final HostHandle hostHandle) { - return new ArangoCursorAsyncImpl<>(this, new ArangoCursorExecute() { - @Override - public CursorEntity next(final String id, Map meta) { - final CompletableFuture result = executor.execute(queryNextRequest(id, options, meta), - CursorEntity.class, hostHandle); - try { - return result.get(); - } catch (InterruptedException | ExecutionException e) { - throw new ArangoDBException(e); - } - } - - @Override - public void close(final String id, Map meta) { - try { - executor.execute(queryCloseRequest(id, options, meta), Void.class, hostHandle).get(); - } catch (InterruptedException | ExecutionException e) { - throw new ArangoDBException(e); - } - } - }, type, result); - } - - @Override - public CompletableFuture explainQuery( - final String query, - final Map bindVars, - final AqlQueryExplainOptions options) { - return executor.execute(explainQueryRequest(query, bindVars, options), AqlExecutionExplainEntity.class); - } - - @Override - public CompletableFuture parseQuery(final String query) { - return executor.execute(parseQueryRequest(query), AqlParseEntity.class); - } - - @Override - public CompletableFuture clearQueryCache() { - return executor.execute(clearQueryCacheRequest(), Void.class); - } - - @Override - public CompletableFuture getQueryCacheProperties() { - return executor.execute(getQueryCachePropertiesRequest(), QueryCachePropertiesEntity.class); - } - - @Override - public CompletableFuture setQueryCacheProperties( - final QueryCachePropertiesEntity properties) { - return executor.execute(setQueryCachePropertiesRequest(properties), QueryCachePropertiesEntity.class); - } - - @Override - public CompletableFuture getQueryTrackingProperties() { - return executor.execute(getQueryTrackingPropertiesRequest(), QueryTrackingPropertiesEntity.class); - } - - @Override - public CompletableFuture setQueryTrackingProperties( - final QueryTrackingPropertiesEntity properties) { - return executor.execute(setQueryTrackingPropertiesRequest(properties), QueryTrackingPropertiesEntity.class); - } - - @Override - public CompletableFuture> getCurrentlyRunningQueries() { - return executor.execute(getCurrentlyRunningQueriesRequest(), new Type>() { - }.getType()); - } - - @Override - public CompletableFuture> getSlowQueries() { - return executor.execute(getSlowQueriesRequest(), new Type>() { - }.getType()); - } - - @Override - public CompletableFuture clearSlowQueries() { - return executor.execute(clearSlowQueriesRequest(), Void.class); - } - - @Override - public CompletableFuture killQuery(final String id) { - return executor.execute(killQueryRequest(id), Void.class); - } - - @Override - public CompletableFuture createAqlFunction( - final String name, - final String code, - final AqlFunctionCreateOptions options) { - return executor.execute(createAqlFunctionRequest(name, code, options), Void.class); - - } - - @Override - public CompletableFuture deleteAqlFunction(final String name, final AqlFunctionDeleteOptions options) { - return executor.execute(deleteAqlFunctionRequest(name, options), deleteAqlFunctionResponseDeserializer()); - } - - @Override - public CompletableFuture> getAqlFunctions(final AqlFunctionGetOptions options) { - return executor.execute(getAqlFunctionsRequest(options), getAqlFunctionsResponseDeserializer()); - } - - @Override - public ArangoGraphAsync graph(final String name) { - return new ArangoGraphAsyncImpl(this, name); - } - - @Override - public CompletableFuture createGraph( - final String name, - final Collection edgeDefinitions) { - return executor.execute(createGraphRequest(name, edgeDefinitions, new GraphCreateOptions()), - createGraphResponseDeserializer()); - } - - @Override - public CompletableFuture createGraph( - final String name, - final Collection edgeDefinitions, - final GraphCreateOptions options) { - return executor.execute(createGraphRequest(name, edgeDefinitions, options), createGraphResponseDeserializer()); - } - - @Override - public CompletableFuture> getGraphs() { - return executor.execute(getGraphsRequest(), getGraphsResponseDeserializer()); - } - - @Override - public CompletableFuture transaction( - final String action, - final Class type, - final TransactionOptions options) { - return executor.execute(transactionRequest(action, options), transactionResponseDeserializer(type)); - } - - @Override - public CompletableFuture getInfo() { - return executor.execute(getInfoRequest(), getInfoResponseDeserializer()); - } - - @Override - public CompletableFuture> executeTraversal( - final Class vertexClass, - final Class edgeClass, - final TraversalOptions options) { - final Request request = executeTraversalRequest(options); - return executor.execute(request, executeTraversalResponseDeserializer(vertexClass, edgeClass)); - } - - @Override - public CompletableFuture getDocument(final String id, final Class type) throws ArangoDBException { - DocumentUtil.validateDocumentId(id); - final String[] split = id.split("/"); - return collection(split[0]).getDocument(split[1], type); - } - - @Override - public CompletableFuture getDocument(final String id, final Class type, final DocumentReadOptions options) - throws ArangoDBException { - DocumentUtil.validateDocumentId(id); - final String[] split = id.split("/"); - return collection(split[0]).getDocument(split[1], type, options); - } - - @Override - public CompletableFuture reloadRouting() { - return executor.execute(reloadRoutingRequest(), Void.class); - } - - @Override - public ArangoRouteAsync route(final String... path) { - return new ArangoRouteAsyncImpl(this, createPath(path), Collections. emptyMap()); - } - - @Override - public CompletableFuture> getViews() { - return executor.execute(getViewsRequest(), getViewsResponseDeserializer()); - } - - @Override - public ArangoViewAsync view(final String name) { - return new ArangoViewAsyncImpl(this, name); - } - - @Override - public ArangoSearchAsync arangoSearch(final String name) { - return new ArangoSearchAsyncImpl(this, name); - } - - @Override - public CompletableFuture createView(final String name, final ViewType type){ - return executor.execute(createViewRequest(name, type), ViewEntity.class); - } - - @Override - public CompletableFuture createArangoSearch(final String name, final ArangoSearchCreateOptions options) { - return executor.execute(createArangoSearchRequest(name, options), ViewEntity.class); - } + implements ArangoDatabaseAsync { + + protected ArangoDatabaseAsyncImpl(final ArangoDBAsyncImpl arangoDB, final String name) { + super(arangoDB, name); + } + + @Override + public CompletableFuture getVersion() { + return executor.execute(getVersionRequest(), ArangoDBVersion.class); + } + + @Override + public CompletableFuture getEngine() { + return executor.execute(getEngineRequest(), ArangoDBEngine.class); + } + + @Override + public CompletableFuture exists() { + return getInfo().thenApply(info -> info != null).exceptionally(e -> e == null); + } + + @Override + public CompletableFuture> getAccessibleDatabases() { + return executor.execute(getAccessibleDatabasesRequest(), getDatabaseResponseDeserializer()); + } + + @Override + public ArangoCollectionAsync collection(final String name) { + return new ArangoCollectionAsyncImpl(this, name); + } + + @Override + public CompletableFuture createCollection(final String name) { + return executor.execute(createCollectionRequest(name, new CollectionCreateOptions()), CollectionEntity.class); + } + + @Override + public CompletableFuture createCollection( + final String name, + final CollectionCreateOptions options) { + return executor.execute(createCollectionRequest(name, options), CollectionEntity.class); + } + + @Override + public CompletableFuture> getCollections() { + return executor.execute(getCollectionsRequest(new CollectionsReadOptions()), + getCollectionsResponseDeserializer()); + } + + @Override + public CompletableFuture> getCollections(final CollectionsReadOptions options) { + return executor.execute(getCollectionsRequest(options), getCollectionsResponseDeserializer()); + } + + @Override + public CompletableFuture getIndex(final String id) { + DocumentUtil.validateIndexId(id); + final String[] split = id.split("/"); + return collection(split[0]).getIndex(split[1]); + } + + @Override + public CompletableFuture deleteIndex(final String id) { + DocumentUtil.validateIndexId(id); + final String[] split = id.split("/"); + return collection(split[0]).deleteIndex(split[1]); + } + + @Override + public CompletableFuture create() { + return arango().createDatabase(name()); + } + + @Override + public CompletableFuture drop() { + return executor.execute(dropRequest(), createDropResponseDeserializer()); + } + + @Override + public CompletableFuture grantAccess(final String user, final Permissions permissions) { + return executor.execute(grantAccessRequest(user, permissions), Void.class); + } + + @Override + public CompletableFuture grantAccess(final String user) { + return executor.execute(grantAccessRequest(user, Permissions.RW), Void.class); + } + + @Override + public CompletableFuture revokeAccess(final String user) { + return executor.execute(grantAccessRequest(user, Permissions.NONE), Void.class); + } + + @Override + public CompletableFuture resetAccess(final String user) { + return executor.execute(resetAccessRequest(user), Void.class); + } + + @Override + public CompletableFuture grantDefaultCollectionAccess(final String user, final Permissions permissions) { + return executor.execute(updateUserDefaultCollectionAccessRequest(user, permissions), Void.class); + } + + @Override + public CompletableFuture getPermissions(final String user) { + return executor.execute(getPermissionsRequest(user), getPermissionsResponseDeserialzer()); + } + + @Override + public CompletableFuture> query( + final String query, + final Map bindVars, + final AqlQueryOptions options, + final Class type) { + final Request request = queryRequest(query, bindVars, options); + final HostHandle hostHandle = new HostHandle(); + final CompletableFuture execution = executor.execute(request, CursorEntity.class, hostHandle); + return execution.thenApply(result -> createCursor(result, type, options, hostHandle)); + } + + @Override + public CompletableFuture> query( + final String query, + final AqlQueryOptions options, + final Class type) { + return query(query, null, options, type); + } + + @Override + public CompletableFuture> query( + final String query, + final Map bindVars, + final Class type) { + return query(query, bindVars, null, type); + } + + @Override + public CompletableFuture> query(final String query, final Class type) { + return query(query, null, null, type); + } + + @Override + public CompletableFuture> cursor(final String cursorId, final Class type) { + final HostHandle hostHandle = new HostHandle(); + final CompletableFuture execution = executor.execute(queryNextRequest(cursorId, null, null), CursorEntity.class, hostHandle); + return execution.thenApply(result -> createCursor(result, type, null, hostHandle)); + } + + private ArangoCursorAsync createCursor( + final CursorEntity result, + final Class type, + final AqlQueryOptions options, + final HostHandle hostHandle) { + return new ArangoCursorAsyncImpl<>(this, new ArangoCursorExecute() { + @Override + public CursorEntity next(final String id, Map meta) { + final CompletableFuture result = executor.execute(queryNextRequest(id, options, meta), + CursorEntity.class, hostHandle); + try { + return result.get(); + } catch (InterruptedException | ExecutionException e) { + throw new ArangoDBException(e); + } + } + + @Override + public void close(final String id, Map meta) { + try { + executor.execute(queryCloseRequest(id, options, meta), Void.class, hostHandle).get(); + } catch (InterruptedException | ExecutionException e) { + throw new ArangoDBException(e); + } + } + }, type, result); + } + + @Override + public CompletableFuture explainQuery( + final String query, + final Map bindVars, + final AqlQueryExplainOptions options) { + return executor.execute(explainQueryRequest(query, bindVars, options), AqlExecutionExplainEntity.class); + } + + @Override + public CompletableFuture parseQuery(final String query) { + return executor.execute(parseQueryRequest(query), AqlParseEntity.class); + } + + @Override + public CompletableFuture clearQueryCache() { + return executor.execute(clearQueryCacheRequest(), Void.class); + } + + @Override + public CompletableFuture getQueryCacheProperties() { + return executor.execute(getQueryCachePropertiesRequest(), QueryCachePropertiesEntity.class); + } + + @Override + public CompletableFuture setQueryCacheProperties( + final QueryCachePropertiesEntity properties) { + return executor.execute(setQueryCachePropertiesRequest(properties), QueryCachePropertiesEntity.class); + } + + @Override + public CompletableFuture getQueryTrackingProperties() { + return executor.execute(getQueryTrackingPropertiesRequest(), QueryTrackingPropertiesEntity.class); + } + + @Override + public CompletableFuture setQueryTrackingProperties( + final QueryTrackingPropertiesEntity properties) { + return executor.execute(setQueryTrackingPropertiesRequest(properties), QueryTrackingPropertiesEntity.class); + } + + @Override + public CompletableFuture> getCurrentlyRunningQueries() { + return executor.execute(getCurrentlyRunningQueriesRequest(), new Type>() { + }.getType()); + } + + @Override + public CompletableFuture> getSlowQueries() { + return executor.execute(getSlowQueriesRequest(), new Type>() { + }.getType()); + } + + @Override + public CompletableFuture clearSlowQueries() { + return executor.execute(clearSlowQueriesRequest(), Void.class); + } + + @Override + public CompletableFuture killQuery(final String id) { + return executor.execute(killQueryRequest(id), Void.class); + } + + @Override + public CompletableFuture createAqlFunction( + final String name, + final String code, + final AqlFunctionCreateOptions options) { + return executor.execute(createAqlFunctionRequest(name, code, options), Void.class); + + } + + @Override + public CompletableFuture deleteAqlFunction(final String name, final AqlFunctionDeleteOptions options) { + return executor.execute(deleteAqlFunctionRequest(name, options), deleteAqlFunctionResponseDeserializer()); + } + + @Override + public CompletableFuture> getAqlFunctions(final AqlFunctionGetOptions options) { + return executor.execute(getAqlFunctionsRequest(options), getAqlFunctionsResponseDeserializer()); + } + + @Override + public ArangoGraphAsync graph(final String name) { + return new ArangoGraphAsyncImpl(this, name); + } + + @Override + public CompletableFuture createGraph( + final String name, + final Collection edgeDefinitions) { + return executor.execute(createGraphRequest(name, edgeDefinitions, new GraphCreateOptions()), + createGraphResponseDeserializer()); + } + + @Override + public CompletableFuture createGraph( + final String name, + final Collection edgeDefinitions, + final GraphCreateOptions options) { + return executor.execute(createGraphRequest(name, edgeDefinitions, options), createGraphResponseDeserializer()); + } + + @Override + public CompletableFuture> getGraphs() { + return executor.execute(getGraphsRequest(), getGraphsResponseDeserializer()); + } + + @Override + public CompletableFuture transaction( + final String action, + final Class type, + final TransactionOptions options) { + return executor.execute(transactionRequest(action, options), transactionResponseDeserializer(type)); + } + + @Override + public CompletableFuture beginStreamTransaction(StreamTransactionOptions options) { + return executor.execute(beginStreamTransactionRequest(options), streamTransactionResponseDeserializer()); + } + + @Override + public CompletableFuture abortStreamTransaction(String id) { + return executor.execute(abortStreamTransactionRequest(id), streamTransactionResponseDeserializer()); + } + + @Override + public CompletableFuture getStreamTransaction(String id) { + return executor.execute(getStreamTransactionRequest(id), streamTransactionResponseDeserializer()); + } + + @Override + public CompletableFuture> getStreamTransactions() { + return executor.execute(getStreamTransactionsRequest(), transactionsResponseDeserializer()); + } + + @Override + public CompletableFuture commitStreamTransaction(String id) { + return executor.execute(commitStreamTransactionRequest(id), streamTransactionResponseDeserializer()); + } + + @Override + public CompletableFuture getInfo() { + return executor.execute(getInfoRequest(), getInfoResponseDeserializer()); + } + + @Override + public CompletableFuture> executeTraversal( + final Class vertexClass, + final Class edgeClass, + final TraversalOptions options) { + final Request request = executeTraversalRequest(options); + return executor.execute(request, executeTraversalResponseDeserializer(vertexClass, edgeClass)); + } + + @Override + public CompletableFuture getDocument(final String id, final Class type) throws ArangoDBException { + DocumentUtil.validateDocumentId(id); + final String[] split = id.split("/"); + return collection(split[0]).getDocument(split[1], type); + } + + @Override + public CompletableFuture getDocument(final String id, final Class type, final DocumentReadOptions options) + throws ArangoDBException { + DocumentUtil.validateDocumentId(id); + final String[] split = id.split("/"); + return collection(split[0]).getDocument(split[1], type, options); + } + + @Override + public CompletableFuture reloadRouting() { + return executor.execute(reloadRoutingRequest(), Void.class); + } + + @Override + public ArangoRouteAsync route(final String... path) { + return new ArangoRouteAsyncImpl(this, createPath(path), Collections.emptyMap()); + } + + @Override + public CompletableFuture> getViews() { + return executor.execute(getViewsRequest(), getViewsResponseDeserializer()); + } + + @Override + public ArangoViewAsync view(final String name) { + return new ArangoViewAsyncImpl(this, name); + } + + @Override + public ArangoSearchAsync arangoSearch(final String name) { + return new ArangoSearchAsyncImpl(this, name); + } + + @Override + public CompletableFuture createView(final String name, final ViewType type) { + return executor.execute(createViewRequest(name, type), ViewEntity.class); + } + + @Override + public CompletableFuture createArangoSearch(final String name, final ArangoSearchCreateOptions options) { + return executor.execute(createArangoSearchRequest(name, options), ViewEntity.class); + } + + @Override + public CompletableFuture createAnalyzer(AnalyzerEntity options) { + return executor.execute(createAnalyzerRequest(options), AnalyzerEntity.class); + } + + @Override + public CompletableFuture getAnalyzer(String name) { + return executor.execute(getAnalyzerRequest(name), AnalyzerEntity.class); + } + + @Override + public CompletableFuture> getAnalyzers() { + return executor.execute(getAnalyzersRequest(), getAnalyzersResponseDeserializer()); + } + + @Override + public CompletableFuture deleteAnalyzer(String name) { + return executor.execute(deleteAnalyzerRequest(name, null), Void.class); + } + + @Override + public CompletableFuture deleteAnalyzer(String name, AnalyzerDeleteOptions options) { + return executor.execute(deleteAnalyzerRequest(name, options), Void.class); + } + } diff --git a/src/main/java/com/arangodb/internal/ArangoEdgeCollectionAsyncImpl.java b/src/main/java/com/arangodb/internal/ArangoEdgeCollectionAsyncImpl.java index 2f87de7..1e5d2b8 100644 --- a/src/main/java/com/arangodb/internal/ArangoEdgeCollectionAsyncImpl.java +++ b/src/main/java/com/arangodb/internal/ArangoEdgeCollectionAsyncImpl.java @@ -25,11 +25,7 @@ import com.arangodb.ArangoEdgeCollectionAsync; import com.arangodb.entity.EdgeEntity; import com.arangodb.entity.EdgeUpdateEntity; -import com.arangodb.model.DocumentReadOptions; -import com.arangodb.model.EdgeCreateOptions; -import com.arangodb.model.EdgeDeleteOptions; -import com.arangodb.model.EdgeReplaceOptions; -import com.arangodb.model.EdgeUpdateOptions; +import com.arangodb.model.*; /** * @author Mark Vollmary @@ -56,11 +52,11 @@ public CompletableFuture insertEdge(final T value, final EdgeCre @Override public CompletableFuture getEdge(final String key, final Class type) { - return executor.execute(getEdgeRequest(key, new DocumentReadOptions()), getEdgeResponseDeserializer(type)); + return executor.execute(getEdgeRequest(key, new GraphDocumentReadOptions()), getEdgeResponseDeserializer(type)); } @Override - public CompletableFuture getEdge(final String key, final Class type, final DocumentReadOptions options) { + public CompletableFuture getEdge(final String key, final Class type, final GraphDocumentReadOptions options) { return executor.execute(getEdgeRequest(key, options), getEdgeResponseDeserializer(type)); } diff --git a/src/main/java/com/arangodb/internal/ArangoVertexCollectionAsyncImpl.java b/src/main/java/com/arangodb/internal/ArangoVertexCollectionAsyncImpl.java index 5f1801b..ca26a79 100644 --- a/src/main/java/com/arangodb/internal/ArangoVertexCollectionAsyncImpl.java +++ b/src/main/java/com/arangodb/internal/ArangoVertexCollectionAsyncImpl.java @@ -25,11 +25,7 @@ import com.arangodb.ArangoVertexCollectionAsync; import com.arangodb.entity.VertexEntity; import com.arangodb.entity.VertexUpdateEntity; -import com.arangodb.model.DocumentReadOptions; -import com.arangodb.model.VertexCreateOptions; -import com.arangodb.model.VertexDeleteOptions; -import com.arangodb.model.VertexReplaceOptions; -import com.arangodb.model.VertexUpdateOptions; +import com.arangodb.model.*; /** * @author Mark Vollmary @@ -61,14 +57,14 @@ public CompletableFuture insertVertex(final T value, final Ver @Override public CompletableFuture getVertex(final String key, final Class type) { - return executor.execute(getVertexRequest(key, new DocumentReadOptions()), getVertexResponseDeserializer(type)); + return executor.execute(getVertexRequest(key, new GraphDocumentReadOptions()), getVertexResponseDeserializer(type)); } @Override public CompletableFuture getVertex( final String key, final Class type, - final DocumentReadOptions options) { + final GraphDocumentReadOptions options) { return executor.execute(getVertexRequest(key, options), getVertexResponseDeserializer(type)); } diff --git a/src/test/java/com/arangodb/ArangoCollectionTest.java b/src/test/java/com/arangodb/ArangoCollectionTest.java index ec7fd52..b734f92 100644 --- a/src/test/java/com/arangodb/ArangoCollectionTest.java +++ b/src/test/java/com/arangodb/ArangoCollectionTest.java @@ -29,7 +29,6 @@ import java.util.*; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionException; import java.util.concurrent.ExecutionException; import static org.hamcrest.CoreMatchers.notNullValue; @@ -45,6 +44,13 @@ public class ArangoCollectionTest extends BaseTest { private static final String COLLECTION_NAME = "db_collection_test"; + public ArangoCollectionTest() throws ExecutionException, InterruptedException { + ArangoCollectionAsync collection = db.collection(COLLECTION_NAME); + if (!collection.exists().get()) { + collection.create().get(); + } + } + @BeforeClass public static void setup() throws InterruptedException, ExecutionException { db.createCollection(COLLECTION_NAME, null).get(); @@ -52,18 +58,15 @@ public static void setup() throws InterruptedException, ExecutionException { @After public void teardown() throws InterruptedException, ExecutionException { - db.collection(COLLECTION_NAME).truncate().get(); + db.collection(COLLECTION_NAME).drop().get(); } @Test public void create() throws InterruptedException, ExecutionException { - try { - final CollectionEntity result = db.collection(COLLECTION_NAME + "_1").create().get(); - assertThat(result, is(notNullValue())); - assertThat(result.getId(), is(notNullValue())); - } finally { - db.collection(COLLECTION_NAME + "_1").drop().get(); - } + final CollectionEntity result = db.collection(COLLECTION_NAME + "_1").create().get(); + assertThat(result, is(notNullValue())); + assertThat(result.getId(), is(notNullValue())); + db.collection(COLLECTION_NAME + "_1").drop().get(); } @Test @@ -809,6 +812,35 @@ public void createHashIndex() throws InterruptedException, ExecutionException { .get(); } + @Test + public void createHashIndexWithOptions() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + + final HashIndexOptions options = new HashIndexOptions(); + options.name("myHashIndex"); + + final Collection fields = new ArrayList(); + fields.add("a"); + fields.add("b"); + final IndexEntity indexResult = db.collection(COLLECTION_NAME).ensureHashIndex(fields, options).get(); + assertThat(indexResult, is(notNullValue())); + assertThat(indexResult.getConstraint(), is(nullValue())); + assertThat(indexResult.getFields(), hasItem("a")); + assertThat(indexResult.getFields(), hasItem("b")); + assertThat(indexResult.getId(), startsWith(COLLECTION_NAME)); + assertThat(indexResult.getIsNewlyCreated(), is(true)); + assertThat(indexResult.getMinLength(), is(nullValue())); + if (arangoDB.getRole().get() == ServerRole.SINGLE) { + assertThat(indexResult.getSelectivityEstimate(), is(1.)); + } + assertThat(indexResult.getSparse(), is(false)); + assertThat(indexResult.getType(), is(IndexType.hash)); + assertThat(indexResult.getUnique(), is(false)); + assertThat(indexResult.getName(), is("myHashIndex")); + } + @Test public void createGeoIndex() throws InterruptedException, ExecutionException { final Collection fields = new ArrayList<>(); @@ -829,6 +861,33 @@ public void createGeoIndex() throws InterruptedException, ExecutionException { .get(); } + @Test + public void createGeoIndexWithOptions() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + + final GeoIndexOptions options = new GeoIndexOptions(); + options.name("myGeoIndex1"); + + final Collection fields = new ArrayList(); + fields.add("a"); + final IndexEntity indexResult = db.collection(COLLECTION_NAME).ensureGeoIndex(fields, options).get(); + assertThat(indexResult, is(notNullValue())); + assertThat(indexResult.getFields(), hasItem("a")); + assertThat(indexResult.getId(), startsWith(COLLECTION_NAME)); + assertThat(indexResult.getIsNewlyCreated(), is(true)); + assertThat(indexResult.getMinLength(), is(nullValue())); + assertThat(indexResult.getSparse(), is(true)); + assertThat(indexResult.getUnique(), is(false)); + if (requireVersion(3, 4)) { + assertThat(indexResult.getType(), is(IndexType.geo)); + } else { + assertThat(indexResult.getType(), is(IndexType.geo1)); + } + assertThat(indexResult.getName(), is("myGeoIndex1")); + } + @Test public void createGeo2Index() throws ExecutionException, InterruptedException { final Collection fields = new ArrayList(); @@ -855,6 +914,35 @@ public void createGeo2Index() throws ExecutionException, InterruptedException { }).get(); } + @Test + public void createGeo2IndexWithOptions() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + + final GeoIndexOptions options = new GeoIndexOptions(); + options.name("myGeoIndex2"); + + final Collection fields = new ArrayList(); + fields.add("a"); + fields.add("b"); + final IndexEntity indexResult = db.collection(COLLECTION_NAME).ensureGeoIndex(fields, options).get(); + assertThat(indexResult, is(notNullValue())); + assertThat(indexResult.getFields(), hasItem("a")); + assertThat(indexResult.getFields(), hasItem("b")); + assertThat(indexResult.getId(), startsWith(COLLECTION_NAME)); + assertThat(indexResult.getIsNewlyCreated(), is(true)); + assertThat(indexResult.getMinLength(), is(nullValue())); + assertThat(indexResult.getSparse(), is(true)); + assertThat(indexResult.getUnique(), is(false)); + if (requireVersion(3, 4)) { + assertThat(indexResult.getType(), is(IndexType.geo)); + } else { + assertThat(indexResult.getType(), is(IndexType.geo2)); + } + assertThat(indexResult.getName(), is("myGeoIndex2")); + } + @Test public void createSkiplistIndex() throws InterruptedException, ExecutionException { final boolean singleServer = arangoDB.getRole().get() == ServerRole.SINGLE; @@ -881,6 +969,32 @@ public void createSkiplistIndex() throws InterruptedException, ExecutionExceptio .get(); } + @Test + public void createSkiplistIndexWithOptions() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + + final SkiplistIndexOptions options = new SkiplistIndexOptions(); + options.name("mySkiplistIndex"); + + final Collection fields = new ArrayList(); + fields.add("a"); + fields.add("b"); + final IndexEntity indexResult = db.collection(COLLECTION_NAME).ensureSkiplistIndex(fields, options).get(); + assertThat(indexResult, is(notNullValue())); + assertThat(indexResult.getConstraint(), is(nullValue())); + assertThat(indexResult.getFields(), hasItem("a")); + assertThat(indexResult.getFields(), hasItem("b")); + assertThat(indexResult.getId(), startsWith(COLLECTION_NAME)); + assertThat(indexResult.getIsNewlyCreated(), is(true)); + assertThat(indexResult.getMinLength(), is(nullValue())); + assertThat(indexResult.getSparse(), is(false)); + assertThat(indexResult.getType(), is(IndexType.skiplist)); + assertThat(indexResult.getUnique(), is(false)); + assertThat(indexResult.getName(), is("mySkiplistIndex")); + } + @Test public void createPersistentIndex() throws InterruptedException, ExecutionException { final boolean singleServer = arangoDB.getRole().get() == ServerRole.SINGLE; @@ -907,6 +1021,32 @@ public void createPersistentIndex() throws InterruptedException, ExecutionExcept .get(); } + @Test + public void createPersistentIndexWithOptions() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + + final PersistentIndexOptions options = new PersistentIndexOptions(); + options.name("myPersistentIndex"); + + final Collection fields = new ArrayList(); + fields.add("a"); + fields.add("b"); + final IndexEntity indexResult = db.collection(COLLECTION_NAME).ensurePersistentIndex(fields, options).get(); + assertThat(indexResult, is(notNullValue())); + assertThat(indexResult.getConstraint(), is(nullValue())); + assertThat(indexResult.getFields(), hasItem("a")); + assertThat(indexResult.getFields(), hasItem("b")); + assertThat(indexResult.getId(), startsWith(COLLECTION_NAME)); + assertThat(indexResult.getIsNewlyCreated(), is(true)); + assertThat(indexResult.getMinLength(), is(nullValue())); + assertThat(indexResult.getSparse(), is(false)); + assertThat(indexResult.getType(), is(IndexType.persistent)); + assertThat(indexResult.getUnique(), is(false)); + assertThat(indexResult.getName(), is("myPersistentIndex")); + } + @Test public void createFulltextIndex() throws InterruptedException, ExecutionException { final Collection fields = new ArrayList<>(); @@ -927,6 +1067,69 @@ public void createFulltextIndex() throws InterruptedException, ExecutionExceptio .get(); } + @Test + public void createFulltextIndexWithOptions() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + + final FulltextIndexOptions options = new FulltextIndexOptions(); + options.name("myFulltextIndex"); + + final Collection fields = new ArrayList(); + fields.add("a"); + final IndexEntity indexResult = db.collection(COLLECTION_NAME).ensureFulltextIndex(fields, options).get(); + assertThat(indexResult, is(notNullValue())); + assertThat(indexResult.getConstraint(), is(nullValue())); + assertThat(indexResult.getFields(), hasItem("a")); + assertThat(indexResult.getId(), startsWith(COLLECTION_NAME)); + assertThat(indexResult.getIsNewlyCreated(), is(true)); + assertThat(indexResult.getSparse(), is(true)); + assertThat(indexResult.getType(), is(IndexType.fulltext)); + assertThat(indexResult.getUnique(), is(false)); + assertThat(indexResult.getName(), is("myFulltextIndex")); + } + + @Test + public void createTtlIndexWithoutOptions() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + final Collection fields = new ArrayList(); + fields.add("a"); + try { + final IndexEntity indexResult = db.collection(COLLECTION_NAME).ensureTtlIndex(fields, null).get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), instanceOf(ArangoDBException.class)); + assertThat(e.getCause().getMessage(), containsString("expireAfter attribute must be a number")); + assertThat(((ArangoDBException) e.getCause()).getResponseCode(), is(400)); + assertThat(((ArangoDBException) e.getCause()).getErrorNum(), is(10)); + } + } + + @Test + public void createTtlIndexWithOptions() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + final Collection fields = new ArrayList(); + fields.add("a"); + + final TtlIndexOptions options = new TtlIndexOptions(); + options.name("myTtlIndex"); + options.expireAfter(3600); + + final IndexEntity indexResult = db.collection(COLLECTION_NAME).ensureTtlIndex(fields, options).get(); + assertThat(indexResult, is(notNullValue())); + assertThat(indexResult.getFields(), hasItem("a")); + assertThat(indexResult.getId(), startsWith(COLLECTION_NAME)); + assertThat(indexResult.getIsNewlyCreated(), is(true)); + assertThat(indexResult.getType(), is(IndexType.ttl)); + assertThat(indexResult.getExpireAfter(), is(3600)); + assertThat(indexResult.getName(), is("myTtlIndex")); + } + @Test public void getIndexes() throws InterruptedException, ExecutionException { final int initialIndexCount = db.collection(COLLECTION_NAME).getIndexes().get().size(); @@ -1901,6 +2104,19 @@ public void rename() throws InterruptedException, ExecutionException { } } + @Test + public void responsibleShard() throws ExecutionException, InterruptedException { + if (arangoDB.getRole().get() != ServerRole.COORDINATOR) { + return; + } + if (!requireVersion(3, 5)) { + return; + } + ShardEntity shard = db.collection(COLLECTION_NAME).getResponsibleShard(new BaseDocument("testKey")).get(); + assertThat(shard, is(notNullValue())); + assertThat(shard.getShardId(), is(notNullValue())); + } + @Test public void getRevision() throws InterruptedException, ExecutionException { db.collection(COLLECTION_NAME).getRevision() diff --git a/src/test/java/com/arangodb/ArangoDatabaseTest.java b/src/test/java/com/arangodb/ArangoDatabaseTest.java index 4b41d3b..e8e9212 100644 --- a/src/test/java/com/arangodb/ArangoDatabaseTest.java +++ b/src/test/java/com/arangodb/ArangoDatabaseTest.java @@ -73,6 +73,13 @@ public void getVersion() throws InterruptedException, ExecutionException { .get(); } + @Test + public void getEngine() throws ExecutionException, InterruptedException { + final ArangoDBEngine engine = db.getEngine().get(); + assertThat(engine, is(notNullValue())); + assertThat(engine.getName(), is(notNullValue())); + } + @Test public void exists() throws InterruptedException, ExecutionException { assertThat(db.exists().get(), is(true)); @@ -120,6 +127,26 @@ public void createCollectionWithReplicationFactor() throws InterruptedException, } } + @Test + public void createCollectionWithMinReplicationFactor() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + + if (arangoDB.getRole().get() == ServerRole.SINGLE) { + return; + } + + final CollectionEntity result = db.createCollection(COLLECTION_NAME, + new CollectionCreateOptions().replicationFactor(2).minReplicationFactor(2)).get(); + assertThat(result, is(notNullValue())); + assertThat(result.getId(), is(notNullValue())); + assertThat(db.collection(COLLECTION_NAME).getProperties().get().getReplicationFactor(), is(2)); + assertThat(db.collection(COLLECTION_NAME).getProperties().get().getMinReplicationFactor(), is(2)); + assertThat(db.collection(COLLECTION_NAME).getProperties().get().getSatellite(), is(nullValue())); + db.collection(COLLECTION_NAME).drop(); + } + @Test public void createCollectionWithNumberOfShards() throws InterruptedException, ExecutionException { if (arangoDB.getRole().get() == ServerRole.SINGLE) { @@ -1034,20 +1061,18 @@ public void executeTraversal() throws InterruptedException, ExecutionException { @Test public void getDocument() throws InterruptedException, ExecutionException { - try { - db.createCollection(COLLECTION_NAME).get(); - final BaseDocument value = new BaseDocument(); - value.setKey("123"); - db.collection(COLLECTION_NAME).insertDocument(value).get(); - db.getDocument(COLLECTION_NAME + "/123", BaseDocument.class) - .whenComplete((document, ex) -> { - assertThat(document, is(notNullValue())); - assertThat(document.getKey(), is("123")); - }) - .get(); - } finally { - db.collection(COLLECTION_NAME).drop().get(); - } + String collectionName = COLLECTION_NAME + "getDocument"; + db.createCollection(collectionName).get(); + final BaseDocument value = new BaseDocument(); + value.setKey("123"); + db.collection(collectionName).insertDocument(value).get(); + db.getDocument(collectionName + "/123", BaseDocument.class) + .whenComplete((document, ex) -> { + assertThat(document, is(notNullValue())); + assertThat(document.getKey(), is("123")); + }) + .get(); + db.collection(collectionName).drop().get(); } @Test diff --git a/src/test/java/com/arangodb/ArangoEdgeCollectionTest.java b/src/test/java/com/arangodb/ArangoEdgeCollectionTest.java index cd64b1b..f7f2796 100644 --- a/src/test/java/com/arangodb/ArangoEdgeCollectionTest.java +++ b/src/test/java/com/arangodb/ArangoEdgeCollectionTest.java @@ -28,6 +28,7 @@ import java.util.Collection; import java.util.concurrent.ExecutionException; +import com.arangodb.model.*; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; @@ -39,11 +40,6 @@ import com.arangodb.entity.EdgeEntity; import com.arangodb.entity.EdgeUpdateEntity; import com.arangodb.entity.VertexEntity; -import com.arangodb.model.CollectionCreateOptions; -import com.arangodb.model.DocumentReadOptions; -import com.arangodb.model.EdgeDeleteOptions; -import com.arangodb.model.EdgeReplaceOptions; -import com.arangodb.model.EdgeUpdateOptions; /** * @author Mark Vollmary @@ -112,7 +108,7 @@ public void getEdge() throws InterruptedException, ExecutionException { public void getEdgeIfMatch() throws InterruptedException, ExecutionException { final BaseEdgeDocument value = createEdgeValue(); final EdgeEntity edge = db.graph(GRAPH_NAME).edgeCollection(EDGE_COLLECTION_NAME).insertEdge(value, null).get(); - final DocumentReadOptions options = new DocumentReadOptions().ifMatch(edge.getRev()); + final GraphDocumentReadOptions options = new GraphDocumentReadOptions().ifMatch(edge.getRev()); final BaseDocument document = db.graph(GRAPH_NAME).edgeCollection(EDGE_COLLECTION_NAME) .getEdge(edge.getKey(), BaseDocument.class, options).get(); assertThat(document, is(notNullValue())); @@ -123,7 +119,7 @@ public void getEdgeIfMatch() throws InterruptedException, ExecutionException { public void getEdgeIfMatchFail() throws InterruptedException, ExecutionException { final BaseEdgeDocument value = createEdgeValue(); final EdgeEntity edge = db.graph(GRAPH_NAME).edgeCollection(EDGE_COLLECTION_NAME).insertEdge(value, null).get(); - final DocumentReadOptions options = new DocumentReadOptions().ifMatch("no"); + final GraphDocumentReadOptions options = new GraphDocumentReadOptions().ifMatch("no"); try { db.graph(GRAPH_NAME).edgeCollection(EDGE_COLLECTION_NAME) .getEdge(edge.getKey(), BaseEdgeDocument.class, options).get(); @@ -137,7 +133,7 @@ public void getEdgeIfMatchFail() throws InterruptedException, ExecutionException public void getEdgeIfNoneMatch() throws InterruptedException, ExecutionException { final BaseEdgeDocument value = createEdgeValue(); final EdgeEntity edge = db.graph(GRAPH_NAME).edgeCollection(EDGE_COLLECTION_NAME).insertEdge(value, null).get(); - final DocumentReadOptions options = new DocumentReadOptions().ifNoneMatch("no"); + final GraphDocumentReadOptions options = new GraphDocumentReadOptions().ifNoneMatch("no"); final BaseDocument document = db.graph(GRAPH_NAME).edgeCollection(EDGE_COLLECTION_NAME) .getEdge(edge.getKey(), BaseDocument.class, options).get(); assertThat(document, is(notNullValue())); @@ -148,7 +144,7 @@ public void getEdgeIfNoneMatch() throws InterruptedException, ExecutionException public void getEdgeIfNoneMatchFail() throws InterruptedException, ExecutionException { final BaseEdgeDocument value = createEdgeValue(); final EdgeEntity edge = db.graph(GRAPH_NAME).edgeCollection(EDGE_COLLECTION_NAME).insertEdge(value, null).get(); - final DocumentReadOptions options = new DocumentReadOptions().ifNoneMatch(edge.getRev()); + final GraphDocumentReadOptions options = new GraphDocumentReadOptions().ifNoneMatch(edge.getRev()); try { db.graph(GRAPH_NAME).edgeCollection(EDGE_COLLECTION_NAME) .getEdge(edge.getKey(), BaseEdgeDocument.class, options).get(); diff --git a/src/test/java/com/arangodb/ArangoGraphTest.java b/src/test/java/com/arangodb/ArangoGraphTest.java index 75ede3b..d6ce62b 100644 --- a/src/test/java/com/arangodb/ArangoGraphTest.java +++ b/src/test/java/com/arangodb/ArangoGraphTest.java @@ -98,6 +98,29 @@ public void create() throws InterruptedException, ExecutionException { } } + @Test + public void createWithReplicationAndMinReplicationFactor() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + + // if we do not have a cluster => exit + if (arangoDB.getRole().get() == ServerRole.SINGLE) { + return; + } + + try { + final Collection edgeDefinitions = new ArrayList(); + final GraphEntity graph = db.createGraph(GRAPH_NAME + "_1", edgeDefinitions, new GraphCreateOptions().isSmart(true).replicationFactor(2).minReplicationFactor(2)).get(); + assertThat(graph, is(notNullValue())); + assertThat(graph.getName(), is(GRAPH_NAME + "_1")); + assertThat(graph.getMinReplicationFactor(), is(2)); + assertThat(graph.getReplicationFactor(), is(2)); + } finally { + db.graph(GRAPH_NAME + "_1").drop(); + } + } + @Test public void getGraphs() throws InterruptedException, ExecutionException { final Collection graphs = db.getGraphs().get(); diff --git a/src/test/java/com/arangodb/ArangoSearchTest.java b/src/test/java/com/arangodb/ArangoSearchTest.java index 511058c..3831585 100644 --- a/src/test/java/com/arangodb/ArangoSearchTest.java +++ b/src/test/java/com/arangodb/ArangoSearchTest.java @@ -20,26 +20,21 @@ package com.arangodb; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; -import java.util.Collection; +import java.util.*; import java.util.concurrent.ExecutionException; +import com.arangodb.entity.arangosearch.*; +import com.arangodb.model.arangosearch.AnalyzerDeleteOptions; import org.junit.BeforeClass; import org.junit.Test; import com.arangodb.entity.ServerRole; import com.arangodb.entity.ViewEntity; import com.arangodb.entity.ViewType; -import com.arangodb.entity.arangosearch.ArangoSearchPropertiesEntity; -import com.arangodb.entity.arangosearch.CollectionLink; -import com.arangodb.entity.arangosearch.ConsolidationPolicy; -import com.arangodb.entity.arangosearch.ConsolidationType; -import com.arangodb.entity.arangosearch.FieldLink; -import com.arangodb.entity.arangosearch.StoreValuesType; import com.arangodb.model.arangosearch.ArangoSearchCreateOptions; import com.arangodb.model.arangosearch.ArangoSearchPropertiesOptions; @@ -136,6 +131,49 @@ public void createWithOptions() throws InterruptedException, ExecutionException assertThat(db.arangoSearch(name).exists().get(), is(true)); } + @Test + public void createWithPrimarySort() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + final String name = "createWithPrimarySort"; + final ArangoSearchCreateOptions options = new ArangoSearchCreateOptions(); + + final PrimarySort primarySort = PrimarySort.on("myFieldName"); + primarySort.ascending(true); + options.primarySort(primarySort); + options.consolidationIntervalMsec(666666L); + + final ViewEntity info = db.arangoSearch(name).create(options).get(); + assertThat(info, is(not(nullValue()))); + assertThat(info.getId(), is(not(nullValue()))); + assertThat(info.getName(), is(name)); + assertThat(info.getType(), is(ViewType.ARANGO_SEARCH)); + assertThat(db.arangoSearch(name).exists().get(), is(true)); + } + + @Test + public void createWithCommitIntervalMsec() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + final String name = "createWithCommitIntervalMsec"; + final ArangoSearchCreateOptions options = new ArangoSearchCreateOptions(); + options.commitIntervalMsec(666666L); + + final ViewEntity info = db.arangoSearch(name).create(options).get(); + assertThat(info, is(not(nullValue()))); + assertThat(info.getId(), is(not(nullValue()))); + assertThat(info.getName(), is(name)); + assertThat(info.getType(), is(ViewType.ARANGO_SEARCH)); + assertThat(db.arangoSearch(name).exists().get(), is(true)); + + // check commit interval msec property + final ArangoSearchAsync view = db.arangoSearch(name); + final ArangoSearchPropertiesEntity properties = view.getProperties().get(); + assertThat(properties.getCommitIntervalMsec(), is(666666L)); + } + @Test public void getProperties() throws InterruptedException, ExecutionException { if (!requireVersion(3, 4)) { @@ -213,4 +251,197 @@ public void replaceProperties() throws InterruptedException, ExecutionException assertThat(link.getFields().iterator().next().getName(), is("value")); } + private void createGetAndDeleteAnalyzer(AnalyzerEntity options) throws ExecutionException, InterruptedException { + + String fullyQualifiedName = db.name() + "::" + options.getName(); + + // createAnalyzer + AnalyzerEntity createdAnalyzer = db.createAnalyzer(options).get(); + + assertThat(createdAnalyzer.getName(), is(fullyQualifiedName)); + assertThat(createdAnalyzer.getType(), is(options.getType())); + assertThat(createdAnalyzer.getFeatures(), is(options.getFeatures())); + assertThat(createdAnalyzer.getProperties(), is(options.getProperties())); + + // getAnalyzer + AnalyzerEntity gotAnalyzer = db.getAnalyzer(options.getName()).get(); + assertThat(gotAnalyzer.getName(), is(fullyQualifiedName)); + assertThat(gotAnalyzer.getType(), is(options.getType())); + assertThat(gotAnalyzer.getFeatures(), is(options.getFeatures())); + assertThat(gotAnalyzer.getProperties(), is(options.getProperties())); + + // getAnalyzers + @SuppressWarnings("OptionalGetWithoutIsPresent") + AnalyzerEntity foundAnalyzer = db.getAnalyzers().get().stream().filter(it -> it.getName().equals(fullyQualifiedName)) + .findFirst().get(); + + assertThat(foundAnalyzer.getName(), is(fullyQualifiedName)); + assertThat(foundAnalyzer.getType(), is(options.getType())); + assertThat(foundAnalyzer.getFeatures(), is(options.getFeatures())); + assertThat(foundAnalyzer.getProperties(), is(options.getProperties())); + + AnalyzerDeleteOptions deleteOptions = new AnalyzerDeleteOptions(); + deleteOptions.setForce(true); + + // deleteAnalyzer + db.deleteAnalyzer(options.getName(), deleteOptions).get(); + + try { + db.getAnalyzer(options.getName()).get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), instanceOf(ArangoDBException.class)); + assertThat(((ArangoDBException) e.getCause()).getResponseCode(), is(404)); + } + } + + @Test + public void identityAnalyzer() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + + String name = "test-" + UUID.randomUUID().toString(); + + Set features = new HashSet<>(); + features.add(AnalyzerFeature.frequency); + features.add(AnalyzerFeature.norm); + features.add(AnalyzerFeature.position); + + AnalyzerEntity options = new AnalyzerEntity(); + options.setFeatures(features); + options.setName(name); + options.setType(AnalyzerType.identity); + options.setProperties(Collections.emptyMap()); + + createGetAndDeleteAnalyzer(options); + } + + @Test + public void delimiterAnalyzer() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + + String name = "test-" + UUID.randomUUID().toString(); + + Set features = new HashSet<>(); + features.add(AnalyzerFeature.frequency); + features.add(AnalyzerFeature.norm); + features.add(AnalyzerFeature.position); + + AnalyzerEntity options = new AnalyzerEntity(); + options.setFeatures(features); + options.setName(name); + options.setType(AnalyzerType.delimiter); + options.setProperties(Collections.singletonMap("delimiter", "-")); + + createGetAndDeleteAnalyzer(options); + } + + @Test + public void stemAnalyzer() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + + String name = "test-" + UUID.randomUUID().toString(); + + Set features = new HashSet<>(); + features.add(AnalyzerFeature.frequency); + features.add(AnalyzerFeature.norm); + features.add(AnalyzerFeature.position); + + AnalyzerEntity options = new AnalyzerEntity(); + options.setFeatures(features); + options.setName(name); + options.setType(AnalyzerType.stem); + options.setProperties(Collections.singletonMap("locale", "ru.utf-8")); + + createGetAndDeleteAnalyzer(options); + } + + @Test + public void normAnalyzer() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + + String name = "test-" + UUID.randomUUID().toString(); + + Set features = new HashSet<>(); + features.add(AnalyzerFeature.frequency); + features.add(AnalyzerFeature.norm); + features.add(AnalyzerFeature.position); + + Map properties = new HashMap<>(); + properties.put("locale", "ru.utf-8"); + properties.put("case", "lower"); + properties.put("accent", true); + + AnalyzerEntity options = new AnalyzerEntity(); + options.setFeatures(features); + options.setName(name); + options.setType(AnalyzerType.norm); + options.setProperties(properties); + + createGetAndDeleteAnalyzer(options); + } + + @Test + public void ngramAnalyzer() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + + String name = "test-" + UUID.randomUUID().toString(); + + Set features = new HashSet<>(); + features.add(AnalyzerFeature.frequency); + features.add(AnalyzerFeature.norm); + features.add(AnalyzerFeature.position); + + Map properties = new HashMap<>(); + properties.put("max", 6L); + properties.put("min", 3L); + properties.put("preserveOriginal", true); + + AnalyzerEntity options = new AnalyzerEntity(); + options.setFeatures(features); + options.setName(name); + options.setType(AnalyzerType.ngram); + options.setProperties(properties); + + createGetAndDeleteAnalyzer(options); + } + + @Test + public void textAnalyzer() throws ExecutionException, InterruptedException { + if (!requireVersion(3, 5)) { + return; + } + + String name = "test-" + UUID.randomUUID().toString(); + + Set features = new HashSet<>(); + features.add(AnalyzerFeature.frequency); + features.add(AnalyzerFeature.norm); + features.add(AnalyzerFeature.position); + + Map properties = new HashMap<>(); + properties.put("locale", "ru.utf-8"); + properties.put("case", "lower"); + properties.put("stopwords", Collections.emptyList()); + properties.put("accent", true); + properties.put("stemming", true); + + AnalyzerEntity options = new AnalyzerEntity(); + options.setFeatures(features); + options.setName(name); + options.setType(AnalyzerType.text); + options.setProperties(properties); + + createGetAndDeleteAnalyzer(options); + } + } diff --git a/src/test/java/com/arangodb/ArangoVertexCollectionTest.java b/src/test/java/com/arangodb/ArangoVertexCollectionTest.java index d09ac31..00d9a87 100644 --- a/src/test/java/com/arangodb/ArangoVertexCollectionTest.java +++ b/src/test/java/com/arangodb/ArangoVertexCollectionTest.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.concurrent.ExecutionException; +import com.arangodb.model.*; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; @@ -34,11 +35,6 @@ import com.arangodb.entity.BaseDocument; import com.arangodb.entity.VertexEntity; import com.arangodb.entity.VertexUpdateEntity; -import com.arangodb.model.DocumentReadOptions; -import com.arangodb.model.GraphCreateOptions; -import com.arangodb.model.VertexDeleteOptions; -import com.arangodb.model.VertexReplaceOptions; -import com.arangodb.model.VertexUpdateOptions; /** * @author Mark Vollmary @@ -94,7 +90,7 @@ public void getVertex() throws InterruptedException, ExecutionException { public void getVertexIfMatch() throws InterruptedException, ExecutionException { final VertexEntity vertex = db.graph(GRAPH_NAME).vertexCollection(COLLECTION_NAME) .insertVertex(new BaseDocument(), null).get(); - final DocumentReadOptions options = new DocumentReadOptions().ifMatch(vertex.getRev()); + final GraphDocumentReadOptions options = new GraphDocumentReadOptions().ifMatch(vertex.getRev()); final BaseDocument document = db.graph(GRAPH_NAME).vertexCollection(COLLECTION_NAME) .getVertex(vertex.getKey(), BaseDocument.class, options).get(); assertThat(document, is(notNullValue())); @@ -105,7 +101,7 @@ public void getVertexIfMatch() throws InterruptedException, ExecutionException { public void getVertexIfMatchFail() throws InterruptedException, ExecutionException { final VertexEntity vertex = db.graph(GRAPH_NAME).vertexCollection(COLLECTION_NAME) .insertVertex(new BaseDocument(), null).get(); - final DocumentReadOptions options = new DocumentReadOptions().ifMatch("no"); + final GraphDocumentReadOptions options = new GraphDocumentReadOptions().ifMatch("no"); try { db.graph(GRAPH_NAME).vertexCollection(COLLECTION_NAME) .getVertex(vertex.getKey(), BaseDocument.class, options).get(); @@ -119,7 +115,7 @@ public void getVertexIfMatchFail() throws InterruptedException, ExecutionExcepti public void getVertexIfNoneMatch() throws InterruptedException, ExecutionException { final VertexEntity vertex = db.graph(GRAPH_NAME).vertexCollection(COLLECTION_NAME) .insertVertex(new BaseDocument(), null).get(); - final DocumentReadOptions options = new DocumentReadOptions().ifNoneMatch("no"); + final GraphDocumentReadOptions options = new GraphDocumentReadOptions().ifNoneMatch("no"); final BaseDocument document = db.graph(GRAPH_NAME).vertexCollection(COLLECTION_NAME) .getVertex(vertex.getKey(), BaseDocument.class, options).get(); assertThat(document, is(notNullValue())); @@ -130,7 +126,7 @@ public void getVertexIfNoneMatch() throws InterruptedException, ExecutionExcepti public void getVertexIfNoneMatchFail() throws InterruptedException, ExecutionException { final VertexEntity vertex = db.graph(GRAPH_NAME).vertexCollection(COLLECTION_NAME) .insertVertex(new BaseDocument(), null).get(); - final DocumentReadOptions options = new DocumentReadOptions().ifNoneMatch(vertex.getRev()); + final GraphDocumentReadOptions options = new GraphDocumentReadOptions().ifNoneMatch(vertex.getRev()); try { db.graph(GRAPH_NAME).vertexCollection(COLLECTION_NAME) .getVertex(vertex.getKey(), BaseDocument.class, options).get(); diff --git a/src/test/java/com/arangodb/BaseTest.java b/src/test/java/com/arangodb/BaseTest.java index d12dc1d..4c5ec8b 100644 --- a/src/test/java/com/arangodb/BaseTest.java +++ b/src/test/java/com/arangodb/BaseTest.java @@ -22,6 +22,8 @@ import java.util.concurrent.ExecutionException; +import com.arangodb.entity.ArangoDBEngine; +import com.arangodb.entity.ServerRole; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -64,4 +66,12 @@ protected static boolean requireVersion(final ArangoDBAsync arangoDB, final int final String[] split = arangoDB.getVersion().get().getVersion().split("\\."); return Integer.valueOf(split[0]) >= major && Integer.valueOf(split[1]) >= minor; } + + protected boolean requireStorageEngine(ArangoDBEngine.StorageEngineName name) throws ExecutionException, InterruptedException { + return name.equals(db.getEngine().get().getName()); + } + + protected boolean requireSingleServer() throws ExecutionException, InterruptedException { + return (arangoDB.getRole().get() == ServerRole.SINGLE); + } } diff --git a/src/test/java/com/arangodb/ConcurrentStreamTransactionsTest.java b/src/test/java/com/arangodb/ConcurrentStreamTransactionsTest.java new file mode 100644 index 0000000..c4babf1 --- /dev/null +++ b/src/test/java/com/arangodb/ConcurrentStreamTransactionsTest.java @@ -0,0 +1,124 @@ +/* + * DISCLAIMER + * + * Copyright 2016 ArangoDB GmbH, Cologne, Germany + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Copyright holder is ArangoDB GmbH, Cologne, Germany + */ + +package com.arangodb; + +import com.arangodb.entity.ArangoDBEngine; +import com.arangodb.entity.BaseDocument; +import com.arangodb.entity.StreamTransactionEntity; +import com.arangodb.model.DocumentCreateOptions; +import com.arangodb.model.StreamTransactionOptions; +import org.hamcrest.Matchers; +import org.junit.After; +import org.junit.Test; + +import java.util.UUID; +import java.util.concurrent.ExecutionException; + +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; +import static org.junit.Assume.assumeTrue; + +/** + * @author Michele Rastelli + */ +public class ConcurrentStreamTransactionsTest extends BaseTest { + + private static final String COLLECTION_NAME = "db_concurrent_stream_transactions_test"; + + public ConcurrentStreamTransactionsTest() throws ExecutionException, InterruptedException { + if (db.collection(COLLECTION_NAME).exists().get()) + db.collection(COLLECTION_NAME).drop().get(); + + db.createCollection(COLLECTION_NAME, null).get(); + } + + @After + public void teardown() throws ExecutionException, InterruptedException { + if (db.collection(COLLECTION_NAME).exists().get()) + db.collection(COLLECTION_NAME).drop().get(); + } + + @Test + public void conflictOnInsertDocumentWithNotYetCommittedTx() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + StreamTransactionEntity tx1 = db.beginStreamTransaction( + new StreamTransactionOptions().readCollections(COLLECTION_NAME).writeCollections(COLLECTION_NAME)).get(); + + StreamTransactionEntity tx2 = db.beginStreamTransaction( + new StreamTransactionOptions().readCollections(COLLECTION_NAME).writeCollections(COLLECTION_NAME)).get(); + + String key = UUID.randomUUID().toString(); + + // insert a document from within tx1 + db.collection(COLLECTION_NAME) + .insertDocument(new BaseDocument(key), new DocumentCreateOptions().streamTransactionId(tx1.getId())).get(); + + try { + // insert conflicting document from within tx2 + db.collection(COLLECTION_NAME).insertDocument(new BaseDocument(key), + new DocumentCreateOptions().streamTransactionId(tx2.getId())).get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), Matchers.instanceOf(ArangoDBException.class)); + e.getCause().printStackTrace(); + } + + db.abortStreamTransaction(tx1.getId()).get(); + db.abortStreamTransaction(tx2.getId()).get(); + } + + @Test + public void conflictOnInsertDocumentWithAlreadyCommittedTx() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + StreamTransactionEntity tx1 = db.beginStreamTransaction( + new StreamTransactionOptions().readCollections(COLLECTION_NAME).writeCollections(COLLECTION_NAME)).get(); + + StreamTransactionEntity tx2 = db.beginStreamTransaction( + new StreamTransactionOptions().readCollections(COLLECTION_NAME).writeCollections(COLLECTION_NAME)).get(); + + String key = UUID.randomUUID().toString(); + + // insert a document from within tx1 + db.collection(COLLECTION_NAME) + .insertDocument(new BaseDocument(key), new DocumentCreateOptions().streamTransactionId(tx1.getId())).get(); + + // commit tx1 + db.commitStreamTransaction(tx1.getId()).get(); + + try { + // insert conflicting document from within tx2 + db.collection(COLLECTION_NAME).insertDocument(new BaseDocument(key), + new DocumentCreateOptions().streamTransactionId(tx2.getId())).get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), Matchers.instanceOf(ArangoDBException.class)); + e.getCause().printStackTrace(); + } + + db.abortStreamTransaction(tx2.getId()).get(); + } +} diff --git a/src/test/java/com/arangodb/StreamTransactionTest.java b/src/test/java/com/arangodb/StreamTransactionTest.java new file mode 100644 index 0000000..84e31ab --- /dev/null +++ b/src/test/java/com/arangodb/StreamTransactionTest.java @@ -0,0 +1,360 @@ +/* + * DISCLAIMER + * + * Copyright 2016 ArangoDB GmbH, Cologne, Germany + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Copyright holder is ArangoDB GmbH, Cologne, Germany + */ + +package com.arangodb; + +import com.arangodb.entity.*; +import com.arangodb.model.DocumentCreateOptions; +import com.arangodb.model.DocumentReadOptions; +import com.arangodb.model.StreamTransactionOptions; +import org.junit.After; +import org.junit.Test; + +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; + +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; +import static org.junit.Assume.assumeTrue; + +/** + * @author Michele Rastelli + */ +public class StreamTransactionTest extends BaseTest { + + private static final String COLLECTION_NAME = "db_stream_transaction_test"; + + public StreamTransactionTest() throws ExecutionException, InterruptedException { + if (db.collection(COLLECTION_NAME).exists().get()) + db.collection(COLLECTION_NAME).drop().get(); + + db.createCollection(COLLECTION_NAME, null).get(); + } + + @After + public void teardown() throws ExecutionException, InterruptedException { + if (db.collection(COLLECTION_NAME).exists().get()) + db.collection(COLLECTION_NAME).drop().get(); + } + + @Test + public void beginStreamTransaction() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + StreamTransactionEntity tx = db.beginStreamTransaction(null).get(); + assertThat(tx.getId(), is(notNullValue())); + assertThat(tx.getStatus(), is(StreamTransactionStatus.running)); + db.abortStreamTransaction(tx.getId()).get(); + } + + @Test + public void beginStreamTransactionWithNonExistingCollectionsShouldThrow() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + try { + db.beginStreamTransaction(new StreamTransactionOptions().writeCollections("notExistingCollection")).get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), instanceOf(ArangoDBException.class)); + } + } + + @Test + public void abortStreamTransaction() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + StreamTransactionEntity begunTx = db.beginStreamTransaction(null).get(); + StreamTransactionEntity abortedTx = db.abortStreamTransaction(begunTx.getId()).get(); + + assertThat(abortedTx.getId(), is(notNullValue())); + assertThat(abortedTx.getId(), is(begunTx.getId())); + assertThat(abortedTx.getStatus(), is(StreamTransactionStatus.aborted)); + } + + @Test + public void abortStreamTransactionTwice() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + StreamTransactionEntity begunTx = db.beginStreamTransaction(null).get(); + db.abortStreamTransaction(begunTx.getId()).get(); + db.abortStreamTransaction(begunTx.getId()).get(); + } + + @Test + public void abortStreamTransactionWhenTransactionIdDoesNotExistsShouldThrow() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + try { + db.abortStreamTransaction("000000").get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), instanceOf(ArangoDBException.class)); + } + } + + @Test + public void abortStreamTransactionWithInvalidTransactionIdShouldThrow() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + try { + db.abortStreamTransaction("invalidTransactionId").get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), instanceOf(ArangoDBException.class)); + } + } + + @Test + public void abortCommittedStreamTransactionShouldThrow() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + StreamTransactionEntity createdTx = db.beginStreamTransaction(null).get(); + db.commitStreamTransaction(createdTx.getId()).get(); + + try { + db.abortStreamTransaction(createdTx.getId()).get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), instanceOf(ArangoDBException.class)); + } + } + + @Test + public void getStreamTransaction() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + StreamTransactionEntity createdTx = db.beginStreamTransaction(null).get(); + StreamTransactionEntity gotTx = db.getStreamTransaction(createdTx.getId()).get(); + + assertThat(gotTx.getId(), is(notNullValue())); + assertThat(gotTx.getId(), is(createdTx.getId())); + assertThat(gotTx.getStatus(), is(StreamTransactionStatus.running)); + + db.abortStreamTransaction(createdTx.getId()).get(); + } + + @Test + public void getStreamTransactionWhenTransactionIdDoesNotExistsShouldThrow() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + try { + db.getStreamTransaction("000000").get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), instanceOf(ArangoDBException.class)); + } + } + + @Test + public void getStreamTransactionWithInvalidTransactionIdShouldThrow() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + try { + db.getStreamTransaction("invalidTransactionId").get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), instanceOf(ArangoDBException.class)); + } + } + + @Test + public void commitStreamTransaction() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + StreamTransactionEntity createdTx = db.beginStreamTransaction(null).get(); + StreamTransactionEntity committedTx = db.commitStreamTransaction(createdTx.getId()).get(); + + assertThat(committedTx.getId(), is(notNullValue())); + assertThat(committedTx.getId(), is(createdTx.getId())); + assertThat(committedTx.getStatus(), is(StreamTransactionStatus.committed)); + } + + @Test + public void commitStreamTransactionTwice() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + StreamTransactionEntity createdTx = db.beginStreamTransaction(null).get(); + db.commitStreamTransaction(createdTx.getId()).get(); + db.commitStreamTransaction(createdTx.getId()).get(); + } + + @Test + public void commitStreamTransactionWhenTransactionIdDoesNotExistsShouldThrow() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + try { + db.commitStreamTransaction("000000").get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), instanceOf(ArangoDBException.class)); + } + } + + @Test + public void commitStreamTransactionWithInvalidTransactionIdShouldThrow() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + try { + db.commitStreamTransaction("invalidTransactionId").get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), instanceOf(ArangoDBException.class)); + } + } + + @Test + public void commitAbortedStreamTransactionShouldThrow() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + StreamTransactionEntity createdTx = db.beginStreamTransaction(null).get(); + db.abortStreamTransaction(createdTx.getId()).get(); + + try { + db.commitStreamTransaction(createdTx.getId()).get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), instanceOf(ArangoDBException.class)); + } + } + + @Test + public void getDocument() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + StreamTransactionEntity tx = db + .beginStreamTransaction(new StreamTransactionOptions().readCollections(COLLECTION_NAME)).get(); + + // insert a document from outside the tx + DocumentCreateEntity externalDoc = db.collection(COLLECTION_NAME) + .insertDocument(new BaseDocument(), null).get(); + + // assert that the document is not found from within the tx + assertThat(db.collection(COLLECTION_NAME).getDocument(externalDoc.getKey(), BaseDocument.class, + new DocumentReadOptions().streamTransactionId(tx.getId())).get(), is(nullValue())); + + db.abortStreamTransaction(tx.getId()).get(); + } + + @Test + public void getDocumentWithNonExistingTransactionIdShouldThrow() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + try { + db.collection(COLLECTION_NAME) + .getDocument("docId", BaseDocument.class, new DocumentReadOptions().streamTransactionId("123456")) + .get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), instanceOf(ArangoDBException.class)); + } + } + + @Test + public void insertDocumentWithNonExistingTransactionIdShouldThrow() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + try { + DocumentCreateEntity txDoc = db.collection(COLLECTION_NAME) + .insertDocument(new BaseDocument(), new DocumentCreateOptions().streamTransactionId("123456")).get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), instanceOf(ArangoDBException.class)); + } + } + + @Test + public void getDocumentWithInvalidTransactionIdShouldThrow() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + try { + db.collection(COLLECTION_NAME) + .getDocument("docId", BaseDocument.class, new DocumentReadOptions().streamTransactionId("abcde")) + .get(); + fail(); + } catch (ExecutionException e) { + assertThat(e.getCause(), instanceOf(ArangoDBException.class)); + } + } + + @Test + public void getStreamTransactions() throws ExecutionException, InterruptedException { + assumeTrue(requireSingleServer()); + assumeTrue(requireVersion(3, 5)); + assumeTrue(requireStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb)); + + StreamTransactionEntity tx1 = db.beginStreamTransaction(null).get(); + StreamTransactionEntity tx2 = db.beginStreamTransaction(null).get(); + + List createdIds = Arrays.asList(tx1.getId(), tx2.getId()); + Set gotTxs = db.getStreamTransactions().get().stream(). + filter(it -> createdIds.contains(it.getId())).collect(Collectors.toSet()); + + assertThat(gotTxs.size(), is(createdIds.size())); + assertThat(gotTxs.stream() + .allMatch(it -> it.getStatus() == StreamTransactionStatus.running), is(true)); + + db.abortStreamTransaction(tx1.getId()).get(); + db.abortStreamTransaction(tx2.getId()).get(); + } + +} diff --git a/src/test/java/com/arangodb/serde/CustomSerdeTest.java b/src/test/java/com/arangodb/serde/CustomSerdeTest.java new file mode 100644 index 0000000..fc5bba9 --- /dev/null +++ b/src/test/java/com/arangodb/serde/CustomSerdeTest.java @@ -0,0 +1,165 @@ +/* + * DISCLAIMER + * + * Copyright 2016 ArangoDB GmbH, Cologne, Germany + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Copyright holder is ArangoDB GmbH, Cologne, Germany + */ + +package com.arangodb.serde; + + +import com.arangodb.*; +import com.arangodb.entity.BaseDocument; +import com.arangodb.model.DocumentCreateOptions; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.math.BigInteger; +import java.util.Collections; +import java.util.HashMap; +import java.util.UUID; +import java.util.concurrent.ExecutionException; + +import static com.fasterxml.jackson.databind.DeserializationFeature.USE_BIG_INTEGER_FOR_INTS; +import static com.fasterxml.jackson.databind.SerializationFeature.WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + +/** + * @author Michele Rastelli + */ +public class CustomSerdeTest { + + private static String COLLECTION_NAME = "collection"; + + private ArangoDatabaseAsync db; + private ArangoCollectionAsync collection; + + @Before + public void init() throws ExecutionException, InterruptedException { + VelocyJack velocyJack = new VelocyJack(); + velocyJack.configure((mapper) -> { + mapper.configure(WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED, true); + mapper.configure(USE_BIG_INTEGER_FOR_INTS, true); + }); + ArangoDBAsync arangoDB = new ArangoDBAsync.Builder().serializer(velocyJack).build(); + + String TEST_DB = "custom-serde-test"; + db = arangoDB.db(TEST_DB); + if (!db.exists().get()) { + db.create().get(); + } + + collection = db.collection(COLLECTION_NAME); + if (!collection.exists().get()) { + collection.create().get(); + } + } + + @After + public void shutdown() throws ExecutionException, InterruptedException { + db.drop().get(); + } + + @Test + public void aqlSerialization() throws ExecutionException, InterruptedException { + String key = "test-" + UUID.randomUUID().toString(); + + BaseDocument doc = new BaseDocument(key); + doc.addAttribute("arr", Collections.singletonList("hello")); + doc.addAttribute("int", 10); + + HashMap params = new HashMap<>(); + params.put("doc", doc); + params.put("@collection", COLLECTION_NAME); + + BaseDocument result = db.query( + "INSERT @doc INTO @@collection RETURN NEW", + params, + BaseDocument.class + ).get().first(); + + assertThat(result.getAttribute("arr"), instanceOf(String.class)); + assertThat(result.getAttribute("arr"), is("hello")); + assertThat(result.getAttribute("int"), instanceOf(BigInteger.class)); + assertThat(result.getAttribute("int"), is(BigInteger.valueOf(10))); + } + + @Test + public void aqlDeserialization() throws ExecutionException, InterruptedException { + String key = "test-" + UUID.randomUUID().toString(); + + BaseDocument doc = new BaseDocument(key); + doc.addAttribute("arr", Collections.singletonList("hello")); + doc.addAttribute("int", 10); + + collection.insertDocument(doc, null).get(); + + final BaseDocument result = db.query( + "RETURN DOCUMENT(@docId)", + Collections.singletonMap("docId", COLLECTION_NAME + "/" + key), + BaseDocument.class + ).get().first(); + + assertThat(result.getAttribute("arr"), instanceOf(String.class)); + assertThat(result.getAttribute("arr"), is("hello")); + assertThat(result.getAttribute("int"), instanceOf(BigInteger.class)); + assertThat(result.getAttribute("int"), is(BigInteger.valueOf(10))); + } + + @Test + public void insertDocument() throws ExecutionException, InterruptedException { + String key = "test-" + UUID.randomUUID().toString(); + + BaseDocument doc = new BaseDocument(key); + doc.addAttribute("arr", Collections.singletonList("hello")); + doc.addAttribute("int", 10); + + BaseDocument result = collection.insertDocument( + doc, + new DocumentCreateOptions().returnNew(true) + ).get().getNew(); + + assertThat(result.getAttribute("arr"), instanceOf(String.class)); + assertThat(result.getAttribute("arr"), is("hello")); + assertThat(result.getAttribute("int"), instanceOf(BigInteger.class)); + assertThat(result.getAttribute("int"), is(BigInteger.valueOf(10))); + } + + @Test + public void getDocument() throws ExecutionException, InterruptedException { + String key = "test-" + UUID.randomUUID().toString(); + + BaseDocument doc = new BaseDocument(key); + doc.addAttribute("arr", Collections.singletonList("hello")); + doc.addAttribute("int", 10); + + collection.insertDocument(doc, null).get(); + + final BaseDocument result = db.collection(COLLECTION_NAME).getDocument( + key, + BaseDocument.class, + null).get(); + + assertThat(result.getAttribute("arr"), instanceOf(String.class)); + assertThat(result.getAttribute("arr"), is("hello")); + assertThat(result.getAttribute("int"), instanceOf(BigInteger.class)); + assertThat(result.getAttribute("int"), is(BigInteger.valueOf(10))); + } + +} diff --git a/src/test/resources/arangodb.properties b/src/test/resources/arangodb.properties index 5682618..4646405 100644 --- a/src/test/resources/arangodb.properties +++ b/src/test/resources/arangodb.properties @@ -1 +1,2 @@ arangodb.hosts=127.0.0.1:8529 +arangodb.password=test \ No newline at end of file