DATAREST-723 - PropertyMappings now get eagerly initialized.

Switched to eager initialization of PropertyMappings to avoid potential ConcurrentModificationException.

Author: odrotbohm

spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/MappingResourceMetadata.java

@@ -49,19 +49,14 @@ public MappingResourceMetadata(PersistentEntity<?, ?> entity, ResourceMappings r
 
 		super(entity.getType());
 
-		this.entity = entity;
 		this.propertyMappings = new PropertyMappings(resourceMappings);
 
-		RestResource annotation = entity.findAnnotation(RestResource.class);
-		this.explicitlyExported = annotation != null && annotation.exported();
-	}
-
-	public MappingResourceMetadata init() {
-
+		this.entity = entity;
 		this.entity.doWithAssociations(propertyMappings);
 		this.entity.doWithProperties(propertyMappings);
 
-		return this;
+		RestResource annotation = entity.findAnnotation(RestResource.class);
+		this.explicitlyExported = annotation != null && annotation.exported();
 	}
 
 	/* 

spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/PersistentEntitiesResourceMappings.java

@@ -99,8 +99,6 @@ MappingResourceMetadata getMappingMetadataFor(Class<?> type) {
 
 		mappingMetadata = new MappingResourceMetadata(entity, this);
 		mappingCache.put(type, mappingMetadata);
-		mappingMetadata.init();
-
 		return mappingMetadata;
 	}
 

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/mapping/MappingResourceMetadataUnitTests.java

@@ -41,9 +41,9 @@ public class MappingResourceMetadataUnitTests {
 	MongoMappingContext context = new MongoMappingContext();
 
 	MongoPersistentEntity<?> entity = context.getPersistentEntity(Entity.class);
-	ResourceMappings resourceMappings = new PersistentEntitiesResourceMappings(new PersistentEntities(
-			Arrays.asList(context)));
-	MappingResourceMetadata metadata = new MappingResourceMetadata(entity, resourceMappings).init();
+	ResourceMappings resourceMappings = new PersistentEntitiesResourceMappings(
+			new PersistentEntities(Arrays.asList(context)));
+	MappingResourceMetadata metadata = new MappingResourceMetadata(entity, resourceMappings);
 
 	/**
 	 * @see DATAREST-514
@@ -76,7 +76,7 @@ public void isNotExportedByDefault() {
 	public void isExportedIfExplicitlyAnnotated() {
 
 		MappingResourceMetadata metadata = new MappingResourceMetadata(context.getPersistentEntity(Related.class),
-				resourceMappings).init();
+				resourceMappings);
 		assertThat(metadata.isExported(), is(true));
 	}