Skip to content

Commit 7c9601d

Browse files
committed
fix client side validations in async API (DE-703)
1 parent 3cb8771 commit 7c9601d

15 files changed

+189
-195
lines changed

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

Lines changed: 50 additions & 52 deletions
Large diffs are not rendered by default.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.arangodb.ArangoDBException;
2525
import com.arangodb.ArangoDatabase;
2626
import com.arangodb.entity.*;
27-
import com.arangodb.internal.util.DocumentUtil;
2827
import com.arangodb.model.*;
2928
import com.arangodb.util.RawData;
3029
import org.slf4j.Logger;
@@ -137,7 +136,6 @@ public <T> T getDocument(final String key, final Class<T> type) {
137136

138137
@Override
139138
public <T> T getDocument(final String key, final Class<T> type, final DocumentReadOptions options) {
140-
DocumentUtil.validateDocumentKey(key);
141139
try {
142140
return executorSync().execute(getDocumentRequest(key, options), getDocumentResponseDeserializer(type));
143141
} catch (final ArangoDBException e) {

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ public CompletableFuture<Boolean> createDatabase(final String dbName) {
7474

7575
@Override
7676
public CompletableFuture<Boolean> createDatabase(DBCreateOptions options) {
77-
return executorAsync().execute(createDatabaseRequest(options), createDatabaseResponseDeserializer());
77+
return executorAsync().execute(() -> createDatabaseRequest(options), createDatabaseResponseDeserializer());
7878
}
7979

8080
@Override
8181
public CompletableFuture<Collection<String>> getDatabases() {
82-
return executorAsync().execute(getDatabasesRequest(ArangoRequestParam.SYSTEM), getDatabaseResponseDeserializer());
82+
return executorAsync().execute(() -> getDatabasesRequest(ArangoRequestParam.SYSTEM), getDatabaseResponseDeserializer());
8383
}
8484

8585
@Override
@@ -89,7 +89,7 @@ public CompletableFuture<Collection<String>> getAccessibleDatabases() {
8989

9090
@Override
9191
public CompletableFuture<Collection<String>> getAccessibleDatabasesFor(final String user) {
92-
return executorAsync().execute(getAccessibleDatabasesForRequest(ArangoRequestParam.SYSTEM, user),
92+
return executorAsync().execute(() -> getAccessibleDatabasesForRequest(ArangoRequestParam.SYSTEM, user),
9393
getAccessibleDatabasesForResponseDeserializer());
9494
}
9595

@@ -105,68 +105,68 @@ public CompletableFuture<ArangoDBEngine> getEngine() {
105105

106106
@Override
107107
public CompletableFuture<ServerRole> getRole() {
108-
return executorAsync().execute(getRoleRequest(), getRoleResponseDeserializer());
108+
return executorAsync().execute(this::getRoleRequest, getRoleResponseDeserializer());
109109
}
110110

111111
@Override
112112
public CompletableFuture<String> getServerId() {
113-
return executorAsync().execute(getServerIdRequest(), getServerIdResponseDeserializer());
113+
return executorAsync().execute(this::getServerIdRequest, getServerIdResponseDeserializer());
114114
}
115115

116116
@Override
117117
public CompletableFuture<UserEntity> createUser(final String user, final String passwd) {
118-
return executorAsync().execute(createUserRequest(ArangoRequestParam.SYSTEM, user, passwd, new UserCreateOptions()),
118+
return executorAsync().execute(() -> createUserRequest(ArangoRequestParam.SYSTEM, user, passwd, new UserCreateOptions()),
119119
UserEntity.class);
120120
}
121121

122122
@Override
123123
public CompletableFuture<UserEntity> createUser(final String user, final String passwd, final UserCreateOptions options) {
124-
return executorAsync().execute(createUserRequest(ArangoRequestParam.SYSTEM, user, passwd, options), UserEntity.class);
124+
return executorAsync().execute(() -> createUserRequest(ArangoRequestParam.SYSTEM, user, passwd, options), UserEntity.class);
125125
}
126126

127127
@Override
128128
public CompletableFuture<Void> deleteUser(final String user) {
129-
return executorAsync().execute(deleteUserRequest(ArangoRequestParam.SYSTEM, user), Void.class);
129+
return executorAsync().execute(() -> deleteUserRequest(ArangoRequestParam.SYSTEM, user), Void.class);
130130
}
131131

132132
@Override
133133
public CompletableFuture<UserEntity> getUser(final String user) {
134-
return executorAsync().execute(getUserRequest(ArangoRequestParam.SYSTEM, user), UserEntity.class);
134+
return executorAsync().execute(() -> getUserRequest(ArangoRequestParam.SYSTEM, user), UserEntity.class);
135135
}
136136

137137
@Override
138138
public CompletableFuture<Collection<UserEntity>> getUsers() {
139-
return executorAsync().execute(getUsersRequest(ArangoRequestParam.SYSTEM), getUsersResponseDeserializer());
139+
return executorAsync().execute(() -> getUsersRequest(ArangoRequestParam.SYSTEM), getUsersResponseDeserializer());
140140
}
141141

142142
@Override
143143
public CompletableFuture<UserEntity> updateUser(final String user, final UserUpdateOptions options) {
144-
return executorAsync().execute(updateUserRequest(ArangoRequestParam.SYSTEM, user, options), UserEntity.class);
144+
return executorAsync().execute(() -> updateUserRequest(ArangoRequestParam.SYSTEM, user, options), UserEntity.class);
145145
}
146146

147147
@Override
148148
public CompletableFuture<UserEntity> replaceUser(final String user, final UserUpdateOptions options) {
149-
return executorAsync().execute(replaceUserRequest(ArangoRequestParam.SYSTEM, user, options), UserEntity.class);
149+
return executorAsync().execute(() -> replaceUserRequest(ArangoRequestParam.SYSTEM, user, options), UserEntity.class);
150150
}
151151

152152
@Override
153153
public CompletableFuture<Void> grantDefaultDatabaseAccess(final String user, final Permissions permissions) {
154-
return executorAsync().execute(updateUserDefaultDatabaseAccessRequest(user, permissions), Void.class);
154+
return executorAsync().execute(() -> updateUserDefaultDatabaseAccessRequest(user, permissions), Void.class);
155155
}
156156

157157
@Override
158158
public CompletableFuture<Void> grantDefaultCollectionAccess(final String user, final Permissions permissions) {
159-
return executorAsync().execute(updateUserDefaultCollectionAccessRequest(user, permissions), Void.class);
159+
return executorAsync().execute(() -> updateUserDefaultCollectionAccessRequest(user, permissions), Void.class);
160160
}
161161

162162
@Override
163163
public <T> CompletableFuture<Response<T>> execute(Request<?> request, Class<T> type) {
164-
return executorAsync().execute(executeRequest(request), responseDeserializer(type));
164+
return executorAsync().execute(() -> executeRequest(request), responseDeserializer(type));
165165
}
166166

167167
@Override
168168
public CompletableFuture<LogEntriesEntity> getLogEntries(final LogOptions options) {
169-
return executorAsync().execute(getLogEntriesRequest(options), LogEntriesEntity.class);
169+
return executorAsync().execute(() -> getLogEntriesRequest(options), LogEntriesEntity.class);
170170
}
171171

172172
@Override
@@ -176,7 +176,7 @@ public CompletableFuture<LogLevelEntity> getLogLevel() {
176176

177177
@Override
178178
public CompletableFuture<LogLevelEntity> getLogLevel(final LogLevelOptions options) {
179-
return executorAsync().execute(getLogLevelRequest(options), LogLevelEntity.class);
179+
return executorAsync().execute(() -> getLogLevelRequest(options), LogLevelEntity.class);
180180
}
181181

182182
@Override
@@ -186,12 +186,12 @@ public CompletableFuture<LogLevelEntity> setLogLevel(final LogLevelEntity entity
186186

187187
@Override
188188
public CompletableFuture<LogLevelEntity> setLogLevel(final LogLevelEntity entity, final LogLevelOptions options) {
189-
return executorAsync().execute(setLogLevelRequest(entity, options), LogLevelEntity.class);
189+
return executorAsync().execute(() -> setLogLevelRequest(entity, options), LogLevelEntity.class);
190190
}
191191

192192
@Override
193193
public CompletableFuture<Collection<QueryOptimizerRule>> getQueryOptimizerRules() {
194-
return executorAsync().execute(getQueryOptimizerRulesRequest(), SerdeUtils.constructListType(QueryOptimizerRule.class));
194+
return executorAsync().execute(this::getQueryOptimizerRulesRequest, SerdeUtils.constructListType(QueryOptimizerRule.class));
195195
}
196196

197197
}

0 commit comments

Comments
 (0)