added overloaded form of addComponent on AbstractComposite, adjusted …

…add method to use such
hector-client · Sep 16, 2011 · 498568e · 498568e
1 parent a5113d2
commit 498568e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 20 deletions.
diff --git a/core/src/main/java/me/prettyprint/hector/api/beans/AbstractComposite.java b/core/src/main/java/me/prettyprint/hector/api/beans/AbstractComposite.java
@@ -404,6 +404,28 @@ public int size() {
     return components.size();
   }
 
+  @SuppressWarnings("unchecked")
+  public <T> AbstractComposite addComponent(int index, T element, ComponentEquality equality) {
+    serialized = null;
+
+    if (element instanceof Component) {
+      components.add(index, (Component<?>) element);
+      return this;
+    }
+
+    Serializer s = serializerForPosition(index);
+    if (s == null) {
+      s = SerializerTypeInferer.getSerializer(element);
+    }
+    String c = comparatorForPosition(index);
+    if (c == null) {
+      c = comparatorForSerializer(s);
+    }
+    components.add(index, new Component(element, null, s, c,
+        equality));
+    return this;
+  }
+
   public <T> AbstractComposite addComponent(T value, Serializer<T> s) {
 
     addComponent(value, s, comparatorForSerializer(s));
@@ -506,28 +528,11 @@ public boolean addAll(int i, Collection<? extends Object> c) {
     return super.addAll(i, flatten(c));
   }
 
-  @SuppressWarnings("unchecked")
   @Override
-  public void add(int index, Object element) {
-    serialized = null;
-
-    if (element instanceof Component) {
-      components.add(index, (Component<?>) element);
-      return;
-    }
-
+  public void add(int index, Object element) {    
     element = mapIfNumber(element);
-    Serializer s = serializerForPosition(index);
-    if (s == null) {
-      s = SerializerTypeInferer.getSerializer(element);
-    }
-    String c = comparatorForPosition(index);
-    if (c == null) {
-      c = comparatorForSerializer(s);
-    }
-    components.add(index, new Component(element, null, s, c,
-        ComponentEquality.EQUAL));
-  }
+    addComponent(index, element, ComponentEquality.EQUAL);
+  }  
 
   @Override
   public Object remove(int index) {

diff --git a/core/src/test/java/me/prettyprint/hector/api/beans/DynamicCompositeTest.java b/core/src/test/java/me/prettyprint/hector/api/beans/DynamicCompositeTest.java
@@ -48,6 +48,7 @@ public void allTypesSerialize() {
 		composite.addComponent(13, timeUUID, TimeUUIDSerializer.get(), "TimeUUIDType(reversed=true)", ComponentEquality.EQUAL);
 		composite.addComponent(14, "UTF8Text", StringSerializer.get(), "UTF8Type(reversed=true)", ComponentEquality.EQUAL);
 		composite.addComponent(15,  lexUUID, UUIDSerializer.get(), "UUIDType(reversed=true)", ComponentEquality.EQUAL);
+		composite.addComponent(16, "My element", ComponentEquality.EQUAL);
 
 		//serialize to the native bytes value
 
@@ -75,6 +76,7 @@ public void allTypesSerialize() {
 		assertEquals(timeUUID, parsed.get(13, TimeUUIDSerializer.get()));
 		assertEquals("UTF8Text", parsed.get(14, StringSerializer.get()));
 		assertEquals(lexUUID, parsed.get(15, UUIDSerializer.get()));
+		assertEquals("My element", parsed.get(16, StringSerializer.get()));
 
 
 	}