added a second level object and did some cleanup

Author: sharrissf

src/main/java/org/sharrissf/sample/Address.java

@@ -0,0 +1,38 @@
+package org.sharrissf.sample;
+
+public class Address {
+    private String street;
+    private String state;
+    private String city;
+
+    public Address(String street, String city, String state) {
+        this.setStreet(street);
+        this.setState(state);
+        this.setCity(city);
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setStreet(String street) {
+        this.street = street;
+    }
+
+    public String getStreet() {
+        return street;
+    }
+
+}

src/main/java/org/sharrissf/sample/EhcacheSearchPlaying.java

@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 
-import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
+import net.sf.ehcache.Ehcache;
 import net.sf.ehcache.Element;
 import net.sf.ehcache.config.CacheConfiguration;
 import net.sf.ehcache.config.Configuration;
@@ -12,7 +12,9 @@
 import net.sf.ehcache.search.Query;
 import net.sf.ehcache.search.Results;
 import net.sf.ehcache.search.aggregator.Average;
+import net.sf.ehcache.search.aggregator.Count;
 import net.sf.ehcache.search.attribute.AttributeExtractor;
+import net.sf.ehcache.search.expression.And;
 
 import org.sharrissf.sample.Person.Gender;
 
@@ -25,7 +27,7 @@
  */
 public class EhcacheSearchPlaying {
     private CacheManager cacheManager;
-    private Cache cache;
+    private Ehcache cache;
 
     public EhcacheSearchPlaying() {
         initializeCache();
@@ -48,7 +50,6 @@ private void initializeCache() {
 
         sa = new SearchAttribute();
         sa.className("org.sharrissf.sample.EhcacheSearchPlaying$NameAttributeExtractor");
-
         sa.setName("name");
         cacheConfig.addSearchAttribute(sa);
 
@@ -57,46 +58,72 @@ private void initializeCache() {
         sa.setName("gender");
         cacheConfig.addSearchAttribute(sa);
 
+        sa = new SearchAttribute();
+        sa.setExpression("value.getAddress().getState()");
+        sa.setName("state");
+        cacheConfig.addSearchAttribute(sa);
+
         cacheManagerConfig.addCache(cacheConfig);
 
         cacheManager = new CacheManager(cacheManagerConfig);
-        cache = cacheManager.getCache("test");
+        cache = cacheManager.getEhcache("test");
     }
 
     public void runTests() throws IOException {
-        cache.put(new Element(1, new Person("Tim Eck", 35, Gender.MALE)));
-        cache.put(new Element(2, new Person("Pamela Jones", 23, Gender.FEMALE)));
-        cache.put(new Element(3, new Person("Ari Zilka", 25, Gender.MALE)));
-        cache.put(new Element(4, new Person("Ari gold", 45, Gender.MALE)));
-        cache.put(new Element(5, new Person("Nabib El-Rahman", 30, Gender.MALE)));
-        for (int i = 5; i < 1000; i++) {
-            cache.put(new Element(i, new Person("Nabib El-Rahman" + i, 30, Gender.MALE)));
-        }
+        loadCache();
 
         Attribute<Integer> age = cache.getSearchAttribute("age");
         Attribute<Gender> gender = cache.getSearchAttribute("gender");
         Attribute<String> name = cache.getSearchAttribute("name");
+        Attribute<String> state = cache.getSearchAttribute("state");
 
         Query query = cache.createQuery();
         query.includeKeys();
-        query.add(name.like("Ari*"));
+        query.add(new And(name.like("Ari*"), gender.eq(Gender.MALE)));
 
         long t = System.currentTimeMillis();
+        System.out.println("Searching for all Person's who's name start with Ari and are Male:");
+
         Results results = query.execute();
         System.out.println("Took: " + (System.currentTimeMillis() - t) + " Size: " + results.size());
 
         read();
 
-        cache.put(new Element(1, new Person("Tim Eck", 36, Gender.MALE)));
+        System.out.println("Adding another Ari");
 
-        t = System.currentTimeMillis();
+        cache.put(new Element(1, new Person("Ari Eck", 36, Gender.MALE, "eck street", "San Mateo", "CA")));
 
+        t = System.currentTimeMillis();
+        System.out.println("Again Searching for all Person's who's name start with Ari and are Male:");
         results = query.execute();
         System.out.println("Took: " + (System.currentTimeMillis() - t) + " Size: " + results.size());
 
+        read();
+
+        System.out.println("Find the average age of all the entries in the cache");
+
         Query averageAgeQuery = cache.createQuery();
         averageAgeQuery.includeAggregator(new Average(), age);
         System.out.println("Average age: " + averageAgeQuery.execute().aggregateResult());
+
+        read();
+
+        System.out.println("Find the count of people from NJ");
+
+        Query newJerseyCountQuery = cache.createQuery().add(state.eq("NJ"));
+        newJerseyCountQuery.includeAggregator(new Count(), state);
+        System.out.println("Count of people from NJ: " + newJerseyCountQuery.execute().aggregateResult());
+    }
+
+    private void loadCache() {
+        cache.put(new Element(1, new Person("Tim Eck", 35, Gender.MALE, "eck street", "San Mateo", "CA")));
+        cache.put(new Element(2, new Person("Pamela Jones", 23, Gender.FEMALE, "berry st", "Parsippany", "LA")));
+        cache.put(new Element(3, new Person("Ari Zilka", 25, Gender.MALE, "big wig", "Beverly Hills", "NJ")));
+        cache.put(new Element(4, new Person("Ari gold", 45, Gender.MALE, "cool agent", "Madison", "WI")));
+        cache.put(new Element(5, new Person("Nabib El-Rahman", 30, Gender.MALE, "dah man", "Bangladesh", "MN")));
+        for (int i = 5; i < 1000; i++) {
+            cache.put(new Element(i, new Person("Nabib El-Rahman" + i, 30, Gender.MALE, "dah man", "Bangladesh", "NJ")));
+        }
     }
 
     private static void read() throws IOException {
@@ -108,9 +135,13 @@ public static void main(String[] args) throws IOException {
         new EhcacheSearchPlaying().runTests();
     }
 
-    @SuppressWarnings( { "unused", "serial" })
     public static class NameAttributeExtractor implements AttributeExtractor {
 
+        /**
+         * 
+         */
+        private static final long serialVersionUID = 1L;
+
         @Override
         public Object attributeFor(Element element) {
             return ((Person) element.getValue()).getName();

src/main/java/org/sharrissf/sample/Person.java

@@ -4,14 +4,20 @@
 
 public class Person implements Serializable {
 
+    /**
+     * Simple Person class that can be searched on by the new Ehcache Search API
+     */
+    private static final long serialVersionUID = 1L;
     private final int age;
     private final String name;
     private final Gender gender;
+    private final Address address;
 
-    public Person(String name, int age, Gender gender) {
+    public Person(String name, int age, Gender gender, String street, String state, String zip) {
         this.name = name;
         this.age = age;
         this.gender = gender;
+        this.address = new Address(street, state, zip);
     }
 
     public int getAge() {
@@ -35,4 +41,8 @@ public String toString() {
         return getClass().getSimpleName() + "(name:" + name + ", age:" + age + ", sex:" + gender.name().toLowerCase() + ")";
     }
 
+    public Address getAddress() {
+        return address;
+    }
+
 }