Cleanup and adding class-level expiry.

src/main/java/com/couchbase/spring/core/CouchbaseTemplate.java

@@ -52,7 +52,6 @@ public class CouchbaseTemplate implements CouchbaseOperations {
   public void insert(Object objectToSave) {
     ConvertedCouchbaseDocument converted = new ConvertedCouchbaseDocument();
     couchbaseConverter.write(objectToSave, converted);
-
     client.set(converted.getId(), converted.getExpiry(), converted.getValue());
   }
 

src/main/java/com/couchbase/spring/core/convert/MappingCouchbaseConverter.java

@@ -28,11 +28,8 @@ import com.couchbase.spring.core.mapping.CouchbasePersistentProperty;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.codehaus.jackson.JsonEncoding;
 import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.JsonGenerator;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -43,7 +40,6 @@ import org.springframework.data.mapping.model.BeanWrapper;
 import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.core.convert.ConversionService;
 import org.springframework.data.mapping.PropertyHandler;
 
 public class MappingCouchbaseConverter extends AbstractCouchbaseConverter
@@ -110,6 +106,7 @@ public class MappingCouchbaseConverter extends AbstractCouchbaseConverter
 
     String id = wrapper.getProperty(idProperty, String.class, false);
     target.setId(id);
+    target.setExpiry(entity.getExpiry());
 
     JsonFactory jsonFactory = new JsonFactory();
     OutputStream jsonStream = new ByteArrayOutputStream();

src/main/java/com/couchbase/spring/core/mapping/BasicCouchbasePersistentEntity.java

@@ -50,4 +50,14 @@ public class BasicCouchbasePersistentEntity<T>
 		context.setBeanResolver(new BeanFactoryResolver(applicationContext));
 		context.setRootObject(applicationContext);
   }
+  
+  public int getExpiry() {
+  	com.couchbase.spring.core.mapping.Document annotation = 
+  			getType().getAnnotation(com.couchbase.spring.core.mapping.Document.class);
+  	
+  	if(annotation == null) {
+  		return 0;
+  	}
+  	return annotation.expiry();
+  }
 }

src/main/java/com/couchbase/spring/core/mapping/CouchbasePersistentEntity.java

@@ -27,4 +27,10 @@ import org.springframework.data.mapping.PersistentEntity;
 public interface CouchbasePersistentEntity<T> extends
   PersistentEntity<T, CouchbasePersistentProperty> {
 
+	/**
+	 * Returns the expiry time for the document.
+	 *
+	 * @return
+	 */
+	int getExpiry();
 }

src/main/java/com/couchbase/spring/core/mapping/Document.java

@@ -37,5 +37,10 @@ import org.springframework.data.annotation.Persistent;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })
 public @interface Document {
+	
+  /**
+   * An optional expiry time for the document.
+   */
+  int expiry() default 0;
 
 }

src/test/java/com/couchbase/spring/core/CouchbaseTemplateTest.java

@@ -24,11 +24,13 @@ package com.couchbase.spring.core;
 
 import com.couchbase.client.CouchbaseClient;
 import com.couchbase.spring.TestApplicationConfig;
-import net.spy.memcached.internal.GetFuture;
+import com.couchbase.spring.core.mapping.Document;
+
 import static org.junit.Assert.*;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.annotation.Id;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -50,10 +52,34 @@ public class CouchbaseTemplateTest {
     Beer beer = new Beer(id).setName(name).setActive(active);
 
     template.insert(beer);
-    Object result = (String) client.get(id);
+    String result = (String) client.get(id);
 
     String expected = "{\"active\":" + active + ",\"name\":\"" + name + "\"}";
     assertNotNull(result);
     assertEquals(expected, result);
   }
+  
+  @Test
+  public void insertDocumentWithExpiry() throws Exception {
+  	String id = "simple-doc-with-expiry";
+  	DocumentWithExpiry doc = new DocumentWithExpiry(id);
+  	template.insert(doc);
+  	assertNotNull(client.get(id));
+  	Thread.sleep(3000);
+  	assertNull(client.get(id));
+  }
+  
+  /**
+   * A sample document that expires in 2 seconds.
+   */
+  @Document(expiry=2)
+  class DocumentWithExpiry {
+    @Id
+    private final String id;
+    
+    public DocumentWithExpiry(String id) {
+    	this.id = id;
+    }
+    
+  }
 }