Fixed #395 - Remove google guava lib

 - Replaced many things with base JDK8 constructs.
 - In JDK9 we can improve some more parts.
 - We do not generat shaded artifact 'stash' anymore.
 - Upgrade version number based on the change.

Author: khmarbaise

ReleaseNotes.md

@@ -1,6 +1,16 @@
 # Release Notes
 
-## Release 0.3.9 (NOT RELEASED YET)
+## Release 0.4.0 (NOT RELEASED YET)
+
+ * [Fixed Issue 395][issue-395]
+   
+   * Remove google guava lib
+   * Removed also the creation of the shaded artifact `stash`
+     cause we do not rely on Guava anymore. So you 
+     can use the original artifact directly.
+   * This results in a bumping of the version
+     number cause it a change which is breaking 
+     with previous version 0.3.8.
 
  * [Fixed Issue 405][issue-405]
 
@@ -1113,6 +1123,7 @@ TestReport testReport = mavenJob.getLastSuccessfulBuild().getTestReport();
 [issue-298]: https://github.com/jenkinsci/java-client-api/issues/298
 [issue-301]: https://github.com/jenkinsci/java-client-api/issues/301
 [issue-394]: https://github.com/jenkinsci/java-client-api/issues/394
+[issue-395]: https://github.com/jenkinsci/java-client-api/issues/395
 [issue-396]: https://github.com/jenkinsci/java-client-api/issues/396
 [issue-397]: https://github.com/jenkinsci/java-client-api/issues/397
 [issue-399]: https://github.com/jenkinsci/java-client-api/issues/399

jenkins-client-it-docker/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.offbytwo.jenkins</groupId>
     <artifactId>jenkins-client-parent</artifactId>
-    <version>0.3.9-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jenkins-client-it-docker</artifactId>
@@ -43,11 +43,6 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>

jenkins-client-it-docker/src/test/java/com/offbytwo/jenkins/integration/NoExecutorStartedGetJobIT.java

@@ -7,7 +7,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import com.google.common.base.Joiner;
 import com.offbytwo.jenkins.model.Build;
 import com.offbytwo.jenkins.model.BuildResult;
 import com.offbytwo.jenkins.model.BuildWithDetails;
@@ -50,7 +49,7 @@ private void checkJob(BuildWithDetails details) throws IOException {
                 "Building in workspace /var/jenkins_home/jobs/test/workspace",
                 "[workspace] $ /bin/sh -xe /tmp/hudson2556403647634111927.sh", "+ echo test", "test",
                 "Finished: SUCCESS", "" };
-        String expectedOutput = Joiner.on("\r\n").join(expectedOutputLines);
+        String expectedOutput = String.join("\r\n", expectedOutputLines);
         // Hint: It looks like the consoleOutputText contains CR+LF
         String resultingOutput = details.getConsoleOutputText();
         assertThat(resultingOutput).isEqualTo(expectedOutput);

jenkins-client-it-docker/src/test/java/com/offbytwo/jenkins/integration/NoExecutorStartedGetJobXmlIT.java

