Use loadtest4j 0.14.0 (+ rename base package)

themasterchef · web-flow · commit bf93e800fbc3 · 2018-07-19T22:24:27.000+01:00
* Rename base package to org.loadtest4j

* Use loadtest4j 0.14.0
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.github.loadtest4j</groupId>
             <artifactId>loadtest4j</artifactId>
-            <version>0.13.0</version>
+            <version>0.14.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/Wrk.java b/src/main/java/org/loadtest4j/drivers/wrk/Wrk.java
@@ -1,13 +1,13 @@
-package com.github.loadtest4j.drivers.wrk;
-
-import com.github.loadtest4j.drivers.wrk.dto.*;
-import com.github.loadtest4j.drivers.wrk.utils.*;
-import com.github.loadtest4j.drivers.wrk.utils.Process;
-import com.github.loadtest4j.loadtest4j.LoadTesterException;
-import com.github.loadtest4j.loadtest4j.driver.DriverResponseTime;
-import com.github.loadtest4j.loadtest4j.driver.Driver;
-import com.github.loadtest4j.loadtest4j.driver.DriverRequest;
-import com.github.loadtest4j.loadtest4j.driver.DriverResult;
+package org.loadtest4j.drivers.wrk;
+
+import org.loadtest4j.LoadTesterException;
+import org.loadtest4j.driver.Driver;
+import org.loadtest4j.driver.DriverRequest;
+import org.loadtest4j.driver.DriverResponseTime;
+import org.loadtest4j.driver.DriverResult;
+import org.loadtest4j.drivers.wrk.dto.*;
+import org.loadtest4j.drivers.wrk.utils.*;
+import org.loadtest4j.drivers.wrk.utils.Process;
 
 import java.io.InputStream;
 import java.net.MalformedURLException;
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/WrkFactory.java b/src/main/java/org/loadtest4j/drivers/wrk/WrkFactory.java
@@ -1,7 +1,7 @@
-package com.github.loadtest4j.drivers.wrk;
+package org.loadtest4j.drivers.wrk;
 
-import com.github.loadtest4j.loadtest4j.driver.Driver;
-import com.github.loadtest4j.loadtest4j.driver.DriverFactory;
+import org.loadtest4j.driver.Driver;
+import org.loadtest4j.driver.DriverFactory;
 
 import java.time.Duration;
 import java.util.*;
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/WrkResponseTime.java b/src/main/java/org/loadtest4j/drivers/wrk/WrkResponseTime.java
@@ -1,6 +1,6 @@
-package com.github.loadtest4j.drivers.wrk;
+package org.loadtest4j.drivers.wrk;
 
-import com.github.loadtest4j.loadtest4j.driver.DriverResponseTime;
+import org.loadtest4j.driver.DriverResponseTime;
 
 import java.time.Duration;
 import java.util.Map;
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/WrkResult.java b/src/main/java/org/loadtest4j/drivers/wrk/WrkResult.java
@@ -1,7 +1,7 @@
-package com.github.loadtest4j.drivers.wrk;
+package org.loadtest4j.drivers.wrk;
 
