fix merge errors

Author: aburmeis

src/main/java/com/arangodb/springframework/core/template/ArangoTemplate.java

@@ -262,22 +262,26 @@ private static void ensureTtlIndex(final CollectionOperations collection, final
 	}
 
     private static void ensureMDIndex(final CollectionOperations collection, final MDIndex annotation, Collection<IndexEntity> existing) {
-        collection.ensureMDIndex(Arrays.asList(annotation.fields()),
-                new MDIndexOptions()
-                        .unique(annotation.unique())
-                        .fieldValueTypes(annotation.fieldValueTypes())
-                        .sparse(annotation.sparse())
-        );
+        final MDIndexOptions options = new MDIndexOptions()
+                .unique(annotation.unique())
+                .fieldValueTypes(annotation.fieldValueTypes())
+                .sparse(annotation.sparse());
+        Collection<String> fields = Arrays.asList(annotation.fields());
+        if (createNewIndex(IndexType.mdi, fields, existing)) {
+            existing.add(collection.ensureMDIndex(fields, options));
+        }
     }
 
     private static void ensureMDPrefixedIndex(final CollectionOperations collection, final MDPrefixedIndex annotation, Collection<IndexEntity> existing) {
-        collection.ensureMDPrefixedIndex(Arrays.asList(annotation.fields()),
-                new MDPrefixedIndexOptions()
-                        .prefixFields(Arrays.asList(annotation.prefixFields()))
-                        .unique(annotation.unique())
-                        .fieldValueTypes(annotation.fieldValueTypes())
-                        .sparse(annotation.sparse())
-        );
+        final MDPrefixedIndexOptions options = new MDPrefixedIndexOptions()
+                .prefixFields(Arrays.asList(annotation.prefixFields()))
+                .unique(annotation.unique())
+                .fieldValueTypes(annotation.fieldValueTypes())
+                .sparse(annotation.sparse());
+        Collection<String> fields = Arrays.asList(annotation.fields());
+        if (createNewIndex(IndexType.mdiPrefixed, fields, existing)) {
+            existing.add(collection.ensureMDPrefixedIndex(fields, options));
+        }
     }
 
 	private static boolean createNewIndex(IndexType type, Collection<String> fields, Collection<IndexEntity> existing) {
@@ -574,7 +578,7 @@ public <T> T repsert(final T value, AqlQueryOptions options) throws DataAccessEx
                     bindVars,
 					options, clazz
             );
-            result = it.hasNext() ? it.next() : null;
+            result = it.next();
         } catch (final ArangoDBException e) {
             throw translateException(e);
         }