Commit Graph

2518 Commits

Author SHA1 Message Date
Mark Paluch
d937460351 DATAMONGO-1183 - Polishing.
Tweak Javadoc and reference docs. Migrate tests to AssertJ. Remove not needed warning suppressions.

Original pull request: #750.
2019-05-28 11:43:34 +02:00
Christoph Strobl
89843a1488 DATAMONGO-1183 - Add support for Hashed Indexes.
We now support hashed index definitions via IndexOperations. Reading index information back allows to identify a hashed index via isHashed().

Original pull request: #750.
2019-05-28 10:20:28 +02:00
Christoph Strobl
e06f326de3 DATAMONGO-1183 - Fix field name mapping in IndexOperations.
We now consider the Field annotation when creating indexes via IndexOperations.

Original pull request: #750.
2019-05-28 10:20:11 +02:00
Christoph Strobl
684e24aff5 DATAMONGO-2252 - Update Javadoc for Reactive/MongoOperations#getCollection(String).
Original pull request: #747.
2019-05-27 11:11:36 +02:00
Mark Paluch
7a22d697cf DATAMONGO-2067 - Polishing.
Tweak Javadoc and reference docs. Use pre/class=code instead of nested code tag.

Original pull request: #756.
2019-05-27 10:57:13 +02:00
Christoph Strobl
505ca4d2c4 DATAMONGO-2067 - Allow repeated usage of CompoundIndex annotation.
Original pull request: #756.
2019-05-27 10:57:06 +02:00
Mark Paluch
b01b25ef93 DATAMONGO-2153 - Polishing.
Relax name ordering in PersonAggregate as we're using unordered MongoDB set operations to assemble results.
2019-05-21 12:11:28 +02:00
Mark Paluch
60cb8c7de7 DATAMONGO-2259 - Polishing.
Tweak Javadoc. Refactor tests for improved readability.

Original pull request: #740.
2019-05-21 11:58:33 +02:00
Christoph Strobl
b4bc95ce5f DATAMONGO-2259 - Add MongoDB 4.2 expanded format to 'out' aggregation operation.
OutOperation now supports the expanded format for the $out aggregation operation if additional parameters, next to the target collection, are given.

    Aggregation.out("out-col").insertDocuments().in("database-2").uniqueKey("field-1“);

    {
        $out : {
            to : "out-col",
            mode : "insertDocuments",
            db : "database-2",
            uniqueKey : "field-1"
        }
    }

We’ll stick to the 2.6 format if only a collection name has been set.

   Aggregation.out("out-col“);

    { $out : "out-col" }

Original pull request: #740.
2019-05-21 11:58:12 +02:00
Christoph Strobl
b48ff3c38b DATAMONGO-2153 - Fix domain type field mapping for change stream aggregations.
We now make sure to call the delegate AggregationOperationContext without potentially overriding arguments. Without this change potentially registered target types would be overridden with null.
2019-05-20 14:26:08 +02:00
Mark Paluch
4ab61bd4d4 DATAMONGO-2081 - Polishing.
Tweak Javadoc. Refactor conditional assignment to if style for improved readability.

Original pull request: #749.
2019-05-17 14:40:42 +02:00
Christoph Strobl
24f23c5365 DATAMONGO-2081 - Expose expireAfterSeconds via IndexInfo.
Original pull request: #749.
2019-05-17 14:40:39 +02:00
Christoph Strobl
8d2a68118b DATAMONGO-2275 - Fix NPE when mapping MongoJsonSchema used in query.
We fixed a NPE when reading raw Document from a collection using a query matching against a JSON schema.

Original pull request: #752.
2019-05-17 14:15:19 +02:00
Mark Paluch
8ce3e45d60 DATAMONGO-2153 - Apply Meta comment and cursor size to AggregationOptions.
We now apply propagate the cursor size to aggregation options. We introduced AggregationOptions.comment to propagate the meta comment to aggregation execution.

Original pull request: #743.
2019-05-17 11:49:15 +02:00
Mark Paluch
f456851791 DATAMONGO-2153 - Polishing.
Use MongoQueryMethod.getDomainClass() instead of getRepositoryDomainType(). Simplify annotation presence indicator methods hasAnnotatedSort() and hasAnnotatedCollation(). Refactor getAnnotatedAggregation() to non-nullable method throwing IllegalStateException to be consistent with other getXxx() methods.

Simplify aggregation execution and consider collection/single element declaration for reactive execution.

Tweak docs.

Original pull request: #743.
2019-05-17 11:48:37 +02:00
Christoph Strobl
221ffb1947 DATAMONGO-2153 - Annotated aggregation support.
The repository layer offers means interact with the aggregation framework via annotated repository finder methods. Similar to the JSON based queries a pipeline can be defined via the Aggregation annotation. The definition may contain simple placeholders like `?0` as well as SpEL expression markers `?#{ ... }`.

public interface PersonRepository extends CrudReppsitory<Person, String> {

  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : $?0 } } }")
  List<PersonAggregate> groupByLastnameAnd(String property);

  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : $firstname } } }")
  List<PersonAggregate> groupByLastnameAndFirstnames(Sort sort);

  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : $?0 } } }")
  List<PersonAggregate> groupByLastnameAnd(String property, Pageable page);

  @Aggregation("{ $group : { _id : null, total : { $sum : $age } } }")
  SumValue sumAgeUsingValueWrapper();

  @Aggregation("{ $group : { _id : null, total : { $sum : $age } } }")
  Long sumAge();

  @Aggregation("{ $group : { _id : null, total : { $sum : $age } } }")
  AggregationResults<SumValue> sumAgeRaw();

  @Aggregation("{ '$project': { '_id' : '$lastname' } }")
  List<String> findAllLastnames();
}

