You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2016/12/06 17:30:09 UTC

[2/5] zest-java git commit: non-checked EntityFinderException

non-checked EntityFinderException

Removed explicit throws declaration from tests where appropriate


Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/5514dd1a
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/5514dd1a
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/5514dd1a

Branch: refs/heads/develop
Commit: 5514dd1a457dacb96a5b7dd4fcf0c0b2f1e4d747
Parents: 4618a2e
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Dec 5 14:54:48 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Dec 5 15:45:26 2016 +0100

----------------------------------------------------------------------
 .../runtime/query/IterableQuerySourceTest.java  | 28 --------------------
 .../zest/spi/query/EntityFinderException.java   |  3 +--
 .../test/indexing/AbstractEntityFinderTest.java | 24 -----------------
 .../test/indexing/AbstractNamedQueryTest.java   | 24 -----------------
 .../zest/test/indexing/AbstractQueryTest.java   | 27 -------------------
 .../elasticsearch/ElasticSearchQueryTest.java   |  2 --
 .../org/apache/zest/index/rdf/RdfQueryTest.java |  2 --
 .../sql/postgresql/PostgreSQLQueryTest.java     |  3 ---
 8 files changed, 1 insertion(+), 112 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/5514dd1a/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java
index d36e659..fd297ce 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java
@@ -51,7 +51,6 @@ import org.apache.zest.runtime.query.model.entities.DomainEntity;
 import org.apache.zest.runtime.query.model.entities.PetEntity;
 import org.apache.zest.runtime.query.model.values.ContactValue;
 import org.apache.zest.runtime.query.model.values.ContactsValue;
-import org.apache.zest.spi.query.EntityFinderException;
 import org.apache.zest.test.EntityTestAssembler;
 
 import static org.junit.Assert.assertTrue;
