Skip to content

Commit dbfb3a7

Browse files
committed
Some minor layout and doc fixes
1 parent 78ed493 commit dbfb3a7

File tree

6 files changed

+51
-34
lines changed

6 files changed

+51
-34
lines changed

.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# EditorConfig is awesome: http://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
charset = utf-8
11+
indent_style = space
12+
indent_size = 2

.gitignore

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
target/
2+
23
pom.xml.tag
34
pom.xml.releaseBackup
45
pom.xml.versionsBackup
@@ -7,7 +8,11 @@ release.properties
78
dependency-reduced-pom.xml
89
buildNumber.properties
910
.mvn/timing.properties
10-
.idea
11-
jenkins-client.iml
11+
1212
# Exclude maven wrapper
1313
!/.mvn/wrapper/maven-wrapper.jar
14+
15+
# Intellij Idea files
16+
.idea
17+
*.iml
18+

src/main/java/com/redhat/digkins/DiggerClient.java

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
import java.net.URISyntaxException;
1010

1111
/**
12-
* Digger Java Client
13-
* <p>
14-
* Interact with digger jenkins api!
12+
* Digger Java Client interact with Digger Jenkins api.
1513
*/
1614
public class DiggerClient {
1715

@@ -21,29 +19,14 @@ public DiggerClient(JenkinsAuth auth) throws URISyntaxException {
2119
this.jenkins = new JenkinsServer(new URI(auth.getUrl()), auth.getUser(), auth.getPassword());
2220
}
2321

24-
/**
25-
* Create new digger job on jenkins platform
26-
*
27-
* @param name - job name that can be used later to reference job
28-
* @param gitRepo - git repository url (full git repository url. e.g [email protected]:wtrocki/helloworld-android-gradle.git
29-
* @param gitBranch - git repository branch (default branch used to checkout source code)
30-
*/
31-
public void createJob(String name, String gitRepo, String gitBranch) throws DiggerClientException {
32-
CreateJobService service = new CreateJobService(this.jenkins);
33-
try {
34-
service.create(name, gitRepo, gitBranch);
35-
} catch (Throwable e) {
36-
throw new DiggerClientException(e);
37-
}
38-
}
39-
4022
/**
4123
* Create client using provided url and credentials
4224
*
43-
* @param url - jenkins url
44-
* @param user - jenkins user
45-
* @param password - jenkins password
25+
* @param url Jenkins url
26+
* @param user Jenkins user
27+
* @param password Jenkins password
4628
* @return client instance
29+
* @throws DiggerClientException if something goes wrong
4730
*/
4831
public static DiggerClient from(String url, String user, String password) throws DiggerClientException {
4932
try {
@@ -53,4 +36,22 @@ public static DiggerClient from(String url, String user, String password) throws
5336
throw new DiggerClientException("Invalid jenkins url format.");
5437
}
5538
}
39+
40+
/**
41+
* Create new Digger job on Jenkins platform
42+
*
43+
* @param name job name that can be used later to reference job
44+
* @param gitRepo git repository url (full git repository url. e.g [email protected]:wtrocki/helloworld-android-gradle.git
45+
* @param gitBranch git repository branch (default branch used to checkout source code)
46+
* @throws DiggerClientException if something goes wrong
47+
*/
48+
public void createJob(String name, String gitRepo, String gitBranch) throws DiggerClientException {
49+
CreateJobService service = new CreateJobService(this.jenkins);
50+
try {
51+
service.create(name, gitRepo, gitBranch);
52+
} catch (Throwable e) {
53+
throw new DiggerClientException(e);
54+
}
55+
}
56+
5657
}

src/main/java/com/redhat/digkins/services/CreateJobService.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
package com.redhat.digkins.services;
22

33
import com.offbytwo.jenkins.JenkinsServer;
4-
import org.apache.commons.io.FileUtils;
54
import org.jtwig.JtwigModel;
65
import org.jtwig.JtwigTemplate;
76

8-
import java.io.File;
97
import java.io.IOException;
108

119
/**
1210
* Create digger job on jenkins platform
1311
*/
1412
public class CreateJobService {
1513

16-
private JenkinsServer jenkins;
14+
private final static String GIT_REPO_URL = "GIT_REPO_URL";
15+
private final static String GIT_REPO_BRANCH = "GIT_REPO_BRANCH";
1716

18-
private final static String GIT_REPO_URL = "GIT_REPO_URL", GIT_REPO_BRANCH = "GIT_REPO_BRANCH";
17+
private JenkinsServer jenkins;
1918

2019
/**
21-
* @param jenkins - jenkins api instance
20+
* @param jenkins jenkins api instance
2221
*/
2322
public CreateJobService(JenkinsServer jenkins) {
2423
this.jenkins = jenkins;
@@ -27,9 +26,9 @@ public CreateJobService(JenkinsServer jenkins) {
2726
/**
2827
* Create new digger job on jenkins platform
2928
*
30-
* @param name - job name that can be used later to reference job
31-
* @param gitRepo - git repository url (full git repository url. e.g [email protected]:digger/helloworld.git
32-
* @param gitBranch - git repository branch (default branch used to checkout source code)
29+
* @param name job name that can be used later to reference job
30+
* @param gitRepo git repository url (full git repository url. e.g [email protected]:digger/helloworld.git
31+
* @param gitBranch git repository branch (default branch used to checkout source code)
3332
*/
3433
public void create(String name, String gitRepo, String gitBranch) throws IOException {
3534
JtwigTemplate template = JtwigTemplate.classpathTemplate("templates/job.xml");

src/main/java/com/redhat/digkins/util/DiggerClientException.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.redhat.digkins.util;
22

3-
import java.util.TreeMap;
4-
53
/**
64
* Represents internal client exception
75
*/

src/main/java/com/redhat/digkins/util/JenkinsAuth.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
/**
44
* Jenkins authentication object.
5+
* <p>
6+
* Holds credentials in it.
57
*/
68
public class JenkinsAuth {
79

0 commit comments

Comments
 (0)