Merge pull request influxdata#136 from andrewdodd/Issue-110

Fix for influxdata#110

Author: majst01

src/main/java/org/influxdb/dto/Point.java

@@ -89,7 +89,9 @@ public Builder useInteger(final boolean enable) {
 		 * @return the Builder instance.
 		 */
 		public Builder tag(final String tagName, final String value) {
-			this.tags.put(tagName, value);
+			Preconditions.checkArgument(tagName != null);
+			Preconditions.checkArgument(value != null);
+			tags.put(tagName, value);
 			return this;
 		}
 
@@ -101,7 +103,9 @@ public Builder tag(final String tagName, final String value) {
 		 * @return the Builder instance.
 		 */
 		public Builder tag(final Map<String, String> tagsToAdd) {
-			this.tags.putAll(tagsToAdd);
+			for (Entry<String, String> tag : tagsToAdd.entrySet()) {
+				tag(tag.getKey(), tag.getValue());
+			}
 			return this;
 		}
 

src/test/java/org/influxdb/dto/PointTest.java

@@ -4,12 +4,15 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.testng.annotations.Test;
 
+import com.google.common.collect.Maps;
+
 /**
  * Test for the Point DTO.
  *
@@ -173,4 +176,33 @@ public void testIgnoreNullPointerValue() {
 
 		assertThat(point.lineProtocol()).asString().isEqualTo("nulltest,foo=bar field1=\"value1\",field3=1.0 1");
 	}
+	
+	/**
+	 * Tests for issue #110
+	 */
+	@Test(expectedExceptions = IllegalArgumentException.class)
+	public void testAddingTagsWithNullNameThrowsAnError() {
+		Point.measurement("dontcare").tag(null, "DontCare");
+	}
+	
+	@Test(expectedExceptions = IllegalArgumentException.class)
+	public void testAddingTagsWithNullValueThrowsAnError() {
+		Point.measurement("dontcare").tag("DontCare", null);
+	}
+
+	@Test(expectedExceptions = IllegalArgumentException.class)
+	public void testAddingMapOfTagsWithNullNameThrowsAnError() {
+		Map<String, String> map = Maps.newHashMap();
+		map.put(null, "DontCare");
+		Point.measurement("dontcare").tag(map);
+	}
+
+	@Test(expectedExceptions = IllegalArgumentException.class)
+	public void testAddingMapOfTagsWithNullValueThrowsAnError() {
+		Map<String, String> map = Maps.newHashMap();
+		map.put("DontCare", null);
+		Point.measurement("dontcare").tag(map);
+	}
+	
+	
 }