Skip to content

Commit 74c7561

Browse files
rashtaorashtao
committed
renamed collection validation to schema
1 parent 597b007 commit 74c7561

File tree

7 files changed

+31
-31
lines changed

7 files changed

+31
-31
lines changed

‎src/main/java/com/arangodb/entity/CollectionEntity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
package com.arangodb.entity;
2222

23-
import com.arangodb.model.CollectionValidation;
23+
import com.arangodb.model.CollectionSchema;
2424

2525
/**
2626
* @author Mark Vollmary
@@ -35,7 +35,7 @@ public class CollectionEntity implements Entity {
3535
private Boolean isSystem;
3636
private CollectionStatus status;
3737
private CollectionType type;
38-
private CollectionValidation validation;
38+
private CollectionSchema schema;
3939

4040
public CollectionEntity() {
4141
super();
@@ -69,8 +69,8 @@ public CollectionType getType() {
6969
return type;
7070
}
7171

72-
public CollectionValidation getValidation() {
73-
return validation;
72+
public CollectionSchema getSchema() {
73+
return schema;
7474
}
7575

7676
}

‎src/main/java/com/arangodb/internal/velocypack/VPackDeserializers.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.arangodb.entity.*;
2424
import com.arangodb.entity.arangosearch.*;
2525
import com.arangodb.entity.arangosearch.analyzer.*;
26-
import com.arangodb.model.CollectionValidation;
26+
import com.arangodb.model.CollectionSchema;
2727
import com.arangodb.velocypack.VPackDeserializer;
2828
import com.arangodb.velocypack.VPackParser;
2929
import com.arangodb.velocypack.VPackSlice;
@@ -260,10 +260,10 @@ protected static FieldLink deserializeField(final Entry<String, VPackSlice> fiel
260260
return null;
261261
};
262262

263-
public static final VPackDeserializer<CollectionValidation> COLLECTION_VALIDATION = (parent, vpack, context) -> {
263+
public static final VPackDeserializer<CollectionSchema> COLLECTION_VALIDATION = (parent, vpack, context) -> {
264264
VPackParser parser = new VPackParser.Builder().build();
265-
CollectionValidation collectionValidation = new CollectionValidation();
266-
collectionValidation.setLevel(CollectionValidation.Level.of(vpack.get("level").getAsString()));
265+
CollectionSchema collectionValidation = new CollectionSchema();
266+
collectionValidation.setLevel(CollectionSchema.Level.of(vpack.get("level").getAsString()));
267267
collectionValidation.setRule(parser.toJson(vpack.get("rule"), true));
268268
collectionValidation.setMessage(vpack.get("message").getAsString());
269269
return collectionValidation;

‎src/main/java/com/arangodb/internal/velocypack/VPackDriverModule.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.arangodb.entity.arangosearch.ConsolidationType;
2828
import com.arangodb.entity.arangosearch.analyzer.SearchAnalyzer;
2929
import com.arangodb.internal.velocystream.internal.AuthenticationRequest;
30-
import com.arangodb.model.CollectionValidation;
30+
import com.arangodb.model.CollectionSchema;
3131
import com.arangodb.model.TraversalOptions;
3232
import com.arangodb.model.arangosearch.ArangoSearchPropertiesOptions;
3333
import com.arangodb.velocypack.VPackModule;
@@ -67,7 +67,7 @@ public <C extends VPackSetupContext<C>> void setup(final C context) {
6767
context.registerSerializer(ArangoSearchPropertiesOptions.class, VPackSerializers.ARANGO_SEARCH_PROPERTIES_OPTIONS);
6868
context.registerSerializer(ArangoSearchProperties.class, VPackSerializers.ARANGO_SEARCH_PROPERTIES);
6969
context.registerSerializer(ConsolidationType.class, VPackSerializers.CONSOLIDATE_TYPE);
70-
context.registerSerializer(CollectionValidation.class, VPackSerializers.COLLECTION_VALIDATION);
70+
context.registerSerializer(CollectionSchema.class, VPackSerializers.COLLECTION_VALIDATION);
7171

7272
context.registerDeserializer(Response.class, VPackDeserializers.RESPONSE);
7373
context.registerDeserializer(CollectionType.class, VPackDeserializers.COLLECTION_TYPE);
@@ -86,7 +86,7 @@ public <C extends VPackSetupContext<C>> void setup(final C context) {
8686
context.registerDeserializer(ArangoSearchProperties.class, VPackDeserializers.ARANGO_SEARCH_PROPERTIES);
8787
context.registerDeserializer(ArangoSearchPropertiesEntity.class, VPackDeserializers.ARANGO_SEARCH_PROPERTIES_ENTITY);
8888
context.registerDeserializer(ConsolidationPolicy.class, VPackDeserializers.CONSOLIDATE);
89-
context.registerDeserializer(CollectionValidation.class, VPackDeserializers.COLLECTION_VALIDATION);
89+
context.registerDeserializer(CollectionSchema.class, VPackDeserializers.COLLECTION_VALIDATION);
9090
}
9191

9292
@Override

‎src/main/java/com/arangodb/internal/velocypack/VPackSerializers.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.arangodb.entity.*;
2424
import com.arangodb.entity.arangosearch.*;
2525
import com.arangodb.internal.velocystream.internal.AuthenticationRequest;
26-
import com.arangodb.model.CollectionValidation;
26+
import com.arangodb.model.CollectionSchema;
2727
import com.arangodb.model.TraversalOptions;
2828
import com.arangodb.model.TraversalOptions.Order;
2929
import com.arangodb.model.arangosearch.ArangoSearchPropertiesOptions;
@@ -223,7 +223,7 @@ private static void serializeFieldLinks(final VPackBuilder builder, final Collec
223223

224224
public static final VPackSerializer<ConsolidationType> CONSOLIDATE_TYPE = (builder, attribute, value, context) -> builder.add(attribute, value.toString().toLowerCase());
225225

226-
public static final VPackSerializer<CollectionValidation> COLLECTION_VALIDATION = (builder, attribute, value, context) -> {
226+
public static final VPackSerializer<CollectionSchema> COLLECTION_VALIDATION = (builder, attribute, value, context) -> {
227227
VPackParser parser = new VPackParser.Builder().build();
228228
VPackSlice rule = parser.fromJson(value.getRule(), true);
229229
final Map<String, Object> doc = new HashMap<>();

‎src/main/java/com/arangodb/model/CollectionCreateOptions.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class CollectionCreateOptions {
4747
private String shardingStrategy; // cluster option
4848
private String smartJoinAttribute; // enterprise option
4949

50-
private CollectionValidation validation;
50+
private CollectionSchema schema;
5151

5252
public CollectionCreateOptions() {
5353
super();
@@ -325,12 +325,12 @@ public CollectionCreateOptions distributeShardsLike(final String distributeShard
325325
return this;
326326
}
327327

328-
public CollectionValidation getValidation() {
329-
return validation;
328+
public CollectionSchema getSchema() {
329+
return schema;
330330
}
331331

332-
public CollectionCreateOptions setValidation(final CollectionValidation validation) {
333-
this.validation = validation;
332+
public CollectionCreateOptions setSchema(final CollectionSchema schema) {
333+
this.schema = schema;
334334
return this;
335335
}
336336

src/main/java/com/arangodb/model/CollectionValidation.java renamed to src/main/java/com/arangodb/model/CollectionSchema.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* @author Michele Rastelli
2727
*/
28-
public class CollectionValidation {
28+
public class CollectionSchema {
2929
private String rule;
3030
private Level level;
3131
private String message;
@@ -34,7 +34,7 @@ public String getRule() {
3434
return rule;
3535
}
3636

37-
public CollectionValidation setRule(String rule) {
37+
public CollectionSchema setRule(String rule) {
3838
this.rule = rule;
3939
return this;
4040
}
@@ -43,7 +43,7 @@ public Level getLevel() {
4343
return level;
4444
}
4545

46-
public CollectionValidation setLevel(Level level) {
46+
public CollectionSchema setLevel(Level level) {
4747
this.level = level;
4848
return this;
4949
}
@@ -52,7 +52,7 @@ public String getMessage() {
5252
return message;
5353
}
5454

55-
public CollectionValidation setMessage(String message) {
55+
public CollectionSchema setMessage(String message) {
5656
this.message = message;
5757
return this;
5858
}

‎src/test/java/com/arangodb/ArangoDatabaseTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -311,21 +311,21 @@ public void createCollectionWithJsonSchema() {
311311

312312
final CollectionEntity result = db
313313
.createCollection(name, new CollectionCreateOptions()
314-
.setValidation(
315-
new CollectionValidation()
316-
.setLevel(CollectionValidation.Level.NEW)
314+
.setSchema(
315+
new CollectionSchema()
316+
.setLevel(CollectionSchema.Level.NEW)
317317
.setMessage(message)
318318
.setRule(rule)
319319
)
320320
);
321-
assertThat(result.getValidation().getLevel(), is(CollectionValidation.Level.NEW));
322-
assertThat(result.getValidation().getRule(), is(rule));
323-
assertThat(result.getValidation().getMessage(), is(message));
321+
assertThat(result.getSchema().getLevel(), is(CollectionSchema.Level.NEW));
322+
assertThat(result.getSchema().getRule(), is(rule));
323+
assertThat(result.getSchema().getMessage(), is(message));
324324

325325
CollectionPropertiesEntity props = db.collection(name).getProperties();
326-
assertThat(props.getValidation().getLevel(), is(CollectionValidation.Level.NEW));
327-
assertThat(props.getValidation().getRule(), is(rule));
328-
assertThat(props.getValidation().getMessage(), is(message));
326+
assertThat(props.getSchema().getLevel(), is(CollectionSchema.Level.NEW));
327+
assertThat(props.getSchema().getRule(), is(rule));
328+
assertThat(props.getSchema().getMessage(), is(message));
329329

330330
BaseDocument doc = new BaseDocument();
331331
doc.addAttribute("number", 33);

0 commit comments

Comments
 (0)