public interface ReactivePersonRepository extends ReactiveCrudReppsitory<Person, String> {

  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : $?0 } } }")
  Flux<PersonAggregate> groupByLastnameAnd(String property);

  @Aggregation("{ $group : { _id : null, total : { $sum : $age } } }")
  Mono<Long> sumAge();

  @Aggregation("{ '$project': { '_id' : '$lastname' } }")
  Flux<String> findAllLastnames();
}

Original pull request: #743.
2019-05-17 11:48:25 +02:00
Mark Paluch
c3a5454d31 DATAMONGO-2267 - Polishing.
Reuse collection name for index creation instead of resolving the collection for every index. Switch lambda to method reference.

Original pull request: #746.
2019-05-15 10:39:31 +02:00
Christoph Strobl
207c82a50b DATAMONGO-2267 - Fix eager collection resolution in Object path.
We now lazily read the collection of an entity as it potentially requires a more expensive SpEL evaluation that might not have been required in fist place.

Original pull request: #746.
2019-05-15 10:39:23 +02:00
Mark Paluch
7596881a06 DATAMONGO-2270 - Updated changelog. 2019-05-13 18:19:07 +02:00
Mark Paluch
3ea670fb3b DATAMONGO-2269 - Updated changelog. 2019-05-13 14:59:27 +02:00
Mark Paluch
8df1c88db1 DATAMONGO-2260 - After release cleanups. 2019-05-13 12:17:54 +02:00
Mark Paluch
a34e8591de DATAMONGO-2260 - Prepare next development iteration. 2019-05-13 12:17:52 +02:00
Mark Paluch
ebc9e3ba3a DATAMONGO-2260 - Release version 2.2 M4 (Moore). 2.2.0.M4 2019-05-13 11:59:50 +02:00
Mark Paluch
74368dd0e8 DATAMONGO-2260 - Prepare 2.2 M4 (Moore). 2019-05-13 11:59:04 +02:00
Mark Paluch
fff971e469 DATAMONGO-2260 - Updated changelog. 2019-05-13 11:58:56 +02:00
Christoph Strobl
352f9ad372 DATAMONGO-2268 - Upgrade to MongoDB Java Driver 3.11.0-beta3. 2019-05-10 18:05:13 +02:00
Oliver Drotbohm
89624518c9 DATAMONGO-2244 - Updated changelog. 2019-05-10 14:18:09 +02:00
Oliver Drotbohm
8e02fd0329 DATAMONGO-2246 - Updated changelog. 2019-05-10 12:57:20 +02:00
Christoph Strobl
0b49f47230 DATAMONGO-2265 - Polishing.
Fix count operation inside transaction and avoid superfluous client session instantiation.
Default MongoDatabase emission in case of non active transaction, update documentation, move test to another package.
Delay reactive collection re/creation in test to cope with issues in server version 4.1.10.

