Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
佳 邓
Gitlab4j Api
Commits
8281b079
Commit
8281b079
authored
6 years ago
by
Greg Messner
Browse files
Options
Download
Email Patches
Plain Diff
Mods to use shared Logger from GitLabApi class (#228).
parent
4eb856c7
main
5.0.x
5.0.x.jdk17
6.x
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/org/gitlab4j/api/systemhooks/SystemHookManager.java
+13
-12
.../java/org/gitlab4j/api/systemhooks/SystemHookManager.java
src/main/java/org/gitlab4j/api/webhook/WebHookManager.java
+13
-12
src/main/java/org/gitlab4j/api/webhook/WebHookManager.java
with
26 additions
and
24 deletions
+26
-24
src/main/java/org/gitlab4j/api/systemhooks/SystemHookManager.java
+
13
-
12
View file @
8281b079
...
...
@@ -9,6 +9,7 @@ import java.util.logging.Logger;
import
javax.servlet.http.HttpServletRequest
;
import
org.gitlab4j.api.GitLabApi
;
import
org.gitlab4j.api.GitLabApiException
;
import
org.gitlab4j.api.HookManager
;
import
org.gitlab4j.api.utils.HttpRequestUtils
;
...
...
@@ -21,7 +22,7 @@ public class SystemHookManager extends HookManager {
public
static
final
String
SYSTEM_HOOK_EVENT
=
"System Hook"
;
private
final
static
Logger
LOG
=
Logger
.
getLogger
(
SystemHookManager
.
class
.
getName
()
);
private
final
static
Logger
LOG
GER
=
GitLabApi
.
getLogger
(
);
private
final
JacksonJson
jacksonJson
=
new
JacksonJson
();
// Collection of objects listening for System Hook events.
...
...
@@ -55,27 +56,27 @@ public class SystemHookManager extends HookManager {
if
(!
isValidSecretToken
(
request
))
{
String
message
=
"X-Gitlab-Token mismatch!"
;
LOG
.
warning
(
message
);
LOG
GER
.
warning
(
message
);
throw
new
GitLabApiException
(
message
);
}
String
eventName
=
request
.
getHeader
(
"X-Gitlab-Event"
);
LOG
.
info
(
"handleEvent: X-Gitlab-Event="
+
eventName
);
LOG
GER
.
info
(
"handleEvent: X-Gitlab-Event="
+
eventName
);
if
(!
SYSTEM_HOOK_EVENT
.
equals
(
eventName
))
{
String
message
=
"Unsupported X-Gitlab-Event, event Name="
+
eventName
;
LOG
.
warning
(
message
);
LOG
GER
.
warning
(
message
);
throw
new
GitLabApiException
(
message
);
}
try
{
SystemHookEvent
event
;
if
(
LOG
.
isLoggable
(
Level
.
FINE
))
{
LOG
.
fine
(
HttpRequestUtils
.
getShortRequestDump
(
"System Hook"
,
true
,
request
));
if
(
LOG
GER
.
isLoggable
(
Level
.
FINE
))
{
LOG
GER
.
fine
(
HttpRequestUtils
.
getShortRequestDump
(
"System Hook"
,
true
,
request
));
String
postData
=
HttpRequestUtils
.
getPostDataAsString
(
request
);
LOG
.
fine
(
"Raw POST data:\n"
+
postData
);
LOG
GER
.
fine
(
"Raw POST data:\n"
+
postData
);
event
=
jacksonJson
.
unmarshal
(
SystemHookEvent
.
class
,
postData
);
LOG
.
fine
(
event
.
getEventName
()
+
"\n"
+
jacksonJson
.
marshal
(
event
)
+
"\n"
);
LOG
GER
.
fine
(
event
.
getEventName
()
+
"\n"
+
jacksonJson
.
marshal
(
event
)
+
"\n"
);
}
else
{
InputStreamReader
reader
=
new
InputStreamReader
(
request
.
getInputStream
());
event
=
jacksonJson
.
unmarshal
(
SystemHookEvent
.
class
,
reader
);
...
...
@@ -84,7 +85,7 @@ public class SystemHookManager extends HookManager {
fireEvent
(
event
);
}
catch
(
Exception
e
)
{
LOG
.
warning
(
"Error processing JSON data, exception="
+
LOG
GER
.
warning
(
"Error processing JSON data, exception="
+
e
.
getClass
().
getSimpleName
()
+
", error="
+
e
.
getMessage
());
throw
new
GitLabApiException
(
e
);
}
...
...
@@ -98,10 +99,10 @@ public class SystemHookManager extends HookManager {
*/
public
void
handleEvent
(
SystemHookEvent
event
)
throws
GitLabApiException
{
if
(
event
!=
null
)
{
LOG
.
info
(
"handleEvent:"
+
event
.
getClass
().
getSimpleName
()
+
", eventName="
+
event
.
getEventName
());
LOG
GER
.
info
(
"handleEvent:"
+
event
.
getClass
().
getSimpleName
()
+
", eventName="
+
event
.
getEventName
());
fireEvent
(
event
);
}
else
{
LOG
.
warning
(
"handleEvent: provided event cannot be null!"
);
LOG
GER
.
warning
(
"handleEvent: provided event cannot be null!"
);
}
}
...
...
@@ -154,7 +155,7 @@ public class SystemHookManager extends HookManager {
fireRepositoryEvent
((
RepositorySystemHookEvent
)
event
);
}
else
{
String
message
=
"Unsupported event, event_named="
+
event
.
getEventName
();
LOG
.
warning
(
message
);
LOG
GER
.
warning
(
message
);
throw
new
GitLabApiException
(
message
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/org/gitlab4j/api/webhook/WebHookManager.java
+
13
-
12
View file @
8281b079
...
...
@@ -9,6 +9,7 @@ import java.util.logging.Logger;
import
javax.servlet.http.HttpServletRequest
;
import
org.gitlab4j.api.GitLabApi
;
import
org.gitlab4j.api.GitLabApiException
;
import
org.gitlab4j.api.HookManager
;
import
org.gitlab4j.api.utils.HttpRequestUtils
;
...
...
@@ -19,7 +20,7 @@ import org.gitlab4j.api.utils.JacksonJson;
*/
public
class
WebHookManager
extends
HookManager
{
private
final
static
Logger
LOG
=
Logger
.
getLogger
(
WebHookManager
.
class
.
getName
()
);
private
final
static
Logger
LOG
GER
=
GitLabApi
.
getLogger
(
);
private
final
JacksonJson
jacksonJson
=
new
JacksonJson
();
// Collection of objects listening for WebHook events.
...
...
@@ -53,12 +54,12 @@ public class WebHookManager extends HookManager {
if
(!
isValidSecretToken
(
request
))
{
String
message
=
"X-Gitlab-Token mismatch!"
;
LOG
.
warning
(
message
);
LOG
GER
.
warning
(
message
);
throw
new
GitLabApiException
(
message
);
}
String
eventName
=
request
.
getHeader
(
"X-Gitlab-Event"
);
LOG
.
info
(
"handleEvent: X-Gitlab-Event="
+
eventName
);
LOG
GER
.
info
(
"handleEvent: X-Gitlab-Event="
+
eventName
);
switch
(
eventName
)
{
case
BuildEvent
.
BUILD_HOOK_X_GITLAB_EVENT
:
...
...
@@ -74,19 +75,19 @@ public class WebHookManager extends HookManager {
default
:
String
message
=
"Unsupported X-Gitlab-Event, event Name="
+
eventName
;
LOG
.
warning
(
message
);
LOG
GER
.
warning
(
message
);
throw
new
GitLabApiException
(
message
);
}
try
{
Event
event
;
if
(
LOG
.
isLoggable
(
Level
.
FINE
))
{
LOG
.
fine
(
HttpRequestUtils
.
getShortRequestDump
(
eventName
+
" webhook"
,
true
,
request
));
if
(
LOG
GER
.
isLoggable
(
Level
.
FINE
))
{
LOG
GER
.
fine
(
HttpRequestUtils
.
getShortRequestDump
(
eventName
+
" webhook"
,
true
,
request
));
String
postData
=
HttpRequestUtils
.
getPostDataAsString
(
request
);
LOG
.
fine
(
"Raw POST data:\n"
+
postData
);
LOG
GER
.
fine
(
"Raw POST data:\n"
+
postData
);
event
=
jacksonJson
.
unmarshal
(
Event
.
class
,
postData
);
LOG
.
fine
(
event
.
getObjectKind
()
+
" event:\n"
+
jacksonJson
.
marshal
(
event
)
+
"\n"
);
LOG
GER
.
fine
(
event
.
getObjectKind
()
+
" event:\n"
+
jacksonJson
.
marshal
(
event
)
+
"\n"
);
}
else
{
InputStreamReader
reader
=
new
InputStreamReader
(
request
.
getInputStream
());
event
=
jacksonJson
.
unmarshal
(
Event
.
class
,
reader
);
...
...
@@ -95,7 +96,7 @@ public class WebHookManager extends HookManager {
fireEvent
(
event
);
}
catch
(
Exception
e
)
{
LOG
.
warning
(
"Error parsing JSON data, exception="
+
e
.
getClass
().
getSimpleName
()
+
", error="
+
e
.
getMessage
());
LOG
GER
.
warning
(
"Error parsing JSON data, exception="
+
e
.
getClass
().
getSimpleName
()
+
", error="
+
e
.
getMessage
());
throw
new
GitLabApiException
(
e
);
}
}
...
...
@@ -108,7 +109,7 @@ public class WebHookManager extends HookManager {
*/
public
void
handleEvent
(
Event
event
)
throws
GitLabApiException
{
LOG
.
info
(
"handleEvent: object_kind="
+
event
.
getObjectKind
());
LOG
GER
.
info
(
"handleEvent: object_kind="
+
event
.
getObjectKind
());
switch
(
event
.
getObjectKind
())
{
case
BuildEvent
.
OBJECT_KIND
:
...
...
@@ -123,7 +124,7 @@ public class WebHookManager extends HookManager {
default
:
String
message
=
"Unsupported event object_kind, object_kind="
+
event
.
getObjectKind
();
LOG
.
warning
(
message
);
LOG
GER
.
warning
(
message
);
throw
new
GitLabApiException
(
message
);
}
...
...
@@ -194,7 +195,7 @@ public class WebHookManager extends HookManager {
default
:
String
message
=
"Unsupported event object_kind, object_kind="
+
event
.
getObjectKind
();
LOG
.
warning
(
message
);
LOG
GER
.
warning
(
message
);
throw
new
GitLabApiException
(
message
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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
Menu
Explore
Projects
Groups
Snippets