cleanup work
This commit is contained in:
parent
e04d2cd2e5
commit
899e7afea6
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<projectDescription>
|
<projectDescription>
|
||||||
<name>spring-jpa</name>
|
<name>spring-jpa-start</name>
|
||||||
<comment></comment>
|
<comment></comment>
|
||||||
<projects>
|
<projects>
|
||||||
</projects>
|
</projects>
|
||||||
|
@ -11,42 +11,39 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.javassist</groupId>
|
||||||
|
<artifactId>javassist</artifactId>
|
||||||
|
<version>3.18.1-GA</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework</groupId>
|
|
||||||
<artifactId>spring-web</artifactId>
|
|
||||||
<version>${org.springframework.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework</groupId>
|
|
||||||
<artifactId>spring-orm</artifactId>
|
|
||||||
<version>${org.springframework.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework</groupId>
|
<groupId>org.springframework</groupId>
|
||||||
<artifactId>spring-context</artifactId>
|
<artifactId>spring-context</artifactId>
|
||||||
<version>${org.springframework.version}</version>
|
<version>${org.springframework.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- <dependency> -->
|
||||||
|
<!-- <groupId>org.springframework</groupId> -->
|
||||||
|
<!-- <artifactId>spring-orm</artifactId> -->
|
||||||
|
<!-- <version>${org.springframework.version}</version> -->
|
||||||
|
<!-- </dependency> -->
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
|
|
||||||
<dependency>
|
<!-- <dependency> -->
|
||||||
<groupId>org.hibernate</groupId>
|
<!-- <groupId>org.hibernate</groupId> -->
|
||||||
<artifactId>hibernate-entitymanager</artifactId>
|
<!-- <artifactId>hibernate-entitymanager</artifactId> -->
|
||||||
<version>${hibernate.version}</version>
|
<!-- <version>${hibernate.version}</version> -->
|
||||||
</dependency>
|
<!-- </dependency> -->
|
||||||
<dependency>
|
<!-- <dependency> -->
|
||||||
<groupId>org.javassist</groupId>
|
<!-- <groupId>mysql</groupId> -->
|
||||||
<artifactId>javassist</artifactId>
|
<!-- <artifactId>mysql-connector-java</artifactId> -->
|
||||||
<version>3.18.1-GA</version>
|
<!-- <version>${mysql-connector-java.version}</version> -->
|
||||||
</dependency>
|
<!-- <scope>runtime</scope> -->
|
||||||
<dependency>
|
<!-- </dependency> -->
|
||||||
<groupId>mysql</groupId>
|
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
|
||||||
<version>${mysql-connector-java.version}</version>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- validation -->
|
<!-- validation -->
|
||||||
|
|
||||||
@ -67,16 +64,16 @@
|
|||||||
<!-- test scoped -->
|
<!-- test scoped -->
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.commons</groupId>
|
<groupId>org.springframework</groupId>
|
||||||
<artifactId>commons-lang3</artifactId>
|
<artifactId>spring-test</artifactId>
|
||||||
<version>${commons-lang3.version}</version>
|
<version>${org.springframework.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework</groupId>
|
<groupId>org.apache.commons</groupId>
|
||||||
<artifactId>spring-test</artifactId>
|
<artifactId>commons-lang3</artifactId>
|
||||||
<version>${org.springframework.version}</version>
|
<version>${commons-lang3.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@ -211,7 +208,7 @@
|
|||||||
<maven-war-plugin.version>2.4</maven-war-plugin.version>
|
<maven-war-plugin.version>2.4</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.6</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -1,46 +0,0 @@
|
|||||||
package org.baeldung.persistence.dao;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.persistence.EntityManager;
|
|
||||||
import javax.persistence.PersistenceContext;
|
|
||||||
|
|
||||||
public abstract class AbstractJpaDAO<T extends Serializable> {
|
|
||||||
|
|
||||||
private Class<T> clazz;
|
|
||||||
|
|
||||||
@PersistenceContext
|
|
||||||
private EntityManager entityManager;
|
|
||||||
|
|
||||||
public final void setClazz(final Class<T> clazzToSet) {
|
|
||||||
this.clazz = clazzToSet;
|
|
||||||
}
|
|
||||||
|
|
||||||
public T findOne(final long id) {
|
|
||||||
return entityManager.find(clazz, id);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
public List<T> findAll() {
|
|
||||||
return entityManager.createQuery("from " + clazz.getName()).getResultList();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void create(final T entity) {
|
|
||||||
entityManager.persist(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
public T update(final T entity) {
|
|
||||||
return entityManager.merge(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void delete(final T entity) {
|
|
||||||
entityManager.remove(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void deleteById(final long entityId) {
|
|
||||||
final T entity = findOne(entityId);
|
|
||||||
delete(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,17 +0,0 @@
|
|||||||
package org.baeldung.persistence.dao;
|
|
||||||
|
|
||||||
import org.baeldung.persistence.model.Foo;
|
|
||||||
import org.springframework.stereotype.Repository;
|
|
||||||
|
|
||||||
@Repository
|
|
||||||
public class FooDao extends AbstractJpaDAO<Foo> implements IFooDao {
|
|
||||||
|
|
||||||
public FooDao() {
|
|
||||||
super();
|
|
||||||
|
|
||||||
setClazz(Foo.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
// API
|
|
||||||
|
|
||||||
}
|
|
@ -1,21 +0,0 @@
|
|||||||
package org.baeldung.persistence.dao;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.baeldung.persistence.model.Foo;
|
|
||||||
|
|
||||||
public interface IFooDao {
|
|
||||||
|
|
||||||
Foo findOne(long id);
|
|
||||||
|
|
||||||
List<Foo> findAll();
|
|
||||||
|
|
||||||
void create(Foo entity);
|
|
||||||
|
|
||||||
Foo update(Foo entity);
|
|
||||||
|
|
||||||
void delete(Foo entity);
|
|
||||||
|
|
||||||
void deleteById(long entityId);
|
|
||||||
|
|
||||||
}
|
|
@ -1,83 +0,0 @@
|
|||||||
package org.baeldung.persistence.model;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
|
|
||||||
import javax.persistence.Column;
|
|
||||||
import javax.persistence.Entity;
|
|
||||||
import javax.persistence.GeneratedValue;
|
|
||||||
import javax.persistence.GenerationType;
|
|
||||||
import javax.persistence.Id;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
public class Foo implements Serializable {
|
|
||||||
|
|
||||||
@Id
|
|
||||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
|
||||||
private long id;
|
|
||||||
|
|
||||||
@Column(nullable = false)
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
public Foo() {
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Foo(final String name) {
|
|
||||||
super();
|
|
||||||
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
// API
|
|
||||||
|
|
||||||
public long getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(final long id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getName() {
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setName(final String name) {
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
final int prime = 31;
|
|
||||||
int result = 1;
|
|
||||||
result = prime * result + ((name == null) ? 0 : name.hashCode());
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(final Object obj) {
|
|
||||||
if (this == obj)
|
|
||||||
return true;
|
|
||||||
if (obj == null)
|
|
||||||
return false;
|
|
||||||
if (getClass() != obj.getClass())
|
|
||||||
return false;
|
|
||||||
final Foo other = (Foo) obj;
|
|
||||||
if (name == null) {
|
|
||||||
if (other.name != null)
|
|
||||||
return false;
|
|
||||||
} else if (!name.equals(other.name))
|
|
||||||
return false;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
final StringBuilder builder = new StringBuilder();
|
|
||||||
builder.append("Foo [name=").append(name).append("]");
|
|
||||||
return builder.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,26 +0,0 @@
|
|||||||
package org.baeldung.persistence.service;
|
|
||||||
|
|
||||||
import org.baeldung.persistence.dao.IFooDao;
|
|
||||||
import org.baeldung.persistence.model.Foo;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
@Transactional
|
|
||||||
public class FooService {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IFooDao dao;
|
|
||||||
|
|
||||||
public FooService() {
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
// API
|
|
||||||
|
|
||||||
public void create(final Foo entity) {
|
|
||||||
dao.create(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,85 +0,0 @@
|
|||||||
package org.baeldung.spring;
|
|
||||||
|
|
||||||
import java.util.Properties;
|
|
||||||
|
|
||||||
import javax.persistence.EntityManagerFactory;
|
|
||||||
import javax.sql.DataSource;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.ComponentScan;
|
|
||||||
import org.springframework.context.annotation.PropertySource;
|
|
||||||
import org.springframework.core.env.Environment;
|
|
||||||
import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
|
|
||||||
import org.springframework.jdbc.datasource.DriverManagerDataSource;
|
|
||||||
import org.springframework.orm.jpa.JpaTransactionManager;
|
|
||||||
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
|
|
||||||
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
|
|
||||||
import org.springframework.transaction.PlatformTransactionManager;
|
|
||||||
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
|
||||||
|
|
||||||
import com.google.common.base.Preconditions;
|
|
||||||
|
|
||||||
// @Configuration
|
|
||||||
@EnableTransactionManagement
|
|
||||||
@PropertySource({ "classpath:persistence-mysql.properties" })
|
|
||||||
@ComponentScan({ "org.baeldung.persistence" })
|
|
||||||
public class PersistenceJPAConfig {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private Environment env;
|
|
||||||
|
|
||||||
public PersistenceJPAConfig() {
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() {
|
|
||||||
final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
|
|
||||||
em.setDataSource(dataSource());
|
|
||||||
em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
|
|
||||||
|
|
||||||
final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
|
|
||||||
// vendorAdapter.set
|
|
||||||
em.setJpaVendorAdapter(vendorAdapter);
|
|
||||||
em.setJpaProperties(additionalProperties());
|
|
||||||
|
|
||||||
return em;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public DataSource dataSource() {
|
|
||||||
final DriverManagerDataSource dataSource = new DriverManagerDataSource();
|
|
||||||
dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
|
|
||||||
dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
|
|
||||||
dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user")));
|
|
||||||
dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass")));
|
|
||||||
|
|
||||||
return dataSource;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public PlatformTransactionManager transactionManager(final EntityManagerFactory emf) {
|
|
||||||
final JpaTransactionManager transactionManager = new JpaTransactionManager();
|
|
||||||
transactionManager.setEntityManagerFactory(emf);
|
|
||||||
return transactionManager;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public PersistenceExceptionTranslationPostProcessor exceptionTranslation() {
|
|
||||||
return new PersistenceExceptionTranslationPostProcessor();
|
|
||||||
}
|
|
||||||
|
|
||||||
final Properties additionalProperties() {
|
|
||||||
return new Properties() {
|
|
||||||
{
|
|
||||||
setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
|
||||||
setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
|
||||||
|
|
||||||
// setProperty("hibernate.globally_quoted_identifiers", "true");
|
|
||||||
// note: necessary in launchpad-storage, but causing problems here
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,18 +0,0 @@
|
|||||||
package org.baeldung.spring;
|
|
||||||
|
|
||||||
import org.springframework.context.annotation.ComponentScan;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.context.annotation.ImportResource;
|
|
||||||
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
@EnableTransactionManagement
|
|
||||||
@ComponentScan({ "org.baeldung.persistence" })
|
|
||||||
@ImportResource({ "classpath:jpaConfig.xml" })
|
|
||||||
public class PersistenceJPAConfigXml {
|
|
||||||
|
|
||||||
public PersistenceJPAConfigXml() {
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,58 +0,0 @@
|
|||||||
package org.baeldung.persistence.service;
|
|
||||||
|
|
||||||
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
|
|
||||||
|
|
||||||
import org.baeldung.persistence.model.Foo;
|
|
||||||
import org.baeldung.spring.PersistenceJPAConfig;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import org.springframework.dao.DataIntegrityViolationException;
|
|
||||||
import org.springframework.dao.InvalidDataAccessApiUsageException;
|
|
||||||
import org.springframework.test.context.ContextConfiguration;
|
|
||||||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
|
||||||
import org.springframework.test.context.support.AnnotationConfigContextLoader;
|
|
||||||
|
|
||||||
@RunWith(SpringJUnit4ClassRunner.class)
|
|
||||||
@ContextConfiguration(classes = { PersistenceJPAConfig.class }, loader = AnnotationConfigContextLoader.class)
|
|
||||||
public class FooServicePersistenceIntegrationTest {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private FooService service;
|
|
||||||
|
|
||||||
// tests
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public final void whenContextIsBootstrapped_thenNoExceptions() {
|
|
||||||
//
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public final void whenEntityIsCreated_thenNoExceptions() {
|
|
||||||
service.create(new Foo(randomAlphabetic(6)));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test(expected = DataIntegrityViolationException.class)
|
|
||||||
public final void whenInvalidEntityIsCreated_thenDataException() {
|
|
||||||
service.create(new Foo());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test(expected = DataIntegrityViolationException.class)
|
|
||||||
public final void whenEntityWithLongNameIsCreated_thenDataException() {
|
|
||||||
service.create(new Foo(randomAlphabetic(2048)));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test(expected = InvalidDataAccessApiUsageException.class)
|
|
||||||
public final void whenSameEntityIsCreatedTwice_thenDataException() {
|
|
||||||
final Foo entity = new Foo(randomAlphabetic(8));
|
|
||||||
service.create(entity);
|
|
||||||
service.create(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test(expected = DataAccessException.class)
|
|
||||||
public final void temp_whenInvalidEntityIsCreated_thenDataException() {
|
|
||||||
service.create(new Foo());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user