@@ -158,7 +157,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenQueryWhenExecutedReturnAll()
-        throws EntityFinderException
     {
         final QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         final Query<Person> query = qb.newQuery( Network.persons() );
@@ -168,7 +166,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenEqQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Domain> qb = qbf.newQueryBuilder( Domain.class );
         final Nameable nameable = templateFor( Nameable.class );
@@ -180,7 +177,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenMixinTypeQueryWhenExecutedReturnAll()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = qbf.newQueryBuilder( Nameable.class );
         Query<Nameable> query = qb.newQuery( Network.nameables() );
@@ -194,7 +190,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenEqQueryOnValueWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         Person personTemplate = templateFor( Person.class );
@@ -207,7 +202,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenEqQueryOnAssociationAndPropertyWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -219,7 +213,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenEqQueryOnAssociationWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -232,7 +225,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenGeQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -244,7 +236,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenAndQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = qbf.newQueryBuilder( Nameable.class );
         Person person = templateFor( Person.class );
@@ -256,7 +247,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenMultipleAndQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = qbf.newQueryBuilder( Nameable.class );
         Person person = templateFor( Person.class );
@@ -270,7 +260,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenOrQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -285,7 +274,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenMultipleOrQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -301,7 +289,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenOrQueryOnFemalesWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Female> qb = qbf.newQueryBuilder( Female.class );
         Person person = templateFor( Person.class );
@@ -316,7 +303,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenNotQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -330,7 +316,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenIsNotNullQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -342,7 +327,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenIsNullQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -354,7 +338,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenIsNotNullOnMixinTypeWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         Male person = templateFor( Male.class );
@@ -366,7 +349,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenIsNullOnMixinTypeWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Male> qb = qbf.newQueryBuilder( Male.class );
         Male person = templateFor( Male.class );
@@ -378,7 +360,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenIsNullOnAssociationWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         Male person = templateFor( Male.class );
@@ -390,7 +371,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenOrderAndMaxResultsQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = qbf.newQueryBuilder( Nameable.class );
         // should return only 2 entities
@@ -406,7 +386,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenOrderAndFirstAndMaxResultsQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = qbf.newQueryBuilder( Nameable.class );
         // should return only 3 entities starting with forth one
@@ -423,7 +402,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenOrderByOnMixinTypeQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = qbf.newQueryBuilder( Nameable.class );
         // should return all Nameable entities sorted by name
@@ -438,7 +416,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenGtAndOrderByQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = qbf.newQueryBuilder( Nameable.class );
         // should return all Nameable entities with a name > "D" sorted by name
@@ -455,7 +432,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenGtAndOrderByDescendingQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         // should return all Persons born after 1973 (Ann and Joe Doe) sorted descending by name
@@ -469,7 +445,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenOrderByMultipleQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         // should return all Persons sorted by name of the city they were born, and then by year they were born
@@ -482,7 +457,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenMatchesQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = qbf.newQueryBuilder( Nameable.class );
         Nameable nameable = templateFor( Nameable.class );
@@ -499,7 +473,6 @@ public class IterableQuerySourceTest
     // TODO solve ManyAssociation filtering for iterables
     // @Test
     public void givenOneOfQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -510,7 +483,6 @@ public class IterableQuerySourceTest
 
     @Test
     public void givenManyAssociationContainsQueryWhenExecutedThenReturnCorrect()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = qbf.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/5514dd1a/core/spi/src/main/java/org/apache/zest/spi/query/EntityFinderException.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/apache/zest/spi/query/EntityFinderException.java b/core/spi/src/main/java/org/apache/zest/spi/query/EntityFinderException.java
index 68670d9..4d91f0f 100644
--- a/core/spi/src/main/java/org/apache/zest/spi/query/EntityFinderException.java
+++ b/core/spi/src/main/java/org/apache/zest/spi/query/EntityFinderException.java
@@ -22,8 +22,7 @@ package org.apache.zest.spi.query;
 /**
  * Entity Finder Exception.
  */
-public class EntityFinderException
-    extends Exception
+public class EntityFinderException extends RuntimeException
 {
     public EntityFinderException( final String message )
     {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/5514dd1a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractEntityFinderTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractEntityFinderTest.java b/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractEntityFinderTest.java
index 0538448..a7af4c3 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractEntityFinderTest.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractEntityFinderTest.java
@@ -35,7 +35,6 @@ import org.apache.zest.api.query.grammar.OrderBy;
 import org.apache.zest.api.service.ServiceReference;
 import org.apache.zest.api.structure.Module;
 import org.apache.zest.spi.query.EntityFinder;
-import org.apache.zest.spi.query.EntityFinderException;
 import org.apache.zest.spi.query.IndexExporter;
 import org.apache.zest.test.indexing.model.Domain;
 import org.apache.zest.test.indexing.model.Female;
@@ -111,7 +110,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script01()
-        throws EntityFinderException
     {
         // should return all persons (Joe, Ann, Jack Doe)
         Iterable<EntityReference> entities = entityFinder.findEntities(
@@ -125,7 +123,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script02()
-        throws EntityFinderException
     {
         Nameable nameable = templateFor( Nameable.class );
         // should return Gaming domain
@@ -140,7 +137,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script03()
-        throws EntityFinderException
     {
         // should return all entities
         Iterable<EntityReference> entities = entityFinder.findEntities(
@@ -154,7 +150,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script04()
-        throws EntityFinderException
     {
         Person person = templateFor( Person.class );
         // should return Joe and Ann Doe
@@ -169,7 +164,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script05()
-        throws EntityFinderException
     {
         Person person = templateFor( Person.class );
         // should return Joe Doe
@@ -184,7 +178,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script06()
-        throws EntityFinderException
     {
         Person person = templateFor( Person.class );
         // should return Joe and Ann Doe
@@ -200,7 +193,6 @@ public abstract class AbstractEntityFinderTest
     @Test
     @SuppressWarnings( "unchecked" )
     public void script07()
-        throws EntityFinderException
     {
         Person person = templateFor( Person.class );
         // should return Jack Doe
@@ -216,7 +208,6 @@ public abstract class AbstractEntityFinderTest
     @Test
     @SuppressWarnings( "unchecked" )
     public void script08()
-        throws EntityFinderException
     {
         Person person = templateFor( Person.class );
         // should return Jack and Ann Doe
@@ -232,7 +223,6 @@ public abstract class AbstractEntityFinderTest
     @Test
     @SuppressWarnings( "unchecked" )
     public void script09()
-        throws EntityFinderException
     {
         Person person = templateFor( Person.class );
         // should return Ann Doe
@@ -247,7 +237,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script10()
-        throws EntityFinderException
     {
         Person person = templateFor( Person.class );
         // should return Joe and Jack Doe
@@ -262,7 +251,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script11()
-        throws EntityFinderException
     {
         Person person = templateFor( Person.class );
         // should return Joe Doe
@@ -277,7 +265,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script12()
-        throws EntityFinderException
     {
         Person person = templateFor( Person.class );
         // should return Ann and Jack Doe
@@ -292,7 +279,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script13()
-        throws EntityFinderException
     {
         Male person = templateFor( Male.class );
         // should return Jack Doe
@@ -307,7 +293,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script14()
-        throws EntityFinderException
     {
         Male person = templateFor( Male.class );
         // should return Joe Doe
@@ -322,7 +307,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script15()
-        throws EntityFinderException
     {
         Male person = templateFor( Male.class );
         // should return Ann and Joe Doe
@@ -337,7 +321,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script16()
-        throws EntityFinderException
     {
         // should return only 2 entities
         final List<EntityReference> references = StreamSupport.stream(
@@ -351,7 +334,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script17()
-        throws EntityFinderException
     {
         // should return only 2 entities starting with third one
         final List<EntityReference> references = StreamSupport.stream(
@@ -365,7 +347,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script18()
-        throws EntityFinderException
     {
         // should return all Nameable entities sorted by name
         Nameable nameable = templateFor( Nameable.class );
@@ -386,7 +367,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script19()
-        throws EntityFinderException
     {
         // should return all Nameable entities with a name > "B" sorted by name
         Nameable nameable = templateFor( Nameable.class );
@@ -413,7 +393,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script20()
-        throws EntityFinderException
     {
         // should return all Persons born after 1973 (Ann and Joe Doe) sorted descending by name
         Person person = templateFor( Person.class );
@@ -431,7 +410,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script21()
-        throws EntityFinderException
     {
         // should return all Persons sorted name of the city they were born
         Person person = templateFor( Person.class );
@@ -449,7 +427,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script22()
-        throws EntityFinderException
     {
         Nameable nameable = templateFor( Nameable.class );
         // should return Jack and Joe Doe
@@ -464,7 +441,6 @@ public abstract class AbstractEntityFinderTest
 
     @Test
     public void script23()
-        throws EntityFinderException
     {
         Nameable nameable = templateFor( Nameable.class );
         // Try using variables

http://git-wip-us.apache.org/repos/asf/zest-java/blob/5514dd1a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractNamedQueryTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractNamedQueryTest.java b/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractNamedQueryTest.java
index a348304..e2605f7 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractNamedQueryTest.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractNamedQueryTest.java
@@ -28,7 +28,6 @@ import org.apache.zest.api.injection.scope.Structure;
 import org.apache.zest.api.query.Query;
 import org.apache.zest.api.query.grammar.OrderBy;
 import org.apache.zest.api.structure.Module;
-import org.apache.zest.spi.query.EntityFinderException;
 import org.apache.zest.spi.query.IndexExporter;
 import org.apache.zest.test.indexing.model.Domain;
 import org.apache.zest.test.indexing.model.Female;
@@ -86,7 +85,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script01()
-        throws EntityFinderException
     {
         final Query<Person> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Person.class )
@@ -97,7 +95,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script02()
-        throws EntityFinderException
     {
         final Query<Domain> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Domain.class )
@@ -108,7 +105,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script03()
-        throws EntityFinderException
     {
         final Query<Nameable> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Nameable.class )
@@ -120,7 +116,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script04()
-        throws EntityFinderException
     {
         final Query<Person> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Person.class )
@@ -131,7 +126,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script05()
-        throws EntityFinderException
     {
         final Query<Person> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Person.class )
@@ -142,7 +136,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script06()
-        throws EntityFinderException
     {
         final Query<Person> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Person.class )
@@ -153,7 +146,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script07()
-        throws EntityFinderException
     {
         final Query<Nameable> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Nameable.class )
@@ -164,7 +156,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script08()
-        throws EntityFinderException
     {
         final Query<Person> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Person.class )
@@ -175,7 +166,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script09()
-        throws EntityFinderException
     {
         final Query<Female> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Female.class )
@@ -186,7 +176,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script10()
-        throws EntityFinderException
     {
         final Query<Person> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Person.class )
@@ -197,7 +186,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script11()
-        throws EntityFinderException
     {
         final Query<Person> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Person.class )
@@ -208,7 +196,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script12()
-        throws EntityFinderException
     {
         final Query<Person> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Person.class )
@@ -219,7 +206,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script13()
-        throws EntityFinderException
     {
         final Query<Person> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Person.class )
@@ -230,7 +216,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script14()
-        throws EntityFinderException
     {
         final Query<Male> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Male.class )
@@ -241,7 +226,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script15()
-        throws EntityFinderException
     {
         final Query<Person> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Person.class )
@@ -252,7 +236,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script16()
-        throws EntityFinderException
     {
         Nameable nameable = templateFor( Nameable.class );
         final Query<Nameable> query = unitOfWork.newQuery( this.moduleInstance
@@ -266,7 +249,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script17()
-        throws EntityFinderException
     {
         Nameable nameable = templateFor( Nameable.class );
         Predicate<Composite> predicate = queries.get( "script17" );
@@ -282,7 +264,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script18()
-        throws EntityFinderException
     {
         Nameable nameable = templateFor( Nameable.class );
         Predicate<Composite> predicate = queries.get( "script18" );
@@ -297,7 +278,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script19()
-        throws EntityFinderException
     {
         Nameable nameable = templateFor( Nameable.class );
         final Query<Nameable> query = unitOfWork.newQuery( this.moduleInstance
@@ -310,7 +290,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script20()
-        throws EntityFinderException
     {
         Person person = templateFor( Person.class );
         final Query<Person> query = unitOfWork.newQuery( this.moduleInstance
@@ -323,7 +302,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script21()
-        throws EntityFinderException
     {
         Person person = templateFor( Person.class );
         final Query<Person> query = unitOfWork.newQuery( this.moduleInstance
@@ -336,7 +314,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script22()
-        throws EntityFinderException
     {
         final Query<Nameable> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Nameable.class )
@@ -347,7 +324,6 @@ public abstract class AbstractNamedQueryTest
 
     @Test
     public void script24()
-        throws EntityFinderException
     {
         final Query<Domain> query = unitOfWork.newQuery( this.moduleInstance
             .newQueryBuilder( Domain.class )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/5514dd1a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractQueryTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractQueryTest.java b/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractQueryTest.java
index 05c038e..8e639c3 100644
--- a/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractQueryTest.java
+++ b/core/testsupport/src/main/java/org/apache/zest/test/indexing/AbstractQueryTest.java
@@ -36,7 +36,6 @@ import org.apache.zest.api.query.Query;
 import org.apache.zest.api.query.QueryBuilder;
 import org.apache.zest.api.query.grammar.OrderBy;
 import org.apache.zest.api.structure.Module;
-import org.apache.zest.spi.query.EntityFinderException;
 import org.apache.zest.spi.query.IndexExporter;
 import org.apache.zest.test.indexing.model.Account;
 import org.apache.zest.test.indexing.model.City;
@@ -92,7 +91,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script01()
-        throws EntityFinderException
     {
         final QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         final Query<Person> query = unitOfWork.newQuery( qb );
@@ -102,7 +100,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script02()
-        throws EntityFinderException
     {
         final QueryBuilder<Domain> qb = this.moduleInstance.newQueryBuilder( Domain.class );
         final Nameable nameable = templateFor( Nameable.class );
@@ -113,7 +110,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script03()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = this.moduleInstance.newQueryBuilder( Nameable.class );
         Query<Nameable> query = unitOfWork.newQuery( qb );
@@ -124,7 +120,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script04()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         Person personTemplate = templateFor( Person.class );
@@ -136,7 +131,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script04_ne()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         Person personTemplate = templateFor( Person.class );
@@ -148,7 +142,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script05()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -164,7 +157,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script06()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -176,7 +168,6 @@ public abstract class AbstractQueryTest
     @Test
     @SuppressWarnings( "unchecked" )
     public void script07()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = this.moduleInstance.newQueryBuilder( Nameable.class );
         Person person = templateFor( Person.class );
@@ -189,7 +180,6 @@ public abstract class AbstractQueryTest
     @Test
     @SuppressWarnings( "unchecked" )
     public void script08()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -202,7 +192,6 @@ public abstract class AbstractQueryTest
     @Test
     @SuppressWarnings( "unchecked" )
     public void script09()
-        throws EntityFinderException
     {
         QueryBuilder<Female> qb = this.moduleInstance.newQueryBuilder( Female.class );
         Person person = templateFor( Person.class );
@@ -214,7 +203,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script10()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -225,7 +213,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script11()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -236,7 +223,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script12()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -247,7 +233,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script12_ne()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -258,7 +243,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script13()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         Male person = templateFor( Male.class );
@@ -269,7 +253,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script14()
-        throws EntityFinderException
     {
         QueryBuilder<Male> qb = this.moduleInstance.newQueryBuilder( Male.class );
         Male person = templateFor( Male.class );
@@ -280,7 +263,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script15()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         Male person = templateFor( Male.class );
@@ -291,7 +273,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script16()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = this.moduleInstance.newQueryBuilder( Nameable.class );
         // should return only 2 entities
@@ -305,7 +286,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script17()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = this.moduleInstance.newQueryBuilder( Nameable.class );
         // should return only 3 entities starting with forth one
@@ -320,7 +300,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script18()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = this.moduleInstance.newQueryBuilder( Nameable.class );
         // should return all Nameable entities sorted by name
@@ -334,7 +313,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script19()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = this.moduleInstance.newQueryBuilder( Nameable.class );
         // should return all Nameable entities with a name > "D" sorted by name
@@ -347,7 +325,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script20()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         // should return all Persons born after 1973 (Ann and Joe Doe) sorted descending by name
@@ -360,7 +337,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script21()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         // should return all Persons sorted by name of the city they were born, and then by year they were born
@@ -373,7 +349,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script22()
-        throws EntityFinderException
     {
         QueryBuilder<Nameable> qb = this.moduleInstance.newQueryBuilder( Nameable.class );
         Nameable nameable = templateFor( Nameable.class );
@@ -385,7 +360,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script23()
-        throws EntityFinderException
     {
         QueryBuilder<Person> qb = this.moduleInstance.newQueryBuilder( Person.class );
         Person person = templateFor( Person.class );
@@ -397,7 +371,6 @@ public abstract class AbstractQueryTest
 
     @Test
     public void script24()
-        throws EntityFinderException
     {
         final QueryBuilder<Domain> qb = this.moduleInstance.newQueryBuilder( Domain.class );
         final Nameable nameable = templateFor( Nameable.class );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/5514dd1a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java
index dfc9bab..1c8d284 100644
--- a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java
+++ b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java
@@ -27,7 +27,6 @@ import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.index.elasticsearch.assembly.ESClientIndexQueryAssembler;
 import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
 import org.apache.zest.library.fileconfig.FileConfigurationOverride;
-import org.apache.zest.spi.query.EntityFinderException;
 import org.apache.zest.test.EntityTestAssembler;
 import org.apache.zest.test.indexing.AbstractQueryTest;
 import org.apache.zest.test.util.NotYetImplemented;
@@ -98,7 +97,6 @@ public class ElasticSearchQueryTest extends AbstractQueryTest
     @Test
     @Override
     public void script23()
-        throws EntityFinderException
     {
         super.script23();
     }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/5514dd1a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfQueryTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfQueryTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfQueryTest.java
index 7c6971c..454f6d4 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfQueryTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfQueryTest.java
@@ -25,7 +25,6 @@ import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler;
 import org.apache.zest.index.rdf.assembly.RdfNativeSesameStoreAssembler;
 import org.apache.zest.library.rdf.repository.NativeConfiguration;
-import org.apache.zest.spi.query.EntityFinderException;
 import org.apache.zest.test.EntityTestAssembler;
 import org.apache.zest.test.indexing.AbstractQueryTest;
 import org.junit.Ignore;
@@ -59,7 +58,6 @@ public class RdfQueryTest
     @Ignore( "oneOf() Query Expression not supported by RDF Indexing" )
     @Override
     public void script23()
-        throws EntityFinderException
     {
         super.script23();
     }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/5514dd1a/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLQueryTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLQueryTest.java b/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLQueryTest.java
index 503269f..a054e4a 100644
--- a/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLQueryTest.java
+++ b/extensions/indexing-sql/src/test/java/org/apache/zest/index/sql/postgresql/PostgreSQLQueryTest.java
@@ -24,7 +24,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.spi.query.EntityFinderException;
 import org.apache.zest.test.indexing.AbstractQueryTest;
 
 import static org.apache.zest.test.util.Assume.assumeConnectivity;
@@ -77,7 +76,6 @@ public class PostgreSQLQueryTest
     @Ignore( "NeSpecification is not supported by SQL Indexing" )
     @Override
     public void script04_ne()
-        throws EntityFinderException
     {
         super.script04_ne();
     }
@@ -86,7 +84,6 @@ public class PostgreSQLQueryTest
     @Ignore( "NeSpecification is not supported by SQL Indexing" )
     @Override
     public void script12_ne()
-        throws EntityFinderException
     {
         super.script04_ne();
     }