only post minReplFactor when set, removed some finally statements within tests, added minReplFactor to deserializer

Author: hkernbach

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

@@ -95,6 +95,7 @@ public String translateName(final Field field) {
 		context.registerDeserializer(Permissions.class, VPackDeserializers.PERMISSIONS);
 		context.registerDeserializer(QueryExecutionState.class, VPackDeserializers.QUERY_EXECUTION_STATE);
 		context.registerDeserializer(ReplicationFactor.class, VPackDeserializers.REPLICATION_FACTOR);
+		context.registerDeserializer(MinReplicationFactor.class, VPackDeserializers.MIN_REPLICATION_FACTOR);
 		context.registerDeserializer(ViewType.class, VPackDeserializers.VIEW_TYPE);
 		context.registerDeserializer(ArangoSearchProperties.class, VPackDeserializers.ARANGO_SEARCH_PROPERTIES);
 		context.registerDeserializer(ArangoSearchPropertiesEntity.class, VPackDeserializers.ARANGO_SEARCH_PROPERTIES_ENTITY);

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

@@ -197,7 +197,9 @@ public void serialize(
 				final String attribute,
 				final MinReplicationFactor value,
 				final VPackSerializationContext context) throws VPackException {
-				builder.add(attribute, value.getMinReplicationFactor());
+			    if (value.getMinReplicationFactor() != null) {
+					builder.add(attribute, value.getMinReplicationFactor());
+				}
 		}
 	};
 

src/test/java/com/arangodb/ArangoCollectionTest.java

@@ -99,8 +99,9 @@ public void create() {
 			final CollectionEntity result = db.collection(COLLECTION_NAME + "_1").create();
 			assertThat(result, is(notNullValue()));
 			assertThat(result.getId(), is(notNullValue()));
-		} finally {
 			db.collection(COLLECTION_NAME + "_1").drop();
+		} catch (final ArangoDBException e) {
+			throw e;
 		}
 	}
 

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

@@ -234,10 +234,9 @@ public void createCollectionWithMinReplicationFactor() {
                         assertThat(db.collection(COLLECTION_NAME).getProperties().getReplicationFactor(), is(2));
                         assertThat(db.collection(COLLECTION_NAME).getProperties().getMinReplicationFactor(), is(2));
                         assertThat(db.collection(COLLECTION_NAME).getProperties().getSatellite(), is(nullValue()));
+                        db.collection(COLLECTION_NAME).drop();
                 } catch (final ArangoDBException e) {
                         e.printStackTrace();
-                } finally {
-                        db.collection(COLLECTION_NAME).drop();
                 }
 
         }