From f003461256a6ce6999326b461e3364180fcbbc3d Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@gopivotal.com>
Date: Thu, 24 Jul 2014 14:08:30 +0200
Subject: [PATCH] DATACMNS-547 - @TypeAlias is now @Persistent.

For @TypeAlias annotated types being picked up using entity scanning, the annotation is now @Persistent.

Related tickets: DATAMONGO-992.
---
 .../data/annotation/TypeAlias.java            |  3 +-
 .../data/annotation/TypeAliasUnitTests.java   | 51 +++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/springframework/data/annotation/TypeAliasUnitTests.java

diff --git a/src/main/java/org/springframework/data/annotation/TypeAlias.java b/src/main/java/org/springframework/data/annotation/TypeAlias.java
index ff09317c0..4cd558715 100644
--- a/src/main/java/org/springframework/data/annotation/TypeAlias.java
+++ b/src/main/java/org/springframework/data/annotation/TypeAlias.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 by the original author(s).
+ * Copyright 2011-2014 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@ import org.springframework.data.mapping.PersistentEntity;
 @Inherited
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
+@Persistent
 public @interface TypeAlias {
 
 	/**
diff --git a/src/test/java/org/springframework/data/annotation/TypeAliasUnitTests.java b/src/test/java/org/springframework/data/annotation/TypeAliasUnitTests.java
new file mode 100644
index 000000000..5b0904379
--- /dev/null
+++ b/src/test/java/org/springframework/data/annotation/TypeAliasUnitTests.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014 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.annotation;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+import java.util.Set;
+
+import org.junit.Test;
+import org.springframework.data.util.AnnotatedTypeScanner;
+
+/**
+ * Unit tests for {@link TypeAlias}.
+ * 
+ * @author Oliver Gierke
+ */
+public class TypeAliasUnitTests {
+
+	/**
+	 * @see DATACMNS-547
+	 */
+	@Test
+	@SuppressWarnings("unchecked")
+	public void scanningforAtPersistentFindsTypeAliasAnnotatedTypes() {
+
+		AnnotatedTypeScanner scanner = new AnnotatedTypeScanner(Persistent.class);
+		Set<Class<?>> types = scanner.findTypes(getClass().getPackage().getName());
+
+		assertThat(types, hasSize(2));
+		assertThat(types, hasItems(SampleType.class, TypeAlias.class));
+	}
+
+	@TypeAlias(value = "foo")
+	static class SampleType {
+
+	}
+}