@@ -7,8 +7,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import com.google.common.base.Joiner;
-
 @Test(groups = { Groups.NO_EXECUTOR_GROUP })
 public class NoExecutorStartedGetJobXmlIT extends AbstractJenkinsIntegrationCase {
 
@@ -47,7 +45,7 @@ public void beforeMethod() throws IOException {
 
     @Test
     public void getJobXmlShouldReturnTheExpectedConfigXml() {
-        String expectedXml = Joiner.on("\n").join(CONFIG_XML);
+        String expectedXml = String.join("\n", CONFIG_XML);
         assertThat(jobXml).isEqualTo(expectedXml);
     }
 

jenkins-client/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.offbytwo.jenkins</groupId>
     <artifactId>jenkins-client-parent</artifactId>
-    <version>0.3.9-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jenkins-client</artifactId>
@@ -51,11 +51,6 @@
     </dependency>
 
     <!-- Musties -->
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -127,28 +122,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <executions>
-          <execution>
-            <id>stash</id>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>com.google.guava:guava</include>
-                </includes>
-              </artifactSet>
-              <shadedArtifactAttached>true</shadedArtifactAttached>
-              <shadedClassifierName>stash</shadedClassifierName>
-              <relocations>
-                <relocation>
-                  <pattern>com.google.common</pattern>
-                  <shadedPattern>com.google.common.jenkins_client_jarjar</shadedPattern>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
           <execution>
             <id>httpclient</id>
             <phase>package</phase>
@@ -164,12 +137,6 @@
               </artifactSet>
               <shadedArtifactAttached>true</shadedArtifactAttached>
               <shadedClassifierName>apachehttp</shadedClassifierName>
-              <relocations>
-                <relocation>
-                  <pattern>com.google.common</pattern>
-                  <shadedPattern>com.google.common.jenkins_client_jarjar</shadedPattern>
-                </relocation>
-              </relocations>
             </configuration>
           </execution>
         </executions>

jenkins-client/src/main/java/com/offbytwo/jenkins/JenkinsServer.java

@@ -8,22 +8,21 @@
 
 import java.io.IOException;
 import java.net.URI;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.xml.bind.JAXBException;
 
+import com.offbytwo.jenkins.helper.FunctionalHelper;
+import com.offbytwo.jenkins.model.BaseModel;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.HttpResponseException;
 import org.apache.http.entity.ContentType;
 import org.dom4j.DocumentException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
 import com.offbytwo.jenkins.client.JenkinsHttpClient;
 import com.offbytwo.jenkins.client.JenkinsHttpConnection;
 import com.offbytwo.jenkins.client.util.EncodingUtils;
@@ -45,6 +44,12 @@
 import com.offbytwo.jenkins.model.QueueReference;
 import com.offbytwo.jenkins.model.View;
 import java.io.Closeable;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static com.offbytwo.jenkins.helper.FunctionalHelper.SET_CLIENT;
+import static java.util.stream.Collectors.toMap;
 
 /**
  * The main starting point for interacting with a Jenkins server.
@@ -167,13 +172,10 @@ public Map<String, Job> getJobs(FolderJob folder, String view) throws IOExceptio
             viewClass = View.class;
         }
         List<Job> jobs = client.get(path, viewClass).getJobs();
-        return Maps.uniqueIndex(jobs, new Function<Job, String>() {
-            @Override
-            public String apply(Job job) {
-                job.setClient(client);
-                return job.getName();
-            }
-        });
+
+        return jobs.stream()
+                .map(SET_CLIENT(this.client))
+                .collect(toMap(s -> s.getName(), s -> s));
     }
 
     /**
@@ -198,22 +200,23 @@ public Map<String, View> getViews(FolderJob folder) throws IOException {
         // This is much better than using &depth=2
         // http://localhost:8080/api/json?pretty&tree=views[name,url,jobs[name,url]]
         List<View> views = client.get(UrlUtils.toBaseUrl(folder) + "?tree=views[name,url,jobs[name,url]]", MainView.class).getViews();
-        return Maps.uniqueIndex(views, new Function<View, String>() {
-            @Override
-            public String apply(View view) {
-                view.setClient(client);
-                // TODO: Think about the following? Does there exists a
-                // simpler/more elegant method?
+
+        //TODO: Think about this Lambda. It's too large? Make it smaller!
+        return views.stream().map(view -> {
+                SET_CLIENT(this.client);
+
+                // TODO: Think about the following? Does there exists a simpler/more
+                // elegant method?
                 for (Job job : view.getJobs()) {
-                    job.setClient(client);
+                    SET_CLIENT(this.client);
                 }
-                for (View item : view.getViews()) {
-                    item.setClient(client);
+                for (View viewView : view.getViews()) {
+                    SET_CLIENT(this.client);
                 }
 
-                return view.getName();
-            }
-        });
+                return view;
+            })
+            .collect(Collectors.toMap(s -> s.getName(), v -> v));
     }
 
     /**
@@ -317,10 +320,9 @@ public Optional<FolderJob> getFolderJob(Job job) throws IOException {
         try {
             FolderJob folder = client.get(job.getUrl(), FolderJob.class);
             if (!folder.isFolder()) {
-                return Optional.absent();
+                return Optional.empty();
             }
             folder.setClient(client);
-
             return Optional.of(folder);
         } catch (HttpResponseException e) {
             LOGGER.debug("getForlderJob(job={}) status={}", job, e.getStatusCode());
@@ -487,8 +489,12 @@ public void createFolder(FolderJob folder, String jobName) throws IOException {
     public void createFolder(FolderJob folder, String jobName, Boolean crumbFlag) throws IOException {
         // https://gist.github.com/stuart-warren/7786892 was slightly helpful
         // here
-        ImmutableMap<String, String> params = ImmutableMap.of("mode", "com.cloudbees.hudson.plugins.folder.Folder",
-                "name", EncodingUtils.formParameter(jobName), "from", "", "Submit", "OK");
+        //TODO: JDK9+: Map.of(...)
+        Map<String, String> params = new HashMap<>();
+        params.put("mode", "com.cloudbees.hudson.plugins.folder.Folder");
+        params.put("name", jobName);
+        params.put("from", "");
+        params.put("Submit", "OK");
         client.post_form(UrlUtils.toBaseUrl(folder) + "createItem?", params, crumbFlag);
     }
 
@@ -535,13 +541,9 @@ public LabelWithDetails getLabel(String labelName) throws IOException {
      */
     public Map<String, Computer> getComputers() throws IOException {
         List<Computer> computers = client.get("computer/", Computer.class).getComputers();
-        return Maps.uniqueIndex(computers, new Function<Computer, String>() {
-            @Override
-            public String apply(Computer computer) {
-                computer.setClient(client);
-                return computer.getDisplayName().toLowerCase();
-            }
-        });
+        return computers.stream()
+                .map(SET_CLIENT(this.client))
+                .collect(Collectors.toMap(s -> s.getDisplayName().toLowerCase(), Function.identity()));
     }
 
     /**

jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java

@@ -6,8 +6,6 @@
 package com.offbytwo.jenkins.client;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-import com.google.common.io.ByteStreams;
 import com.offbytwo.jenkins.client.util.EncodingUtils;
 import com.offbytwo.jenkins.client.util.RequestReleasingInputStream;
 import com.offbytwo.jenkins.client.validator.HttpResponseValidator;
@@ -47,6 +45,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -291,7 +291,7 @@ public void post_form(String path, Map<String, String> data, boolean crumbFlag)
         if (data != null) {
             // https://gist.github.com/stuart-warren/7786892 was slightly
             // helpful here
-            List<String> queryParams = Lists.newArrayList();
+            List<String> queryParams = new ArrayList<>();
             for (String param : data.keySet()) {
                 queryParams.add(param + "=" + EncodingUtils.formParameter(data.get(param)));
             }
@@ -493,7 +493,7 @@ protected void setLocalContext(final HttpContext localContext) {
 
     private <T extends BaseModel> T objectFromResponse(Class<T> cls, HttpResponse response) throws IOException {
         InputStream content = response.getEntity().getContent();
-        byte[] bytes = ByteStreams.toByteArray(content);
+        byte[] bytes = IOUtils.toByteArray(content);
         T result = mapper.readValue(bytes, cls);
         // TODO: original:
         // T result = mapper.readValue(content, cls);

jenkins-client/src/main/java/com/offbytwo/jenkins/client/util/EncodingUtils.java

@@ -1,20 +1,46 @@
+/*
+ * Copyright (c) 2019 Karl Heinz Marbaise, and contributors.
+ *
+ * Distributed under the MIT license: http://opensource.org/licenses/MIT
+ */
 package com.offbytwo.jenkins.client.util;
 
-import com.google.common.net.UrlEscapers;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * This class is a help class to centralize the
+ * encoding parts which will call an appropriate library function.
+ *
+ * @author Karl Heinz Marbaise
+ */
 public final class EncodingUtils {
 
     private EncodingUtils() {
     } // nope
 
     public static String encode(String pathPart) {
         // jenkins doesn't like the + for space, use %20 instead
-        return UrlEscapers.urlPathSegmentEscaper().escape(pathPart);
+        try {
+            return URLEncoder.encode(pathPart, StandardCharsets.UTF_8.displayName());
+        } catch (UnsupportedEncodingException e) {
+            // Should never happen, because that would imply that
+            // the parameter StandardCharsets.UTF_8 is wrong.
+            throw new IllegalArgumentException(e);
+        }
     }
 
     public static String formParameter(String pathPart) {
         // jenkins doesn't like the + for space, use %20 instead
-        return UrlEscapers.urlFormParameterEscaper().escape(pathPart);
+        try {
+            return URLEncoder.encode(pathPart, StandardCharsets.UTF_8.displayName());
+        } catch (UnsupportedEncodingException e) {
+            // Should never happen, because that would imply that
+            // the parameter StandardCharsets.UTF_8 is wrong.
+            throw new IllegalArgumentException(e);
+        }
     }
 
 }

jenkins-client/src/main/java/com/offbytwo/jenkins/helper/FunctionalHelper.java

@@ -0,0 +1,22 @@
+package com.offbytwo.jenkins.helper;
+
+import com.offbytwo.jenkins.client.JenkinsHttpConnection;
+import com.offbytwo.jenkins.model.BaseModel;
+
+import java.util.function.Function;
+
+public final class FunctionalHelper {
+
+    private FunctionalHelper() {
+        // intentionally empty.
+    }
+
+    public static final <T extends BaseModel> Function<T, T> SET_CLIENT(JenkinsHttpConnection client) {
+        return s -> {
+            s.setClient(client);
+            return s;
+        };
+    }
+
+
+}