Skip to content

Commit

Permalink
Revert "fix(docs): Fixing javadoc failures (spinnaker#620)"
Browse files Browse the repository at this point in the history
This reverts commit 290abe8.
  • Loading branch information
Travis Tomsu committed Feb 24, 2020
1 parent 861923a commit 9941cb3
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,8 @@

public interface KeelService {
/**
* Events should be sent with this format (inherited from echo events):
*
* <pre>{@code
* [
* payload: [
* artifacts: List<Artifact>, details: Map
* ],
* eventName: String
* ]
* }</pre>
* Events should be sent with this format (inherited from echo events): [ payload: [artifacts:
* List<Artifact>, details: Map], eventName: String ]
*/
@POST("/artifacts/events")
Void sendArtifactEvent(@Body Map event);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
import lombok.AllArgsConstructor;
import lombok.Data;

/** Encapsulates a build content block */
/**
* Encapsulates a build content block
*
* <p>
*/
@Data
@AllArgsConstructor
public class JenkinsBuildContent implements BuildContent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void poll(final boolean sendEvents) {
}

/**
* Gets a list of jobs for this master and processes builds between last poll stamp and a sliding
* Gets a list of jobs for this master & processes builds between last poll stamp and a sliding
* upper bound stamp, the cursor will be used to advanced to the upper bound when all builds are
* completed in the commit phase.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,15 @@
* <p>The serialization of these details in the Jenkins build XML changed in version 4.0.0 of the
* jenkins-git plugin.
*
* <p>Prior to 4.0.0, the format was:
*
* <pre>{@code
* <action _class="hudson.plugins.git.util.BuildData">
* <p>Prior to 4.0.0, the format was: <action _class="hudson.plugins.git.util.BuildData">
* <lastBuiltRevision> <branch> <SHA1>943a702d06f34599aee1f8da8ef9f7296031d699</SHA1>
* <name>refs/remotes/origin/master</name> </branch> </lastBuiltRevision>
* <remoteUrl>some-url</remoteUrl> </action>
* }</pre>
*
* <p>As of version 4.0.0, the format is:
*
* <pre>{@code
* <action _class="hudson.plugins.git.util.BuildDetails">
* <p>As of version 4.0.0, the format is: <action _class="hudson.plugins.git.util.BuildDetails">
* <build> <revision> <branch> <SHA1>943a702d06f34599aee1f8da8ef9f7296031d699</SHA1>
* <name>refs/remotes/origin/master</name> </branch> </revision> <remoteUrl>some-url</remoteUrl>
* </build> </action>
* }</pre>
*
* <p>The code in this module should remain compatible with both formats to ensure that SCM info is
* populated in Spinnaker regardless of which version of the jenkins-git plugin is being used.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,16 @@

package com.netflix.spinnaker.igor.concourse.client;

import static org.assertj.core.api.Assertions.assertThatThrownBy;

import java.net.UnknownHostException;
import org.junit.jupiter.api.Test;

class ConcourseClientTest {
// @Test
// @Ignore // NPE that cannot be observed with a debugger and no stacktrace.
// void connectException() {
// ConcourseClient client = new ConcourseClient("http://does.not.exist", "test", "test");
// assertThatThrownBy(() -> client.getJobService().jobs())
// .hasRootCauseInstanceOf(UnknownHostException.class);
// }
@Test
void connectException() {
ConcourseClient client = new ConcourseClient("http://does.not.exist", "test", "test");
assertThatThrownBy(() -> client.getJobService().jobs())
.hasRootCauseInstanceOf(UnknownHostException.class);
}
}

0 comments on commit 9941cb3

Please sign in to comment.