-import com.github.loadtest4j.loadtest4j.driver.DriverResponseTime;
-import com.github.loadtest4j.loadtest4j.driver.DriverResult;
+import org.loadtest4j.driver.DriverResponseTime;
+import org.loadtest4j.driver.DriverResult;
 
 import java.time.Duration;
 import java.util.Optional;
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/dto/Errors.java b/src/main/java/org/loadtest4j/drivers/wrk/dto/Errors.java
@@ -1,4 +1,4 @@
-package com.github.loadtest4j.drivers.wrk.dto;
+package org.loadtest4j.drivers.wrk.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/dto/Input.java b/src/main/java/org/loadtest4j/drivers/wrk/dto/Input.java
@@ -1,4 +1,4 @@
-package com.github.loadtest4j.drivers.wrk.dto;
+package org.loadtest4j.drivers.wrk.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/dto/Latency.java b/src/main/java/org/loadtest4j/drivers/wrk/dto/Latency.java
@@ -1,4 +1,4 @@
-package com.github.loadtest4j.drivers.wrk.dto;
+package org.loadtest4j.drivers.wrk.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/dto/Output.java b/src/main/java/org/loadtest4j/drivers/wrk/dto/Output.java
@@ -1,4 +1,4 @@
-package com.github.loadtest4j.drivers.wrk.dto;
+package org.loadtest4j.drivers.wrk.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/dto/Req.java b/src/main/java/org/loadtest4j/drivers/wrk/dto/Req.java
@@ -1,4 +1,4 @@
-package com.github.loadtest4j.drivers.wrk.dto;
+package org.loadtest4j.drivers.wrk.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/dto/Summary.java b/src/main/java/org/loadtest4j/drivers/wrk/dto/Summary.java
@@ -1,4 +1,4 @@
-package com.github.loadtest4j.drivers.wrk.dto;
+package org.loadtest4j.drivers.wrk.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/utils/ArgumentBuilder.java b/src/main/java/org/loadtest4j/drivers/wrk/utils/ArgumentBuilder.java
@@ -1,4 +1,4 @@
-package com.github.loadtest4j.drivers.wrk.utils;
+package org.loadtest4j.drivers.wrk.utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/utils/Command.java b/src/main/java/org/loadtest4j/drivers/wrk/utils/Command.java
@@ -1,4 +1,4 @@
-package com.github.loadtest4j.drivers.wrk.utils;
+package org.loadtest4j.drivers.wrk.utils;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/utils/Json.java b/src/main/java/org/loadtest4j/drivers/wrk/utils/Json.java
@@ -1,7 +1,7 @@
-package com.github.loadtest4j.drivers.wrk.utils;
+package org.loadtest4j.drivers.wrk.utils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.loadtest4j.loadtest4j.LoadTesterException;
+import org.loadtest4j.LoadTesterException;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/utils/Process.java b/src/main/java/org/loadtest4j/drivers/wrk/utils/Process.java
@@ -1,6 +1,6 @@
-package com.github.loadtest4j.drivers.wrk.utils;
+package org.loadtest4j.drivers.wrk.utils;
 
-import com.github.loadtest4j.loadtest4j.LoadTesterException;
+import org.loadtest4j.LoadTesterException;
 
 import java.io.InputStream;
 
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/utils/QueryString.java b/src/main/java/org/loadtest4j/drivers/wrk/utils/QueryString.java
@@ -1,4 +1,4 @@
-package com.github.loadtest4j.drivers.wrk.utils;
+package org.loadtest4j.drivers.wrk.utils;
 
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/utils/Shell.java b/src/main/java/org/loadtest4j/drivers/wrk/utils/Shell.java
@@ -1,20 +1,20 @@
-package com.github.loadtest4j.drivers.wrk.utils;
+package org.loadtest4j.drivers.wrk.utils;
 
