[hibernate-commits] Hibernate SVN: r20820 - in search/trunk/hibernate-search/src/main/java/org/hibernate/search: query and 1 other directory.

Author: epbernard Date: 2010-10-13 07:25:36 -0400 (Wed, 13 Oct 2010) New Revision: 20820 Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/AbstractLoader.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/Loader.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/ProjectionLoader.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java Log: HSEARCH-546 Support THIS Projection and fetching definition Define loadWithoutTiming on Loader interface for its use by ProjectionLoader Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/AbstractLoader.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/AbstractLoader.java 2010-10-13 10:21:56 UTC (rev 20819) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/AbstractLoader.java 2010-10-13 11:25:36 UTC (rev 20820) @@ -55,6 +55,10 @@ return loadedObject; } + public Object loadWithoutTiming(EntityInfo entityInfo) { + return executeLoad(entityInfo); + } + public abstract Object executeLoad(EntityInfo entityInfo); public List load(EntityInfo... entityInfos) { Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/Loader.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/Loader.java 2010-10-13 10:21:56 UTC (rev 20819) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/Loader.java 2010-10-13 11:25:36 UTC (rev 20820) @@ -40,5 +40,7 @@ Object load(EntityInfo entityInfo); + Object loadWithoutTiming(EntityInfo entityInfo); + List load(EntityInfo... entityInfos); } Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/ProjectionLoader.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/ProjectionLoader.java 2010-10-13 10:21:56 UTC (rev 20819) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/ProjectionLoader.java 2010-10-13 11:25:36 UTC (rev 20820) @@ -76,6 +76,10 @@ } } + public Object loadWithoutTiming(EntityInfo entityInfo) { + throw new AssertionFailure("This method is not meant to be used on ProjectionLoader"); + } + private void initThisProjectionFlag(EntityInfo entityInfo) { if ( projectThis == null ) { projectThis = entityInfo.indexesOfThis.size() != 0; Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2010-10-13 10:21:56 UTC (rev 20819) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2010-10-13 11:25:36 UTC (rev 20820) @@ -997,6 +997,10 @@ throw new UnsupportedOperationException( "noLoader should not be used" ); } + public Object loadWithoutTiming(EntityInfo entityInfo) { + throw new UnsupportedOperationException( "noLoader should not be used" ); + } + public List load(EntityInfo... entityInfos) { throw new UnsupportedOperationException( "noLoader should not be used" ); }