DATACMNS-156 - Removed deprecated persistence package.

spring-data-commons-core/src/main/java/org/springframework/data/persistence/AbstractConstructorEntityInstantiator.java

@@ -1,156 +0,0 @@
-package org.springframework.data.persistence;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.util.ClassUtils;
-
-import sun.reflect.ReflectionFactory;
-
-/**
- * Try for a constructor taking state: failing that, try a no-arg constructor and then setUnderlyingNode().
- * 
- * @deprecated use {@link org.springframework.data.convert.EntityInstantiator} abstraction instead.
- * @author Rod Johnson
- */
-@Deprecated
-public abstract class AbstractConstructorEntityInstantiator<BACKING_INTERFACE, STATE> implements
-		EntityInstantiator<BACKING_INTERFACE, STATE> {
-
-	private final Log log = LogFactory.getLog(getClass());
-	private final Map<Class<? extends BACKING_INTERFACE>, StateBackedCreator<? extends BACKING_INTERFACE, STATE>> cache = new HashMap<Class<? extends BACKING_INTERFACE>, StateBackedCreator<? extends BACKING_INTERFACE, STATE>>();
-
-	public <T extends BACKING_INTERFACE> T createEntityFromState(STATE n, Class<T> c) {
-		try {
-			StateBackedCreator<T, STATE> creator = (StateBackedCreator<T, STATE>) cache.get(c);
-			if (creator != null)
-				return creator.create(n, c);
-			synchronized (cache) {
-				creator = (StateBackedCreator<T, STATE>) cache.get(c);
-				if (creator != null)
-					return creator.create(n, c);
-				Class<STATE> stateClass = (Class<STATE>) n.getClass();
-				creator = createInstantiator(c, stateClass);
-				cache.put(c, creator);
-				return creator.create(n, c);
-			}
-		} catch (IllegalArgumentException e) {
-			throw e;
-		} catch (InvocationTargetException e) {
-			throw new IllegalArgumentException(e.getTargetException());
-		} catch (Exception e) {
-			throw new IllegalArgumentException(e);
-		}
-	}
-
-	public void setInstantiators(
-			Map<Class<? extends BACKING_INTERFACE>, StateBackedCreator<? extends BACKING_INTERFACE, STATE>> instantiators) {
-		this.cache.putAll(instantiators);
-	}
-
-	protected <T extends BACKING_INTERFACE> StateBackedCreator<T, STATE> createInstantiator(Class<T> type,
-			final Class<STATE> stateType) {
-		StateBackedCreator<T, STATE> creator = stateTakingConstructorInstantiator(type, stateType);
-		if (creator != null)
-			return creator;
-		creator = emptyConstructorStateSettingInstantiator(type, stateType);
-		if (creator != null)
-			return creator;
-		return createFailingInstantiator(stateType);
-	}
-
-	protected <T extends BACKING_INTERFACE> StateBackedCreator<T, STATE> createFailingInstantiator(
-			final Class<STATE> stateType) {
-		return new StateBackedCreator<T, STATE>() {
-			public T create(STATE n, Class<T> c) throws Exception {
-				throw new IllegalArgumentException(getFailingMessageForClass(c, stateType));
-			}
-		};
-	}
-
-	protected String getFailingMessageForClass(Class<?> entityClass, Class<STATE> stateClass) {
-		return getClass().getSimpleName() + ": entity " + entityClass + " must have either a constructor taking ["
-				+ stateClass + "] or a no-arg constructor and state setter.";
-	}
-
-	private <T extends BACKING_INTERFACE> StateBackedCreator<T, STATE> emptyConstructorStateSettingInstantiator(
-			Class<T> type, Class<STATE> stateType) {
-		final Constructor<T> constructor = getNoArgConstructor(type);
-		if (constructor == null)
-			return null;
-
-		log.info("Using " + type + " no-arg constructor");
-
-		return new StateBackedCreator<T, STATE>() {
-			public T create(STATE state, Class<T> c) throws Exception {
-				try {
-					StateProvider.setUnderlyingState(state);
-					T newInstance = constructor.newInstance();
-					setState(newInstance, state);
-					return newInstance;
-				} finally {
-					StateProvider.retrieveState();
-				}
-			}
-		};
-	}
-
-	protected <T extends BACKING_INTERFACE> StateBackedCreator<T, STATE> createWithoutConstructorInvocation(
-			final Class<T> type, Class<STATE> stateType) {
-		ReflectionFactory rf = ReflectionFactory.getReflectionFactory();
-		Constructor<?> objectConstructor = getDeclaredConstructor(Object.class);
-		final Constructor<?> serializationConstructor = rf.newConstructorForSerialization(type, objectConstructor);
-		return new StateBackedCreator<T, STATE>() {
-			public T create(STATE state, Class<T> c) throws Exception {
-				final T result = type.cast(serializationConstructor.newInstance());
-				setState(result, state);
-				return result;
-			}
-		};
-	}
-
-	protected <T extends BACKING_INTERFACE> Constructor<T> getNoArgConstructor(Class<T> type) {
-		Constructor<T> constructor = ClassUtils.getConstructorIfAvailable(type);
-		if (constructor != null)
-			return constructor;
-		return getDeclaredConstructor(type);
-	}
-
-	protected <T extends BACKING_INTERFACE> StateBackedCreator<T, STATE> stateTakingConstructorInstantiator(
-			Class<T> type, Class<STATE> stateType) {
-		Class<? extends STATE> stateInterface = (Class<? extends STATE>) stateType.getInterfaces()[0];
-		final Constructor<T> constructor = ClassUtils.getConstructorIfAvailable(type, stateInterface);
-		if (constructor == null)
-			return null;
-
-		log.info("Using " + type + " constructor taking " + stateInterface);
-		return new StateBackedCreator<T, STATE>() {
-			public T create(STATE n, Class<T> c) throws Exception {
-				return constructor.newInstance(n);
-			}
-		};
-	}
-
-	protected <T> Constructor<T> getDeclaredConstructor(Class<T> c) {
-		try {
-			final Constructor<T> declaredConstructor = c.getDeclaredConstructor();
-			declaredConstructor.setAccessible(true);
-			return declaredConstructor;
-		} catch (NoSuchMethodException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Subclasses must implement to set state
-	 * 
-	 * @param entity
-	 * @param s
-	 */
-	protected abstract void setState(BACKING_INTERFACE entity, STATE s);
-
-}

spring-data-commons-core/src/main/java/org/springframework/data/persistence/EntityInstantiator.java

@@ -1,31 +0,0 @@
-package org.springframework.data.persistence;
-
-/**
- * Interface to be implemented by classes that can instantiate and configure entities. The framework must do this when
- * creating objects resulting from finders, even when there may be no no-arg constructor supplied by the user.
- * 
- * @deprecated use {@link org.springframework.data.convert.EntityInstantiator} abstraction instead.
- * @author Rod Johnson
- */
-@Deprecated
-public interface EntityInstantiator<BACKING_INTERFACE, STATE> {
-
-	/*
-		 * The best solution if available is to add a constructor that takes Node
-		 * to each GraphEntity. This means generating an aspect beside every
-		 * class as Roo presently does.
-		 *
-		 * An alternative that does not require Roo
-		 * is a user-authored constructor taking Node and calling setUnderlyingNode()
-		 * but this is less elegant and pollutes the domain object.
-		 *
-		 * If the user supplies a no-arg constructor, instantiation can occur by invoking it
-		 * prior to calling setUnderlyingNode().
-		 *
-		 * If the user does NOT supply a no-arg constructor, we must rely on Sun-specific
-		 * code to instantiate entities without invoking a constructor.
-		 */
-
-	<T extends BACKING_INTERFACE> T createEntityFromState(STATE s, Class<T> c);
-
-}

spring-data-commons-core/src/main/java/org/springframework/data/persistence/StateBackedCreator.java

@@ -1,16 +0,0 @@
-package org.springframework.data.persistence;
-
-import org.springframework.data.convert.EntityInstantiator;
-
-/**
- * encapsulates the instantiator of state-backed classes and populating them with the provided state.
- * <p/>
- * Can be implemented and registered with the concrete AbstractConstructorEntityInstantiator to provide non reflection
- * bases instantiaton for domain classes
- * 
- * @deprecated use {@link EntityInstantiator} abstraction instead.
- */
-@Deprecated
-public interface StateBackedCreator<T, STATE> {
-	T create(STATE n, Class<T> c) throws Exception;
-}

spring-data-commons-core/src/main/java/org/springframework/data/persistence/StateProvider.java

@@ -1,29 +0,0 @@
-package org.springframework.data.persistence;
-
-import org.springframework.data.convert.EntityInstantiator;
-
-/**
- * @author Michael Hunger
- * @since 24.09.2010
- * @deprecated use {@link EntityInstantiator} abstraction instead
- */
-@Deprecated
-public abstract class StateProvider {
-	private final static ThreadLocal stateHolder = new ThreadLocal();
-
-	private StateProvider() {
-	}
-
-	public static <STATE> void setUnderlyingState(STATE state) {
-		if (stateHolder.get() != null)
-			throw new IllegalStateException("StateHolder already contains state " + stateHolder.get() + " in thread "
-					+ Thread.currentThread());
-		stateHolder.set(state);
-	}
-
-	public static <STATE> STATE retrieveState() {
-		STATE result = (STATE) stateHolder.get();
-		stateHolder.remove();
-		return result;
-	}
-}

spring-data-commons-core/src/main/java/org/springframework/data/persistence/package-info.java

@@ -1,6 +0,0 @@
-/**
- * Deprecated entity instantiation API.
- * 
- * @deprecated Use entity instantation API around {@link org.springframework.data.convert.EntityInstantiator} instead.
- */
-package org.springframework.data.persistence;