From b1b503e136464410119034e08b655c299c3b3ca0 Mon Sep 17 00:00:00 2001 From: Pinaki Poddar Date: Fri, 11 Feb 2011 23:34:15 +0000 Subject: [PATCH] OPENJPA-1050: Generics for extent git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1069984 13f79535-47bb-0310-9956-ffa450edef68 --- .../openjpa/kernel/DelegatingExtent.java | 26 ++++++++--------- .../org/apache/openjpa/kernel/Extent.java | 8 +++--- .../org/apache/openjpa/kernel/ExtentImpl.java | 28 +++++++++---------- .../exps/InMemoryExpressionFactory.java | 10 +++---- .../openjpa/persistence/ExtentImpl.java | 5 ++-- 5 files changed, 38 insertions(+), 39 deletions(-) diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingExtent.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingExtent.java index 4bc67a63a..b65ce4f04 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingExtent.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingExtent.java @@ -36,27 +36,27 @@ import org.apache.openjpa.util.RuntimeExceptionTranslator; * @author Abe White * @nojavadoc */ -public class DelegatingExtent - implements Extent { +public class DelegatingExtent + implements Extent { - private final Extent _extent; - private final DelegatingExtent _del; + private final Extent _extent; + private final DelegatingExtent _del; private final RuntimeExceptionTranslator _trans; /** * Constructor; supply delegate. */ - public DelegatingExtent(Extent extent) { + public DelegatingExtent(Extent extent) { this(extent, null); } /** * Constructor; supply delegate and exception translator. */ - public DelegatingExtent(Extent extent, RuntimeExceptionTranslator trans) { + public DelegatingExtent(Extent extent, RuntimeExceptionTranslator trans) { _extent = extent; if (extent instanceof DelegatingExtent) - _del = (DelegatingExtent) extent; + _del = (DelegatingExtent) extent; else _del = null; _trans = trans; @@ -65,14 +65,14 @@ public class DelegatingExtent /** * Return the direct delegate. */ - public Extent getDelegate() { + public Extent getDelegate() { return _extent; } /** * Return the native delegate. */ - public Extent getInnermostDelegate() { + public Extent getInnermostDelegate() { return (_del == null) ? _extent : _del.getInnermostDelegate(); } @@ -84,7 +84,7 @@ public class DelegatingExtent if (other == this) return true; if (other instanceof DelegatingExtent) - other = ((DelegatingExtent) other).getInnermostDelegate(); + other = ((DelegatingExtent) other).getInnermostDelegate(); return getInnermostDelegate().equals(other); } @@ -95,7 +95,7 @@ public class DelegatingExtent return (_trans == null) ? re : _trans.translate(re); } - public Class getElementType() { + public Class getElementType() { try { return _extent.getElementType(); } catch (RuntimeException re) { @@ -143,7 +143,7 @@ public class DelegatingExtent } } - public List list() { + public List list() { try { return _extent.list(); } catch (RuntimeException re) { @@ -151,7 +151,7 @@ public class DelegatingExtent } } - public Iterator iterator() { + public Iterator iterator() { try { return _extent.iterator(); } catch (RuntimeException re) { diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Extent.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Extent.java index 75a6c82a0..96a0370c9 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Extent.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Extent.java @@ -28,7 +28,7 @@ import java.util.List; * @author Abe White * @author Patrick Linskey */ -public interface Extent { +public interface Extent { /** * Return the (mutable) fetch configuration for this extent. @@ -52,12 +52,12 @@ public interface Extent { * work correctly, but if the extent represents a large data set, this * method may be quite slow and may consume quite a bit of memory. */ - public List list(); + public List list(); /** * Return an iterator over the extent members. */ - public Iterator iterator(); + public Iterator iterator(); /** * The broker that generated the extent. @@ -67,7 +67,7 @@ public interface Extent { /** * The class of extent elements. */ - public Class getElementType(); + public Class getElementType(); /** * Whether the extent includes subclasses. diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java index 5d300f96c..0feade581 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java @@ -44,13 +44,13 @@ import org.apache.openjpa.util.OpenJPAException; * @author Patrick Linskey * @nojavadoc */ -public class ExtentImpl - implements Extent { +public class ExtentImpl + implements Extent { private static final ClassMetaData[] EMPTY_METAS = new ClassMetaData[0]; private final Broker _broker; - private final Class _type; + private final Class _type; private final boolean _subs; private final FetchConfiguration _fc; private final ReentrantLock _lock; @@ -66,7 +66,7 @@ public class ExtentImpl * @param type the candidate class * @param subs whether subclasses are included in the extent */ - ExtentImpl(Broker broker, Class type, boolean subs, + ExtentImpl(Broker broker, Class type, boolean subs, FetchConfiguration fetch) { _broker = broker; _type = type; @@ -95,9 +95,9 @@ public class ExtentImpl _ignore = ignoreChanges; } - public List list() { - List list = new ArrayList(); - Iterator itr = iterator(); + public List list() { + List list = new ArrayList(); + Iterator itr = iterator(); try { while (itr.hasNext()) list.add(itr.next()); @@ -107,7 +107,7 @@ public class ExtentImpl } } - public Iterator iterator() { + public Iterator iterator() { _broker.assertNontransactionalRead(); CloseableIterator citr = null; try { @@ -169,7 +169,7 @@ public class ExtentImpl return _broker; } - public Class getElementType() { + public Class getElementType() { return _type; } @@ -215,13 +215,13 @@ public class ExtentImpl /** * Closeable iterator. */ - private static interface CloseableIterator - extends Closeable, Iterator { + private static interface CloseableIterator + extends Closeable, Iterator { /** * Set the extent to remove self from on close. */ - public void setRemoveOnClose(ExtentImpl extent); + public void setRemoveOnClose(ExtentImpl extent); } /** @@ -231,7 +231,7 @@ public class ExtentImpl extends IteratorChain implements CloseableIterator { - private ExtentImpl _extent = null; + private ExtentImpl _extent = null; private boolean _closed = false; public boolean hasNext() { @@ -342,7 +342,7 @@ public class ExtentImpl if (!_broker.isNew(o)) return false; - Class type = o.getClass(); + Class type = o.getClass(); if (!_subs && type != _type) return false; if (_subs && !_type.isAssignableFrom(type)) diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InMemoryExpressionFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InMemoryExpressionFactory.java index c35b30a3c..da962e480 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InMemoryExpressionFactory.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InMemoryExpressionFactory.java @@ -53,7 +53,7 @@ public class InMemoryExpressionFactory private static final Object UNIQUE = new Object(); // list of unbound variables in this query - private List _unbounds = null; + private List _unbounds = null; /** * Tests whether the given candidate matches the given type and this @@ -90,8 +90,8 @@ public class InMemoryExpressionFactory return exp.evaluate(candidate, candidate, ctx, params); // grab the extent for this variable - UnboundVariable var = (UnboundVariable) _unbounds.get(i); - Iterator itr = ctx.extentIterator(var.getType(), true, null, false); + UnboundVariable var = _unbounds.get(i); + Iterator itr = ctx.extentIterator(var.getType(), true, null, false); try { // if the extent was empty, then alias the variable to null if (!itr.hasNext()) { @@ -191,7 +191,7 @@ public class InMemoryExpressionFactory return exp.evaluate(group, ctx, params); // grab the extent for this variable - UnboundVariable var = (UnboundVariable) _unbounds.get(i); + UnboundVariable var = _unbounds.get(i); Extent extent = ctx.getBroker().newExtent(var.getType(), true); Iterator itr = extent.iterator(); try { @@ -533,7 +533,7 @@ public class InMemoryExpressionFactory public Value newUnboundVariable(String name, Class type) { UnboundVariable var = new UnboundVariable(type); if (_unbounds == null) - _unbounds = new ArrayList(3); + _unbounds = new ArrayList(3); _unbounds.add(var); return var; } diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java index 1ffc4c1c7..05039baef 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java @@ -40,8 +40,7 @@ public class ExtentImpl /** * Constructor; supply delegate. */ - public ExtentImpl(EntityManagerImpl em, - org.apache.openjpa.kernel.Extent extent) { + public ExtentImpl(EntityManagerImpl em, org.apache.openjpa.kernel.Extent extent) { _em = em; _extent = new DelegatingExtent(extent, PersistenceExceptions.getRollbackTranslator(em)); @@ -50,7 +49,7 @@ public class ExtentImpl /** * Delegate. */ - public org.apache.openjpa.kernel.Extent getDelegate() { + public org.apache.openjpa.kernel.Extent getDelegate() { return _extent.getDelegate(); }