-import com.github.loadtest4j.loadtest4j.LoadTesterException;
+import org.loadtest4j.LoadTesterException;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 public class Shell {
 
-    public Process start(Command command) {
+    public org.loadtest4j.drivers.wrk.utils.Process start(Command command) {
         final List<String> cmd = new ArrayList<>();
         cmd.add(command.getLaunchPath());
         cmd.addAll(command.getArguments());
 
         try {
-            return new Process(new ProcessBuilder(cmd).redirectInput(ProcessBuilder.Redirect.PIPE).start());
+            return new org.loadtest4j.drivers.wrk.utils.Process(new ProcessBuilder(cmd).redirectInput(ProcessBuilder.Redirect.PIPE).start());
         } catch (IOException e) {
             throw new LoadTesterException(e);
         }
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/utils/StreamReader.java b/src/main/java/org/loadtest4j/drivers/wrk/utils/StreamReader.java
@@ -1,4 +1,4 @@
-package com.github.loadtest4j.drivers.wrk.utils;
+package org.loadtest4j.drivers.wrk.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/src/main/java/org/loadtest4j/drivers/wrk/utils/TempFile.java b/src/main/java/org/loadtest4j/drivers/wrk/utils/TempFile.java
@@ -1,6 +1,6 @@
-package com.github.loadtest4j.drivers.wrk.utils;
+package org.loadtest4j.drivers.wrk.utils;
 
-import com.github.loadtest4j.loadtest4j.LoadTesterException;
+import org.loadtest4j.LoadTesterException;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/test/java/com/github/loadtest4j/drivers/wrk/junit/IntegrationTest.java b/src/test/java/com/github/loadtest4j/drivers/wrk/junit/IntegrationTest.java
diff --git a/src/test/java/com/github/loadtest4j/drivers/wrk/junit/UnitTest.java b/src/test/java/com/github/loadtest4j/drivers/wrk/junit/UnitTest.java
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/DriverRequests.java b/src/test/java/org/loadtest4j/drivers/wrk/DriverRequests.java
@@ -1,6 +1,6 @@
-package com.github.loadtest4j.drivers.wrk;
+package org.loadtest4j.drivers.wrk;
 
-import com.github.loadtest4j.loadtest4j.driver.DriverRequest;
+import org.loadtest4j.driver.DriverRequest;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/WrkFactoryTest.java b/src/test/java/org/loadtest4j/drivers/wrk/WrkFactoryTest.java
@@ -1,12 +1,12 @@
-package com.github.loadtest4j.drivers.wrk;
+package org.loadtest4j.drivers.wrk;
 
-import com.github.loadtest4j.loadtest4j.driver.Driver;
-import com.github.loadtest4j.loadtest4j.driver.DriverFactory;
-import com.github.loadtest4j.drivers.wrk.junit.UnitTest;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.ExpectedException;
+import org.loadtest4j.driver.Driver;
+import org.loadtest4j.driver.DriverFactory;
+import org.loadtest4j.drivers.wrk.junit.UnitTest;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/WrkParserTest.java b/src/test/java/org/loadtest4j/drivers/wrk/WrkParserTest.java
@@ -1,15 +1,15 @@
-package com.github.loadtest4j.drivers.wrk;
+package org.loadtest4j.drivers.wrk;
 
-import com.github.loadtest4j.drivers.wrk.junit.UnitTest;
-import com.github.loadtest4j.loadtest4j.LoadTesterException;
-import com.github.loadtest4j.loadtest4j.driver.DriverResult;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.loadtest4j.LoadTesterException;
+import org.loadtest4j.driver.DriverResult;
+import org.loadtest4j.drivers.wrk.junit.UnitTest;
 
 import java.net.URL;
 import java.time.Duration;
 
-import static com.github.loadtest4j.drivers.wrk.junit.DriverResultAssert.assertThat;
+import static org.loadtest4j.drivers.wrk.junit.DriverResultAssert.assertThat;
 
 @Category(UnitTest.class)
 public class WrkParserTest {
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/WrkResponseTimeTest.java b/src/test/java/org/loadtest4j/drivers/wrk/WrkResponseTimeTest.java
@@ -1,9 +1,9 @@
-package com.github.loadtest4j.drivers.wrk;
+package org.loadtest4j.drivers.wrk;
 
-import com.github.loadtest4j.drivers.wrk.junit.UnitTest;
-import com.github.loadtest4j.loadtest4j.driver.DriverResponseTime;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.loadtest4j.driver.DriverResponseTime;
+import org.loadtest4j.drivers.wrk.junit.UnitTest;
 
 import java.time.Duration;
 import java.util.Collections;
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/WrkTest.java b/src/test/java/org/loadtest4j/drivers/wrk/WrkTest.java
@@ -1,10 +1,5 @@
-package com.github.loadtest4j.drivers.wrk;
+package org.loadtest4j.drivers.wrk;
 
-import com.github.loadtest4j.drivers.wrk.junit.IntegrationTest;
-import com.github.loadtest4j.loadtest4j.LoadTesterException;
-import com.github.loadtest4j.loadtest4j.driver.Driver;
-import com.github.loadtest4j.loadtest4j.driver.DriverRequest;
-import com.github.loadtest4j.loadtest4j.driver.DriverResult;
 import com.xebialabs.restito.server.StubServer;
 import org.glassfish.grizzly.http.util.HttpStatus;
 import org.junit.After;
@@ -13,6 +8,12 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.ExpectedException;
+import org.loadtest4j.LoadTesterException;
+import org.loadtest4j.driver.Driver;
+import org.loadtest4j.driver.DriverRequest;
+import org.loadtest4j.driver.DriverResult;
+import org.loadtest4j.drivers.wrk.junit.DriverResultAssert;
+import org.loadtest4j.drivers.wrk.junit.IntegrationTest;
 
 import java.time.Duration;
 import java.util.Arrays;
@@ -21,7 +22,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static com.github.loadtest4j.drivers.wrk.junit.DriverResultAssert.assertThat;
 import static com.xebialabs.restito.builder.stub.StubHttp.whenHttp;
 import static com.xebialabs.restito.semantics.Action.status;
 import static com.xebialabs.restito.semantics.Condition.*;
@@ -72,7 +72,7 @@ public void testRun()  {
         final DriverResult result = driver.run(requests);
 
         // Then
-        assertThat(result)
+        DriverResultAssert.assertThat(result)
                 .hasOkGreaterThan(0)
                 .hasKo(0)
                 .hasReportUrlWithScheme("file")
@@ -94,7 +94,7 @@ public void testRunWithMultipleRequests() {
         final DriverResult result = driver.run(requests);
 
         // Then
-        assertThat(result)
+        DriverResultAssert.assertThat(result)
                 .hasOkGreaterThan(0)
                 .hasKo(0);
     }
@@ -116,7 +116,7 @@ public void testRunWithJsonPost() {
         final DriverResult result = driver.run(requests);
 
         // Then
-        assertThat(result)
+        DriverResultAssert.assertThat(result)
                 .hasOkGreaterThan(0)
                 .hasKo(0);
     }
@@ -140,7 +140,7 @@ public void testRunWithEdgeCaseRequest() {
         final DriverResult result = driver.run(requests);
 
         // Then
-        assertThat(result)
+        DriverResultAssert.assertThat(result)
                 .hasOkGreaterThan(0)
                 .hasKo(0);
     }
@@ -159,7 +159,7 @@ public void testRunWithErrors()  {
         final DriverResult result = driver.run(requests);
 
         // Then
-        assertThat(result)
+        DriverResultAssert.assertThat(result)
                 .hasOk(0)
                 .hasKoGreaterThan(0);
     }
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/junit/DriverResultAssert.java b/src/test/java/org/loadtest4j/drivers/wrk/junit/DriverResultAssert.java
@@ -1,7 +1,7 @@
-package com.github.loadtest4j.drivers.wrk.junit;
+package org.loadtest4j.drivers.wrk.junit;
 
-import com.github.loadtest4j.loadtest4j.driver.DriverResult;
 import org.assertj.core.api.AbstractAssert;
+import org.loadtest4j.driver.DriverResult;
 
 import java.time.Duration;
 import java.util.Objects;
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/junit/IntegrationTest.java b/src/test/java/org/loadtest4j/drivers/wrk/junit/IntegrationTest.java
@@ -0,0 +1,4 @@
+package org.loadtest4j.drivers.wrk.junit;
+
+public interface IntegrationTest {
+}
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/junit/UnitTest.java b/src/test/java/org/loadtest4j/drivers/wrk/junit/UnitTest.java
@@ -0,0 +1,4 @@
+package org.loadtest4j.drivers.wrk.junit;
+
+public interface UnitTest {
+}
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/ArgumentBuilderTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/ArgumentBuilderTest.java
@@ -1,6 +1,6 @@
-package com.github.loadtest4j.drivers.wrk.utils;
+package org.loadtest4j.drivers.wrk.utils;
 
-import com.github.loadtest4j.drivers.wrk.junit.UnitTest;
+import org.loadtest4j.drivers.wrk.junit.UnitTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/CommandTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/CommandTest.java
@@ -1,6 +1,6 @@
-package com.github.loadtest4j.drivers.wrk.utils;
+package org.loadtest4j.drivers.wrk.utils;
 
-import com.github.loadtest4j.drivers.wrk.junit.UnitTest;
+import org.loadtest4j.drivers.wrk.junit.UnitTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/JsonTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/JsonTest.java
@@ -1,10 +1,10 @@
-package com.github.loadtest4j.drivers.wrk.utils;
+package org.loadtest4j.drivers.wrk.utils;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.loadtest4j.drivers.wrk.junit.IntegrationTest;
-import com.github.loadtest4j.loadtest4j.LoadTesterException;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.loadtest4j.LoadTesterException;
+import org.loadtest4j.drivers.wrk.junit.IntegrationTest;
 
 import java.io.File;
 import java.net.MalformedURLException;
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/QueryStringTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/QueryStringTest.java
@@ -1,6 +1,6 @@
-package com.github.loadtest4j.drivers.wrk.utils;
+package org.loadtest4j.drivers.wrk.utils;
 
-import com.github.loadtest4j.drivers.wrk.junit.UnitTest;
+import org.loadtest4j.drivers.wrk.junit.UnitTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/ShellTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/ShellTest.java
@@ -1,6 +1,6 @@
-package com.github.loadtest4j.drivers.wrk.utils;
+package org.loadtest4j.drivers.wrk.utils;
 
-import com.github.loadtest4j.drivers.wrk.junit.IntegrationTest;
+import org.loadtest4j.drivers.wrk.junit.IntegrationTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/StreamReaderTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/StreamReaderTest.java
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/TempFileTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/TempFileTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.github.loadtest4j.drivers.wrk.dto;`
	`1`	`+package org.loadtest4j.drivers.wrk.dto;`
`2`	`2`
`3`	`3`	`import com.fasterxml.jackson.annotation.JsonProperty;`
`4`	`4`