Skip to content

Commit a519716

Browse files
committed
Added unit tests for HealthCheckApi (#159).
1 parent 900c1a9 commit a519716

File tree

10 files changed

+415
-37
lines changed

10 files changed

+415
-37
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ To utilize the GitLab API for Java in your project, simply add the following dep
1111
```java
1212
dependencies {
1313
...
14-
compile group: 'org.gitlab4j', name: 'gitlab4j-api', version: '4.8.11'
14+
compile group: 'org.gitlab4j', name: 'gitlab4j-api', version: '4.8.12'
1515
}
1616
```
1717

@@ -20,7 +20,7 @@ dependencies {
2020
<dependency>
2121
<groupId>org.gitlab4j</groupId>
2222
<artifactId>gitlab4j-api</artifactId>
23-
<version>4.8.11</version>
23+
<version>4.8.12</version>
2424
</dependency>
2525
```
2626

@@ -194,9 +194,9 @@ List<Group> groups = gitLabApi.getGroupApi().getGroups();
194194

195195
#### HealthCheckApi
196196
```java
197-
// Get the liveness endpoint health check results.
198-
// Assumes ip_whitelisted
199-
LivenessHealthCheck healthCheck = gitLabApi.getHealthCheckApi().getLiveness();
197+
// Get the liveness endpoint health check results. Assumes ip_whitelisted per:
198+
// https://docs.gitlab.com/ee/administration/monitoring/ip_whitelist.html
199+
HealthCheckInfo healthCheck = gitLabApi.getHealthCheckApi().getLiveness();
200200
```
201201

202202
#### IssuesApi

example-test-gitlab4j.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ TEST_BLOCK_USERNAME=
3434
TEST_PROXY_URI=
3535
TEST_PROXY_USERNAME=
3636
TEST_PROXY_PASSWORD=
37+
38+
# OPTIONAL: To thest the HealthCheckApi provide the health check token from the GitLab server
39+
TEST_HEALTH_CHECK_TOKEN=

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>org.gitlab4j</groupId>
66
<artifactId>gitlab4j-api</artifactId>
77
<packaging>jar</packaging>
8-
<version>4.8.12-SNAPSHOT</version>
8+
<version>4.8.13-SNAPSHOT</version>
99
<name>GitLab API Java Client</name>
1010
<description>GitLab API for Java (gitlab4j-api) provides a full featured Java API for working with GitLab repositories via the GitLab REST API.</description>
1111
<url>https://github.com/gmessner/gitlab4j-api</url>

pom.xml.releaseBackup

Lines changed: 249 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,249 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>org.gitlab4j</groupId>
6+
<artifactId>gitlab4j-api</artifactId>
7+
<packaging>jar</packaging>
8+
<version>4.8.12-SNAPSHOT</version>
9+
<name>GitLab API Java Client</name>
10+
<description>GitLab API for Java (gitlab4j-api) provides a full featured Java API for working with GitLab repositories via the GitLab REST API.</description>
11+
<url>https://github.com/gmessner/gitlab4j-api</url>
12+
13+
<distributionManagement>
14+
<snapshotRepository>
15+
<id>ossrh</id>
16+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
17+
</snapshotRepository>
18+
<repository>
19+
<id>ossrh</id>
20+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
21+
</repository>
22+
</distributionManagement>
23+
24+
<licenses>
25+
<license>
26+
<name>The MIT License (MIT)</name>
27+
<url>http://opensource.org/licenses/MIT</url>
28+
<distribution>repo</distribution>
29+
</license>
30+
</licenses>
31+
32+
<developers>
33+
<developer>
34+
<id>gmessner</id>
35+
<name>Greg Messner</name>
36+
<email>[email protected]</email>
37+
</developer>
38+
</developers>
39+
40+
<properties>
41+
<java.source.version>1.8</java.source.version>
42+
<java.target.version>1.8</java.target.version>
43+
<jersey.version>2.26</jersey.version>
44+
<jackson.version>2.9.3</jackson.version>
45+
<javaServlet.version>3.1.0</javaServlet.version>
46+
<junit.version>4.12</junit.version>
47+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
48+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
49+
</properties>
50+
51+
<scm>
52+
<url>[email protected]:gmessner/gitlab4j-api.git</url>
53+
<connection>scm:git:[email protected]:gmessner/gitlab4j-api.git</connection>
54+
<developerConnection>scm:git:[email protected]:gmessner/gitlab4j-api.git</developerConnection>
55+
<tag>HEAD</tag>
56+
</scm>
57+
58+
<build>
59+
<defaultGoal>package</defaultGoal>
60+
<plugins>
61+
<plugin>
62+
<groupId>org.apache.maven.plugins</groupId>
63+
<artifactId>maven-release-plugin</artifactId>
64+
<version>2.5.3</version>
65+
<configuration>
66+
<goals>deploy</goals>
67+
</configuration>
68+
</plugin>
69+
70+
<plugin>
71+
<artifactId>maven-scm-plugin</artifactId>
72+
<version>1.9.5</version>
73+
<configuration>
74+
<tag>${project.artifactId}-${project.version}</tag>
75+
</configuration>
76+
</plugin>
77+
78+
<plugin>
79+
<groupId>org.apache.maven.plugins</groupId>
80+
<artifactId>maven-compiler-plugin</artifactId>
81+
<version>3.7.0</version>
82+
<configuration>
83+
<source>${java.source.version}</source>
84+
<target>${java.target.version}</target>
85+
</configuration>
86+
<executions>
87+
<execution>
88+
<id>default-compile</id>
89+
<configuration>
90+
<excludes>
91+
<exclude>**/module-info.java</exclude>
92+
</excludes>
93+
</configuration>
94+
</execution>
95+
</executions>
96+
</plugin>
97+
98+
<plugin>
99+
<groupId>org.apache.maven.plugins</groupId>
100+
<artifactId>maven-gpg-plugin</artifactId>
101+
<version>1.6</version>
102+
<executions>
103+
<execution>
104+
<id>sign-artifacts</id>
105+
<phase>verify</phase>
106+
<goals>
107+
<goal>sign</goal>
108+
</goals>
109+
</execution>
110+
</executions>
111+
</plugin>
112+
113+
<plugin>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<artifactId>maven-source-plugin</artifactId>
116+
<version>3.0.0</version>
117+
<executions>
118+
<execution>
119+
<id>attach-sources</id>
120+
<goals>
121+
<goal>jar-no-fork</goal>
122+
</goals>
123+
</execution>
124+
</executions>
125+
</plugin>
126+
127+
<plugin>
128+
<groupId>org.apache.maven.plugins</groupId>
129+
<artifactId>maven-javadoc-plugin</artifactId>
130+
<version>3.0.0</version>
131+
<executions>
132+
<execution>
133+
<id>attach-javadocs</id>
134+
<goals>
135+
<goal>jar</goal>
136+
</goals>
137+
</execution>
138+
</executions>
139+
</plugin>
140+
141+
<plugin>
142+
<groupId>org.jacoco</groupId>
143+
<artifactId>jacoco-maven-plugin</artifactId>
144+
<version>0.8.0</version>
145+
<executions>
146+
<execution>
147+
<id>default-prepare-agent</id>
148+
<goals>
149+
<goal>prepare-agent</goal>
150+
</goals>
151+
</execution>
152+
<execution>
153+
<id>default-report</id>
154+
<phase>prepare-package</phase>
155+
<goals>
156+
<goal>report</goal>
157+
</goals>
158+
</execution>
159+
<execution>
160+
<id>default-check</id>
161+
<goals>
162+
<goal>check</goal>
163+
</goals>
164+
<configuration>
165+
<rules>
166+
<!-- implementation is needed only for Maven 2 -->
167+
<rule implementation="org.jacoco.maven.RuleConfiguration">
168+
<element>BUNDLE</element>
169+
<limits>
170+
<!-- implementation is needed only for Maven 2 -->
171+
<limit implementation="org.jacoco.report.check.Limit">
172+
<counter>COMPLEXITY</counter>
173+
<value>COVEREDRATIO</value>
174+
<minimum>0.50</minimum>
175+
</limit>
176+
</limits>
177+
</rule>
178+
</rules>
179+
</configuration>
180+
</execution>
181+
</executions>
182+
</plugin>
183+
184+
<plugin>
185+
<groupId>org.apache.maven.plugins</groupId>
186+
<artifactId>maven-surefire-plugin</artifactId>
187+
<version>2.19.1</version>
188+
<configuration>
189+
<systemPropertyVariables>
190+
<jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
191+
</systemPropertyVariables>
192+
</configuration>
193+
</plugin>
194+
</plugins>
195+
</build>
196+
197+
<dependencies>
198+
<!-- jaxb-api and javax.activation added for Java 9 compatibility -->
199+
<dependency>
200+
<groupId>javax.xml.bind</groupId>
201+
<artifactId>jaxb-api</artifactId>
202+
<version>2.3.0</version>
203+
</dependency>
204+
<dependency>
205+
<groupId>com.sun.activation</groupId>
206+
<artifactId>javax.activation</artifactId>
207+
<version>1.2.0</version>
208+
</dependency>
209+
210+
<dependency>
211+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
212+
<artifactId>jackson-jaxrs-json-provider</artifactId>
213+
<version>${jackson.version}</version>
214+
</dependency>
215+
<dependency>
216+
<groupId>org.glassfish.jersey.inject</groupId>
217+
<artifactId>jersey-hk2</artifactId>
218+
<version>${jersey.version}</version>
219+
</dependency>
220+
<dependency>
221+
<groupId>org.glassfish.jersey.core</groupId>
222+
<artifactId>jersey-client</artifactId>
223+
<version>${jersey.version}</version>
224+
</dependency>
225+
<dependency>
226+
<groupId>org.glassfish.jersey.connectors</groupId>
227+
<artifactId>jersey-apache-connector</artifactId>
228+
<version>${jersey.version}</version>
229+
</dependency>
230+
<dependency>
231+
<groupId>org.glassfish.jersey.media</groupId>
232+
<artifactId>jersey-media-multipart</artifactId>
233+
<version>${jersey.version}</version>
234+
</dependency>
235+
236+
<dependency>
237+
<groupId>javax.servlet</groupId>
238+
<artifactId>javax.servlet-api</artifactId>
239+
<version>${javaServlet.version}</version>
240+
</dependency>
241+
<dependency>
242+
<groupId>junit</groupId>
243+
<artifactId>junit</artifactId>
244+
<version>${junit.version}</version>
245+
<scope>test</scope>
246+
</dependency>
247+
</dependencies>
248+
249+
</project>

release.properties

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#release configuration
2+
#Thu Apr 19 23:51:10 PDT 2018
3+
projectVersionPolicyId=default
4+
remoteTagging=true
5+
project.scm.org.gitlab4j\:gitlab4j-api.connection=scm\:git\:[email protected]\:gmessner/gitlab4j-api.git
6+
scm.commentPrefix=[maven-release-plugin]
7+
completedPhase=end-release
8+
scm.url=scm\:git\:[email protected]\:gmessner/gitlab4j-api.git
9+
project.scm.org.gitlab4j\:gitlab4j-api.url=[email protected]\:gmessner/gitlab4j-api.git
10+
project.scm.org.gitlab4j\:gitlab4j-api.developerConnection=scm\:git\:[email protected]\:gmessner/gitlab4j-api.git
11+
exec.additionalArguments=-P development
12+
scm.tagNameFormat=@{project.artifactId}-@{project.version}
13+
pushChanges=true
14+
project.rel.org.gitlab4j\:gitlab4j-api=4.8.12
15+
project.scm.org.gitlab4j\:gitlab4j-api.tag=HEAD
16+
scm.tag=gitlab4j-api-4.8.12
17+
project.dev.org.gitlab4j\:gitlab4j-api=4.8.13-SNAPSHOT
18+
exec.snapshotReleasePluginAllowed=false
19+
preparationGoals=clean verify

0 commit comments

Comments
 (0)