From 87a3057a4fccf872c548677fdad4f24554cd2145 Mon Sep 17 00:00:00 2001
From: Andy Grove <andy.grove@codefutures.com>
Date: Sat, 6 Dec 2014 12:18:27 -0700
Subject: [PATCH] usability changes, code cleanup

---
 pom.xml                                           |  2 +-
 src/main/java/org/jperf/AbstractPerfTest.java     | 13 +++++++++++++
 src/main/java/org/jperf/ConfigBuilder.java        |  4 ++++
 src/main/java/org/jperf/DefaultConfigBuilder.java | 14 ++++++++++----
 4 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/org/jperf/AbstractPerfTest.java

diff --git a/pom.xml b/pom.xml
index e8a1aa4..6c464e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>org.jperf</groupId>
     <artifactId>jperf</artifactId>
     <name>jperf</name>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <licenses>
diff --git a/src/main/java/org/jperf/AbstractPerfTest.java b/src/main/java/org/jperf/AbstractPerfTest.java
new file mode 100644
index 0000000..2b450d1
--- /dev/null
+++ b/src/main/java/org/jperf/AbstractPerfTest.java
@@ -0,0 +1,13 @@
+package org.jperf;
+
+public abstract class AbstractPerfTest implements PerfTest {
+
+  @Override
+  public void setUp() throws Exception {
+  }
+
+  @Override
+  public void tearDown() throws Exception {
+  }
+
+}
diff --git a/src/main/java/org/jperf/ConfigBuilder.java b/src/main/java/org/jperf/ConfigBuilder.java
index 9df143d..ea65735 100644
--- a/src/main/java/org/jperf/ConfigBuilder.java
+++ b/src/main/java/org/jperf/ConfigBuilder.java
@@ -7,5 +7,9 @@ public interface ConfigBuilder {
   ConfigBuilder duration(int duration);
   ConfigBuilder testFactory(PerfTestFactory testFactory);
   ConfigBuilder resultWriter(ResultWriter resultWriter);
+  void run() throws Exception;
+
+  @Deprecated
   PerfTestConfig build();
+
 }
diff --git a/src/main/java/org/jperf/DefaultConfigBuilder.java b/src/main/java/org/jperf/DefaultConfigBuilder.java
index 0c9f028..0293c04 100644
--- a/src/main/java/org/jperf/DefaultConfigBuilder.java
+++ b/src/main/java/org/jperf/DefaultConfigBuilder.java
@@ -14,13 +14,13 @@ public DefaultConfigBuilder() {
   }
 
   @Override
-  public DefaultConfigBuilder minThreads(int minThreads) {
+  public ConfigBuilder minThreads(int minThreads) {
     config.minThreads = minThreads;
     return this;
   }
 
   @Override
-  public DefaultConfigBuilder maxThreads(int maxThreads) {
+  public ConfigBuilder maxThreads(int maxThreads) {
     config.maxThreads = maxThreads;
     return this;
   }
@@ -32,13 +32,13 @@ public ConfigBuilder threadIncrement(int threadIncrement) {
   }
 
   @Override
-  public DefaultConfigBuilder duration(int duration) {
+  public ConfigBuilder duration(int duration) {
     config.duration = duration;
     return this;
   }
 
   @Override
-  public DefaultConfigBuilder testFactory(PerfTestFactory testFactory) {
+  public ConfigBuilder testFactory(PerfTestFactory testFactory) {
     config.testFactory = testFactory;
     return this;
   }
@@ -49,8 +49,14 @@ public ConfigBuilder resultWriter(ResultWriter resultWriter) {
     return this;
   }
 
+  @Deprecated // use run() instead
   @Override
   public PerfTestConfig build() {
     return config;
   }
+
+  @Override
+  public void run() throws Exception {
+    JPerf.run(config);
+  }
 }