Original Pull Request: #745
2019-05-07 20:03:04 +02:00
Mark Paluch
5c10a5821b DATAMONGO-2265 - Add initial ReactiveMongoTransactionManager.
Support declarative reactive transaction via the Transactional annotation via a MongoDB specific ReactiveTransactionManager implementation.

@Bean
ReactiveMongoTransactionManager transactionManager(ReactiveDatabaseFactory factory) {
    return new ReactiveMongoTransactionManager(factory);
}

@Component
public class StateService {

    @Transactional
    Mono<UpdateResult> someBusinessFunction(Step step) {

        return template.insert(step)
                   .then(process(step))
                   .then(template.update(Step.class).apply(Update.set("state", …));
    };
});

Original Pull Request: #745
2019-05-07 19:59:43 +02:00
Mark Paluch
c15ab4c946 DATAMONGO-2264 - Polishing.
Store result to getPersistentEntity() in local variable to reduce invocation count. Use numbered postfix instead of object instantiation to generate a unique distance field name.

Deprecate geoNear methods with hint to aggregations. Fix distance field usage in ReactiveMongoTemplate.

Tweak docs.

Original pull request: #744.
2019-05-06 14:38:31 +02:00
Mark Paluch
c3769df07f DATAMONGO-2264 - Migrate tests to AssertJ.
Original pull request: #744.
2019-05-06 14:38:28 +02:00
Christoph Strobl
33d69abd53 DATAMONGO-2264 - Support upcoming MongoDB 4.2 Server.
Deprecate and guard tests for removed commands:
    - eval
    - group
    - maxScan
    - geoNear

Transition from removed geoNear command to $geoNear aggregation pipeline stage.
This allows users to still use NearQuery along with the template that now transforms the query into a GeoNearOperation applying skip (previously in memory skipping) and limit (previous num parameter) as additional aggregation pipeline stages.

Tested against:
    - 4.1.10
    - 4.0.4
    - 3.6.12
    - 4.4.20

Original pull request: #744.
2019-05-06 14:38:06 +02:00
Mark Paluch
e683c8f08f DATAMONGO-1854 - Polishing.
Extract common collation resolution code into EntityOperations (TypedOperations).

Original pull request: #644.
2019-04-23 13:46:04 +02:00
Christoph Strobl
ac1873a163 DATAMONGO-1854 - Allow Collation to be configured on entity level.
The collation can now also be configured on entity level and gets applied via MongoTemplate. However one can alway override a default collation by adding the collation explicitly to either the Query or one of the Options available for various operations.
When it comes to the repository level the hierarchy is method parameter over query annotation over entity metadata.

Remove collation annotation in favor of attributes of Query / Document.

Original pull request: #644.
2019-04-23 13:46:04 +02:00
Mark Paluch
8b7071e6ae DATAMONGO-1854 - Polishing.
Use ParameterBindingDocumentCodec to parse collation expressions.

Original pull request: #644.
2019-04-23 13:46:04 +02:00
Christoph Strobl
b8368a677d DATAMONGO-1854 - Add collation option to @Document and @Query annotation.
We now allow to specify the collation via the @Query annotation.

public interface PersonRepository extends MongoRepository<Person, String> {

	@Query(collation = "en_US")
	List<Person> findByFirstname(String firstname);

	@Query(collation = "{ 'locale' : 'en_US' }")
	List<Person> findPersonByFirstname(String firstname);

