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

OPENJPA-536. Committing on behalf of Amy Yang. 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/1.1.x@650559 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Patrick Linskey 2008-04-22 15:46:58 +00:00
parent a657dda465
commit 44e06d03a3
5 changed files with 82 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceComparator.java
View File

@ -30,7 +30,7 @@ import java.util.Comparator;
public class InheritanceComparator
implements Comparator, Serializable {
private Class _base = null;
private Class _base = Object.class;
/**
* Set the least-derived type possible; defaults to <code>null</code>.
@ -92,8 +92,6 @@ public class InheritanceComparator
private int levels(Class to) {
if (to.isInterface())
return to.getInterfaces().length;
if (_base == null)
return 0;
for (int i = 0; to != null; i++, to = to.getSuperclass())
if (to == _base)
return i;

72
openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceOrderedMetaDataList.java Normal file
View File

@ -0,0 +1,72 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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.apache.openjpa.meta;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.ListIterator;
import java.io.Serializable;
public class InheritanceOrderedMetaDataList
implements Serializable {
private MetaDataInheritanceComparator _comp
= new MetaDataInheritanceComparator();
private LinkedList<ClassMetaData> buffer = new LinkedList<ClassMetaData>();
public boolean add(ClassMetaData meta) {
for (ListIterator<ClassMetaData> itr = buffer.listIterator();
itr.hasNext();) {
int ord = _comp.compare(meta, itr.next());
if (ord > 0)
continue;
if (ord == 0)
return false;
itr.previous();
itr.add(meta);
return true;
}
buffer.add(meta);
return true;
}
public boolean remove(ClassMetaData meta) {
return buffer.remove(meta);
}
public ClassMetaData peek() {
return buffer.peek();
}
public int size() {
return buffer.size();
}
public Iterator<ClassMetaData> iterator() {
return buffer.iterator();
}
public boolean isEmpty() {
return buffer.isEmpty();
}
public void clear() {
buffer.clear();
}
}

41
openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
View File

@ -31,7 +31,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import org.apache.commons.lang.StringUtils;
@ -137,10 +136,10 @@ public class MetaDataRepository
private final Collection _registered = new HashSet();
// set of metadatas we're in the process of resolving
private final SortedSet _resolving = new TreeSet
(new MetaDataInheritanceComparator());
private final SortedSet _mapping = new TreeSet
(new MetaDataInheritanceComparator());
private final InheritanceOrderedMetaDataList _resolving =
new InheritanceOrderedMetaDataList();
private final InheritanceOrderedMetaDataList _mapping =
new InheritanceOrderedMetaDataList();
private final List _errs = new LinkedList();
// system listeners
@ -574,12 +573,6 @@ public class MetaDataRepository
* if we're still in the process of resolving other metadatas.
*/
private List resolveMeta(ClassMetaData meta) {
// pcl: 10 April 2008: disabling temporarily as this is causing
// integration problems. A more complete fix will be forthcoming.
// See OPENJPA-536. Also disabled code in TestGetMetaData.
// setBaseIfNecessary(meta);
if (meta.getPCSuperclass() == null) {
// set superclass
Class sup = meta.getDescribedType().getSuperclass();
@ -623,27 +616,6 @@ public class MetaDataRepository
return processBuffer(meta, _resolving, MODE_META);
}
private void setBaseIfNecessary(ClassMetaData meta) {
if (_resolving == null)
return;
InheritanceComparator comp =
(InheritanceComparator) _resolving.comparator();
if (meta.getPCSuperclass() == null) {
Class sup = meta.getDescribedType().getSuperclass();
Class pBase = null;
while (sup != null && sup != Object.class) {
pBase = sup;
sup = sup.getSuperclass();
}
if (pBase != null && !pBase.equals(comp.getBase())) {
// setBase() can be called because getMetaData() is
// syncronized
comp.setBase(pBase);
}
}
}
/**
* Load mapping information for the given metadata.
*/
@ -724,7 +696,8 @@ public class MetaDataRepository
/**
* Process the given metadata and the associated buffer.
*/
private List processBuffer(ClassMetaData meta, SortedSet buffer, int mode) {
private List processBuffer(ClassMetaData meta,
InheritanceOrderedMetaDataList buffer, int mode) {
// if we're already processing a metadata, just buffer this one; when
// the initial metadata finishes processing, we traverse the buffer
// and process all the others that were introduced during reentrant
@ -739,7 +712,7 @@ public class MetaDataRepository
ClassMetaData buffered;
List processed = new ArrayList(5);
while (!buffer.isEmpty()) {
buffered = (ClassMetaData) buffer.first();
buffered = buffer.peek();
try {
buffered.resolve(mode);
processed.add(buffered);

7
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestGetMetaData.java
View File

@ -29,10 +29,7 @@ public class TestGetMetaData extends SingleEMFTestCase {
}
public void testGetMetaData() {
// pcl: 10 April 2008: disabling temporarily as this is causing
// integration problems. A more complete fix will be forthcoming.
// See OPENJPA-536. Also disabled code in MetaDataRepository.
// assertNotNull(JPAFacadeHelper.getMetaData(emf, Item.class));
// assertNotNull(JPAFacadeHelper.getMetaData(emf, Person.class));
assertNotNull(JPAFacadeHelper.getMetaData(emf, Item.class));
assertNotNull(JPAFacadeHelper.getMetaData(emf, Person.class));
}
}

8
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestMetaDataInheritanceComparator.java
View File

@ -25,10 +25,6 @@ import org.apache.openjpa.persistence.JPAFacadeHelper;
public class TestMetaDataInheritanceComparator extends PersistenceTestCase {
public void testInheritanceComparatorWithoutBase() {
inheritanceComparatorHelper(false);
}
public void testInheritanceComparatorWithBase() {
inheritanceComparatorHelper(true);
}
@ -47,10 +43,6 @@ public class TestMetaDataInheritanceComparator extends PersistenceTestCase {
assertTrue(comp.compare(AbstractThing.class, C.class) < 0);
}
public void testMetaDataInheritanceComparatorWithoutBase() {
metaDataInheritanceComparatorHelper(false);
}
public void testMetaDataInheritanceComparatorWithBase() {
metaDataInheritanceComparatorHelper(true);
}