Projects information

Chunk

Conflicting content
@Override public WriteResult insert(final List documents, final WriteConcern aWriteConcern) { final MongoInsert mongoInsert = new MongoInsert(documents) <<<<<<< HEAD .writeConcern(writeConcern.toNew()); return insert(mongoInsert, codec); ======= .writeConcern(aWriteConcern.toNew()); return new WriteResult(insertInternal(mongoInsert, serializer), aWriteConcern); >>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433 } /**

Conflicting content

    @Override
    public WriteResult insert(final List documents, final WriteConcern aWriteConcern) {
        final MongoInsert mongoInsert = new MongoInsert(documents)
<<<<<<< HEAD
                .writeConcern(writeConcern.toNew());
        return insert(mongoInsert, codec);
=======
                .writeConcern(aWriteConcern.toNew());
        return new WriteResult(insertInternal(mongoInsert, serializer), aWriteConcern);
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
    }

    /**

Solution content
@Override public WriteResult insert(final List documents, final WriteConcern aWriteConcern) { final MongoInsert mongoInsert = new MongoInsert(documents) .writeConcern(aWriteConcern.toNew()); return new WriteResult(insertInternal(mongoInsert, codec), aWriteConcern); } /**

Solution content

    @Override
    public WriteResult insert(final List documents, final WriteConcern aWriteConcern) {
        final MongoInsert mongoInsert = new MongoInsert(documents)
                .writeConcern(aWriteConcern.toNew());
        return new WriteResult(insertInternal(mongoInsert, codec), aWriteConcern);
    }

    /**

File
DBCollection.java

Developer's decision
Manual

Kind of conflict
Attribute
Method invocation
Return statement

Chunk

Conflicting content
* @throws MongoException if the operation fails */ @Override <<<<<<< HEAD public WriteResult insert(final List documents, final WriteConcern writeConcern, final DBEncoder encoder) { final Codec codec; //TODO: Is this really how it should work? ======= public WriteResult insert(final List documents, final WriteConcern aWriteConcern, final DBEncoder encoder) { final Serializer serializer = toDBObjectSerializer(encoder); final MongoInsert mongoInsert = new MongoInsert(documents) .writeConcern(this.writeConcern.toNew()); return new WriteResult(insertInternal(mongoInsert, serializer), aWriteConcern); } private Serializer toDBObjectSerializer(DBEncoder encoder) { Serializer serializer; >>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433 if (encoder != null) { codec = new DBEncoderDecoderCodec(encoder, null, null, null); } else if (encoderFactory != null) {

Conflicting content

     * @throws MongoException if the operation fails
     */
    @Override
<<<<<<< HEAD
    public WriteResult insert(final List documents, final WriteConcern writeConcern, final DBEncoder encoder) {
        final Codec codec;
        //TODO: Is this really how it should work?
=======
    public WriteResult insert(final List documents, final WriteConcern aWriteConcern, final DBEncoder encoder) {
        final Serializer serializer = toDBObjectSerializer(encoder);

        final MongoInsert mongoInsert = new MongoInsert(documents)
                .writeConcern(this.writeConcern.toNew());
        return new WriteResult(insertInternal(mongoInsert, serializer), aWriteConcern);
    }

    private Serializer toDBObjectSerializer(DBEncoder encoder) {
        Serializer serializer;
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
        if (encoder != null) {
            codec = new DBEncoderDecoderCodec(encoder, null, null, null);
        } else if (encoderFactory != null) {

Solution content
* @throws MongoException if the operation fails */ @Override public WriteResult insert(final List documents, final WriteConcern aWriteConcern, final DBEncoder encoder) { final Codec serializer = toDBObjectSerializer(encoder); final MongoInsert mongoInsert = new MongoInsert(documents) .writeConcern(this.writeConcern.toNew()); return new WriteResult(insertInternal(mongoInsert, serializer), aWriteConcern); } private Serializer toDBObjectSerializer(DBEncoder encoder) { Serializer serializer; if (encoder != null) { codec = new DBEncoderDecoderCodec(encoder, null, null, null); } else if (encoderFactory != null) {

Solution content

     * @throws MongoException if the operation fails
     */
    @Override
    public WriteResult insert(final List documents, final WriteConcern aWriteConcern, final DBEncoder encoder) {
        final Codec serializer = toDBObjectSerializer(encoder);

        final MongoInsert mongoInsert = new MongoInsert(documents)
                .writeConcern(this.writeConcern.toNew());
        return new WriteResult(insertInternal(mongoInsert, serializer), aWriteConcern);
    }

    private Serializer toDBObjectSerializer(DBEncoder encoder) {
        Serializer serializer;
        if (encoder != null) {
            codec = new DBEncoderDecoderCodec(encoder, null, null, null);
        } else if (encoderFactory != null) {

File
DBCollection.java

Developer's decision
Manual

Kind of conflict
Comment
Method declaration
Method signature
Variable

Chunk

Conflicting content
} else { codec = this.codec; } <<<<<<< HEAD final MongoInsert mongoInsert = new MongoInsert(documents) .writeConcern(this.writeConcern.toNew()); return insert(mongoInsert, codec); } private WriteResult insert(final MongoInsert mongoInsert, Codec codec) { try { final org.mongodb.result.WriteResult result = getConnector().insert(getNamespace(), mongoInsert, codec); return new WriteResult(result, writeConcern); ======= return serializer; } private org.mongodb.result.WriteResult insertInternal(final MongoInsert mongoInsert, Serializer serializer) { try { return getConnector().insert(getNamespace(), mongoInsert, serializer); >>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433 } catch (MongoDuplicateKeyException e) { throw new MongoException.DuplicateKey(e); }

Conflicting content

        } else {
            codec = this.codec;
        }
<<<<<<< HEAD

        final MongoInsert mongoInsert = new MongoInsert(documents)
                .writeConcern(this.writeConcern.toNew());
        return insert(mongoInsert, codec);
    }

    private WriteResult insert(final MongoInsert mongoInsert, Codec codec) {
        try {
            final org.mongodb.result.WriteResult result = getConnector().insert(getNamespace(), mongoInsert, codec);
            return new WriteResult(result, writeConcern);
=======
        return serializer;
    }

    private org.mongodb.result.WriteResult insertInternal(final MongoInsert mongoInsert, Serializer serializer) {
        try {
            return getConnector().insert(getNamespace(), mongoInsert, serializer);
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
        } catch (MongoDuplicateKeyException e) {
            throw new MongoException.DuplicateKey(e);
        }

Solution content
} else { codec = this.codec; } return serializer; } private org.mongodb.result.WriteResult insertInternal(final MongoInsert mongoInsert, Serializer serializer) { try { return getConnector().insert(getNamespace(), mongoInsert, serializer); } catch (MongoDuplicateKeyException e) { throw new MongoException.DuplicateKey(e); }

Solution content

        } else {
            codec = this.codec;
        }
        return serializer;
    }

    private org.mongodb.result.WriteResult insertInternal(final MongoInsert mongoInsert, Serializer serializer) {
        try {
            return getConnector().insert(getNamespace(), mongoInsert, serializer);
        } catch (MongoDuplicateKeyException e) {
            throw new MongoException.DuplicateKey(e);
        }

File
DBCollection.java

Developer's decision
Version 2

Kind of conflict
Attribute
Method invocation
Method signature
Return statement
Try statement
Variable

Chunk

Conflicting content
private org.mongodb.result.WriteResult updateInternal(MongoUpdate mongoUpdate) { try { <<<<<<< HEAD final org.mongodb.result.WriteResult result = getConnector().update(getNamespace(), mongoUpdate, documentCodec); return new WriteResult(result, writeConcern); ======= return getConnector().update(getNamespace(), mongoUpdate, documentSerializer); >>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433 } catch (org.mongodb.MongoException e) { throw new MongoException(e); }

Conflicting content

    private org.mongodb.result.WriteResult updateInternal(MongoUpdate mongoUpdate) {
        try {
<<<<<<< HEAD
            final org.mongodb.result.WriteResult result =
                    getConnector().update(getNamespace(), mongoUpdate, documentCodec);
            return new WriteResult(result, writeConcern);
=======
            return  getConnector().update(getNamespace(), mongoUpdate, documentSerializer);
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
        } catch (org.mongodb.MongoException e) {
            throw new MongoException(e);
        }

Solution content
private org.mongodb.result.WriteResult updateInternal(MongoUpdate mongoUpdate) { try { return getConnector().update(getNamespace(), mongoUpdate, documentSerializer); } catch (org.mongodb.MongoException e) { throw new MongoException(e); }

Solution content

    private org.mongodb.result.WriteResult updateInternal(MongoUpdate mongoUpdate) {
        try {
            return  getConnector().update(getNamespace(), mongoUpdate, documentSerializer);
        } catch (org.mongodb.MongoException e) {
            throw new MongoException(e);
        }

File
DBCollection.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Return statement
Variable

Chunk

Conflicting content
@Override public void createIndex(final DBObject keys, final DBObject options, final DBEncoder encoder) { <<<<<<< HEAD final Codec codec; if (encoder != null) { codec = new DBEncoderDecoderCodec(encoder, null, null, null); } else if (encoderFactory != null) { codec = new DBEncoderDecoderCodec(encoderFactory.create(), null, null, null); } else { codec = this.codec; } ======= final Serializer serializer = toDBObjectSerializer(encoder); >>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433 final Document indexDetails = toIndexDetailsDocument(keys, options); final MongoInsert insertIndexOperation = new MongoInsert(toDBObject(indexDetails));

Conflicting content

    @Override
    public void createIndex(final DBObject keys, final DBObject options, final DBEncoder encoder) {

<<<<<<< HEAD
        final Codec codec;
        if (encoder != null) {
            codec = new DBEncoderDecoderCodec(encoder, null, null, null);
        } else if (encoderFactory != null) {
            codec = new DBEncoderDecoderCodec(encoderFactory.create(), null, null, null);
        } else {
            codec = this.codec;
        }

=======
        final Serializer serializer = toDBObjectSerializer(encoder);
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
        final Document indexDetails = toIndexDetailsDocument(keys, options);

        final MongoInsert insertIndexOperation = new MongoInsert(toDBObject(indexDetails));

Solution content
@Override public void createIndex(final DBObject keys, final DBObject options, final DBEncoder encoder) { final Serializer serializer = toDBObjectSerializer(encoder); final Document indexDetails = toIndexDetailsDocument(keys, options); final MongoInsert insertIndexOperation = new MongoInsert(toDBObject(indexDetails));

Solution content

    @Override
    public void createIndex(final DBObject keys, final DBObject options, final DBEncoder encoder) {

        final Serializer serializer = toDBObjectSerializer(encoder);
        final Document indexDetails = toIndexDetailsDocument(keys, options);

        final MongoInsert insertIndexOperation = new MongoInsert(toDBObject(indexDetails));

File
DBCollection.java

Developer's decision
Version 2

Kind of conflict
If statement
Method invocation
Variable

Chunk

Conflicting content
private void getMore() { currentResult = getConnector().getMore( collection.getNamespace(), <<<<<<< HEAD new GetMore(currentResult.getCursor(), find.getBatchSize()), collection.getCodec()); ======= new MongoGetMore(currentResult.getCursor(), find.getBatchSize()), collection.getSerializer()); >>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433 currentIterator = currentResult.getResults().iterator(); }

Conflicting content

    private void getMore() {
        currentResult = getConnector().getMore(
                collection.getNamespace(),
<<<<<<< HEAD
                new GetMore(currentResult.getCursor(), find.getBatchSize()),
                collection.getCodec());
=======
                new MongoGetMore(currentResult.getCursor(), find.getBatchSize()),
                collection.getSerializer());
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
        currentIterator = currentResult.getResults().iterator();
    }

Solution content
private void getMore() { currentResult = getConnector().getMore( collection.getNamespace(), new MongoGetMore(currentResult.getCursor(), find.getBatchSize()), collection.getCodec()); currentIterator = currentResult.getResults().iterator(); }

Solution content

    private void getMore() {
        currentResult = getConnector().getMore(
                collection.getNamespace(),
                new MongoGetMore(currentResult.getCursor(), find.getBatchSize()),
                collection.getCodec());
        currentIterator = currentResult.getResults().iterator();
    }

File
DBCursor.java

Developer's decision
Combination

Kind of conflict
Method invocation

Chunk

Conflicting content
QueryResult query(final MongoNamespace namespace, MongoFind find, Encoder queryEncoder, Decoder resultDecoder); <<<<<<< HEAD QueryResult getMore(final MongoNamespace namespace, GetMore getMore, Decoder resultDecoder); ======= QueryResult getMore(final MongoNamespace namespace, MongoGetMore getMore, Serializer resultSerializer); >>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433 void killCursors(MongoKillCursor killCursor);

Conflicting content

     QueryResult query(final MongoNamespace namespace, MongoFind find, Encoder queryEncoder,
                             Decoder resultDecoder);

<<<<<<< HEAD
     QueryResult getMore(final MongoNamespace namespace, GetMore getMore, Decoder resultDecoder);
=======
     QueryResult getMore(final MongoNamespace namespace, MongoGetMore getMore, Serializer resultSerializer);
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433

    void killCursors(MongoKillCursor killCursor);

Solution content
QueryResult query(final MongoNamespace namespace, MongoFind find, Encoder queryEncoder, Decoder resultDecoder); QueryResult getMore(final MongoNamespace namespace, MongoGetMore getMore, Decoder resultDecoder); void killCursors(MongoKillCursor killCursor);

Solution content

     QueryResult query(final MongoNamespace namespace, MongoFind find, Encoder queryEncoder,
                             Decoder resultDecoder);

     QueryResult getMore(final MongoNamespace namespace, MongoGetMore getMore, Decoder resultDecoder);

    void killCursors(MongoKillCursor killCursor);

File
MongoSyncConnector.java

Developer's decision
Manual

Kind of conflict
Method interface

Chunk

Conflicting content
void asyncQuery(final MongoNamespace namespace, MongoFind find, Encoder queryEncoder, Decoder resultDecoder, SingleResultCallback> callback); <<<<<<< HEAD Future> asyncGetMore(final MongoNamespace namespace, GetMore getMore, Decoder resultDecoder); void asyncGetMore(final MongoNamespace namespace, GetMore getMore, Decoder resultDecoder, ======= Future> asyncGetMore(final MongoNamespace namespace, MongoGetMore getMore, Serializer resultSerializer); void asyncGetMore(final MongoNamespace namespace, MongoGetMore getMore, Serializer resultSerializer, >>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433 SingleResultCallback> callback); Future asyncInsert(MongoNamespace namespace, MongoInsert insert, Encoder encoder);

Conflicting content

     void asyncQuery(final MongoNamespace namespace, MongoFind find, Encoder queryEncoder,
                        Decoder resultDecoder, SingleResultCallback> callback);

<<<<<<< HEAD
     Future> asyncGetMore(final MongoNamespace namespace, GetMore getMore, Decoder resultDecoder);

     void asyncGetMore(final MongoNamespace namespace, GetMore getMore, Decoder resultDecoder,
=======
     Future> asyncGetMore(final MongoNamespace namespace, MongoGetMore getMore, Serializer resultSerializer);

     void asyncGetMore(final MongoNamespace namespace, MongoGetMore getMore, Serializer resultSerializer,
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
                          SingleResultCallback> callback);

     Future asyncInsert(MongoNamespace namespace, MongoInsert insert, Encoder encoder);

Solution content
void asyncQuery(final MongoNamespace namespace, MongoFind find, Encoder queryEncoder, Decoder resultDecoder, SingleResultCallback> callback); Future> asyncGetMore(final MongoNamespace namespace, MongoGetMore getMore, Decoder resultDecoder); void asyncGetMore(final MongoNamespace namespace, MongoGetMore getMore, Decoder resultDecoder, SingleResultCallback> callback); Future asyncInsert(MongoNamespace namespace, MongoInsert insert, Encoder encoder);

Solution content

     void asyncQuery(final MongoNamespace namespace, MongoFind find, Encoder queryEncoder,
                        Decoder resultDecoder, SingleResultCallback> callback);

     Future> asyncGetMore(final MongoNamespace namespace, MongoGetMore getMore, Decoder resultDecoder);

     void asyncGetMore(final MongoNamespace namespace, MongoGetMore getMore, Decoder resultDecoder,
                          SingleResultCallback> callback);

     Future asyncInsert(MongoNamespace namespace, MongoInsert insert, Encoder encoder);

File
MongoAsyncConnector.java

Developer's decision
Manual

Kind of conflict
Method interface
Method signature

Chunk

Conflicting content
} else { connector <<<<<<< HEAD .asyncGetMore(getNamespace(), new GetMore(result.getCursor(), findOp.getBatchSize()), getCodec(), new QueryResultSingleResultCallback(block)); ======= .asyncGetMore(getNamespace(), new MongoGetMore(result.getCursor(), findOp.getBatchSize()), getSerializer(), new QueryResultSingleResultCallback(block)); >>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433 } } }

Conflicting content

                }
                else {
                    connector
<<<<<<< HEAD
                            .asyncGetMore(getNamespace(), new GetMore(result.getCursor(), findOp.getBatchSize()),
                                    getCodec(), new QueryResultSingleResultCallback(block));
=======
                            .asyncGetMore(getNamespace(), new MongoGetMore(result.getCursor(), findOp.getBatchSize()),
                                    getSerializer(), new QueryResultSingleResultCallback(block));
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
                }
            }
        }

Solution content
} else { connector .asyncGetMore(getNamespace(), new MongoGetMore(result.getCursor(), findOp.getBatchSize()), getCodec(), new QueryResultSingleResultCallback(block)); } } }

File
MongoCollectionImpl.java

Developer's decision
Combination

Kind of conflict
Method invocation

Chunk

Conflicting content

import org.mongodb.codecs.DocumentCodec;
=======
import org.mongodb.MongoConnector;
import org.mongodb.ServerAddress;
import org.mongodb.command.IsMasterCommandResult;
<<<<<<< HEAD
import org.mongodb.operation.MongoCommand;
import org.mongodb.PrimitiveCodecs;
import org.mongodb.command.MongoCommand;
import org.mongodb.serialization.PrimitiveSerializers;
import org.mongodb.serialization.serializers.DocumentSerializer;
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433

class MongoConnectionIsMasterExecutor implements IsMasterExecutor {
    private final MongoConnector connector;

Solution content

import org.mongodb.MongoConnector;
import org.mongodb.ServerAddress;
import org.mongodb.command.IsMasterCommandResult;
import org.mongodb.command.MongoCommand;
import org.mongodb.PrimitiveCodecs;
import org.mongodb.codecs.DocumentCodec;

class MongoConnectionIsMasterExecutor implements IsMasterExecutor {
    private final MongoConnector connector;

File
MongoConnectionIsMasterExecutor.java

Developer's decision
Combination

Kind of conflict
Import

Chunk

Conflicting content

    }

    @Override
<<<<<<< HEAD
    public  QueryResult getMore(final MongoNamespace namespace, final GetMore getMore,
                                      final Decoder resultDecoder) {
        return getConnection(getMore.getServerCursor().getAddress()).getMore(namespace, getMore, resultDecoder);
=======
    public  QueryResult getMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                      final Serializer resultSerializer) {
        return getConnection(getMore.getServerCursor().getAddress()).getMore(namespace, getMore, resultSerializer);
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
    }

    @Override

Solution content

    }

    @Override
    public  QueryResult getMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                      final Decoder resultDecoder) {
        return getConnection(getMore.getServerCursor().getAddress()).getMore(namespace, getMore, resultDecoder);
    }

    @Override

File
MultipleServerMongoConnector.java

Developer's decision
Combination

Kind of conflict
Method invocation
Method signature
Return statement

Chunk

Conflicting content

    }

    @Override
<<<<<<< HEAD
    public  Future> asyncGetMore(final MongoNamespace namespace, final GetMore getMore,
                                                   final Decoder resultDecoder) {
        return getConnection(getMore.getServerCursor().getAddress()).asyncGetMore(namespace, getMore, resultDecoder);
    }

    @Override
    public  void asyncGetMore(final MongoNamespace namespace, final GetMore getMore, final Decoder resultDecoder,
=======
    public  Future> asyncGetMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                                   final Serializer resultSerializer) {
        return getConnection(getMore.getServerCursor().getAddress()).asyncGetMore(namespace, getMore, resultSerializer);
    }

    @Override
    public  void asyncGetMore(final MongoNamespace namespace, final MongoGetMore getMore, final Serializer resultSerializer,
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
                                 final SingleResultCallback> callback) {
        getConnection(getMore.getServerCursor().getAddress()).asyncGetMore(namespace, getMore, resultDecoder, callback);
    }

Solution content

    }

    @Override
    public  Future> asyncGetMore(final MongoNamespace namespace, final GetMore getMore,
                                                   final Serializer resultSerializer) {
        return getConnection(getMore.getServerCursor().getAddress()).asyncGetMore(namespace, getMore, resultSerializer);
    }

    @Override
    public  void asyncGetMore(final MongoNamespace namespace, final GetMore getMore, final Serializer resultSerializer,
                                 final SingleResultCallback> callback) {
        getConnection(getMore.getServerCursor().getAddress()).asyncGetMore(namespace, getMore, resultDecoder, callback);
    }

File
MultipleServerMongoConnector.java

Developer's decision
Manual

Kind of conflict
Annotation
Method declaration
Method signature

Chunk

Conflicting content

    }

    @Override
<<<<<<< HEAD
    public  QueryResult getMore(final MongoNamespace namespace, final GetMore getMore,
                                      final Decoder resultDecoder) {
=======
    public  QueryResult getMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                      final Serializer resultSerializer) {
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
        try {
            QueryResult result = asyncGetMore(namespace, getMore, resultDecoder).get();
            if (result == null) {

Solution content

    }

    @Override
    public  QueryResult getMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                      final Decoder resultDecoder) {
        try {
            QueryResult result = asyncGetMore(namespace, getMore, resultDecoder).get();
            if (result == null) {

File
SingleChannelAsyncMongoConnector.java

Developer's decision
Combination

Kind of conflict
Method signature

Chunk

Conflicting content

    }

    @Override
<<<<<<< HEAD
    public  Future> asyncGetMore(final MongoNamespace namespace, final GetMore getMore,
                                                   final Decoder resultDecoder) {
=======
    public  Future> asyncGetMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                                   final Serializer resultSerializer) {
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
        final SingleResultFuture> retVal = new SingleResultFuture>();

        asyncGetMore(namespace, getMore, resultDecoder, new SingleResultFutureCallback>(retVal));

Solution content

    }

    @Override
    public  Future> asyncGetMore(final MongoNamespace namespace, final GetMore getMore,
                                                   final Serializer resultSerializer) {
        final SingleResultFuture> retVal = new SingleResultFuture>();

        asyncGetMore(namespace, getMore, resultDecoder, new SingleResultFutureCallback>(retVal));

File
SingleChannelAsyncMongoConnector.java

Developer's decision
Combination

Kind of conflict
Method signature

Chunk

Conflicting content

    }

    @Override
<<<<<<< HEAD
    public  void asyncGetMore(final MongoNamespace namespace, final GetMore getMore, final Decoder resultDecoder,
=======
    public  void asyncGetMore(final MongoNamespace namespace, final MongoGetMore getMore, final Serializer resultSerializer,
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
                                 final SingleResultCallback> callback) {
        final PooledByteBufferOutputBuffer buffer = new PooledByteBufferOutputBuffer(bufferPool);
        final MongoGetMoreMessage message = new MongoGetMoreMessage(namespace.getFullName(), getMore);

Solution content

    }

    @Override
    public  void asyncGetMore(final MongoNamespace namespace, final GetMore getMore, final Serializer resultSerializer,
                                 final SingleResultCallback> callback) {
        final PooledByteBufferOutputBuffer buffer = new PooledByteBufferOutputBuffer(bufferPool);
        final MongoGetMoreMessage message = new MongoGetMoreMessage(namespace.getFullName(), getMore);

File
SingleChannelAsyncMongoConnector.java

Developer's decision
Manual

Kind of conflict
Method signature

Chunk

Conflicting content

    @Override
    }

<<<<<<< HEAD
    public  QueryResult getMore(final MongoNamespace namespace, final GetMore getMore,
                                      final Decoder resultDecoder) {
=======
    public  QueryResult getMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                      final Serializer resultSerializer) {
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
        final PooledByteBufferOutputBuffer buffer = new PooledByteBufferOutputBuffer(bufferPool);
        try {
            final MongoGetMoreMessage message = new MongoGetMoreMessage(namespace.getFullName(), getMore);

Solution content

    }

    @Override
    public  QueryResult getMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                      final Decoder resultDecoder) {
        final PooledByteBufferOutputBuffer buffer = new PooledByteBufferOutputBuffer(bufferPool);
        try {
            final MongoGetMoreMessage message = new MongoGetMoreMessage(namespace.getFullName(), getMore);

File
SingleChannelSyncMongoConnector.java

Developer's decision
Combination

Kind of conflict
Method signature

Chunk

Conflicting content

    }

    @Override
<<<<<<< HEAD
    public  Future> asyncGetMore(final MongoNamespace namespace, final GetMore getMore,
                                                   final Decoder resultDecoder) {
=======
    public  Future> asyncGetMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                                   final Serializer resultSerializer) {
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
        throw new UnsupportedOperationException();
    }

Solution content
} @Override public Future> asyncGetMore(final MongoNamespace namespace, final MongoGetMore getMore, final Decoder resultDecoder) { throw new UnsupportedOperationException(); }

File
SingleChannelSyncMongoConnector.java

Developer's decision
Combination

Kind of conflict
Method signature

Chunk

Conflicting content

    }

    @Override
<<<<<<< HEAD
    public  void asyncGetMore(final MongoNamespace namespace, final GetMore getMore, final Decoder resultDecoder,
=======
    public  void asyncGetMore(final MongoNamespace namespace, final MongoGetMore getMore, final Serializer resultSerializer,
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
                                 final SingleResultCallback> callback) {
        throw new UnsupportedOperationException();
    }

Solution content

    }

    @Override
    public  void asyncGetMore(final MongoNamespace namespace, final MongoGetMore getMore, final Decoder resultDecoder,
                                 final SingleResultCallback> callback) {
        throw new UnsupportedOperationException();
    }

File
SingleChannelSyncMongoConnector.java

Developer's decision
Manual

Kind of conflict
Method signature

Chunk

Conflicting content

    }

    @Override
<<<<<<< HEAD
    public  QueryResult getMore(final MongoNamespace namespace, final GetMore getMore,
                                      final Decoder resultDecoder) {
=======
    public  QueryResult getMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                      final Serializer resultSerializer) {
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
        final MongoPoolableConnector connection = getChannelConnection();
        try {
            return connection.getMore(namespace, getMore, resultDecoder);

Solution content

    }

    @Override
    public  QueryResult getMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                      final Decoder resultDecoder) {
        final MongoPoolableConnector connection = getChannelConnection();
        try {
            return connection.getMore(namespace, getMore, resultDecoder);

File
SingleServerMongoConnector.java

Developer's decision
Combination

Kind of conflict
Method signature

Chunk

Conflicting content

    }

    @Override
<<<<<<< HEAD
    public  Future> asyncGetMore(final MongoNamespace namespace, final GetMore getMore,
                                                   final Decoder resultDecoder) {
=======
    public  Future> asyncGetMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                                   final Serializer resultSerializer) {
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
        final MongoPoolableConnector connection = getChannelConnection();
        try {
            return connection.asyncGetMore(namespace, getMore, resultDecoder);

Solution content

    }

    @Override
    public  Future> asyncGetMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                                   final Decoder resultDecoder) {
        final MongoPoolableConnector connection = getChannelConnection();
        try {
            return connection.asyncGetMore(namespace, getMore, resultDecoder);

File
SingleServerMongoConnector.java

Developer's decision
Combination

Kind of conflict
Method signature

Chunk

Conflicting content

    }

    @Override
<<<<<<< HEAD
    public  void asyncGetMore(final MongoNamespace namespace, final GetMore getMore,
                                 final Decoder resultDecoder,
=======
    public  void asyncGetMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                 final Serializer resultSerializer,
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433
                                 final SingleResultCallback> callback) {
        final MongoPoolableConnector connection = getChannelConnection();
        try {

Solution content

    }

    @Override
    public  void asyncGetMore(final MongoNamespace namespace, final MongoGetMore getMore,
                                 final Decoder resultDecoder,
                                 final SingleResultCallback> callback) {
        final MongoPoolableConnector connection = getChannelConnection();
        try {

File
SingleServerMongoConnector.java

Developer's decision
Combination

Kind of conflict
Method signature

Chunk

Conflicting content

import org.mongodb.Document;
import org.mongodb.io.ChannelAwareOutputBuffer;
<<<<<<< HEAD
import org.mongodb.operation.MongoCommand;
import org.mongodb.Encoder;
=======
import org.mongodb.command.MongoCommand;
import org.mongodb.serialization.Serializer;
>>>>>>> 7c9c613f66fafd7b8f36d9a14a41b861b4843433

public class MongoCommandMessage extends MongoQueryBaseMessage {
    private final MongoCommand commandOperation;

Solution content


import org.mongodb.Document;
import org.mongodb.io.ChannelAwareOutputBuffer;
import org.mongodb.command.MongoCommand;
import org.mongodb.Encoder;
public class MongoCommandMessage extends MongoQueryBaseMessage {
    private final MongoCommand commandOperation;

File
MongoCommandMessage.java

Developer's decision
Combination

Kind of conflict
Import

Projects >> mongo-java-driver >>a8b65ac8223b87e23f1fe98fa27d877f12ea5d53