Update view api

Author: mpv1989

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

@@ -37,10 +37,11 @@
 import com.arangodb.entity.ViewType;
 import com.arangodb.entity.arangosearch.ArangoSearchProperties;
 import com.arangodb.entity.arangosearch.ArangoSearchPropertiesEntity;
-import com.arangodb.entity.arangosearch.ConsolidationPolicy;
 import com.arangodb.entity.arangosearch.ConsolidateType;
+import com.arangodb.entity.arangosearch.ConsolidationPolicy;
 import com.arangodb.internal.velocystream.internal.AuthenticationRequest;
 import com.arangodb.model.TraversalOptions;
+import com.arangodb.model.arangosearch.ArangoSearchPropertiesOptions;
 import com.arangodb.velocypack.VPackFieldNamingStrategy;
 import com.arangodb.velocypack.VPackModule;
 import com.arangodb.velocypack.VPackParserModule;
@@ -77,6 +78,8 @@ public String translateName(final Field field) {
 context.registerSerializer(Permissions.class, VPackSerializers.PERMISSIONS);
 context.registerSerializer(ReplicationFactor.class, VPackSerializers.REPLICATION_FACTOR);
 context.registerSerializer(ViewType.class, VPackSerializers.VIEW_TYPE);
+context.registerSerializer(ArangoSearchPropertiesOptions.class,
+VPackSerializers.ARANGO_SEARCH_PROPERTIES_OPTIONS);
 context.registerSerializer(ArangoSearchProperties.class, VPackSerializers.ARANGO_SEARCH_PROPERTIES);
 context.registerSerializer(ConsolidateType.class, VPackSerializers.CONSOLIDATE_TYPE);
 

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

@@ -41,6 +41,7 @@
 import com.arangodb.internal.velocystream.internal.AuthenticationRequest;
 import com.arangodb.model.TraversalOptions;
 import com.arangodb.model.TraversalOptions.Order;
+import com.arangodb.model.arangosearch.ArangoSearchPropertiesOptions;
 import com.arangodb.velocypack.VPackBuilder;
 import com.arangodb.velocypack.VPackSerializationContext;
 import com.arangodb.velocypack.VPackSerializer;
@@ -208,17 +209,26 @@ public void serialize(
 }
 };
 
+public static final VPackSerializer<ArangoSearchPropertiesOptions> ARANGO_SEARCH_PROPERTIES_OPTIONS = new VPackSerializer<ArangoSearchPropertiesOptions>() {
+@Override
+public void serialize(
+final VPackBuilder builder,
+final String attribute,
+final ArangoSearchPropertiesOptions value,
+final VPackSerializationContext context) throws VPackException {
+builder.add(ValueType.OBJECT);
+context.serialize(builder, attribute, value.getProperties());
+builder.close();
+}
+};
+
 public static final VPackSerializer<ArangoSearchProperties> ARANGO_SEARCH_PROPERTIES = new VPackSerializer<ArangoSearchProperties>() {
 @Override
 public void serialize(
 final VPackBuilder builder,
 final String attribute,
 final ArangoSearchProperties value,
 final VPackSerializationContext context) throws VPackException {
-final boolean wrap = !attribute.startsWith("_");
-if (wrap) {
-builder.add("properties", ValueType.OBJECT);
-}
 final Long consolidationIntervalMsec = value.getConsolidationIntervalMsec();
 if (consolidationIntervalMsec != null) {
 builder.add("consolidationIntervalMsec", consolidationIntervalMsec);
@@ -259,9 +269,6 @@ public void serialize(
 }
 builder.close();
 }
-if (wrap) {
-builder.close();
-}
 }
 };
 

src/main/java/com/arangodb/model/arangosearch/ArangoSearchPropertiesOptions.java

