use non test default client in examples

SUSE · Oct 2, 2018 · 5924c87 · 5924c87
1 parent 90cda1b
commit 5924c87
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/src/test/java/com/suse/salt/netapi/examples/Async.java b/src/test/java/com/suse/salt/netapi/examples/Async.java
@@ -3,6 +3,7 @@
 import com.suse.salt.netapi.AuthModule;
 import com.suse.salt.netapi.client.SaltClient;
 import com.suse.salt.netapi.client.impl.HttpAsyncClientImpl;
+import com.suse.salt.netapi.utils.HttpClientUtils;
 import com.suse.salt.netapi.utils.TestUtils;
 import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
 
@@ -18,7 +19,7 @@ public class Async {
     private static final String PASSWORD = "saltdev";
 
     public static void main(String[] args) {
-        CloseableHttpAsyncClient httpClient = TestUtils.defaultClient();
+        CloseableHttpAsyncClient httpClient = HttpClientUtils.defaultClient();
         // Init the client
         SaltClient client = new SaltClient(URI.create(SALT_API_URL), new HttpAsyncClientImpl(httpClient));
 

diff --git a/src/test/java/com/suse/salt/netapi/examples/Calls.java b/src/test/java/com/suse/salt/netapi/examples/Calls.java
@@ -11,6 +11,7 @@
 import com.suse.salt.netapi.datatypes.target.MinionList;
 import com.suse.salt.netapi.datatypes.target.Target;
 import com.suse.salt.netapi.results.Result;
+import com.suse.salt.netapi.utils.HttpClientUtils;
 import com.suse.salt.netapi.utils.TestUtils;
 
 import java.net.URI;
@@ -31,7 +32,7 @@ public class Calls {
     public static void main(String[] args) {
         // Init the client
         SaltClient client = new SaltClient(URI.create(SALT_API_URL),
-                new HttpAsyncClientImpl(TestUtils.defaultClient()));
+                new HttpAsyncClientImpl(HttpClientUtils.defaultClient()));
 
         // Ping all minions using a glob matcher
         Target<String> globTarget = new Glob("*");

diff --git a/src/test/java/com/suse/salt/netapi/examples/Events.java b/src/test/java/com/suse/salt/netapi/examples/Events.java
@@ -6,6 +6,7 @@
 import com.suse.salt.netapi.datatypes.Event;
 import com.suse.salt.netapi.datatypes.Token;
 import com.suse.salt.netapi.event.EventListener;
+import com.suse.salt.netapi.utils.HttpClientUtils;
 import com.suse.salt.netapi.utils.TestUtils;
 import org.apache.http.client.config.CookieSpecs;
 import org.apache.http.client.config.RequestConfig;
@@ -28,7 +29,7 @@ public class Events {
     public static void main(String[] args) {
         // Init client and set the timeout to infinite
         SaltClient client = new SaltClient(URI.create(SALT_API_URL),
-                new HttpAsyncClientImpl(TestUtils.defaultClient()));
+                new HttpAsyncClientImpl(HttpClientUtils.defaultClient()));
 
         RequestConfig requestConfig = RequestConfig.custom()
                 .setConnectionRequestTimeout(0)

diff --git a/src/test/java/com/suse/salt/netapi/examples/LocateModule.java b/src/test/java/com/suse/salt/netapi/examples/LocateModule.java
@@ -10,6 +10,7 @@
 import com.suse.salt.netapi.datatypes.target.Glob;
 import com.suse.salt.netapi.datatypes.target.Target;
 import com.suse.salt.netapi.results.Result;
+import com.suse.salt.netapi.utils.HttpClientUtils;
 import com.suse.salt.netapi.utils.TestUtils;
 
 import java.net.URI;
@@ -29,7 +30,7 @@ public class LocateModule {
     public static void main(String[] args) {
         // Init the client
         SaltClient client = new SaltClient(URI.create(SALT_API_URL),
-                new HttpAsyncClientImpl(TestUtils.defaultClient()));
+                new HttpAsyncClientImpl(HttpClientUtils.defaultClient()));
         Token token = client.login(USER, PASSWORD, AuthModule.AUTO).toCompletableFuture().join();
         AuthMethod tokenAuth = new AuthMethod(token);
 

diff --git a/src/test/java/com/suse/salt/netapi/examples/Runner.java b/src/test/java/com/suse/salt/netapi/examples/Runner.java
@@ -8,6 +8,7 @@
 import com.suse.salt.netapi.datatypes.AuthMethod;
 import com.suse.salt.netapi.datatypes.PasswordAuth;
 import com.suse.salt.netapi.results.Result;
+import com.suse.salt.netapi.utils.HttpClientUtils;
 import com.suse.salt.netapi.utils.TestUtils;
 
 import java.net.URI;
@@ -29,7 +30,7 @@ public class Runner {
     public static void main(String[] args) {
         // Init the client
         SaltClient client = new SaltClient(URI.create(SALT_API_URL),
-                new HttpAsyncClientImpl(TestUtils.defaultClient()));
+                new HttpAsyncClientImpl(HttpClientUtils.defaultClient()));
 
         // Send a custom event with some data (salt.runners.event)
         Map<String, Object> data = new HashMap<>();

diff --git a/src/test/java/com/suse/salt/netapi/examples/SaltSSH.java b/src/test/java/com/suse/salt/netapi/examples/SaltSSH.java
@@ -12,6 +12,7 @@
 import com.suse.salt.netapi.datatypes.target.SSHTarget;
 import com.suse.salt.netapi.results.Result;
 import com.suse.salt.netapi.results.SSHResult;
+import com.suse.salt.netapi.utils.HttpClientUtils;
 import com.suse.salt.netapi.utils.TestUtils;
 
 import java.net.URI;
@@ -28,7 +29,7 @@ public class SaltSSH {
     public static void main(String[] args) {
         // Init the client
         SaltClient client = new SaltClient(URI.create(SALT_API_URL),
-                new HttpAsyncClientImpl(TestUtils.defaultClient()));
+                new HttpAsyncClientImpl(HttpClientUtils.defaultClient()));
 
         // Setup the configuration for Salt SSH (use defaults)
         SaltSSHConfig sshConfig = new SaltSSHConfig.Builder().build();

diff --git a/src/test/java/com/suse/salt/netapi/examples/Wheel.java b/src/test/java/com/suse/salt/netapi/examples/Wheel.java
@@ -8,6 +8,7 @@
 import com.suse.salt.netapi.datatypes.AuthMethod;
 import com.suse.salt.netapi.datatypes.PasswordAuth;
 import com.suse.salt.netapi.results.Result;
+import com.suse.salt.netapi.utils.HttpClientUtils;
 import com.suse.salt.netapi.utils.TestUtils;
 
 import java.net.URI;
@@ -28,7 +29,7 @@ public static void main(String[] args) {
         // Init the client
 
         SaltClient client = new SaltClient(URI.create(SALT_API_URL),
-                new HttpAsyncClientImpl(TestUtils.defaultClient()));
+                new HttpAsyncClientImpl(HttpClientUtils.defaultClient()));
 
         // List accepted and pending minion keys
         WheelResult<Result<Key.Names>> keyResults = Key.listAll().callSync(