DATAJPA-417 - Upgraded to EclipseLink 2.5.1.

Was able to upgrade to EclipseLink 2.5.1 and re-enable a previously ignored integration tests. However, some of the disabled test cases still fail despite the relevant bug being reported as fixed in 2.5.1.

Turned the workaround in QueryUtils into a TODO for removal as we don't want to strongly force EclipseLink users to upgrade to 2.5.x yet.
This commit is contained in:
Oliver Gierke
2013-06-21 17:48:57 +02:00
parent d442bb5fa0
commit 9640ea81ad
3 changed files with 5 additions and 19 deletions

View File

@@ -22,7 +22,7 @@
<dist.key>DATAJPA</dist.key>
<eclipselink>2.4.0</eclipselink>
<eclipselink>2.5.1</eclipselink>
<hibernate>3.6.10.Final</hibernate>
<hsqldb1>1.8.0.10</hsqldb1>
<jpa>2.0.0</jpa>

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008-2013 the original author or authors.
* Copyright 2008-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.
@@ -440,9 +440,9 @@ public abstract class QueryUtils {
Bindable<?> propertyPathModel = null;
if (from.getModel() instanceof ManagedType) {
/*
* Avoid calling from.get(...) because this triggers the generation of an inner-join instead
* of and outer-join in eclipse-link.
* Required to keep support for EclipseLink 2.4.x. TODO: Remove once we drop that (probably Dijkstra M1)
* See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=413892
*/
propertyPathModel = (Bindable<?>) ((ManagedType<?>) from.getModel()).getAttribute(property.getSegment());

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008-2012 the original author or authors.
* Copyright 2008-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.
@@ -50,20 +50,6 @@ public class EclipseLinkNamespaceUserRepositoryTests extends NamespaceUserReposi
}
@Override
public void doesNotDropNullValuesOnPagedSpecificationExecution() {}
/**
* Works with a workaround in QueryUtils.toExpressionRecursively(…). TODO: remove once EclipseLink bug is fixed.
*
* @see DATAJPA-346
* @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=413892
*/
@Override
public void shouldGenerateLeftOuterJoinInfindAllWithPaginationAndSortOnNestedPropertyPath() {
super.shouldGenerateLeftOuterJoinInfindAllWithPaginationAndSortOnNestedPropertyPath();
}
/**
* Ignored until https://bugs.eclipse.org/bugs/show_bug.cgi?id=349477 is resolved.
*/