Update AbstractMongoCollection

Change method visibility to public for extensibility

Author: justinchuch

core/src/main/java/de/bwaldvogel/mongo/backend/AbstractMongoCollection.java

@@ -1,7 +1,5 @@
 package de.bwaldvogel.mongo.backend;
 
-import static de.bwaldvogel.mongo.backend.Constants.ID_FIELD;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -33,6 +31,8 @@
 import de.bwaldvogel.mongo.exception.MongoServerException;
 import de.bwaldvogel.mongo.oplog.Oplog;
 
+import static de.bwaldvogel.mongo.backend.Constants.ID_FIELD;
+
 public abstract class AbstractMongoCollection<P> implements MongoCollection<P> {
 
     private static final Logger log = LoggerFactory.getLogger(AbstractMongoCollection.class);
@@ -217,7 +217,7 @@ public void addIndex(Index<P> index) {
         indexes.add(index);
     }
 
-    private Index<P> findByName(String indexName) {
+    protected Index<P> findByName(String indexName) {
         return indexes.stream()
             .filter(index -> index.getName().equals(indexName))
             .findFirst()
@@ -244,7 +244,7 @@ public void dropIndex(String indexName) {
         indexes.remove(indexToDrop);
     }
 
-    private void modifyField(Document document, String modifier, Document update, ArrayFilters arrayFilters,
+    protected void modifyField(Document document, String modifier, Document update, ArrayFilters arrayFilters,
                              Integer matchPos, boolean isUpsert) {
         Document change = (Document) update.get(modifier);
         UpdateOperator updateOperator = getUpdateOperator(modifier, change);
@@ -256,7 +256,7 @@ protected String getIdField() {
         return options.getIdField();
     }
 
-    private UpdateOperator getUpdateOperator(String modifier, Document change) {
+    protected UpdateOperator getUpdateOperator(String modifier, Document change) {
         final UpdateOperator op;
         try {
             op = UpdateOperator.fromValue(modifier);
@@ -267,7 +267,7 @@ private UpdateOperator getUpdateOperator(String modifier, Document change) {
         return op;
     }
 
-    private void applyUpdate(Document oldDocument, Document newDocument) {
+    protected void applyUpdate(Document oldDocument, Document newDocument) {
         if (newDocument.equals(oldDocument)) {
             return;
         }
@@ -298,7 +298,7 @@ Object deriveDocumentId(Document selector) {
         return new ObjectId();
     }
 
-    private Object deriveIdFromExpression(Object value) {
+    protected Object deriveIdFromExpression(Object value) {
         Document expression = (Document) value;
         for (String key : expression.keySet()) {
             Object expressionValue = expression.get(key);
@@ -313,7 +313,7 @@ private Object deriveIdFromExpression(Object value) {
         return new ObjectId();
     }
 
-    private Document calculateUpdateDocument(Document oldDocument, Document update, ArrayFilters arrayFilters,
+    protected Document calculateUpdateDocument(Document oldDocument, Document update, ArrayFilters arrayFilters,
                                              Integer matchPos, boolean isUpsert) {
 
         int numStartsWithDollar = 0;
@@ -469,7 +469,7 @@ public List<Document> insertDocuments(List<Document> documents, boolean isOrdere
         return writeErrors;
     }
 
-    private static Document toErrorDocument(MongoServerError e, int index) {
+    public static Document toErrorDocument(MongoServerError e, int index) {
         Document error = new Document();
         error.put("index", index);
         error.put("errmsg", e.getMessageWithoutErrorCode());
@@ -555,7 +555,7 @@ public Document updateDocuments(Document selector, Document updateQuery, ArrayFi
         return result;
     }
 
-    private Document updateDocument(Document document, Document updateQuery,
+    protected Document updateDocument(Document document, Document updateQuery,
                                     ArrayFilters arrayFilters, Integer matchPos) {
         Document oldDocument = document.cloneDeeply();
 
@@ -596,7 +596,7 @@ private Document updateDocument(Document document, Document updateQuery,
         return oldDocument;
     }
 
-    private P getSinglePosition(Document document) {
+    protected P getSinglePosition(Document document) {
         if (indexes.isEmpty()) {
             return findDocumentPosition(document);
         }
@@ -609,7 +609,7 @@ private P getSinglePosition(Document document) {
 
     protected abstract void handleUpdate(P position, Document oldDocument, Document newDocument);
 
-    private Document handleUpsert(Document updateQuery, Document selector, ArrayFilters arrayFilters) {
+    protected Document handleUpsert(Document updateQuery, Document selector, ArrayFilters arrayFilters) {
         Document document = convertSelectorToDocument(selector);
 
         Document newDocument = calculateUpdateDocument(document, updateQuery, arrayFilters, null, true);
@@ -769,7 +769,7 @@ protected P findDocumentPosition(Document document) {
 
     protected abstract Stream<DocumentWithPosition<P>> streamAllDocumentsWithPosition();
 
-    private boolean isSystemCollection() {
+    protected boolean isSystemCollection() {
         return AbstractMongoDatabase.isSystemCollection(getCollectionName());
     }