Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJPA-1248 - Fixed build for Hibernate 5.3.

Browse Source 
Removed obsolete version detection and associated persistence units from tests.

Added explicite cascade option to many-to-one reference in id. It is not clear if this is a bug in Hibernate or not. See HHH-12251 for details.

The fix of HHH-12119 made it obvious that our use of Tuples for Projections from native queries were not correct. When looking up Tuple values we now find them using a property name with correct upper/lower case as well as with the upper case as it is actually returned by the JDBC driver.

Converted all touched tests using Hamcrest to use AssertJ instead.

See also: 
https://hibernate.atlassian.net/browse/HHH-12251
https://hibernate.atlassian.net/browse/HHH-12119

Original pull request: #245.
This commit is contained in:
Jens Schauder
2018-01-24 06:13:36 +01:00
committed by Oliver Gierke
parent c9802dc73f
commit b6c38dd450
9 changed files with 227 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/main/java/org/springframework/data/jpa/repository/query/AbstractJpaQuery.java
View File

@@ -15,9 +15,13 @@
*/
package org.springframework.data.jpa.repository.query;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import javax.persistence.EntityManager;
import javax.persistence.LockModeType;
@@ -285,19 +289,7 @@ public abstract class AbstractJpaQuery implements RepositoryQuery {
}
}
Map<String, Object> result = new HashMap<>();
for (TupleElement<?> element : elements) {
String alias = element.getAlias();
if (alias == null || isIndexAsString(alias)) {
throw new IllegalStateException("No aliases found in result tuple! Make sure your query defines aliases!");
}
result.put(element.getAlias(), tuple.get(element));
}
return result;
return new TupleBackedMap(tuple);
}
private static boolean isIndexAsString(String source) {
@@ -309,5 +301,87 @@ public abstract class AbstractJpaQuery implements RepositoryQuery {
return false;
}
}
/**
* A {@link Map} implementation which delegates all calls to a {@link Tuple}.
*
* Depending on the provided {@link Tuple} implementation it might return the same value for various keys of which only one will appear in the key/entry set.
*
* @author Jens Schauder
*/
private static class TupleBackedMap implements Map<String, Object> {
private final Tuple tuple;
TupleBackedMap(Tuple tuple) {
this.tuple = tuple;
}
@Override
public int size() {
return tuple.getElements().size();
}
@Override
public boolean isEmpty() {
return tuple.getElements().isEmpty();
}
@Override
public boolean containsKey(Object key) {
return key instanceof String && tuple.get((String) key) != null;
}
@Override
public boolean containsValue(Object value) {
return Arrays.stream(tuple.toArray()).anyMatch(v -> v.equals(value));
}
@Override
public Object get(Object key) {
return key instanceof String ? tuple.get((String) key) : null;
}
@Override
public Object put(String key, Object value) {
throw new UnsupportedOperationException("A TupleBakcedMap cannot be modified");
}
@Override
public Object remove(Object key) {
throw new UnsupportedOperationException("A TupleBakcedMap cannot be modified");
}
@Override
public void putAll(Map<? extends String, ?> m) {
throw new UnsupportedOperationException("A TupleBakcedMap cannot be modified");
}
@Override
public void clear() {
throw new UnsupportedOperationException("A TupleBakcedMap cannot be modified");
}
@Override
public Set<String> keySet() {
return tuple.getElements().stream() //
.map(TupleElement::getAlias) //
.collect(Collectors.toSet());
}
@Override
public Collection<Object> values() {
return Arrays.asList(tuple.toArray());
}
@Override
public Set<Entry<String, Object>> entrySet() {
return tuple.getElements().stream() //
.map(e -> new HashMap.SimpleEntry<String, Object>(e.getAlias(), tuple.get(e))) //
.collect(Collectors.toSet());
}
}
}
}

3
src/test/java/org/springframework/data/jpa/domain/sample/IdClassExampleEmployee.java
View File