	@Query(collation = "?1")
	List<Person> findByFirstname(String firstname, Object collation);

	@Query(collation = "{ 'locale' : '?1' }")
	List<Person> findByFirstname(String firstname, String collation);

	List<Person> findByFirstname(String firstname, Collation collation);
}

We now make sure to include collation information derived from the Query method if the collation is a fixed value.

Original pull request: #644.
2019-04-23 13:46:04 +02:00
Mark Paluch
5c333d6159 DATAMONGO-2258 - Polishing.
Consider undefined state in ChangeStreamOptions.isResumeAfter()/isStartAfter() when resume token is not set.

Original pull request: #739.
2019-04-16 11:25:36 +02:00
Christoph Strobl
7f4d3f27e6 DATAMONGO-2258 - Add startAfter option to change stream support.
Original pull request: #739.
2019-04-16 11:25:27 +02:00
Christoph Strobl
a30ee07b4a DATAMONGO-2257 - Polishing.
Enable tests for issues already resolved.
2019-04-15 09:47:20 +02:00
Christoph Strobl
cc45b4e081 DATAMONGO-2257 - Upgrade to MongoDB Java Driver 3.11.0-beta2 2019-04-15 09:38:33 +02:00
Christoph Strobl
0d0d17ebf6 DATAMONGO-2222 - After release cleanups. 2019-04-11 12:00:20 +02:00
Christoph Strobl
b53caaf69d DATAMONGO-2222 - Prepare next development iteration. 2019-04-11 12:00:19 +02:00
Christoph Strobl
98091f9096 DATAMONGO-2222 - Release version 2.2 M3 (Moore). 2.2.0.M3 2019-04-11 11:24:31 +02:00
Christoph Strobl
010f182c2b DATAMONGO-2222 - Prepare 2.2 M3 (Moore). 2019-04-11 11:23:56 +02:00
Christoph Strobl
e8553468e7 DATAMONGO-2222 - Updated changelog. 2019-04-11 11:23:50 +02:00
Mark Paluch
8741b85806 DATAMONGO-2112 - Polishing.
Align Indexed(expireAfter) default to empty string according to the documentation. Slightly reword Javadoc.

Import DurationStyle to reuse duration parsing until Spring Framework provides a similar utility. Document ISO-8601 duration style. Prevent null index name evaluation to render "null" as String.

Convert assertions from Hamcrest to AssertJ.

Original pull request: #647.
2019-04-10 12:45:18 +02:00
Christoph Strobl
8fbaba0a7c DATAMONGO-2112 - Allow SpEL expression to be used for annotated index & geoIndex names as well as compound index definition.
We now also evaluate SpEL expressions for the name of indices as well as the def attribute of the compound index definition.

   @CompoundIndex(name = "#{'cmp' + 2 + 'name‘}“, def = "#{T(org.bson.Document).parse(\"{ 'foo': 1, 'bar': -1 }\")}")
    class WithCompoundIndexFromExpression {
      // …
    }

An expression used for Indexed.expireAfter may now not only return a plain String value with the timeout but also a java.time.Duration.

Original pull request: #647.
2019-04-10 12:45:12 +02:00
Christoph Strobl
82da8027f5 DATAMONGO-2112 - Allow usage of SpEL expression for index timeout.
We added expireAfter which accepts numeric values followed by the unit of measure (d(ays), h(ours), m(inutes), s(econds)) or a Spring template expression to the Indexed annotation.

   @Indexed(expireAfter = "10s")
    String expireAfterTenSeconds;

    @Indexed(expireAfter = "1d")
    String expireAfterOneDay;

    @Indexed(expireAfter = "#{@mySpringBean.timeout}")
    String expireAfterTimeoutObtainedFromSpringBean;

Original pull request: #647.
2019-04-10 12:45:01 +02:00
Mark Paluch
9c26859c04 DATAMONGO-2255 - Polishing.
Add ticket references. Rename allAsFlow() to flow() to simplify naming.

Original pull request: #736.
2019-04-10 08:38:14 +02:00