Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions src/main/java/com/arangodb/ArangoCollection.java
Original file line number Diff line number Diff line change
Expand Up @@ -654,31 +654,6 @@ <T> MultiDocumentEntity<DocumentDeleteEntity<T>> deleteDocuments(
*/
void drop(boolean isSystem) throws ArangoDBException;

/**
* Tells the server to load the collection into memory.
*
* @return information about the collection
* @throws ArangoDBException
* @see <a href="https://www.arangodb.com/docs/stable/http/collection-modifying.html#load-collection">API
* Documentation</a>
* @deprecated MMFiles only
*/
@Deprecated
CollectionEntity load() throws ArangoDBException;

/**
* Tells the server to remove the collection from memory. This call does not delete any documents. You can use the
* collection afterwards; in which case it will be loaded into memory, again.
*
* @return information about the collection
* @throws ArangoDBException
* @see <a href="https://www.arangodb.com/docs/stable/http/collection-modifying.html#unload-collection">API
* Documentation</a>
* @deprecated MMFiles only
*/
@Deprecated
CollectionEntity unload() throws ArangoDBException;

/**
* Returns information about the collection
*
Expand Down
13 changes: 0 additions & 13 deletions src/main/java/com/arangodb/ArangoDB.java
Original file line number Diff line number Diff line change
Expand Up @@ -1001,19 +1001,6 @@ default Boolean createDatabase(String name) throws ArangoDBException {
*/
Response execute(Request request, HostHandle hostHandle) throws ArangoDBException;

/**
* Returns fatal, error, warning or info log messages from the server's global log.
*
* @param options Additional options, can be null
* @return the log messages
* @throws ArangoDBException
* @see <a href= "https://www.arangodb.com/docs/stable/http/administration-and-monitoring.html#read-global-logs-from-the-server">API
* Documentation</a>
* @deprecated use {@link #getLogEntries(LogOptions)} instead
*/
@Deprecated
LogEntity getLogs(LogOptions options) throws ArangoDBException;

/**
* Returns the server logs
*
Expand Down
16 changes: 0 additions & 16 deletions src/main/java/com/arangodb/ArangoDatabase.java
Original file line number Diff line number Diff line change
Expand Up @@ -623,22 +623,6 @@ GraphEntity createGraph(String name, Collection<EdgeDefinition> edgeDefinitions,
*/
DatabaseEntity getInfo() throws ArangoDBException;

/**
* 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
* @throws ArangoDBException
* @see <a href= "https://www.arangodb.com/docs/stable/http/traversal.html#executes-a-traversal">API
* Documentation</a>
* @deprecated use {@link this#query(String, Map, AqlQueryOptions, Class)}
*/
@Deprecated
<V, E> TraversalEntity<V, E> executeTraversal(Class<V> vertexClass, Class<E> edgeClass, TraversalOptions options)
throws ArangoDBException;

/**
* Reads a single document
*
Expand Down
23 changes: 0 additions & 23 deletions src/main/java/com/arangodb/async/ArangoCollectionAsync.java
Original file line number Diff line number Diff line change
Expand Up @@ -609,29 +609,6 @@ CompletableFuture<IndexEntity> ensureFulltextIndex(
*/
CompletableFuture<Void> drop(final boolean isSystem);

/**
* Loads a collection into memory.
*
* @return information about the collection
* @see <a href="https://www.arangodb.com/docs/stable/http/collection-modifying.html#load-collection">API
* Documentation</a>
* @deprecated MMFiles only
*/
@Deprecated
CompletableFuture<CollectionEntity> load();

/**
* Removes a collection from memory. This call does not delete any documents. You can use the collection afterwards;
* in which case it will be loaded into memory, again.
*
* @return information about the collection
* @see <a href="https://www.arangodb.com/docs/stable/http/collection-modifying.html#unload-collection">API
* Documentation</a>
* @deprecated MMFiles only
*/
@Deprecated
CompletableFuture<CollectionEntity> unload();

/**
* Returns information about the collection
*
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/com/arangodb/async/ArangoDBAsync.java
Original file line number Diff line number Diff line change
Expand Up @@ -299,18 +299,6 @@ default CompletableFuture<Boolean> createDatabase(final String name) {
*/
CompletableFuture<Response> execute(final Request request);

/**
* Returns fatal, error, warning or info log messages from the server's global log.
*
* @param options Additional options, can be null
* @return the log messages
* @see <a href= "https://www.arangodb.com/docs/stable/http/administration-and-monitoring.html#read-global-logs-from-the-server">API
* Documentation</a>
* @deprecated use {@link #getLogEntries(LogOptions)} instead
*/
@Deprecated
CompletableFuture<LogEntity> getLogs(final LogOptions options);

/**
* Returns the server logs
*
Expand Down
17 changes: 0 additions & 17 deletions src/main/java/com/arangodb/async/ArangoDatabaseAsync.java
Original file line number Diff line number Diff line change
Expand Up @@ -603,23 +603,6 @@ CompletableFuture<GraphEntity> createGraph(
*/
CompletableFuture<DatabaseEntity> 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 <a href= "https://www.arangodb.com/docs/stable/http/traversal.html#executes-a-traversal">API
* Documentation</a>
* @deprecated use {@link this#query(String, Map, AqlQueryOptions, Class)}
*/
@Deprecated
<V, E> CompletableFuture<TraversalEntity<V, E>> executeTraversal(
final Class<V> vertexClass,
final Class<E> edgeClass,
final TraversalOptions options);

/**
* Reads a single document
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -360,16 +360,6 @@ public CompletableFuture<Void> drop(final boolean isSystem) {
return executor.execute(dropRequest(isSystem), Void.class);
}

@Override
public CompletableFuture<CollectionEntity> load() {
return executor.execute(loadRequest(), CollectionEntity.class);
}

@Override
public CompletableFuture<CollectionEntity> unload() {
return executor.execute(unloadRequest(), CollectionEntity.class);
}

@Override
public CompletableFuture<CollectionEntity> getInfo() {
return executor.execute(getInfoRequest(), CollectionEntity.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,6 @@ public CompletableFuture<Response> execute(final Request request) {
return executor.execute(request, response -> response);
}

@Override
public CompletableFuture<LogEntity> getLogs(final LogOptions options) {
return executor.execute(getLogsRequest(options), LogEntity.class);
}

@Override
public CompletableFuture<LogEntriesEntity> getLogEntries(final LogOptions options) {
return executor.execute(getLogEntriesRequest(options), LogEntriesEntity.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
import com.arangodb.model.GraphCreateOptions;
import com.arangodb.model.StreamTransactionOptions;
import com.arangodb.model.TransactionOptions;
import com.arangodb.model.TraversalOptions;
import com.arangodb.model.arangosearch.AnalyzerDeleteOptions;
import com.arangodb.model.arangosearch.ArangoSearchCreateOptions;
import com.arangodb.velocypack.Type;
Expand Down Expand Up @@ -401,15 +400,6 @@ public CompletableFuture<DatabaseEntity> getInfo() {
return executor.execute(getInfoRequest(), getInfoResponseDeserializer());
}

@Override
public <V, E> CompletableFuture<TraversalEntity<V, E>> executeTraversal(
final Class<V> vertexClass,
final Class<E> edgeClass,
final TraversalOptions options) {
final Request request = executeTraversalRequest(options);
return executor.execute(request, executeTraversalResponseDeserializer(vertexClass, edgeClass));
}

@Override
public <T> CompletableFuture<T> getDocument(final String id, final Class<T> type) throws ArangoDBException {
DocumentUtil.validateDocumentId(id);
Expand Down
10 changes: 0 additions & 10 deletions src/main/java/com/arangodb/entity/CollectionEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public class CollectionEntity implements Entity {
private String id;
private String name;
private Boolean waitForSync;
private Boolean isVolatile;
private Boolean isSystem;
private CollectionStatus status;
private CollectionType type;
Expand All @@ -41,11 +40,6 @@ public CollectionEntity() {
super();
}

/**
* @deprecated Accessing collections by their internal ID instead of accessing them by name is deprecated and highly
* discouraged. This functionality may be removed in future versions of ArangoDB.
*/
@Deprecated
public String getId() {
return id;
}
Expand All @@ -58,10 +52,6 @@ public Boolean getWaitForSync() {
return waitForSync;
}

public Boolean getIsVolatile() {
return isVolatile;
}

public Boolean getIsSystem() {
return isSystem;
}
Expand Down
45 changes: 0 additions & 45 deletions src/main/java/com/arangodb/entity/CollectionPropertiesEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,47 +29,18 @@
*/
public class CollectionPropertiesEntity extends CollectionEntity {

private Boolean doCompact;
private Long journalSize;
private Integer indexBuckets;
private KeyOptions keyOptions;
private Long count;
private Integer numberOfShards;
private Collection<String> shardKeys;
private final ReplicationFactor replicationFactor;
private final MinReplicationFactor minReplicationFactor;
private Integer writeConcern;
private String shardingStrategy; // cluster option
private String smartJoinAttribute; // enterprise option

public CollectionPropertiesEntity() {
super();
replicationFactor = new ReplicationFactor();
minReplicationFactor = new MinReplicationFactor();
}

public Boolean getDoCompact() {
return doCompact;
}

public void setDoCompact(final Boolean doCompact) {
this.doCompact = doCompact;
}

public Long getJournalSize() {
return journalSize;
}

public void setJournalSize(final Long journalSize) {
this.journalSize = journalSize;
}

public Integer getIndexBuckets() {
return indexBuckets;
}

public void setIndexBuckets(final Integer indexBuckets) {
this.indexBuckets = indexBuckets;
}

public KeyOptions getKeyOptions() {
Expand Down Expand Up @@ -119,22 +90,6 @@ public void setReplicationFactor(final Integer replicationFactor) {
this.replicationFactor.setReplicationFactor(replicationFactor);
}

/**
* @deprecated use {@link #getWriteConcern()} instead
*/
@Deprecated
public Integer getMinReplicationFactor() {
return minReplicationFactor.getMinReplicationFactor();
}

/**
* @deprecated use {@link #setWriteConcern(Integer)} instead
*/
@Deprecated
public void setMinReplicationFactor(final Integer minReplicationFactor) {
this.minReplicationFactor.setMinReplicationFactor(minReplicationFactor);
}

public Integer getWriteConcern() {
return writeConcern;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/arangodb/entity/CollectionStatus.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/
public enum CollectionStatus {

NEW_BORN_COLLECTION(1), UNLOADED(2), LOADED(3), IN_THE_PROCESS_OF_BEING_UNLOADED(4), DELETED(5);
LOADED(3),DELETED(5);

private final int status;

Expand Down
9 changes: 0 additions & 9 deletions src/main/java/com/arangodb/entity/GraphEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public class GraphEntity implements Entity {
private Integer numberOfShards;
private String smartGraphAttribute;
private ReplicationFactor replicationFactor;
private Integer minReplicationFactor;
private Integer writeConcern;

public String getName() {
Expand Down Expand Up @@ -75,14 +74,6 @@ public Boolean getSatellite() {
return this.replicationFactor.getSatellite();
}

/**
* @deprecated use {@link #getWriteConcern()} instead
*/
@Deprecated
public Integer getMinReplicationFactor() {
return minReplicationFactor;
}

public Integer getWriteConcern() {
return writeConcern;
}
Expand Down
Loading