Align Spring Data JPA annotations with Spring Framework annotations.

Remove @inherited from Spring Data JPA annotations to align with Spring Framework ones. Closes #803.
spring-projects · Jun 8, 2022 · 48790ad · 48790ad
1 parent cbfb0f7
commit 48790ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/...main/java/org/springframework/data/envers/repository/config/EnableEnversRepositories.java b/...main/java/org/springframework/data/envers/repository/config/EnableEnversRepositories.java
@@ -15,15 +15,14 @@
  */
 package org.springframework.data.envers.repository.config;
 
+import jakarta.persistence.EntityManagerFactory;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import jakarta.persistence.EntityManagerFactory;
-
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Lazy;
@@ -45,14 +44,14 @@
  * {@link #repositoryFactoryBeanClass} to {@link EnversRevisionRepositoryFactoryBean}.
  *
  * @author Mark Paluch
+ * @author Greg Turnquist
  * @since 2.5
  * @see EnableJpaRepositories
  * @see AliasFor
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Inherited
 @EnableJpaRepositories
 public @interface EnableEnversRepositories {
 

diff --git a/...a-jpa/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaAuditing.java b/...a-jpa/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaAuditing.java
@@ -17,7 +17,6 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -31,8 +30,8 @@
  *
  * @author Thomas Darimont
  * @author Oliver Gierke
+ * @author Greg Turnquist
  */
-@Inherited
 @Documented
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
@@ -61,8 +60,8 @@
 	boolean modifyOnCreate() default true;
 
 	/**
-	 * Configures a {@link DateTimeProvider} bean name that allows customizing the {@link java.time.temporal.TemporalAccessor} to be
-	 * used for setting creation and modification dates.
+	 * Configures a {@link DateTimeProvider} bean name that allows customizing the
+	 * {@link java.time.temporal.TemporalAccessor} to be used for setting creation and modification dates.
 	 *
 	 * @return
 	 */

diff --git a/...a/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaRepositories.java b/...a/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaRepositories.java
@@ -15,15 +15,14 @@
  */
 package org.springframework.data.jpa.repository.config;
 
+import jakarta.persistence.EntityManagerFactory;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import jakarta.persistence.EntityManagerFactory;
-
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Import;
@@ -41,11 +40,11 @@
  *
  * @author Oliver Gierke
  * @author Thomas Darimont
+ * @author Greg Turnquist
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Inherited
 @Import(JpaRepositoriesRegistrar.class)
 public @interface EnableJpaRepositories {