Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
java-gitlab-api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
沈俊林
java-gitlab-api
Commits
2341a37b
Commit
2341a37b
authored
Oct 01, 2015
by
Lorenzo Caenazzo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert format code
parent
37444213
Changes
15
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
370 additions
and
393 deletions
+370
-393
pom.xml
pom.xml
+135
-135
GitlabAPI.java
src/main/java/org/gitlab/api/GitlabAPI.java
+127
-153
TokenType.java
src/main/java/org/gitlab/api/TokenType.java
+10
-8
GitlabHTTPRequestor.java
src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java
+34
-33
Query.java
src/main/java/org/gitlab/api/http/Query.java
+24
-28
GitlabBranch.java
src/main/java/org/gitlab/api/models/GitlabBranch.java
+0
-1
GitlabBranchCommit.java
src/main/java/org/gitlab/api/models/GitlabBranchCommit.java
+0
-1
GitlabMergeRequest.java
src/main/java/org/gitlab/api/models/GitlabMergeRequest.java
+0
-1
GitlabNamespace.java
src/main/java/org/gitlab/api/models/GitlabNamespace.java
+0
-1
GitlabProjectAccessLevel.java
.../java/org/gitlab/api/models/GitlabProjectAccessLevel.java
+3
-0
GitlabRepositoryTree.java
...main/java/org/gitlab/api/models/GitlabRepositoryTree.java
+29
-30
GitlabSSHKey.java
src/main/java/org/gitlab/api/models/GitlabSSHKey.java
+1
-1
GitlabUser.java
src/main/java/org/gitlab/api/models/GitlabUser.java
+0
-1
GitlabAPIT.java
src/test/java/org/gitlab/api/GitlabAPIT.java
+6
-0
QueryTest.java
src/test/java/org/gitlab/api/http/QueryTest.java
+1
-0
No files found.
pom.xml
View file @
2341a37b
src/main/java/org/gitlab/api/GitlabAPI.java
View file @
2341a37b
This diff is collapsed.
Click to expand it.
src/main/java/org/gitlab/api/TokenType.java
View file @
2341a37b
package
org
.
gitlab
.
api
;
package
org
.
gitlab
.
api
;
public
enum
TokenType
{
public
enum
TokenType
{
PRIVATE_TOKEN
(
"private_token"
),
ACCESS_TOKEN
(
"access_token"
),;
PRIVATE_TOKEN
(
"private_token"
)
,
ACCESS_TOKEN
(
"access_token"
),
;
private
final
String
tokenParamName
;
private
final
String
tokenParamName
;
...
...
src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java
View file @
2341a37b
...
@@ -20,8 +20,8 @@ import java.util.regex.Pattern;
...
@@ -20,8 +20,8 @@ import java.util.regex.Pattern;
import
java.util.zip.GZIPInputStream
;
import
java.util.zip.GZIPInputStream
;
/**
/**
* Gitlab HTTP Requestor
Responsible for handling HTTP requests to the Gitlab
* Gitlab HTTP Requestor
* API
*
Responsible for handling HTTP requests to the Gitlab
API
*
*
* @author @timols (Tim O)
* @author @timols (Tim O)
*/
*/
...
@@ -57,8 +57,8 @@ public class GitlabHTTPRequestor {
...
@@ -57,8 +57,8 @@ public class GitlabHTTPRequestor {
}
}
/**
/**
* Sets the HTTP Request method for the request.
Has a fluent api for method
* Sets the HTTP Request method for the request.
* chaining.
*
Has a fluent api for method
chaining.
*
*
* @param method The HTTP method
* @param method The HTTP method
* @return this
* @return this
...
@@ -74,8 +74,8 @@ public class GitlabHTTPRequestor {
...
@@ -74,8 +74,8 @@ public class GitlabHTTPRequestor {
}
}
/**
/**
* Sets the HTTP Form Post parameters for the request
Has a fluent api for
* Sets the HTTP Form Post parameters for the request
* method chaining
*
Has a fluent api for
method chaining
*
*
* @param key Form parameter Key
* @param key Form parameter Key
* @param value Form parameter Value
* @param value Form parameter Value
...
@@ -101,8 +101,7 @@ public class GitlabHTTPRequestor {
...
@@ -101,8 +101,7 @@ public class GitlabHTTPRequestor {
* Will throw an error
* Will throw an error
*
*
* @param <T> The return type of the method
* @param <T> The return type of the method
* @param tailAPIUrl The url to open a connection to (after the host and
* @param tailAPIUrl The url to open a connection to (after the host and namespace)
* namespace)
* @param type The type of the response to be deserialized from
* @param type The type of the response to be deserialized from
* @param instance The instance to update from the response
* @param instance The instance to update from the response
* @return An object of type T
* @return An object of type T
...
@@ -232,7 +231,8 @@ public class GitlabHTTPRequestor {
...
@@ -232,7 +231,8 @@ public class GitlabHTTPRequestor {
if
(
matcher
.
find
())
{
if
(
matcher
.
find
())
{
Integer
page
=
Integer
.
parseInt
(
matcher
.
group
(
2
))
+
1
;
Integer
page
=
Integer
.
parseInt
(
matcher
.
group
(
2
))
+
1
;
this
.
url
=
new
URL
(
matcher
.
replaceAll
(
matcher
.
group
(
1
)
+
"page="
+
page
));
this
.
url
=
new
URL
(
matcher
.
replaceAll
(
matcher
.
group
(
1
)
+
"page="
+
page
));
}
else
if
(
GitlabCommit
[].
class
==
type
)
{
}
else
{
if
(
GitlabCommit
[].
class
==
type
)
{
// there is a bug in the Gitlab CE API
// there is a bug in the Gitlab CE API
// (https://gitlab.com/gitlab-org/gitlab-ce/issues/759)
// (https://gitlab.com/gitlab-org/gitlab-ce/issues/759)
// that starts pagination with page=0 for commits
// that starts pagination with page=0 for commits
...
@@ -243,6 +243,7 @@ public class GitlabHTTPRequestor {
...
@@ -243,6 +243,7 @@ public class GitlabHTTPRequestor {
this
.
url
=
new
URL
(
url
+
"&page=2"
);
this
.
url
=
new
URL
(
url
+
"&page=2"
);
}
}
}
}
}
};
};
}
}
...
...
src/main/java/org/gitlab/api/http/Query.java
View file @
2341a37b
...
@@ -8,12 +8,12 @@ import java.util.ArrayList;
...
@@ -8,12 +8,12 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
/**
/**
* Models the Query aspect of a URL
* Models the Query
* aspect of a URL
*/
*/
public
class
Query
{
public
class
Query
{
private
class
Tuple
<
T1
,
T2
>
{
private
class
Tuple
<
T1
,
T2
>
{
T1
_1
;
T1
_1
;
T2
_2
;
T2
_2
;
...
@@ -24,8 +24,8 @@ public class Query {
...
@@ -24,8 +24,8 @@ public class Query {
}
}
/**
/**
* The type of params is:
Tuple<name,
* The type of params is:
* Tuple<value, URLEncoder.encode(value, "UTF-8")>>
* Tuple<
name, Tuple<
value, URLEncoder.encode(value, "UTF-8")>>
*/
*/
private
final
List
<
Tuple
<
String
,
Tuple
<
String
,
String
>>>
params
=
new
ArrayList
<
Tuple
<
String
,
Tuple
<
String
,
String
>>>();
private
final
List
<
Tuple
<
String
,
Tuple
<
String
,
String
>>>
params
=
new
ArrayList
<
Tuple
<
String
,
Tuple
<
String
,
String
>>>();
...
@@ -35,8 +35,7 @@ public class Query {
...
@@ -35,8 +35,7 @@ public class Query {
* @param name Parameter name
* @param name Parameter name
* @param value Parameter value
* @param value Parameter value
* @return this
* @return this
* @throws java.io.UnsupportedEncodingException If the provided value cannot
* @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
* be URL Encoded
*/
*/
public
Query
append
(
final
String
name
,
final
String
value
)
throws
UnsupportedEncodingException
{
public
Query
append
(
final
String
name
,
final
String
value
)
throws
UnsupportedEncodingException
{
params
.
add
(
new
Tuple
<
String
,
Tuple
<
String
,
String
>>(
name
,
new
Tuple
<
String
,
String
>(
value
,
URLEncoder
.
encode
(
value
,
"UTF-8"
))));
params
.
add
(
new
Tuple
<
String
,
Tuple
<
String
,
String
>>(
name
,
new
Tuple
<
String
,
String
>(
value
,
URLEncoder
.
encode
(
value
,
"UTF-8"
))));
...
@@ -44,14 +43,13 @@ public class Query {
...
@@ -44,14 +43,13 @@ public class Query {
}
}
/**
/**
* Conditionally append a parameter to the query
if the value of the
* Conditionally append a parameter to the query
* parameter is not null
*
if the value of the
parameter is not null
*
*
* @param name Parameter name
* @param name Parameter name
* @param value Parameter value
* @param value Parameter value
* @return this
* @return this
* @throws java.io.UnsupportedEncodingException If the provided value cannot
* @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
* be URL Encoded
*/
*/
public
Query
appendIf
(
final
String
name
,
final
String
value
)
throws
UnsupportedEncodingException
{
public
Query
appendIf
(
final
String
name
,
final
String
value
)
throws
UnsupportedEncodingException
{
if
(
value
!=
null
)
{
if
(
value
!=
null
)
{
...
@@ -61,14 +59,13 @@ public class Query {
...
@@ -61,14 +59,13 @@ public class Query {
}
}
/**
/**
* Conditionally append a parameter to the query
if the value of the
* Conditionally append a parameter to the query
* parameter is not null
*
if the value of the
parameter is not null
*
*
* @param name Parameter name
* @param name Parameter name
* @param value Parameter value
* @param value Parameter value
* @return this
* @return this
* @throws java.io.UnsupportedEncodingException If the provided value cannot
* @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
* be URL Encoded
*/
*/
public
Query
appendIf
(
final
String
name
,
final
Integer
value
)
throws
UnsupportedEncodingException
{
public
Query
appendIf
(
final
String
name
,
final
Integer
value
)
throws
UnsupportedEncodingException
{
if
(
value
!=
null
)
{
if
(
value
!=
null
)
{
...
@@ -78,14 +75,13 @@ public class Query {
...
@@ -78,14 +75,13 @@ public class Query {
}
}
/**
/**
* Conditionally append a parameter to the query
if the value of the
* Conditionally append a parameter to the query
* parameter is not null
*
if the value of the
parameter is not null
*
*
* @param name Parameter name
* @param name Parameter name
* @param value Parameter value
* @param value Parameter value
* @return this
* @return this
* @throws java.io.UnsupportedEncodingException If the provided value cannot
* @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
* be URL Encoded
*/
*/
public
Query
appendIf
(
final
String
name
,
final
Boolean
value
)
throws
UnsupportedEncodingException
{
public
Query
appendIf
(
final
String
name
,
final
Boolean
value
)
throws
UnsupportedEncodingException
{
if
(
value
!=
null
)
{
if
(
value
!=
null
)
{
...
@@ -95,14 +91,13 @@ public class Query {
...
@@ -95,14 +91,13 @@ public class Query {
}
}
/**
/**
* Conditionally append a parameter to the query
if the value of the
* Conditionally append a parameter to the query
* parameter is not null
*
if the value of the
parameter is not null
*
*
* @param name Parameter name
* @param name Parameter name
* @param value Parameter value
* @param value Parameter value
* @return this
* @return this
* @throws java.io.UnsupportedEncodingException If the provided value cannot
* @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
* be URL Encoded
*/
*/
public
Query
appendIf
(
final
String
name
,
final
GitlabAccessLevel
value
)
throws
UnsupportedEncodingException
{
public
Query
appendIf
(
final
String
name
,
final
GitlabAccessLevel
value
)
throws
UnsupportedEncodingException
{
if
(
value
!=
null
)
{
if
(
value
!=
null
)
{
...
@@ -112,7 +107,8 @@ public class Query {
...
@@ -112,7 +107,8 @@ public class Query {
}
}
/**
/**
* Returns a Query suitable for appending to a URI
* Returns a Query suitable for appending
* to a URI
*/
*/
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
...
...
src/main/java/org/gitlab/api/models/GitlabBranch.java
View file @
2341a37b
...
@@ -3,7 +3,6 @@ package org.gitlab.api.models;
...
@@ -3,7 +3,6 @@ package org.gitlab.api.models;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
public
class
GitlabBranch
{
public
class
GitlabBranch
{
public
final
static
String
URL
=
"/repository/branches/"
;
public
final
static
String
URL
=
"/repository/branches/"
;
@JsonProperty
(
"name"
)
@JsonProperty
(
"name"
)
...
...
src/main/java/org/gitlab/api/models/GitlabBranchCommit.java
View file @
2341a37b
...
@@ -5,7 +5,6 @@ import java.util.Date;
...
@@ -5,7 +5,6 @@ import java.util.Date;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
public
class
GitlabBranchCommit
{
public
class
GitlabBranchCommit
{
public
static
String
URL
=
"/users"
;
public
static
String
URL
=
"/users"
;
private
String
id
;
private
String
id
;
...
...
src/main/java/org/gitlab/api/models/GitlabMergeRequest.java
View file @
2341a37b
...
@@ -5,7 +5,6 @@ import java.util.Date;
...
@@ -5,7 +5,6 @@ import java.util.Date;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
public
class
GitlabMergeRequest
{
public
class
GitlabMergeRequest
{
public
static
final
String
URL
=
"/merge_requests"
;
public
static
final
String
URL
=
"/merge_requests"
;
private
Integer
id
;
private
Integer
id
;
...
...
src/main/java/org/gitlab/api/models/GitlabNamespace.java
View file @
2341a37b
...
@@ -5,7 +5,6 @@ import java.util.Date;
...
@@ -5,7 +5,6 @@ import java.util.Date;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
public
class
GitlabNamespace
{
public
class
GitlabNamespace
{
public
static
final
String
URL
=
"/groups"
;
public
static
final
String
URL
=
"/groups"
;
private
Integer
id
;
private
Integer
id
;
...
...
src/main/java/org/gitlab/api/models/GitlabProjectAccessLevel.java
View file @
2341a37b
...
@@ -10,6 +10,7 @@ public class GitlabProjectAccessLevel {
...
@@ -10,6 +10,7 @@ public class GitlabProjectAccessLevel {
@JsonProperty
(
"notification_level"
)
@JsonProperty
(
"notification_level"
)
private
int
notificationLevel
;
private
int
notificationLevel
;
public
GitlabAccessLevel
getAccessLevel
()
{
public
GitlabAccessLevel
getAccessLevel
()
{
return
GitlabAccessLevel
.
fromAccessValue
(
accessLevel
);
return
GitlabAccessLevel
.
fromAccessValue
(
accessLevel
);
}
}
...
@@ -18,6 +19,7 @@ public class GitlabProjectAccessLevel {
...
@@ -18,6 +19,7 @@ public class GitlabProjectAccessLevel {
this
.
accessLevel
=
accessLevel
.
accessValue
;
this
.
accessLevel
=
accessLevel
.
accessValue
;
}
}
public
int
getNoficationLevel
()
{
public
int
getNoficationLevel
()
{
return
notificationLevel
;
return
notificationLevel
;
}
}
...
@@ -26,4 +28,5 @@ public class GitlabProjectAccessLevel {
...
@@ -26,4 +28,5 @@ public class GitlabProjectAccessLevel {
this
.
accessLevel
=
notificationLevel
;
this
.
accessLevel
=
notificationLevel
;
}
}
}
}
src/main/java/org/gitlab/api/models/GitlabRepositoryTree.java
View file @
2341a37b
package
org
.
gitlab
.
api
.
models
;
package
org
.
gitlab
.
api
.
models
;
public
class
GitlabRepositoryTree
{
public
class
GitlabRepositoryTree
{
public
static
String
URL
=
"/tree"
;
public
static
String
URL
=
"/tree"
;
private
String
name
;
private
String
name
;
...
...
src/main/java/org/gitlab/api/models/GitlabSSHKey.java
View file @
2341a37b
package
org
.
gitlab
.
api
.
models
;
package
org
.
gitlab
.
api
.
models
;
public
class
GitlabSSHKey
{
public
class
GitlabSSHKey
{
public
static
String
KEYS_URL
=
"/keys"
;
public
static
String
KEYS_URL
=
"/keys"
;
private
Integer
_id
;
private
Integer
_id
;
...
...
src/main/java/org/gitlab/api/models/GitlabUser.java
View file @
2341a37b
...
@@ -5,7 +5,6 @@ import java.util.Date;
...
@@ -5,7 +5,6 @@ import java.util.Date;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
public
class
GitlabUser
{
public
class
GitlabUser
{
public
static
String
URL
=
"/users"
;
public
static
String
URL
=
"/users"
;
public
static
String
USERS_URL
=
"/users"
;
public
static
String
USERS_URL
=
"/users"
;
public
static
String
USER_URL
=
"/user"
;
// for sudo based ops
public
static
String
USER_URL
=
"/user"
;
// for sudo based ops
...
...
src/test/java/org/gitlab/api/GitlabAPIT.java
View file @
2341a37b
...
@@ -24,6 +24,7 @@ public class GitlabAPIT {
...
@@ -24,6 +24,7 @@ public class GitlabAPIT {
String
rand
=
UUID
.
randomUUID
().
toString
().
replace
(
"-"
,
""
).
substring
(
0
,
8
);
String
rand
=
UUID
.
randomUUID
().
toString
().
replace
(
"-"
,
""
).
substring
(
0
,
8
);
@Before
@Before
public
void
setup
()
throws
IOException
{
public
void
setup
()
throws
IOException
{
api
=
GitlabAPI
.
connect
(
TEST_URL
,
TEST_TOKEN
);
api
=
GitlabAPI
.
connect
(
TEST_URL
,
TEST_TOKEN
);
...
@@ -61,6 +62,7 @@ public class GitlabAPIT {
...
@@ -61,6 +62,7 @@ public class GitlabAPIT {
String
password
=
randVal
(
"$%password"
);
String
password
=
randVal
(
"$%password"
);
GitlabUser
gitUser
=
api
.
createUser
(
randVal
(
"testEmail@gitlabapitest.com"
),
GitlabUser
gitUser
=
api
.
createUser
(
randVal
(
"testEmail@gitlabapitest.com"
),
password
,
password
,
randVal
(
"userName"
),
randVal
(
"userName"
),
...
@@ -89,11 +91,14 @@ public class GitlabAPIT {
...
@@ -89,11 +91,14 @@ public class GitlabAPIT {
10
/* project limit does not come back on GET */
,
gitUser
.
getExternUid
(),
gitUser
.
getExternProviderName
(),
10
/* project limit does not come back on GET */
,
gitUser
.
getExternUid
(),
gitUser
.
getExternProviderName
(),
gitUser
.
getBio
(),
gitUser
.
isAdmin
(),
gitUser
.
isCanCreateGroup
());
gitUser
.
getBio
(),
gitUser
.
isAdmin
(),
gitUser
.
isCanCreateGroup
());
GitlabUser
postUpdate
=
api
.
getUserViaSudo
(
gitUser
.
getUsername
());
GitlabUser
postUpdate
=
api
.
getUserViaSudo
(
gitUser
.
getUsername
());
assertNotNull
(
postUpdate
);
assertNotNull
(
postUpdate
);
assertEquals
(
postUpdate
.
getSkype
(),
"newSkypeId"
);
assertEquals
(
postUpdate
.
getSkype
(),
"newSkypeId"
);
api
.
deleteUser
(
postUpdate
.
getId
());
api
.
deleteUser
(
postUpdate
.
getId
());
// expect a 404, but we have no access to it
// expect a 404, but we have no access to it
...
@@ -104,6 +109,7 @@ public class GitlabAPIT {
...
@@ -104,6 +109,7 @@ public class GitlabAPIT {
assertTrue
(
true
);
// expected
assertTrue
(
true
);
// expected
}
}
}
}
private
String
randVal
(
String
postfix
)
{
private
String
randVal
(
String
postfix
)
{
...
...
src/test/java/org/gitlab/api/http/QueryTest.java
View file @
2341a37b
...
@@ -32,6 +32,7 @@ public class QueryTest {
...
@@ -32,6 +32,7 @@ public class QueryTest {
Query
query
=
new
Query
()
Query
query
=
new
Query
()
.
append
(
"p1"
,
"v1"
);
.
append
(
"p1"
,
"v1"
);
query
.
append
(
"p2"
,
"v2"
);
query
.
append
(
"p2"
,
"v2"
);
query
=
query
.
append
(
"p3"
,
"v3"
);
query
=
query
.
append
(
"p3"
,
"v3"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment