Compare commits

...

8 Commits

Author SHA1 Message Date
Mark Paluch
87ddbcf299 DATAMONGO-1671 - Release version 1.9.11 (Hopper SR11). 2017-06-07 11:11:07 +02:00
Mark Paluch
34e00adeba DATAMONGO-1671 - Prepare 1.9.11 (Hopper SR11). 2017-06-07 11:10:24 +02:00
Mark Paluch
b823efa6ee DATAMONGO-1671 - Updated changelog. 2017-06-07 11:10:20 +02:00
Mark Paluch
278b23d5ee DATAMONGO-1664 - Updated changelog. 2017-05-09 11:36:17 +02:00
Mark Paluch
f4f26c6fd5 DATAMONGO-1205 - Polishing.
Add author tag. Extend year range in copyright header.

Original pull request: #397.
2017-04-20 08:36:15 +02:00
Martin Macko
ce7dc13f99 DATAMONGO-1205 - Log only CyclicPropertyReferenceException message.
We log CyclicPropertyReferenceException with its message only and removed the stack trace from the log. The stacktrace points to a verifier location and is not particularly useful in finding the offending code. This change creates consistency over how CyclicPropertyReferenceException is logged.

Original pull request: #397.
2017-04-20 08:36:15 +02:00
Oliver Gierke
8ee5942bba DATAMONGO-1670 - After release cleanups. 2017-04-19 21:02:16 +02:00
Oliver Gierke
a7cd820f32 DATAMONGO-1670 - Prepare next development iteration. 2017-04-19 21:02:13 +02:00
8 changed files with 52 additions and 28 deletions

View File

@@ -5,7 +5,7 @@
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb-parent</artifactId>
<version>1.9.10.RELEASE</version>
<version>1.9.11.RELEASE</version>
<packaging>pom</packaging>
<name>Spring Data MongoDB</name>
@@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-parent</artifactId>
<version>1.8.10.RELEASE</version>
<version>1.8.11.RELEASE</version>
</parent>
<modules>
@@ -28,7 +28,7 @@
<properties>
<project.type>multi</project.type>
<dist.id>spring-data-mongodb</dist.id>
<springdata.commons>1.12.10.RELEASE</springdata.commons>
<springdata.commons>1.12.11.RELEASE</springdata.commons>
<mongo>2.14.3</mongo>
<mongo.osgi>2.13.0</mongo.osgi>
</properties>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb-parent</artifactId>
<version>1.9.10.RELEASE</version>
<version>1.9.11.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb</artifactId>
<version>1.9.10.RELEASE</version>
<version>1.9.11.RELEASE</version>
</dependency>
<dependency>

View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb-parent</artifactId>
<version>1.9.10.RELEASE</version>
<version>1.9.11.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb-parent</artifactId>
<version>1.9.10.RELEASE</version>
<version>1.9.11.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb-parent</artifactId>
<version>1.9.10.RELEASE</version>
<version>1.9.11.RELEASE</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2015 the original author or authors.
* Copyright 2014-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -53,9 +53,10 @@ import com.mongodb.util.JSON;
* indexed. <br />
* All {@link MongoPersistentProperty} of the {@link MongoPersistentEntity} are inspected for potential indexes by
* scanning related annotations.
*
*
* @author Christoph Strobl
* @author Thomas Darimont
* @author Martin Macko
* @since 1.5
*/
public class MongoPersistentEntityIndexResolver implements IndexResolver {
@@ -66,7 +67,7 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
/**
* Create new {@link MongoPersistentEntityIndexResolver}.
*
*
* @param mappingContext must not be {@literal null}.
*/
public MongoPersistentEntityIndexResolver(MongoMappingContext mappingContext) {
@@ -87,7 +88,7 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
* Resolve the {@link IndexDefinition}s for given {@literal root} entity by traversing {@link MongoPersistentProperty}
* scanning for index annotations {@link Indexed}, {@link CompoundIndex} and {@link GeospatialIndex}. The given
* {@literal root} has therefore to be annotated with {@link Document}.
*
*
* @param root must not be null.
* @return List of {@link IndexDefinitionHolder}. Will never be {@code null}.
* @throws IllegalArgumentException in case of missing {@link Document} annotation marking root entities.
@@ -133,7 +134,7 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
/**
* Recursively resolve and inspect properties of given {@literal type} for indexes to be created.
*
*
* @param type
* @param path The {@literal "dot} path.
* @param collection
@@ -264,7 +265,7 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
appendTextIndexInformation(propertyDotPath, indexDefinitionBuilder,
mappingContext.getPersistentEntity(persistentProperty.getActualType()), optionsForNestedType, guard);
} catch (CyclicPropertyReferenceException e) {
LOGGER.info(e.getMessage(), e);
LOGGER.info(e.getMessage());
} catch (InvalidDataAccessApiUsageException e) {
LOGGER.info(String.format("Potentially invalid index structure discovered. Breaking operation for %s.",
entity.getName()), e);
@@ -281,7 +282,7 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
/**
* Create {@link IndexDefinition} wrapped in {@link IndexDefinitionHolder} for {@link CompoundIndexes} of given type.
*
*
* @param dotPath The properties {@literal "dot"} path representation from its document root.
* @param fallbackCollection
* @param type
@@ -361,7 +362,7 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
/**
* Creates {@link IndexDefinition} wrapped in {@link IndexDefinitionHolder} out of {@link Indexed} for given
* {@link MongoPersistentProperty}.
*
*
* @param dotPath The properties {@literal "dot"} path representation from its document root.
* @param collection
* @param persitentProperty
@@ -402,7 +403,7 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
/**
* Creates {@link IndexDefinition} wrapped in {@link IndexDefinitionHolder} out of {@link GeoSpatialIndexed} for
* {@link MongoPersistentProperty}.
*
*
* @param dotPath The properties {@literal "dot"} path representation from its document root.
* @param collection
* @param persistentProperty
@@ -479,7 +480,7 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
/**
* {@link CycleGuard} holds information about properties and the paths for accessing those. This information is used
* to detect potential cycles within the references.
*
*
* @author Christoph Strobl
*/
static class CycleGuard {
@@ -529,24 +530,24 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
/**
* Path defines the property and its full path from the document root. <br />
* A {@link Path} with {@literal spring.data.mongodb} would be created for the property {@code Three.mongodb}.
*
*
* <pre>
* <code>
* &#64;Document
* class One {
* Two spring;
* }
*
*
* class Two {
* Three data;
* }
*
*
* class Three {
* String mongodb;
* }
* </code>
* </pre>
*
*
* @author Christoph Strobl
*/
static class Path {
@@ -569,7 +570,7 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
* the current path. Given {@literal foo.bar.bar} cycles if {@literal foo.bar} has already been visited and
* {@code class Bar} contains a property of type {@code Bar}. The previously mentioned path would not cycle if
* {@code class Bar} contained a property of type {@code SomeEntity} named {@literal bar}.
*
*
* @param property
* @param path
* @return
@@ -618,7 +619,7 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
/**
* Implementation of {@link IndexDefinition} holding additional (property)path information used for creating the
* index. The path itself is the properties {@literal "dot"} path representation from its root document.
*
*
* @author Christoph Strobl
* @since 1.5
*/
@@ -630,7 +631,7 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
/**
* Create
*
*
* @param path
*/
public IndexDefinitionHolder(String path, IndexDefinition definition, String collection) {
@@ -646,7 +647,7 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
/**
* Get the {@literal "dot"} path used to create the index.
*
*
* @return
*/
public String getPath() {
@@ -655,7 +656,7 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
/**
* Get the {@literal raw} {@link IndexDefinition}.
*
*
* @return
*/
public IndexDefinition getIndexDefinition() {

View File

@@ -1,6 +1,29 @@
Spring Data MongoDB Changelog
=============================
Changes in version 1.9.11.RELEASE (2017-06-07)
----------------------------------------------
* DATAMONGO-1671 - Release 1.9.11 (Hopper SR11).
* DATAMONGO-1205 - CyclicPropertyReferenceException logged with stack trace.
Changes in version 2.0.0.M3 (2017-05-09)
----------------------------------------
* DATAMONGO-1684 - Adopt documentation to removed JodaTime DateMidnight support.
* DATAMONGO-1679 - Adapt to API changes in CrudRepository.
* DATAMONGO-1674 - Adapt to Range API changes.
* DATAMONGO-1668 - Adopt changed Mono and Flux error handling API.
* DATAMONGO-1667 - Rename @InfiniteStream to @Tailable.
* DATAMONGO-1666 - Constructor creation with bulk fetching of DBRefs uses List instead of collection type.
* DATAMONGO-1665 - Adapt to API changes in Reactor 3.1.
* DATAMONGO-1664 - Release 2.0 M3 (Kay).
* DATAMONGO-1662 - Section "Projection Expressions" contains error "Aggregate".
* DATAMONGO-1660 - Extract CustomConversions into Spring Data Commons.
* DATAMONGO-1518 - Add support for Collations.
* DATAMONGO-1325 - Add support for $sample to aggregation.
* DATAMONGO-1205 - CyclicPropertyReferenceException logged with stack trace.
Changes in version 1.9.10.RELEASE (2017-04-19)
----------------------------------------------
* DATAMONGO-1670 - Release 1.9.10 (Hopper SR10).

View File

@@ -1,4 +1,4 @@
Spring Data MongoDB 1.9.10
Spring Data MongoDB 1.9.11
Copyright (c) [2010-2015] Pivotal Software, Inc.
This product is licensed to you under the Apache License, Version 2.0 (the "License").