iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrated modules to parent-boot with spring-boot 2.1: 

* spring-boot-persistence
* persistence-modules/spring-data-jpa
* persistence-modules/spring-data-keyvalue
* persistence-modules/spring-data-redis
This commit is contained in:
geroza 2018-12-03 21:38:12 -02:00
parent b91f7e321e
commit 64acbeec4e
9 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
persistence-modules/spring-boot-persistence/pom.xml
View File

@ -9,10 +9,10 @@
<name>spring-boot-persistence</name>
<parent>
<artifactId>parent-boot-2.0-temp</artifactId>
<artifactId>parent-boot-2</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-2.0-temp</relativePath>
<relativePath>../../parent-boot-2</relativePath>
</parent>
<dependencies>

4
persistence-modules/spring-data-jpa/pom.xml
View File

@ -8,10 +8,10 @@
<name>spring-data-jpa</name>
<parent>
<artifactId>parent-boot-2.0-temp</artifactId>
<artifactId>parent-boot-2</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-2.0-temp</relativePath>
<relativePath>../../parent-boot-2</relativePath>
</parent>
<dependencies>

33
persistence-modules/spring-data-jpa/src/main/java/com/baeldung/config/PersistenceConfiguration.java
View File

@ -1,13 +1,14 @@
package com.baeldung.config;
import com.baeldung.services.IBarService;
import com.baeldung.services.impl.BarSpringDataJpaService;
import com.google.common.base.Preconditions;
import com.baeldung.dao.repositories.impl.ExtendedRepositoryImpl;
import com.baeldung.services.IFooService;
import com.baeldung.services.impl.FooService;
import java.util.Properties;
import javax.sql.DataSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.*;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.core.env.Environment;
import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
@ -20,13 +21,15 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import javax.sql.DataSource;
import java.util.Properties;
import com.baeldung.dao.repositories.impl.ExtendedRepositoryImpl;
import com.baeldung.services.IBarService;
import com.baeldung.services.impl.BarSpringDataJpaService;
import com.google.common.base.Preconditions;
@Configuration
@ComponentScan({"com.baeldung.dao", "com.baeldung.services"})
@ComponentScan({ "com.baeldung.dao", "com.baeldung.services" })
@EnableTransactionManagement
@EnableJpaRepositories(basePackages = {"com.baeldung.dao"}, repositoryBaseClass = ExtendedRepositoryImpl.class)
@EnableJpaRepositories(basePackages = { "com.baeldung.dao" }, repositoryBaseClass = ExtendedRepositoryImpl.class)
@EnableJpaAuditing
@PropertySource("classpath:persistence.properties")
public class PersistenceConfiguration {
@ -79,11 +82,6 @@ public class PersistenceConfiguration {
return new BarSpringDataJpaService();
}
@Bean
public IFooService fooService() {
return new FooService();
}
private final Properties hibernateProperties() {
final Properties hibernateProperties = new Properties();
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
@ -94,7 +92,8 @@ public class PersistenceConfiguration {
// hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
// Envers properties
hibernateProperties.setProperty("org.hibernate.envers.audit_table_suffix", env.getProperty("envers.audit_table_suffix"));
hibernateProperties.setProperty("org.hibernate.envers.audit_table_suffix",
env.getProperty("envers.audit_table_suffix"));
return hibernateProperties;
}

4
persistence-modules/spring-data-jpa/src/main/resources/application.properties
View File

@ -12,4 +12,6 @@ hibernate.cache.use_second_level_cache=true
hibernate.cache.use_query_cache=true
hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory
spring.datasource.data=import_entities.sql
spring.datasource.data=import_entities.sql
spring.main.allow-bean-definition-overriding=true

0
persistence-modules/spring-data-jpa/src/test/resources/import_entities.sql → persistence-modules/spring-data-jpa/src/main/resources/import_entities.sql
View File

5
persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringContextIntegrationTest.java
View File

@ -2,17 +2,12 @@ package org.baeldung;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import com.baeldung.Application;
import com.baeldung.config.PersistenceConfiguration;
import com.baeldung.config.PersistenceProductConfiguration;
import com.baeldung.config.PersistenceUserConfiguration;
@RunWith(SpringRunner.class)
@DataJpaTest(excludeAutoConfiguration = {PersistenceConfiguration.class, PersistenceUserConfiguration.class, PersistenceProductConfiguration.class})
@SpringBootTest(classes = Application.class)
public class SpringContextIntegrationTest {

25
persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringJpaContextIntegrationTest.java Normal file
View File

@ -0,0 +1,25 @@
package org.baeldung;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import com.baeldung.Application;
import com.baeldung.config.PersistenceConfiguration;
import com.baeldung.config.PersistenceProductConfiguration;
import com.baeldung.config.PersistenceUserConfiguration;
@RunWith(SpringRunner.class)
@DataJpaTest(excludeAutoConfiguration = {
PersistenceConfiguration.class,
PersistenceUserConfiguration.class,
PersistenceProductConfiguration.class })
@ContextConfiguration(classes = Application.class)
public class SpringJpaContextIntegrationTest {
@Test
public void whenSpringContextIsBootstrapped_thenNoExceptions() {
}
}

4
persistence-modules/spring-data-keyvalue/pom.xml
View File

@ -5,10 +5,10 @@
<name>spring-data-keyvalue</name>
<parent>
<artifactId>parent-boot-2.0-temp</artifactId>
<artifactId>parent-boot-2</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-2.0-temp</relativePath>
<relativePath>../../parent-boot-2</relativePath>
</parent>
<dependencies>

18
persistence-modules/spring-data-redis/pom.xml
View File

@ -8,10 +8,10 @@
<packaging>jar</packaging>
<parent>
<artifactId>parent-boot-2.0-temp</artifactId>
<artifactId>parent-boot-2</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-2.0-temp</relativePath>
<relativePath>../../parent-boot-2</relativePath>
</parent>
<dependencies>
@ -47,21 +47,9 @@
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>${junit.platform.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId>
<version>${junit.platform.version}</version>
<scope>test</scope>
</dependency>
@ -97,8 +85,6 @@
<nosqlunit.version>0.10.0</nosqlunit.version>
<spring-data-commons.version>2.0.3.RELEASE</spring-data-commons.version>
<embedded-redis.version>0.6</embedded-redis.version>
<junit.platform.version>1.0.0</junit.platform.version>
<junit.jupiter.version>5.0.2</junit.jupiter.version>
</properties>
</project>