Skip to content

Commit 48790ad

Browse files
committed
Align Spring Data JPA annotations with Spring Framework annotations.
Remove @inherited from Spring Data JPA annotations to align with Spring Framework ones. Closes #803.
1 parent cbfb0f7 commit 48790ad

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

spring-data-envers/src/main/java/org/springframework/data/envers/repository/config/EnableEnversRepositories.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
*/
1616
package org.springframework.data.envers.repository.config;
1717

18+
import jakarta.persistence.EntityManagerFactory;
19+
1820
import java.lang.annotation.Documented;
1921
import java.lang.annotation.ElementType;
20-
import java.lang.annotation.Inherited;
2122
import java.lang.annotation.Retention;
2223
import java.lang.annotation.RetentionPolicy;
2324
import java.lang.annotation.Target;
2425

25-
import jakarta.persistence.EntityManagerFactory;
26-
2726
import org.springframework.beans.factory.FactoryBean;
2827
import org.springframework.context.annotation.ComponentScan.Filter;
2928
import org.springframework.context.annotation.Lazy;
@@ -45,14 +44,14 @@
4544
* {@link #repositoryFactoryBeanClass} to {@link EnversRevisionRepositoryFactoryBean}.
4645
*
4746
* @author Mark Paluch
47+
* @author Greg Turnquist
4848
* @since 2.5
4949
* @see EnableJpaRepositories
5050
* @see AliasFor
5151
*/
5252
@Target(ElementType.TYPE)
5353
@Retention(RetentionPolicy.RUNTIME)
5454
@Documented
55-
@Inherited
5655
@EnableJpaRepositories
5756
public @interface EnableEnversRepositories {
5857

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaAuditing.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import java.lang.annotation.Documented;
1919
import java.lang.annotation.ElementType;
20-
import java.lang.annotation.Inherited;
2120
import java.lang.annotation.Retention;
2221
import java.lang.annotation.RetentionPolicy;
2322
import java.lang.annotation.Target;
@@ -31,8 +30,8 @@
3130
*
3231
* @author Thomas Darimont
3332
* @author Oliver Gierke
33+
* @author Greg Turnquist
3434
*/
35-
@Inherited
3635
@Documented
3736
@Target(ElementType.TYPE)
3837
@Retention(RetentionPolicy.RUNTIME)
@@ -61,8 +60,8 @@
6160
boolean modifyOnCreate() default true;
6261

6362
/**
64-
* Configures a {@link DateTimeProvider} bean name that allows customizing the {@link java.time.temporal.TemporalAccessor} to be
65-
* used for setting creation and modification dates.
63+
* Configures a {@link DateTimeProvider} bean name that allows customizing the
64+
* {@link java.time.temporal.TemporalAccessor} to be used for setting creation and modification dates.
6665
*
6766
* @return
6867
*/

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaRepositories.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
*/
1616
package org.springframework.data.jpa.repository.config;
1717

18+
import jakarta.persistence.EntityManagerFactory;
19+
1820
import java.lang.annotation.Documented;
1921
import java.lang.annotation.ElementType;
20-
import java.lang.annotation.Inherited;
2122
import java.lang.annotation.Retention;
2223
import java.lang.annotation.RetentionPolicy;
2324
import java.lang.annotation.Target;
2425

25-
import jakarta.persistence.EntityManagerFactory;
26-
2726
import org.springframework.beans.factory.FactoryBean;
2827
import org.springframework.context.annotation.ComponentScan.Filter;
2928
import org.springframework.context.annotation.Import;
@@ -41,11 +40,11 @@
4140
*
4241
* @author Oliver Gierke
4342
* @author Thomas Darimont
43+
* @author Greg Turnquist
4444
*/
4545
@Target(ElementType.TYPE)
4646
@Retention(RetentionPolicy.RUNTIME)
4747
@Documented
48-
@Inherited
4948
@Import(JpaRepositoriesRegistrar.class)
5049
public @interface EnableJpaRepositories {
5150

0 commit comments

Comments
 (0)