diff --git a/pom.xml b/pom.xml index 8dabf9b..df53d2d 100755 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.build spring-data-parent - 1.9.10.BUILD-SNAPSHOT + 1.9.10.RELEASE @@ -42,8 +42,8 @@ - 1.13.10.BUILD-SNAPSHOT - 1.11.10.BUILD-SNAPSHOT + 1.13.10.RELEASE + 1.11.10.RELEASE 4.3.11 @@ -114,8 +114,8 @@ - spring-libs-snapshot - https://repo.spring.io/libs-snapshot + spring-libs-release + https://repo.spring.io/libs-release diff --git a/src/main/java/org/springframework/data/envers/repository/support/DefaultRevisionMetadata.java b/src/main/java/org/springframework/data/envers/repository/support/DefaultRevisionMetadata.java index b309be2..71f77db 100755 --- a/src/main/java/org/springframework/data/envers/repository/support/DefaultRevisionMetadata.java +++ b/src/main/java/org/springframework/data/envers/repository/support/DefaultRevisionMetadata.java @@ -1,68 +1,68 @@ -/* - * Copyright 2012 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.envers.repository.support; - -import org.hibernate.envers.DefaultRevisionEntity; -import org.joda.time.DateTime; -import org.springframework.data.history.RevisionMetadata; -import org.springframework.util.Assert; - -/** - * {@link RevisionMetadata} working with a {@link DefaultRevisionEntity}. - * - * @author Oliver Gierke - * @author Philip Huegelmeyer - */ -public class DefaultRevisionMetadata implements RevisionMetadata { - - private final DefaultRevisionEntity entity; - - /** - * Creates a new {@link DefaultRevisionMetadata}. - * - * @param entity must not be {@literal null}. - */ - public DefaultRevisionMetadata(DefaultRevisionEntity entity) { - - Assert.notNull(entity); - this.entity = entity; - } - - /* - * (non-Javadoc) - * @see org.springframework.data.history.RevisionMetadata#getRevisionNumber() - */ - public Integer getRevisionNumber() { - return entity.getId(); - } - - /* - * (non-Javadoc) - * @see org.springframework.data.history.RevisionMetadata#getRevisionDate() - */ - public DateTime getRevisionDate() { - return new DateTime(entity.getTimestamp()); - } - - /* - * (non-Javadoc) - * @see org.springframework.data.history.RevisionMetadata#getDelegate() - */ - @SuppressWarnings("unchecked") - public T getDelegate() { - return (T) entity; - } -} +/* + * Copyright 2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.envers.repository.support; + +import org.hibernate.envers.DefaultRevisionEntity; +import org.joda.time.DateTime; +import org.springframework.data.history.RevisionMetadata; +import org.springframework.util.Assert; + +/** + * {@link RevisionMetadata} working with a {@link DefaultRevisionEntity}. + * + * @author Oliver Gierke + * @author Philip Huegelmeyer + */ +public class DefaultRevisionMetadata implements RevisionMetadata { + + private final DefaultRevisionEntity entity; + + /** + * Creates a new {@link DefaultRevisionMetadata}. + * + * @param entity must not be {@literal null}. + */ + public DefaultRevisionMetadata(DefaultRevisionEntity entity) { + + Assert.notNull(entity); + this.entity = entity; + } + + /* + * (non-Javadoc) + * @see org.springframework.data.history.RevisionMetadata#getRevisionNumber() + */ + public Integer getRevisionNumber() { + return entity.getId(); + } + + /* + * (non-Javadoc) + * @see org.springframework.data.history.RevisionMetadata#getRevisionDate() + */ + public DateTime getRevisionDate() { + return new DateTime(entity.getTimestamp()); + } + + /* + * (non-Javadoc) + * @see org.springframework.data.history.RevisionMetadata#getDelegate() + */ + @SuppressWarnings("unchecked") + public T getDelegate() { + return (T) entity; + } +} diff --git a/src/test/java/org/springframework/data/envers/Config.java b/src/test/java/org/springframework/data/envers/Config.java index b0fabf5..61b57ba 100755 --- a/src/test/java/org/springframework/data/envers/Config.java +++ b/src/test/java/org/springframework/data/envers/Config.java @@ -1,76 +1,76 @@ -/* - * Copyright 2012-2014 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.envers; - -import java.sql.SQLException; -import java.util.Collections; -import java.util.Map; - -import javax.sql.DataSource; - -import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; -import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import org.springframework.orm.jpa.AbstractEntityManagerFactoryBean; -import org.springframework.orm.jpa.JpaTransactionManager; -import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; -import org.springframework.orm.jpa.vendor.Database; -import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; -import org.springframework.transaction.PlatformTransactionManager; - -/** - * Spring JavaConfig configuration for general infrastructure. - * - * @author Oliver Gierke - */ -@Configuration -@EnableJpaRepositories(repositoryFactoryBeanClass = EnversRevisionRepositoryFactoryBean.class) -public class Config { - - @Bean - public DataSource dataSource() throws SQLException { - return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2).build(); - } - - @Bean - public PlatformTransactionManager transactionManager() throws SQLException { - return new JpaTransactionManager(); - } - - @Bean - public AbstractEntityManagerFactoryBean entityManagerFactory() throws SQLException { - - HibernateJpaVendorAdapter jpaVendorAdapter = new HibernateJpaVendorAdapter(); - jpaVendorAdapter.setDatabase(Database.H2); - jpaVendorAdapter.setGenerateDdl(true); - - LocalContainerEntityManagerFactoryBean bean = new LocalContainerEntityManagerFactoryBean(); - bean.setJpaVendorAdapter(jpaVendorAdapter); - bean.setPackagesToScan(Config.class.getPackage().getName()); - bean.setDataSource(dataSource()); - bean.setJpaPropertyMap(jpaProperties()); - - return bean; - } - - private Map jpaProperties() { - return Collections.singletonMap("org.hibernate.envers.audit_strategy", ValidityAuditStrategy.class.getName()); - } -} +/* + * Copyright 2012-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.envers; + +import java.sql.SQLException; +import java.util.Collections; +import java.util.Map; + +import javax.sql.DataSource; + +import org.hibernate.envers.strategy.ValidityAuditStrategy; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; +import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; +import org.springframework.orm.jpa.AbstractEntityManagerFactoryBean; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.orm.jpa.vendor.Database; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; +import org.springframework.transaction.PlatformTransactionManager; + +/** + * Spring JavaConfig configuration for general infrastructure. + * + * @author Oliver Gierke + */ +@Configuration +@EnableJpaRepositories(repositoryFactoryBeanClass = EnversRevisionRepositoryFactoryBean.class) +public class Config { + + @Bean + public DataSource dataSource() throws SQLException { + return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2).build(); + } + + @Bean + public PlatformTransactionManager transactionManager() throws SQLException { + return new JpaTransactionManager(); + } + + @Bean + public AbstractEntityManagerFactoryBean entityManagerFactory() throws SQLException { + + HibernateJpaVendorAdapter jpaVendorAdapter = new HibernateJpaVendorAdapter(); + jpaVendorAdapter.setDatabase(Database.H2); + jpaVendorAdapter.setGenerateDdl(true); + + LocalContainerEntityManagerFactoryBean bean = new LocalContainerEntityManagerFactoryBean(); + bean.setJpaVendorAdapter(jpaVendorAdapter); + bean.setPackagesToScan(Config.class.getPackage().getName()); + bean.setDataSource(dataSource()); + bean.setJpaPropertyMap(jpaProperties()); + + return bean; + } + + private Map jpaProperties() { + return Collections.singletonMap("org.hibernate.envers.audit_strategy", ValidityAuditStrategy.class.getName()); + } +} diff --git a/src/test/java/org/springframework/data/envers/sample/Country.java b/src/test/java/org/springframework/data/envers/sample/Country.java index 81596e3..8bc9127 100755 --- a/src/test/java/org/springframework/data/envers/sample/Country.java +++ b/src/test/java/org/springframework/data/envers/sample/Country.java @@ -1,33 +1,33 @@ -/* - * Copyright 2012 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.envers.sample; - -import javax.persistence.Entity; - -import org.hibernate.envers.Audited; - -/** - * Sample domain class. - * - * @author Oliver Gierke - */ -@Audited -@Entity -public class Country extends AbstractEntity { - - public String code; - public String name; -} +/* + * Copyright 2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.envers.sample; + +import javax.persistence.Entity; + +import org.hibernate.envers.Audited; + +/** + * Sample domain class. + * + * @author Oliver Gierke + */ +@Audited +@Entity +public class Country extends AbstractEntity { + + public String code; + public String name; +} diff --git a/src/test/java/org/springframework/data/envers/sample/License.java b/src/test/java/org/springframework/data/envers/sample/License.java index e727577..8c84858 100755 --- a/src/test/java/org/springframework/data/envers/sample/License.java +++ b/src/test/java/org/springframework/data/envers/sample/License.java @@ -1,41 +1,41 @@ -/* - * Copyright 2012 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.envers.sample; - -import java.util.Set; - -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.Version; - -import org.hibernate.envers.Audited; - -/** - * Sample domain class. - * - * @author Philip Huegelmeyer - */ -@Audited -@Entity -public class License extends AbstractEntity { - - @Version - public Integer version; - - public String name; - @ManyToMany - public Set laender; -} +/* + * Copyright 2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.envers.sample; + +import java.util.Set; + +import javax.persistence.Entity; +import javax.persistence.ManyToMany; +import javax.persistence.Version; + +import org.hibernate.envers.Audited; + +/** + * Sample domain class. + * + * @author Philip Huegelmeyer + */ +@Audited +@Entity +public class License extends AbstractEntity { + + @Version + public Integer version; + + public String name; + @ManyToMany + public Set laender; +}