more examples, unit tests. Added a generic comparison method to the test

base class. Added more methods to VirtualLists

Author: tim-aero

src/main/java/com/aerospike/mapper/tools/AeroMapper.java

@@ -249,6 +249,25 @@ public <T> T translateFromAerospike(@NotNull Object obj, @NotNull Class<T> expec
     }
 
 
+    /**
+     * Save each object in the database. This method will perform a REPLACE on the existing record so any existing
+     * data will be overwritten by the data in the passed object. This is a convenience method for
+     * <pre>
+     * save(A);
+     * save(B);
+     * save(C);
+     * </pre>
+     * Not that no transactionality is implied by this method -- if any of the save methods fail, the exception will be
+     * thrown without trying the other objects, nor attempting to roll back previously saved objects
+     * @param object
+     * @throws AerospikeException
+     */
+    public void save(@NotNull Object ... objects) throws AerospikeException {
+    	for (Object thisObject : objects) {
+    		this.save(thisObject);
+    	}
+    }
+
     /**
      * Save an object in the database. This method will perform a REPLACE on the existing record so any existing
      * data will be overwritten by the data in the passed object

src/main/java/com/aerospike/mapper/tools/VirtualList.java

@@ -129,6 +129,10 @@ public MultiOperation<E> append(E item) {
 			this.interactions.add(new Interactor(virtualList.getAppendOperation(aerospikeItem)));
 			return this;
 		}
+		public MultiOperation<E> removeByKey(Object key) {
+			this.interactions.add(getRemoveKeyInteractor(key));
+			return this;
+		}
 		public MultiOperation<E> removeByKeyRange(Object startKey, Object endKey) {
 			this.interactions.add(getRemoveKeyRangeInteractor(startKey, endKey));
 			return this;
@@ -473,7 +477,42 @@ public boolean isGetOperation() {
 		};
 		return new Interactor(deferred);
 	}
+
+	private Interactor getRemoveKeyInteractor(Object key) {
+		DeferredOperation deferred = new DeferredOperation() {
+			
+			@Override
+			public ResultsUnpacker[] getUnpackers(OperationParameters operationParams) {
+				switch (operationParams.getNeedsResultOfType()) {
+				case DEFAULT:
+				case ELEMENTS:
+					return new ResultsUnpacker[] { new ArrayUnpacker(instanceMapper) };
+				default:
+					return new ResultsUnpacker[0];
+				}
+			}
+			
+			@Override
+			public Operation getOperation(OperationParameters operationParams) {
+	    		if (listType == EmbedType.LIST) {
+    				return ListOperation.removeByValue(binName, getValue(key, true), 
+    						returnTypeToListReturnType(operationParams.getNeedsResultOfType()));
+				}
+	    		else {
+    				return MapOperation.removeByKey(binName, getValue(key, true), 
+    						returnTypeToMapReturnType(operationParams.getNeedsResultOfType()));
+	    		}
+			}
+
+			@Override
+			public boolean isGetOperation() {
+				return false;
+			}
+		};
+		return new Interactor(deferred);
+	}
 
+
 	private Interactor getRemoveValueRangeInteractor(Object startValue, Object endValue) {
 		DeferredOperation deferred = new DeferredOperation() {
 

src/test/java/com/aerospike/mapper/AeroMapperBaseTest.java

@@ -1,5 +1,7 @@
 package com.aerospike.mapper;
 
+import static org.junit.Assert.assertEquals;
+
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -9,6 +11,9 @@
 import com.aerospike.client.DebugAerospikeClient.Options;
 import com.aerospike.client.IAerospikeClient;
 import com.aerospike.mapper.tools.ClassCache;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
 
 public abstract class AeroMapperBaseTest {
 
@@ -33,4 +38,17 @@ public void clearCache() {
 		ClassCache.getInstance().clear();
 
     }
+    
+    public void compare(Object original, Object read) {
+    	try {
+			ObjectWriter objectWriter = new ObjectMapper().writerWithDefaultPrettyPrinter();
+			String readString = objectWriter.writeValueAsString(read);
+			System.out.println(readString);
+			String originalObject = objectWriter.writeValueAsString(original);
+			assertEquals(originalObject, readString);
+    	} catch (JsonProcessingException jpe) {
+    		throw new RuntimeException(jpe);
+    	}
+    	
+    }
 }

src/test/java/com/aerospike/mapper/InheritenceTest.java

@@ -0,0 +1,72 @@
+package com.aerospike.mapper;
+
+import org.junit.Test;
+
+import com.aerospike.mapper.annotations.AerospikeEmbed;
+import com.aerospike.mapper.annotations.AerospikeKey;
+import com.aerospike.mapper.annotations.AerospikeRecord;
+import com.aerospike.mapper.tools.AeroMapper;
+
+public class InheritenceTest extends AeroMapperBaseTest {
+	@AerospikeRecord(namespace = "test", set = "A")
+	public static class A {
+		@AerospikeKey
+		public int id;
+		public String name;
+	 	@AerospikeEmbed
+		public B topB;
+		@AerospikeEmbed
+		public B cAsAb;
+		@AerospikeEmbed
+		public B dAsAb;
+	}
+	
+	@AerospikeRecord(namespace = "test", set = "B")
+	public static class B {
+		@AerospikeKey
+		public int id;
+		public String name;
+	}
+	
+	// Inherit namespace and set from B
+	@AerospikeRecord
+	public static class C extends B {
+		public String otherName;
+	}
+
+	// Map into a separate table
+	@AerospikeRecord(namespace = "test", set = "D")
+	public static class D extends B {
+		public int age;
+	}
+
+	@Test
+	public void run() {
+		AeroMapper mapper = new AeroMapper.Builder(client).build();
+		A a = new A();
+		a.id = 1;
+		a.name = "test";
+		
+		B b = new B();
+		b.id = 2;
+		b.name = "b";
+		
+		C c = new C();
+		c.id = 3;
+		c.name = "c";
+		c.otherName = "maquerading as a B";
+		
+		D d = new D();
+		d.id = 4;
+		d.name = "d";
+		d.age = 312;
+		a.topB = b;
+		a.cAsAb = c;
+		a.dAsAb = d;
+		
+		mapper.save(a,b,c,d);
+		A a2 = mapper.read(A.class, a.id);
+		compare(a, a2);
+	}
+	
+}

src/test/java/com/aerospike/mapper/ListOfReferencesTest.java

@@ -8,6 +8,8 @@
 
 import org.junit.Test;
 
+import com.aerospike.mapper.annotations.AerospikeEmbed;
+import com.aerospike.mapper.annotations.AerospikeEmbed.EmbedType;
 import com.aerospike.mapper.annotations.AerospikeKey;
 import com.aerospike.mapper.annotations.AerospikeRecord;
 import com.aerospike.mapper.annotations.AerospikeReference;

src/test/java/com/aerospike/mapper/ObjectReferencesTest.java

@@ -0,0 +1,46 @@
+package com.aerospike.mapper;
+
+import org.junit.Test;
+
+import com.aerospike.client.AerospikeClient;
+import com.aerospike.client.IAerospikeClient;
+import com.aerospike.mapper.annotations.AerospikeEmbed;
+import com.aerospike.mapper.annotations.AerospikeKey;
+import com.aerospike.mapper.annotations.AerospikeRecord;
+import com.aerospike.mapper.annotations.AerospikeEmbed.EmbedType;
+import com.aerospike.mapper.tools.AeroMapper;
+
+public class ObjectReferencesTest {
+	@AerospikeRecord(namespace = "test", set = "parent")
+	public static class Parent {
+		@AerospikeKey
+		private int id;
+		@AerospikeEmbed(type = EmbedType.LIST)
+		private Child child;
+	}
+	
+	@AerospikeRecord(namespace = "test", set = "child")
+	public static class Child {
+		@AerospikeKey
+		private String key;
+		private int age;
+		private String name;
+	}
+	
+	@Test
+	public void test() {
+		Child child = new Child();
+		child.key = "child1";
+		child.age = 17;
+		child.name = "bob";
+		
+		Parent parent = new Parent();
+		parent.id = 1;
+		parent.child = child;
+		
+		IAerospikeClient client = new AerospikeClient("127.0.0.1", 3000);
+		AeroMapper mapper = new AeroMapper.Builder(client).build();
+		mapper.save(parent);
+		mapper.save(child);
+	}
+}

src/test/java/com/aerospike/mapper/TestAnonymousReferences.java

@@ -41,12 +41,12 @@ public void runner() {
 		AeroMapper mapper = new AeroMapper.Builder(client).build();
 		B b = new B();
 		b.id = 2;
-		b.name = "test";
+		b.name = "a B";
 		mapper.save(b);
 
 		B b1 = new B();
-		b1.id = 2;
-		b1.name = "test";
+		b1.id = 3;
+		b1.name = "another B";
 		mapper.save(b1);
 
 		A a = new A();

src/test/java/com/aerospike/mapper/VirtualListExample.java

@@ -0,0 +1,78 @@
+package com.aerospike.mapper;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.aerospike.mapper.annotations.AerospikeEmbed;
+import com.aerospike.mapper.annotations.AerospikeEmbed.EmbedType;
+import com.aerospike.mapper.annotations.AerospikeKey;
+import com.aerospike.mapper.annotations.AerospikeRecord;
+import com.aerospike.mapper.tools.AeroMapper;
+import com.aerospike.mapper.tools.ReturnType;
+import com.aerospike.mapper.tools.VirtualList;
+
+public class VirtualListExample extends AeroMapperBaseTest {
+	
+	@AerospikeRecord(namespace = "test", set = "item")
+	public static class Item {
+		@AerospikeKey
+		private int id;
+		private Date due;
+		private String desc;
+		public Item(int id, Date due, String desc) {
+			super();
+			this.id = id;
+			this.due = due;
+			this.desc = desc;
+		}
+		
+		public Item() {
+		}
+	}
+	
+	@AerospikeRecord(namespace = "test", set = "container")
+	public static class Container {
+		@AerospikeKey
+		private int id;
+		private String name;
+		@AerospikeEmbed(type = EmbedType.MAP, elementType = EmbedType.LIST)
+		private List<Item> items;
+		
+		public Container() {
+			this.items = new ArrayList<>();
+		}
+	}
+	
+	@Test
+	public void testListOfReferences() {
+		Container container = new Container();
+		container.id = 1;
+		container.name = "container";
+		
+		container.items.add(new Item(100, new Date(), "Item 1"));
+		container.items.add(new Item(200, new Date(), "Item 2"));
+		container.items.add(new Item(300, new Date(), "Item 3"));
+		container.items.add(new Item(400, new Date(), "Item 4"));
+		
+		AeroMapper mapper = new AeroMapper.Builder(client).build();
+		mapper.save(container);
+		
+		VirtualList<Item> list = mapper.asBackedList(container, "items", Item.class);
+		// perform a single operation. NOTE: This does NOT change the backed item, just the database
+		list.append(new Item(500, new Date(), "Item5"));
+		
+		List<Item> results = (List<Item>) list.beginMultiOperation()
+				.append(new Item(600, new Date(), "Item6"))
+				.removeByKey(200)
+				.getByKeyRange(100, 450)
+			.end();
+		
+		System.out.println(results.size());
+	}
+	
+}

src/test/java/com/aerospike/mapper/VirtualListTest.java

@@ -158,16 +158,7 @@ public void test() {
 
 		AeroMapper mapper = new AeroMapper.Builder(client).build();
 		mapper.save(collection);
-		mapper.save(a);
-		mapper.save(b);
-		mapper.save(c);
-		mapper.save(d);
-		mapper.save(e);
-		mapper.save(f);
-		mapper.save(g);
-		mapper.save(h);
-		mapper.save(i);
-		mapper.save(j);
+		mapper.save(a,b,c,d,e,f,g,h,i,j);
 
 		VirtualList<B> list = mapper.asBackedList(collection, "elements", B.class);
 //		list.append(new CollectionElement(103, "tom", 45678));

src/test/java/com/aerospike/mapper/example/ApplicationBase.java

@@ -96,6 +96,9 @@ protected Property createAndPopulateProperty1() {
 
 	protected Property createAndPopulateProperty2() {
 		Property property = new Property(11567724, new Address("333 Bob Jones Street", null, "Seattle", "WA", "23152"), 1955, "Brick");
+		property
+			.addValuation(new Valuation(new Date(), 550000, 4000, "Don's Valuers", 56367, new Address("67 Dartmouth Cl", null, "Chicago", "IL", "43252")))
+			.addValuation(new Valuation(new Date(), 563000, 3000, "Tim's Valuers", 34245, null));
 		return property;
 	}
 
@@ -107,7 +110,7 @@ protected Property createAndPopulateProperty3() {
 	protected Property createAndPopulateProperty4() {
 		Property property = new Property(8898, new Address("203 S Aneky St", null, "Denver", "CO", "82222-4321"), 1965, "Brick");
 		property.addValuation(new Valuation(new Date(), 240000, 5000, "Steve's Valuers", 5647328, null))
-				.addValuation(new Valuation(new Date(), 220000, 7000, "John's Valuers", 65462, new Address("67 Dartmouth Cl", null, "Smithfield", "IL", "43252")))
+				.addValuation(new Valuation(new Date(), 220000, 7000, "John's Valuers", 65462, new Address("88 Dartmouth Cl", null, "Smithfield", "IL", "43252")))
 				.addValuation(new Valuation(new Date(), 255000, 3000, "Wilma's Valuers", 254665, null));
 
 		return property;