@@ -15,6 +15,7 @@
*/
package org.springframework.data.jpa.domain.sample;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.IdClass;
@@ -29,7 +30,7 @@ import javax.persistence.ManyToOne;
public class IdClassExampleEmployee {
@Id long empId;
@Id @ManyToOne IdClassExampleDepartment department;
@Id @ManyToOne(cascade = CascadeType.ALL) IdClassExampleDepartment department;
String name;

10
src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java
View File

@@ -94,4 +94,14 @@ public class EclipseLinkNamespaceUserRepositoryTests extends NamespaceUserReposi
@Override
@Test // DATAJPA-980
public void supportsProjectionsWithNativeQueries() {}
/**
* Ignored until https://bugs.eclipse.org/bugs/show_bug.cgi?id=525319 is fixed.
*/
@Ignore
@Override
@Test // DATAJPA-1248
public void supportsProjectionsWithNativeQueriesAndCamelCaseProperty() {
super.supportsProjectionsWithNativeQueriesAndCamelCaseProperty();
}
}

23
src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
View File

@@ -50,8 +50,6 @@ import org.springframework.dao.IncorrectResultSizeDataAccessException;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.domain.Example;
import org.springframework.data.domain.ExampleMatcher;
import org.springframework.data.domain.ExampleMatcher.GenericPropertyMatcher;
import org.springframework.data.domain.ExampleMatcher.StringMatcher;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
@@ -60,6 +58,7 @@ import org.springframework.data.domain.Slice;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.data.domain.Sort.Order;
import org.springframework.data.domain.ExampleMatcher.*;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.data.jpa.domain.sample.Address;
import org.springframework.data.jpa.domain.sample.Role;
@@ -2059,8 +2058,24 @@ public class UserRepositoryTests {
assertThat(result.getLastname()).isEqualTo(user.getLastname());
}
@Test //DATAJPA-1235
public void handlesColonsFollowedByIntegerInStringLiteral(){
@Test // DATAJPA-1248
public void supportsProjectionsWithNativeQueriesAndCamelCaseProperty() {
flushTestUsers();
User user = repository.findAll().get(0);
UserRepository.EmailOnly result = repository.findEmailOnlyByNativeQuery(user.getId());
String emailAddress = result.getEmailAddress();
assertThat(emailAddress) //
.isEqualTo(user.getEmailAddress()) //
.as("ensuring email is actually not null") //
.isNotNull();
}
@Test // DATAJPA-1235
public void handlesColonsFollowedByIntegerInStringLiteral() {
String firstName = "aFirstName";

12
src/test/java/org/springframework/data/jpa/repository/cdi/EntityManagerFactoryProducer.java
View File

@@ -21,16 +21,18 @@ import javax.enterprise.inject.Produces;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import org.hibernate.Version;
/**
* Produces and {@link EntityManagerFactory}.
*
* @author Dirk Mahler
* @author Jens Schauder
*/
class EntityManagerFactoryProducer {
@Produces
@ApplicationScoped
public EntityManagerFactory createEntityManagerFactory() {
String hibernateVersion = Version.getVersionString();
return Persistence.createEntityManagerFactory(hibernateVersion.startsWith("5.2") ? "cdi-52" : "cdi");
return Persistence.createEntityManagerFactory("cdi");
}
public void close(@Disposes EntityManagerFactory entityManagerFactory) {

97
src/test/java/org/springframework/data/jpa/repository/query/TupleConverterUnitTests.java
View File

@@ -15,15 +15,18 @@
*/
package org.springframework.data.jpa.repository.query;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import javax.persistence.Tuple;
import javax.persistence.TupleElement;
import org.assertj.core.api.SoftAssertions;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,6 +44,7 @@ import org.springframework.data.repository.query.ReturnedType;
* Unit tests for {@link TupleConverter}.
*
* @author Oliver Gierke
* @author Jens Schauder
* @soundtrack James Bay - Let it go (Chaos and the Calm)
*/
@RunWith(MockitoJUnitRunner.class)
@@ -70,22 +74,103 @@ public class TupleConverterUnitTests {
TupleConverter converter = new TupleConverter(type);
assertThat(converter.convert(tuple), is((Object) "Foo"));
assertThat(converter.convert(tuple)).isEqualTo("Foo");
}
@Test // DATAJPA-1024
@SuppressWarnings("unchecked")
public void returnsNullForSingleElementTupleWithNullValue() throws Exception {
doReturn(Arrays.asList(element)).when(tuple).getElements();
doReturn(Collections.singletonList(element)).when(tuple).getElements();
doReturn(null).when(tuple).get(element);
TupleConverter converter = new TupleConverter(type);
assertThat(converter.convert(tuple), is(nullValue()));
assertThat(converter.convert(tuple)).isNull();
}
static interface SampleRepository extends CrudRepository<Object, Long> {
@SuppressWarnings("unchecked")
@Test // DATAJPA-1048
public void findsValuesForAllVariantsSupportedByTheTuple() {
Tuple tuple = new MockTuple();
TupleConverter converter = new TupleConverter(type);
Map<String, Object> map = (Map<String, Object>) converter.convert(tuple);
SoftAssertions softly = new SoftAssertions();
softly.assertThat(map.get("ONE")).isEqualTo("one");
softly.assertThat(map.get("one")).isEqualTo("one");
softly.assertThat(map.get("OnE")).isEqualTo("one");
softly.assertThat(map.get("oNe")).isEqualTo("one");
softly.assertAll();
}
interface SampleRepository extends CrudRepository<Object, Long> {
String someMethod();
}
@SuppressWarnings("unchecked")
private static class MockTuple implements Tuple {
TupleElement<String> one = new StringTupleElement("oNe");
TupleElement<String> two = new StringTupleElement("tWo");
@Override
public <X> X get(TupleElement<X> tupleElement) {
return (X) get(tupleElement.getAlias());
}
@Override
public <X> X get(String alias, Class<X> type) {
return (X) get(alias);
}
@Override
public Object get(String alias) {
return alias.toLowerCase();
}
@Override
public <X> X get(int i, Class<X> type) {
return (X) String.valueOf(i);
}
@Override
public Object get(int i) {
return get(i, Object.class);
}
@Override
public Object[] toArray() {
return new Object[] { one.getAlias().toLowerCase(), two.getAlias().toLowerCase() };
}
@Override
public List<TupleElement<?>> getElements() {
return Arrays.asList(one, two);
}
private static class StringTupleElement implements TupleElement<String> {
private final String value;
private StringTupleElement(String value) {
this.value = value;
}
@Override
public Class<? extends String> getJavaType() {
return String.class;
}
@Override
public String getAlias() {
return value;
}
}
}
}

8
src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java
View File

@@ -509,6 +509,10 @@ public interface UserRepository
@Query(value = "SELECT firstname, lastname FROM SD_User WHERE id = ?1", nativeQuery = true)
NameOnly findByNativeQuery(Integer id);
// DATAJPA-1248
@Query(value = "SELECT emailaddress FROM SD_User WHERE id = ?1", nativeQuery = true)
EmailOnly findEmailOnlyByNativeQuery(Integer id);
// DATAJPA-1235
@Query("SELECT u FROM User u where u.firstname >= ?1 and u.lastname = '000:1'")
List<User> queryWithIndexedParameterAndColonFollowedByIntegerInString(String firstname);
@@ -526,4 +530,8 @@ public interface UserRepository
String getLastname();
}
interface EmailOnly {
String getEmailAddress();
}
}

30
src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationIntegrationTests.java
View File

@@ -23,38 +23,14 @@ import java.io.Serializable;
import java.sql.Timestamp;
import java.util.Date;
import javax.persistence.Access;
import javax.persistence.AccessType;
import javax.persistence.Entity;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Id;
import javax.persistence.IdClass;
import javax.persistence.MappedSuperclass;
import javax.persistence.Persistence;
import javax.persistence.PersistenceContext;
import javax.persistence.*;
import javax.persistence.metamodel.Metamodel;
import org.hibernate.Version;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.data.jpa.domain.AbstractPersistable;
import org.springframework.data.jpa.domain.sample.ConcreteType1;
import org.springframework.data.jpa.domain.sample.Item;
import org.springframework.data.jpa.domain.sample.ItemId;
import org.springframework.data.jpa.domain.sample.ItemSite;
import org.springframework.data.jpa.domain.sample.ItemSiteId;
import org.springframework.data.jpa.domain.sample.PersistableWithIdClass;
import org.springframework.data.jpa.domain.sample.PersistableWithIdClassPK;
import org.springframework.data.jpa.domain.sample.PrimitiveVersionProperty;
import org.springframework.data.jpa.domain.sample.Role;
import org.springframework.data.jpa.domain.sample.SampleWithIdClass;
import org.springframework.data.jpa.domain.sample.SampleWithPrimitiveId;
import org.springframework.data.jpa.domain.sample.SampleWithTimestampVersion;
import org.springframework.data.jpa.domain.sample.Site;
import org.springframework.data.jpa.domain.sample.User;
import org.springframework.data.jpa.domain.sample.VersionedUser;
import org.springframework.data.jpa.domain.sample.*;
import org.springframework.data.repository.core.EntityInformation;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -283,7 +259,7 @@ public class JpaMetamodelEntityInformationIntegrationTests {
}
protected String getMetadadataPersitenceUnitName() {
return Version.getVersionString().startsWith("5.2") ? "metadata-52" : "metadata";
return "metadata";
}
@SuppressWarnings("serial")

32
src/test/resources/META-INF/persistence.xml
View File

@@ -54,25 +54,6 @@
<exclude-unlisted-classes>true</exclude-unlisted-classes>
</persistence-unit>
<persistence-unit name="cdi">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<class>org.springframework.data.jpa.domain.sample.MailMessage</class>
<class>org.springframework.data.jpa.domain.sample.MailSender</class>
<class>org.springframework.data.jpa.domain.sample.MailUser</class>
<class>org.springframework.data.jpa.domain.sample.User</class>
<class>org.springframework.data.jpa.repository.cdi.Person</class>
<class>org.springframework.data.jpa.domain.sample.Dummy</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
<property name="hibernate.connection.username" value="sa" />
<property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" />
<property name="hibernate.connection.password" value="" />
<property name="hibernate.connection.url" value="jdbc:hsqldb:mem:cdi" />
<property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" />
<property name="hibernate.hbm2ddl.auto" value="update" />
</properties>
</persistence-unit>
<persistence-unit name="cdi-52">
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.springframework.data.jpa.domain.sample.MailMessage</class>
<class>org.springframework.data.jpa.domain.sample.MailSender</class>
@@ -106,19 +87,6 @@
<!-- Custom PUs for metadata tests -->
<persistence-unit name="metadata">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<class>org.springframework.data.jpa.domain.sample.CustomAbstractPersistable</class>
<class>org.springframework.data.jpa.domain.sample.MailMessage</class>
<class>org.springframework.data.jpa.domain.sample.MailSender</class>
<class>org.springframework.data.jpa.domain.sample.MailUser</class>
<class>org.springframework.data.jpa.domain.sample.User</class>
<class>org.springframework.data.jpa.repository.support.JpaMetamodelEntityInformationIntegrationTests$Sample</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" />
</properties>
</persistence-unit>
<persistence-unit name="metadata-52">
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.springframework.data.jpa.domain.sample.CustomAbstractPersistable</class>
<class>org.springframework.data.jpa.domain.sample.MailMessage</class>