modified the signature of the Builder creation for Point and BatchPoints.

Author: majst01

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

@@ -37,6 +37,17 @@ public class BatchPoints {
 		// Only visible in the Builder
 	}
 
+	/**
+	 * Create a new BatchPoints build to create a new BatchPoints in a fluent manner-
+	 *
+	 * @param database
+	 *            the name of the Database
+	 * @return the Builder to be able to add further Builder calls.
+	 */
+	public static Builder database(final String database) {
+		return new Builder(database);
+	}
+
 	/**
 	 * The Builder to create a new BatchPoints instance.
 	 */
@@ -52,7 +63,7 @@ public static class Builder {
 		/**
 		 * @param database
 		 */
-		public Builder(final String database) {
+		Builder(final String database) {
 			super();
 			this.database = database;
 		}

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

@@ -28,6 +28,18 @@ public class Point {
 	Point() {
 	}
 
+	/**
+	 * Create a new Point Build build to create a new Point in a fluent manner-
+	 *
+	 * @param measurement
+	 *            the name of the measurement.
+	 * @return the Builder to be able to add further Builder calls.
+	 */
+
+	public static Builder measurement(final String measurement) {
+		return new Builder(measurement);
+	}
+
 	/**
 	 * Builder for a new Point.
 	 *
@@ -44,7 +56,7 @@ public static class Builder {
 		/**
 		 * @param measurement
 		 */
-		public Builder(final String measurement) {
+		Builder(final String measurement) {
 			this.measurement = measurement;
 		}
 

src/main/java/org/influxdb/impl/BatchProcessor.java

@@ -152,9 +152,7 @@ void write() {
 			for (BatchEntry batchEntry : this.cache) {
 				String dbName = batchEntry.getDb();
 				if (!databaseToBatchPoints.containsKey(dbName)) {
-					BatchPoints batchPoints = new BatchPoints.Builder(dbName)
-							.retentionPolicy(batchEntry.getRp())
-							.build();
+					BatchPoints batchPoints = BatchPoints.database(dbName).retentionPolicy(batchEntry.getRp()).build();
 					databaseToBatchPoints.put(dbName, batchPoints);
 				}
 				Point point = batchEntry.getPoint();

src/main/java/org/influxdb/impl/InfluxDBImpl.java

@@ -135,7 +135,7 @@ public void write(final String database, final String retentionPolicy, final Poi
 			BatchEntry batchEntry = new BatchEntry(point, database, retentionPolicy);
 			this.batchProcessor.put(batchEntry);
 		} else {
-			BatchPoints batchPoints = new BatchPoints.Builder(database).retentionPolicy(retentionPolicy).build();
+			BatchPoints batchPoints = BatchPoints.database(database).retentionPolicy(retentionPolicy).build();
 			batchPoints.point(point);
 			this.write(batchPoints);
 			this.unBatchedCount.incrementAndGet();

src/test/java/org/influxdb/InfluxDBTest.java

@@ -166,13 +166,14 @@ public void testWrite() {
 		String dbName = "write_unittest_" + System.currentTimeMillis();
 		this.influxDB.createDatabase(dbName);
 
-		BatchPoints batchPoints = new BatchPoints.Builder(dbName)
+		BatchPoints batchPoints = BatchPoints
+				.database(dbName)
 				.time(System.currentTimeMillis(), TimeUnit.MILLISECONDS)
 				.tag("async", "true")
 				.retentionPolicy("default")
 				.build();
-		Point point1 = new Point.Builder("cpu").field("idle", 90L).field("user", 9L).field("system", 1L).build();
-		Point point2 = new Point.Builder("disk").field("used", 80L).field("free", 1L).build();
+		Point point1 = Point.measurement("cpu").field("idle", 90L).field("user", 9L).field("system", 1L).build();
+		Point point2 = Point.measurement("disk").field("used", 80L).field("free", 1L).build();
 		batchPoints.point(point1);
 		batchPoints.point(point2);
 		this.influxDB.write(batchPoints);

src/test/java/org/influxdb/PerformanceTests.java

@@ -30,7 +30,7 @@ public void writeSinglePointPerformance() throws InterruptedException {
 		this.influxDB.enableBatch(2000, 100, TimeUnit.MILLISECONDS);
 		Stopwatch watch = Stopwatch.createStarted();
 		for (int j = 0; j < SINGLE_POINT_COUNT; j++) {
-			Point point = new Point.Builder("cpu").field("idle", j).field("user", 2 * j).field("system", 3 * j).build();
+			Point point = Point.measurement("cpu").field("idle", j).field("user", 2 * j).field("system", 3 * j).build();
 			this.influxDB.write(dbName, "default", point);
 		}
 		this.influxDB.disableBatch();
@@ -46,13 +46,15 @@ public void writePerformance() {
 		Stopwatch watch = Stopwatch.createStarted();
 		for (int i = 0; i < COUNT; i++) {
 
-			BatchPoints batchPoints = new BatchPoints.Builder(dbName)
+			BatchPoints batchPoints = BatchPoints
+					.database(dbName)
 					.time(System.currentTimeMillis(), TimeUnit.MILLISECONDS)
 					.tag("blubber", "bla")
 					.retentionPolicy("default")
 					.build();
 			for (int j = 0; j < POINT_COUNT; j++) {
-				Point point = new Point.Builder("cpu")
+				Point point = Point
+						.measurement("cpu")
 						.field("idle", j)
 						.field("user", 2 * j)
 						.field("system", 3 * j)
@@ -74,7 +76,7 @@ public void maxWritePointsPerformance() {
 
 		Stopwatch watch = Stopwatch.createStarted();
 		for (int i = 0; i < 2000000; i++) {
-			Point point = new Point.Builder("s").field("v", 1).build();
+			Point point = Point.measurement("s").field("v", 1).build();
 			this.influxDB.write(dbName, "default", point);
 		}
 		System.out.println("5Mio points:" + watch);