Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-2908 fix delayed collection proxies 

some new methods in base interfaces did not get handled correctly
This commit is contained in:
Mark Struberg 2023-04-25 16:16:46 +02:00
parent 9a87badd3b
commit 6fc05e14d0
11 changed files with 73 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
View File

@ -350,9 +350,11 @@ public abstract class AbstractMetaDataDefaults
* user-defined.
*/
protected static boolean isUserDefined(Class<?> cls) {
return cls != null && !cls.getName().startsWith("java.")
&& !cls.getName().startsWith ("javax.");
}
return cls != null
&& !cls.getName().startsWith("java.")
&& !cls.getName().startsWith ("javax.")
&& !cls.getName().startsWith ("jakarta.");
}
/**
* Affirms if the given method matches the following signature

9
openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedArrayListProxy.java
View File

@ -25,6 +25,7 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.function.IntFunction;
import org.apache.openjpa.kernel.AutoDetach;
import org.apache.openjpa.kernel.Broker;
@ -406,6 +407,14 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
return super.toArray(array);
}
@Override
public Object[] toArray(IntFunction generator) {
if (!_directAccess && isDelayLoad()) {
load();
}
return super.toArray(generator);
}
@Override
public boolean equals(Object paramObject) {
if (!_directAccess && isDelayLoad()) {

10
openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedHashSetProxy.java
View File

@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.function.IntFunction;
import org.apache.openjpa.kernel.AutoDetach;
import org.apache.openjpa.kernel.Broker;
@ -276,6 +277,14 @@ public class DelayedHashSetProxy extends HashSet implements DelayedProxy, ProxyC
return super.toArray(a);
}
@Override
public Object[] toArray(IntFunction generator) {
if (!_directAccess && isDelayLoad()) {
load();
}
return super.toArray(generator);
}
@Override
public boolean containsAll(Collection c) {
if (!_directAccess && isDelayLoad()) {
@ -284,6 +293,7 @@ public class DelayedHashSetProxy extends HashSet implements DelayedProxy, ProxyC
return super.containsAll(c);
}
@Override
public String toString() {
if (!_directAccess && isDelayLoad()) {

9
openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedLinkedHashSetProxy.java
View File

@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Comparator;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.function.IntFunction;
import org.apache.openjpa.kernel.AutoDetach;
import org.apache.openjpa.kernel.Broker;
@ -275,6 +276,14 @@ public class DelayedLinkedHashSetProxy extends LinkedHashSet implements DelayedP
return super.toArray(a);
}
@Override
public Object[] toArray(IntFunction generator) {
if (!_directAccess && isDelayLoad()) {
load();
}
return super.toArray(generator);
}
@Override
public boolean containsAll(Collection c) {
if (!_directAccess && isDelayLoad()) {

9
openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedLinkedListProxy.java
View File

@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import java.util.function.IntFunction;
import org.apache.openjpa.kernel.AutoDetach;
import org.apache.openjpa.kernel.Broker;
@ -568,6 +569,14 @@ public class DelayedLinkedListProxy extends LinkedList implements ProxyCollectio
return super.toArray(array);
}
@Override
public Object[] toArray(IntFunction generator) {
if (!_directAccess && isDelayLoad()) {
load();
}
return super.toArray(generator);
}
@Override
public boolean contains(Object object) {
if (!_directAccess && isDelayLoad()) {

9
openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedPriorityQueueProxy.java
View File

@ -24,6 +24,7 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.PriorityQueue;
import java.util.SortedSet;
import java.util.function.IntFunction;
import org.apache.openjpa.kernel.AutoDetach;
import org.apache.openjpa.kernel.Broker;
@ -330,6 +331,14 @@ public class DelayedPriorityQueueProxy extends PriorityQueue implements ProxyCol
return super.toArray(array);
}
@Override
public Object[] toArray(IntFunction generator) {
if (!_directAccess && isDelayLoad()) {
load();
}
return super.toArray(generator);
}
@Override
public boolean containsAll(Collection c) {
if (!_directAccess && isDelayLoad()) {

9
openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedTreeSetProxy.java
View File

@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.NavigableSet;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.function.IntFunction;
import org.apache.openjpa.kernel.AutoDetach;
import org.apache.openjpa.kernel.Broker;
@ -315,6 +316,14 @@ public class DelayedTreeSetProxy extends TreeSet implements ProxyCollection, Del
return super.toArray(array);
}
@Override
public Object[] toArray(IntFunction generator) {
if (!_directAccess && isDelayLoad()) {
load();
}
return super.toArray(generator);
}
@Override
public Comparator comparator() {
if (!_directAccess && isDelayLoad()) {

9
openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedVectorProxy.java
View File

@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Vector;
import java.util.function.IntFunction;
import org.apache.openjpa.kernel.AutoDetach;
import org.apache.openjpa.kernel.Broker;
@ -525,6 +526,14 @@ public class DelayedVectorProxy extends Vector implements ProxyCollection, Delay
return super.toArray(array);
}
@Override
public Object[] toArray(IntFunction generator) {
if (!_directAccess && isDelayLoad()) {
load();
}
return super.toArray(generator);
}
@Override
public synchronized boolean equals(Object paramObject) {
if (!_directAccess && isDelayLoad()) {

2
openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
View File

@ -769,7 +769,7 @@ public class ConfigurationImpl
/**
* Adds a prefix <code>"openjpa."</code> to the given key, if necessary. A key is
* considered without prefix if it starts neither of <code>"openjpa."</code>,
* <code>"java."</code> and <code>"javax."</code>.
* <code>"java."</code>, <code>"javax."</code> and {@code "jakarta."}.
*/
String fixPrefix(String key) {
return (key == null || hasKnownPrefix(key)) ? key : "openjpa."+key;

1
openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
View File

@ -66,6 +66,7 @@ public class ClassMetaDataIterator implements MetaDataIterator {
ClassLoader loader, boolean topDown) {
// skip classes that can't have metadata
if (cls != null && (cls.isPrimitive()
|| cls.getName().startsWith("jakarta.")
|| cls.getName().startsWith("java.")
|| cls.getName().startsWith("javax."))) {
_loader = null;

3
openjpa-lib/src/main/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java
View File

@ -55,7 +55,8 @@ public class TemporaryClassLoader extends ClassLoader {
// "sun." is required for JDK 1.4, which has an access check for
// sun.reflect.GeneratedSerializationConstructorAccessor1
if (name.startsWith("java.") || name.startsWith("javax.")
|| name.startsWith("sun.") || name.startsWith("jdk.")) {
|| name.startsWith("sun.") || name.startsWith("jdk.")
|| name.startsWith("jakarta.") ) {
return Class.forName(name, resolve, getClass().getClassLoader());
}