Polishing of annotation model for object creators.

Move to @PersistenceCreator as canonical annotation to explicitly express constructors and methods to be used to create domain object instances from persistence operations. Removed @FactoryMethod as it's not needed anymore. @PersistenceConstructor is now deprecated.

Renamed EntityCreatorMetadata(Support|Discoverer) to InstanceCreatorMetadata(Support|Discoverer) to avoid further manifestation of the notion of an entity in the metamodel as it's not used to only handle entities.

Issue #2476.

src/main/java/org/springframework/data/annotation/FactoryMethod.java

@@ -1,33 +0,0 @@
-/*
- * Copyright 2011-2021 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
- *
- *      https://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 java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to declare a {@code static} method as factory method for class instantiation.
- *
- * @author Mark Paluch
- * @since 3.0
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
-@EntityCreatorAnnotation
-public @interface FactoryMethod {
-}

src/main/java/org/springframework/data/annotation/PersistenceConstructor.java

@@ -25,9 +25,11 @@ import java.lang.annotation.Target;
  *
  * @author Jon Brisbin
  * @author Mark Paluch
+ * @author Oliver Drotbohm
+ * @deprecated in favor of {@link PersistenceCreator} since 3.0, to be removed in 3.1
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.CONSTRUCTOR, ElementType.ANNOTATION_TYPE })
-@EntityCreatorAnnotation
-public @interface PersistenceConstructor {
-}
+@PersistenceCreator
+@Deprecated
+public @interface PersistenceConstructor {}

src/main/java/org/springframework/data/annotation/PersistenceCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2021 the original author or authors.
+ * Copyright 2011-2022 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.
@@ -24,9 +24,9 @@ import java.lang.annotation.Target;
  * Marker annotation to declare a constructor or factory method annotation as factory/preferred constructor annotation.
  *
  * @author Mark Paluch
+ * @author Oliver Drotbohm
  * @since 3.0
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.ANNOTATION_TYPE })
-public @interface EntityCreatorAnnotation {
-}
+@Target({ ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.ANNOTATION_TYPE })
+public @interface PersistenceCreator {}