@@ -30,11 +30,15 @@
  */
 public class ArangoSearchPropertiesOptions {
 
-private final ArangoSearchProperties _properties;
+private final ArangoSearchProperties properties;
 
 public ArangoSearchPropertiesOptions() {
 super();
-_properties = new ArangoSearchProperties();
+properties = new ArangoSearchProperties();
+}
+
+public ArangoSearchProperties getProperties() {
+return properties;
 }
 
 /**
@@ -47,7 +51,7 @@ public ArangoSearchPropertiesOptions() {
  * @return options
  */
 public ArangoSearchPropertiesOptions consolidationIntervalMsec(final Long consolidationIntervalMsec) {
-_properties.setConsolidationIntervalMsec(consolidationIntervalMsec);
+properties.setConsolidationIntervalMsec(consolidationIntervalMsec);
 return this;
 }
 
@@ -61,7 +65,7 @@ public ArangoSearchPropertiesOptions consolidationIntervalMsec(final Long consol
  * @return options
  */
 public ArangoSearchPropertiesOptions cleanupIntervalStep(final Long cleanupIntervalStep) {
-_properties.setCleanupIntervalStep(cleanupIntervalStep);
+properties.setCleanupIntervalStep(cleanupIntervalStep);
 return this;
 }
 
@@ -71,7 +75,7 @@ public ArangoSearchPropertiesOptions cleanupIntervalStep(final Long cleanupInter
  * @return options
  */
 public ArangoSearchPropertiesOptions consolidationPolicy(final ConsolidationPolicy consolidationPolicy) {
-_properties.setConsolidationPolicy(consolidationPolicy);
+properties.setConsolidationPolicy(consolidationPolicy);
 return this;
 }
 
@@ -81,7 +85,7 @@ public ArangoSearchPropertiesOptions consolidationPolicy(final ConsolidationPoli
  * @return options
  */
 public ArangoSearchPropertiesOptions link(final CollectionLink... links) {
-_properties.addLink(links);
+properties.addLink(links);
 return this;
 }
 

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

@@ -50,7 +50,6 @@
 import com.arangodb.entity.AqlExecutionExplainEntity.ExecutionPlan;
 import com.arangodb.entity.AqlFunctionEntity;
 import com.arangodb.entity.AqlParseEntity;
-import com.arangodb.entity.AqlParseEntity.AstNode;
 import com.arangodb.entity.ArangoDBVersion;
 import com.arangodb.entity.ArangoDBVersion.License;
 import com.arangodb.entity.BaseDocument;
@@ -874,29 +873,6 @@ public void parseQuery() {
 assertThat(parse.getBindVars(), is(empty()));
 assertThat(parse.getCollections().size(), is(0));
 assertThat(parse.getAst().size(), is(1));
-final AstNode root = parse.getAst().iterator().next();
-assertThat(root.getType(), is("root"));
-assertThat(root.getName(), is(nullValue()));
-assertThat(root.getSubNodes(), is(notNullValue()));
-assertThat(root.getSubNodes().size(), is(2));
-final Iterator<AstNode> iterator = root.getSubNodes().iterator();
-final AstNode for_ = iterator.next();
-assertThat(for_.getType(), is("for"));
-assertThat(for_.getSubNodes(), is(notNullValue()));
-assertThat(for_.getSubNodes().size(), is(2));
-final Iterator<AstNode> iterator2 = for_.getSubNodes().iterator();
-final AstNode first = iterator2.next();
-assertThat(first.getType(), is("variable"));
-assertThat(first.getName(), is("i"));
-final AstNode second = iterator2.next();
-assertThat(second.getType(), is("range"));
-assertThat(second.getName(), is(nullValue()));
-final AstNode return_ = iterator.next();
-assertThat(return_.getType(), is("return"));
-assertThat(return_.getSubNodes(), is(notNullValue()));
-assertThat(return_.getSubNodes().size(), is(1));
-assertThat(return_.getSubNodes().iterator().next().getType(), is("reference"));
-assertThat(return_.getSubNodes().iterator().next().getName(), is("i"));
 }
 
 @Test

src/test/java/com/arangodb/ArangoSearchTest.java

@@ -124,7 +124,8 @@ public void createWithOptions() {
 return;
 }
 final String name = VIEW_NAME + "_createtest";
-final ViewEntity info = db.arangoSearch(name).create(new ArangoSearchCreateOptions());
+final ArangoSearchCreateOptions options = new ArangoSearchCreateOptions();
+final ViewEntity info = db.arangoSearch(name).create(options);
 assertThat(info, is(not(nullValue())));
 assertThat(info.getId(), is(not(nullValue())));
 assertThat(info.getName(), is(name));