Skip to content

Commit 2a27beb

Browse files
committed
Update to model changes from upstream GeoNetwork
Adapt the code to work with this pull request geonetwork/core-geonetwork#8137
1 parent 7b53f56 commit 2a27beb

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

modules/library/common-persistence/src/main/java/org/fao/geonet/persistence/PersistenceConfig.java

+11-1
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,28 @@
77

88
import java.util.Properties;
99
import javax.sql.DataSource;
10+
import org.fao.geonet.auditable.UsernameAuditorAware;
1011
import org.fao.geonet.repository.GeonetRepositoryImpl;
1112
import org.springframework.beans.factory.annotation.Autowired;
1213
import org.springframework.context.annotation.Bean;
1314
import org.springframework.context.annotation.Configuration;
1415
import org.springframework.context.annotation.Profile;
16+
import org.springframework.data.domain.AuditorAware;
17+
import org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean;
1518
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
1619
import org.springframework.orm.jpa.JpaVendorAdapter;
1720
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
1821
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
1922
import org.springframework.transaction.annotation.EnableTransactionManagement;
2023

24+
2125
@Configuration
2226
@EnableTransactionManagement
2327
@EnableJpaRepositories(
2428
basePackages = "org.fao.geonet.repository",
2529
entityManagerFactoryRef = "gnEntityManager",
26-
repositoryBaseClass = GeonetRepositoryImpl.class)
30+
repositoryBaseClass = GeonetRepositoryImpl.class,
31+
repositoryFactoryBeanClass = EnversRevisionRepositoryFactoryBean.class)
2732
@Profile("!withoutSql")
2833
public class PersistenceConfig {
2934

@@ -54,4 +59,9 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
5459

5560
return em;
5661
}
62+
63+
@Bean
64+
public AuditorAware<String> auditingProvider() {
65+
return new UsernameAuditorAware();
66+
}
5767
}

modules/services/authorizing/src/test/java/org/fao/geonet/authorizing/H2JpaConfig.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
package org.fao.geonet.authorizing;
22

3+
import org.fao.geonet.auditable.UsernameAuditorAware;
34
import org.fao.geonet.repository.GeonetRepositoryImpl;
45
import org.springframework.context.annotation.Bean;
56
import org.springframework.context.annotation.Configuration;
67
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
8+
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
9+
import org.springframework.data.domain.AuditorAware;
10+
import org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean;
711
import org.springframework.jdbc.datasource.DriverManagerDataSource;
812
import org.springframework.orm.jpa.JpaTransactionManager;
913
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
@@ -17,7 +21,9 @@
1721
@Configuration
1822
@EnableJpaRepositories(
1923
basePackages = "org.fao.geonet.repository",
20-
repositoryBaseClass = GeonetRepositoryImpl.class)
24+
repositoryBaseClass = GeonetRepositoryImpl.class,
25+
repositoryFactoryBeanClass = EnversRevisionRepositoryFactoryBean.class)
26+
@EnableJpaAuditing(auditorAwareRef = "auditingProvider", setDates = true)
2127
public class H2JpaConfig {
2228

2329
@Bean
@@ -54,6 +60,12 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
5460
return em;
5561
}
5662

63+
@Bean
64+
public AuditorAware<String> auditingProvider() {
65+
return new UsernameAuditorAware();
66+
}
67+
68+
5769
private Properties additionalProperties() {
5870
Properties properties = new Properties();
5971
properties.setProperty("hibernate.hbm2ddl.auto", "create");

0 commit comments

Comments
 (0)