fix for delivering wrong result set in case of a missing/misspleled p…

…roperty. Throws now an Exception.
ghelmling · Mar 4, 2010 · 3af01e8 · 3af01e8
1 parent c63577e
commit 3af01e8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/src/java/meetup/beeno/ScanByIndex.java b/src/java/meetup/beeno/ScanByIndex.java
@@ -11,6 +11,7 @@
 
 import meetup.beeno.mapping.EntityInfo;
 import meetup.beeno.mapping.IndexMapping;
+import meetup.beeno.mapping.MappingException;
 import meetup.beeno.util.HUtil;
 import meetup.beeno.util.PBUtil;
 
@@ -151,9 +152,10 @@ protected ResultScanner getIndexScanner(String tablename,
 	 * for the query.
 	 * @param expressions
 	 * @return
+	 * @throws MappingException 
 	 */
 	protected Criteria.PropertyExpression selectIndexedExpression(EntityInfo info, 
-																  List<Criteria.Expression> expressions) {
+																  List<Criteria.Expression> expressions) throws MappingException {
 		// first look for a direct match expression
 		for (Criteria.Expression e : expressions) {
 			if (e instanceof Criteria.RequireExpression)
@@ -179,8 +181,9 @@ protected Criteria.PropertyExpression selectIndexedExpression(EntityInfo info,
 					return propExpr;
 			}
 		}
-
-		return null;
+		// not property match found
+		// notifying user to avoid returning wrong result set
+		throw new MappingException(info.getClass(), "Can't find property " + expressions);
 	}
 
 

diff --git a/test/java/meetup/beeno/BasicOrmPersistanceTest.java b/test/java/meetup/beeno/BasicOrmPersistanceTest.java
@@ -66,7 +66,7 @@ public static void setUpBeforeClass() throws Exception {
 
 	// create tables
 	HTableDescriptor by_photoId_idx = new HTableDescriptor(
-		"test_simple-by_photoId");
+	"test_simple-by_photoId");
 	by_photoId_idx.addFamily(new HColumnDescriptor("__idx__"));
 	by_photoId_idx.addFamily(new HColumnDescriptor("props"));
 	admin.createTable(by_photoId_idx);
@@ -94,7 +94,7 @@ public void tearDown() throws Exception {
     public void testCreationAndCriteriaRetrieval() throws HBaseException {
 
 	EntityService<SimpleEntity> service = EntityService
-		.create(SimpleEntity.class);
+	.create(SimpleEntity.class);
 
 	for (int i = 0; i < 10; i++) {
 	    SimpleEntity se = new SimpleEntity();
@@ -106,8 +106,7 @@ public void testCreationAndCriteriaRetrieval() throws HBaseException {
 	}
 
 	// query rows
-	Query query = service.query().using(
-		Criteria.eq("photoIdProperty", "PHOTOID5"));
+	Query query = service.query().using(Criteria.eq("photoIdProperty", "PHOTOID5"));
 	List<SimpleEntity> items = query.execute();
 	for (SimpleEntity e : items) {
 	    System.out.println("items: " + ((SimpleEntity) e).getId());
@@ -121,13 +120,29 @@ public void testCreationAndNonExistantCriteriaRetrieval() throws HBaseException
 	EntityService<SimpleEntity> service = EntityService.create(SimpleEntity.class);
 
 	// query rows
-	Query query = service.query().using(
-		Criteria.eq("IDONTEXISTFORSURE", "PHOTOID5"));
-	List<SimpleEntity> items = query.execute();
-	for (SimpleEntity e : items) {
-	    System.out.println("items: " + ((SimpleEntity) e).getId());
+	try{
+	    Query query = service.query().using(Criteria.eq("IDONTEXISTFORSURE", "PHOTOID5"));
+	    List<SimpleEntity> items = query.execute();
+	    fail("Should have gotten a QueryException for the missing properties.");
+	} catch(QueryException e){
+	    //Sweet! Got our expected exception.
+	}
+    }
+
+    @Test
+    public void testCreationOfMixedExistingAndNonExistantCriteriaRetrieval() throws HBaseException {
+
+	EntityService<SimpleEntity> service = EntityService.create(SimpleEntity.class);
+
+	// query rows
+	try{
+	    Query query = service.query().using(Criteria.eq("IDONTEXISTFORSURE", "PHOTOID5")).where(Criteria.eq("photoIdProperty", "PHOTOID5"));
+	    List<SimpleEntity> items = query.execute();
+	    fail("Should have gotten a QueryException for the missing properties.");
+	} catch(QueryException e){
+	    //Sweet! Got our expected exception.
 	}
-	assertEquals(0, items.size());
     }
 
+
 }