From 8a5cefd243c7af8fa3ed640f3ee93ddc9b70fe84 Mon Sep 17 00:00:00 2001
From: Michael Voigt <michael.voigt@softwareag.com>
Date: Mon, 2 Jul 2018 10:14:21 +0200
Subject: [PATCH] fixes #337 by setting the client properly

---
 .travis.yml                                           |  2 +-
 .../jobs/test/builds/1/archive/artifact1.txt          |  1 +
 .../test/builds/1/archive/sub folder/artifact2.txt    |  1 +
 jenkins-client-it-docker/jobs/test/config.xml         | 11 ++++++++++-
 .../integration/NoExecutorStartedGetJobDetailsIT.java |  4 ++++
 .../com/offbytwo/jenkins/model/BuildWithDetails.java  |  9 +++++++++
 pom.xml                                               |  4 ++--
 7 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 jenkins-client-it-docker/jobs/test/builds/1/archive/artifact1.txt
 create mode 100644 jenkins-client-it-docker/jobs/test/builds/1/archive/sub folder/artifact2.txt

diff --git a/.travis.yml b/.travis.yml
index 40d3995c..6c57468f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ after_script:
 # http://www.webupd8.org/2017/06/why-oracle-java-7-and-6-installers-no.html
 # - oraclejdk8 is not supported anymore.
 jdk:
- - openjdk7
+ - openjdk8
 cache:
   directories:
   - $HOME/.m2/repository
diff --git a/jenkins-client-it-docker/jobs/test/builds/1/archive/artifact1.txt b/jenkins-client-it-docker/jobs/test/builds/1/archive/artifact1.txt
new file mode 100644
index 00000000..0097bbb1
--- /dev/null
+++ b/jenkins-client-it-docker/jobs/test/builds/1/archive/artifact1.txt
@@ -0,0 +1 @@
+this is artifact1
\ No newline at end of file
diff --git a/jenkins-client-it-docker/jobs/test/builds/1/archive/sub folder/artifact2.txt b/jenkins-client-it-docker/jobs/test/builds/1/archive/sub folder/artifact2.txt
new file mode 100644
index 00000000..c1fcd1c6
--- /dev/null
+++ b/jenkins-client-it-docker/jobs/test/builds/1/archive/sub folder/artifact2.txt	
@@ -0,0 +1 @@
+this is artifact2 in the "sub folder"
\ No newline at end of file
diff --git a/jenkins-client-it-docker/jobs/test/config.xml b/jenkins-client-it-docker/jobs/test/config.xml
index 885fc61d..1b65249e 100644
--- a/jenkins-client-it-docker/jobs/test/config.xml
+++ b/jenkins-client-it-docker/jobs/test/config.xml
@@ -16,6 +16,15 @@
       <command>echo &quot;test&quot;</command>
     </hudson.tasks.Shell>
   </builders>
-  <publishers/>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>**/*.txt</artifacts>
+      <allowEmptyArchive>false</allowEmptyArchive>
+      <onlyIfSuccessful>true</onlyIfSuccessful>
+      <fingerprint>false</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+      <caseSensitive>true</caseSensitive>
+    </hudson.tasks.ArtifactArchiver>
+  </publishers>
   <buildWrappers/>
 </project>
\ No newline at end of file
diff --git a/jenkins-client-it-docker/src/test/java/com/offbytwo/jenkins/integration/NoExecutorStartedGetJobDetailsIT.java b/jenkins-client-it-docker/src/test/java/com/offbytwo/jenkins/integration/NoExecutorStartedGetJobDetailsIT.java
index 1f01d782..0fac3051 100644
--- a/jenkins-client-it-docker/src/test/java/com/offbytwo/jenkins/integration/NoExecutorStartedGetJobDetailsIT.java
+++ b/jenkins-client-it-docker/src/test/java/com/offbytwo/jenkins/integration/NoExecutorStartedGetJobDetailsIT.java
@@ -25,6 +25,10 @@ public void beforeMethod() throws IOException {
     @Test
     public void shouldCheckTheBuildCause() throws IOException {
         BuildWithDetails details = job.getFirstBuild().details();
+        assertThat(details.getArtifacts()).isNotNull();
+        assertThat(details.getArtifacts().size()).isEqualTo(2);
+        details.getArtifacts().forEach(a -> assertThat(a.getClient()).isNotNull());
+
         List<BuildCause> causes = details.getCauses();
         assertThat(causes).hasSize(1);
         BuildCause buildCause = causes.get(0);
diff --git a/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java b/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java
index 8674e921..ecd8b84c 100644
--- a/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java
+++ b/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java
@@ -10,6 +10,7 @@
 import com.google.common.base.Predicate;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
+import com.offbytwo.jenkins.client.JenkinsHttpConnection;
 import com.offbytwo.jenkins.helper.BuildConsoleStreamListener;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
@@ -154,6 +155,14 @@ public BuildWithDetails(BuildWithDetails details) {
         this.setClient(details.getClient());
     }
 
+    @Override
+    public void setClient(JenkinsHttpConnection client) {
+        super.setClient(client);
+        if (this.artifacts != null) {
+            this.artifacts.stream().forEach(a -> a.setClient(client));
+        }
+    }
+
     public List<Artifact> getArtifacts() {
         return artifacts;
     }
diff --git a/pom.xml b/pom.xml
index ff44c7e4..ce6912d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
     <maven.compiler.showWarnings>true</maven.compiler.showWarnings>