DATACMNS-216 - Removed deprecations from AbstractMappingContext.

Removed the deprecation as it might still be necessary to set the ApplicationEventPublisher to emit MappingContextEvents.

spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java

@@ -35,7 +35,6 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationEventPublisher;
@@ -66,15 +65,16 @@ import org.springframework.util.ReflectionUtils.FieldCallback;
  * @author Oliver Gierke
  */
 public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?, P>, P extends PersistentProperty<P>>
-		implements MappingContext<E, P>, InitializingBean, ApplicationEventPublisherAware, ApplicationContextAware,
+		implements MappingContext<E, P>, ApplicationContextAware, ApplicationEventPublisherAware,
 		ApplicationListener<ContextRefreshedEvent> {
 
 	private static final Set<String> UNMAPPED_FIELDS = new HashSet<String>(Arrays.asList("class", "this$0"));
 
 	private final ConcurrentMap<TypeInformation<?>, E> persistentEntities = new ConcurrentHashMap<TypeInformation<?>, E>();
 
-	private ApplicationEventPublisher applicationEventPublisher;
 	private ApplicationContext applicationContext;
+	private ApplicationEventPublisher applicationEventPublisher;
+
 	private Set<? extends Class<?>> initialEntitySet = new HashSet<Class<?>>();
 	private boolean strict = false;
 	private SimpleTypeHolder simpleTypeHolder = new SimpleTypeHolder();
@@ -83,23 +83,26 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 	private final Lock read = lock.readLock();
 	private final Lock write = lock.writeLock();
 
-	/**
-	 * Use {@link #setApplicationContext(ApplicationContext)} instead.
-	 * 
-	 * @see #setApplicationContext(ApplicationContext)
-	 * @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher(org.springframework.context.ApplicationEventPublisher)
-	 */
-	@Deprecated
-	public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
-		this.applicationEventPublisher = applicationEventPublisher;
-	}
-
 	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
 	 */
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+
 		this.applicationContext = applicationContext;
+
+		// Default publisher
+		if (this.applicationEventPublisher == null) {
+			this.applicationEventPublisher = applicationContext;
+		}
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher(org.springframework.context.ApplicationEventPublisher)
+	 */
+	public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
+		this.applicationEventPublisher = applicationEventPublisher;
 	}
 
 	/**
@@ -318,19 +321,6 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 	protected abstract P createPersistentProperty(Field field, PropertyDescriptor descriptor, E owner,
 			SimpleTypeHolder simpleTypeHolder);
 
-	/**
-	 * Initial entity population is now done on receiving the {@link ContextRefreshedEvent}. If implementations still need
-	 * the {@link InitializingBean} hook implement the interface yourself. Assume not entities being added at invocation
-	 * time yet.
-	 * 
-	 * @see #onApplicationEvent(ContextRefreshedEvent)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
-	@Deprecated
-	public void afterPropertiesSet() {
-
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)

spring-data-commons-core/src/test/java/org/springframework/data/mapping/MappingMetadataTests.java

@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * Copyright 2011-2012 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.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.mapping;
 
 import static org.junit.Assert.*;
@@ -32,7 +31,10 @@ import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.util.TypeInformation;
 
 /**
- * @author Jon Brisbin <jbrisbin@vmware.com>
+ * Integration tests for Mapping metadata.
+ * 
+ * @author Jon Brisbin
+ * @author Oliver Gierke
  */
 public class MappingMetadataTests {
 
@@ -44,11 +46,10 @@ public class MappingMetadataTests {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
 	public void testPojoWithId() {
 
 		ctx.setInitialEntitySet(Collections.singleton(PersonWithId.class));
-		ctx.afterPropertiesSet();
+		ctx.initialize();
 
 		PersistentEntity<?, SampleProperty> person = ctx.getPersistentEntity(PersonWithId.class);
 		assertNotNull(person.getIdProperty());
@@ -56,11 +57,10 @@ public class MappingMetadataTests {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
 	public void testAssociations() {
 
 		ctx.setInitialEntitySet(Collections.singleton(PersonWithChildren.class));
-		ctx.afterPropertiesSet();
+		ctx.initialize();
 
 		PersistentEntity<?, SampleProperty> person = ctx.getPersistentEntity(PersonWithChildren.class);
 		person.doWithAssociations(new AssociationHandler<MappingMetadataTests.SampleProperty>() {

spring-data-commons-core/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011-2012 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.data.mapping.context;
 
 import static org.hamcrest.Matchers.*;
@@ -61,7 +76,6 @@ public class AbstractMappingContextUnitTests {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
 	public void registersEntitiesOnContextRefreshedEvent() {
 
 		ApplicationContext context = mock(ApplicationContext.class);
@@ -69,9 +83,7 @@ public class AbstractMappingContextUnitTests {
 		DummyMappingContext mappingContext = new DummyMappingContext();
 		mappingContext.setInitialEntitySet(Collections.singleton(Person.class));
 		mappingContext.setApplicationContext(context);
-		mappingContext.setApplicationEventPublisher(context);
 
-		mappingContext.afterPropertiesSet();
 		verify(context, times(0)).publishEvent(Mockito.any(ApplicationEvent.class));
 
 		mappingContext.onApplicationEvent(new ContextRefreshedEvent(context));