Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREST-723 - PropertyMappings now get eagerly initialized.

Browse Source 
Switched to eager initialization of PropertyMappings to avoid potential ConcurrentModificationException.
This commit is contained in:
Oliver Gierke
2015-12-16 16:02:14 +01:00
parent 5c1b731bfa
commit 8c5bf9802f
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,19 +49,14 @@ class MappingResourceMetadata extends TypeBasedCollectionResourceMapping impleme
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();
}
/*

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

@@ -99,8 +99,6 @@ public class PersistentEntitiesResourceMappings implements ResourceMappings {
mappingMetadata = new MappingResourceMetadata(entity, this);
mappingCache.put(type, mappingMetadata);
mappingMetadata.init();
return mappingMetadata;
}

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

@@ -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 class MappingResourceMetadataUnitTests {
public void isExportedIfExplicitlyAnnotated() {
MappingResourceMetadata metadata = new MappingResourceMetadata(context.getPersistentEntity(Related.class),
resourceMappings).init();
resourceMappings);
assertThat(metadata.isExported(), is(true));
}