Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
佳 邓
Gitlab4j Api
Commits
94f26c90
Unverified
Commit
94f26c90
authored
Nov 16, 2023
by
Jérémie Bresson
Committed by
GitHub
Nov 16, 2023
Browse files
Fix wrongly named "*_at" members (#1062)
parent
7420c35a
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/models/GpgKey.java
View file @
94f26c90
...
...
@@ -2,11 +2,13 @@ package org.gitlab4j.api.models;
import
java.util.Date
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
public
class
GpgKey
{
private
Long
id
;
private
String
key
;
private
Date
created
_a
t
;
private
Date
created
A
t
;
public
Long
getId
()
{
return
id
;
...
...
@@ -24,11 +26,31 @@ public class GpgKey {
this
.
key
=
key
;
}
public
Date
getCreated_at
()
{
return
created_at
;
public
Date
getCreatedAt
()
{
return
createdAt
;
}
public
void
setCreated
_a
t
(
Date
created
_a
t
)
{
this
.
created
_a
t
=
created
_a
t
;
public
void
setCreated
A
t
(
Date
created
A
t
)
{
this
.
created
A
t
=
created
A
t
;
}
}
/**
* @deprecated Replaced by {@link #getCreatedAt()}
* @return the created at Date
*/
@Deprecated
@JsonIgnore
public
Date
getCreated_at
()
{
return
createdAt
;
}
/**
* @deprecated Replaced by {@link #setCreatedAt(Date)}
* @param createdAt new created at value
*/
@Deprecated
@JsonIgnore
public
void
setCreated_at
(
Date
createdAt
)
{
this
.
createdAt
=
createdAt
;
}}
src/main/java/org/gitlab4j/api/models/PackageFile.java
View file @
94f26c90
...
...
@@ -4,11 +4,13 @@ import java.util.Date;
import
org.gitlab4j.api.utils.JacksonJson
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
public
class
PackageFile
{
private
Long
id
;
private
Long
packageId
;
private
Date
created
_a
t
;
private
Date
created
A
t
;
private
String
fileName
;
private
Long
size
;
private
String
fileMd5
;
...
...
@@ -30,14 +32,33 @@ public class PackageFile {
this
.
packageId
=
packageId
;
}
public
Date
getCreated_at
()
{
return
created_at
;
public
Date
getCreatedAt
()
{
return
createdAt
;
}
public
void
setCreatedAt
(
Date
createdAt
)
{
this
.
createdAt
=
createdAt
;
}
public
void
setCreated_at
(
Date
created_at
)
{
this
.
created_at
=
created_at
;
/**
* @deprecated Replaced by {@link #getCreatedAt()}
* @return the created at Date
*/
@Deprecated
@JsonIgnore
public
Date
getCreated_at
()
{
return
createdAt
;
}
/**
* @deprecated Replaced by {@link #setCreatedAt(Date)}
* @param createdAt new created at value
*/
@Deprecated
@JsonIgnore
public
void
setCreated_at
(
Date
createdAt
)
{
this
.
createdAt
=
createdAt
;
}
public
String
getFileName
()
{
return
fileName
;
}
...
...
src/main/java/org/gitlab4j/api/models/Pipeline.java
View file @
94f26c90
...
...
@@ -130,32 +130,32 @@ public class Pipeline {
return
updatedAt
;
}
public
void
setUpdatedAt
(
Date
updated
_a
t
)
{
this
.
updatedAt
=
updated
_a
t
;
public
void
setUpdatedAt
(
Date
updated
A
t
)
{
this
.
updatedAt
=
updated
A
t
;
}
public
Date
getStartedAt
()
{
return
startedAt
;
}
public
void
setStartedAt
(
Date
started
_a
t
)
{
this
.
startedAt
=
started
_a
t
;
public
void
setStartedAt
(
Date
started
A
t
)
{
this
.
startedAt
=
started
A
t
;
}
public
Date
getFinishedAt
()
{
return
finishedAt
;
}
public
void
setFinishedAt
(
Date
finished
_a
t
)
{
this
.
finishedAt
=
finished
_a
t
;
public
void
setFinishedAt
(
Date
finished
A
t
)
{
this
.
finishedAt
=
finished
A
t
;
}
public
Date
getCommittedAt
()
{
return
committedAt
;
}
public
void
setCommittedAt
(
Date
committed
_a
t
)
{
this
.
committedAt
=
committed
_a
t
;
public
void
setCommittedAt
(
Date
committed
A
t
)
{
this
.
committedAt
=
committed
A
t
;
}
/**
...
...
src/main/java/org/gitlab4j/api/webhook/BuildEvent.java
View file @
94f26c90
...
...
@@ -5,6 +5,8 @@ import java.util.Date;
import
org.gitlab4j.api.models.User
;
import
org.gitlab4j.api.utils.JacksonJson
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
/**
* The documentation at: <a href="https://docs.gitlab.com/ee/user/project/integrations/webhook_events.html#job-events">
* Job Events</a> is incorrect, this class represents the actual content of the Job Hook event.
...
...
@@ -22,8 +24,8 @@ public class BuildEvent extends AbstractEvent {
private
String
buildName
;
private
String
buildStage
;
private
String
buildStatus
;
private
Date
buildStarted
_a
t
;
private
Date
buildFinished
_a
t
;
private
Date
buildStarted
A
t
;
private
Date
buildFinished
A
t
;
private
Float
buildDuration
;
private
Float
buildQueuedDuration
;
...
...
@@ -111,20 +113,60 @@ public class BuildEvent extends AbstractEvent {
this
.
buildStatus
=
buildStatus
;
}
public
Date
getBuildStartedAt
()
{
return
buildStartedAt
;
}
public
void
setBuildStartedAt
(
Date
buildStartedAt
)
{
this
.
buildStartedAt
=
buildStartedAt
;
}
/**
* @deprecated Replaced by {@link #getBuildStartedAt()}
* @return the buildstarted at Date
*/
@Deprecated
@JsonIgnore
public
Date
getBuildStarted_at
()
{
return
buildStarted_at
;
return
buildStartedAt
;
}
/**
* @deprecated Replaced by {@link #setBuildStartedAt(Date)}
* @param buildStartedAt new buildstarted at value
*/
@Deprecated
@JsonIgnore
public
void
setBuildStarted_at
(
Date
buildStartedAt
)
{
this
.
buildStartedAt
=
buildStartedAt
;
}
public
Date
getBuildFinishedAt
()
{
return
buildFinishedAt
;
}
public
void
setBuild
Started_a
t
(
Date
build
Started_a
t
)
{
this
.
build
Started_at
=
buildStarted_a
t
;
public
void
setBuild
FinishedA
t
(
Date
build
FinishedA
t
)
{
this
.
build
FinishedAt
=
buildFinishedA
t
;
}
/**
* @deprecated Replaced by {@link #getBuildFinishedAt()}
* @return the buildfinished at Date
*/
@Deprecated
@JsonIgnore
public
Date
getBuildFinished_at
()
{
return
buildFinished
_a
t
;
return
buildFinished
A
t
;
}
public
void
setBuildFinished_at
(
Date
buildFinished_at
)
{
this
.
buildFinished_at
=
buildFinished_at
;
/**
* @deprecated Replaced by {@link #setBuildFinishedAt(Date)}
* @param buildFinishedAt new buildfinished at value
*/
@Deprecated
@JsonIgnore
public
void
setBuildFinished_at
(
Date
buildFinishedAt
)
{
this
.
buildFinishedAt
=
buildFinishedAt
;
}
public
Float
getBuildDuration
()
{
...
...
src/main/java/org/gitlab4j/api/webhook/JobEvent.java
View file @
94f26c90
...
...
@@ -5,6 +5,8 @@ import java.util.Date;
import
org.gitlab4j.api.models.User
;
import
org.gitlab4j.api.utils.JacksonJson
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
public
class
JobEvent
extends
AbstractEvent
{
public
static
final
String
JOB_HOOK_X_GITLAB_EVENT
=
"Job Hook"
;
...
...
@@ -18,8 +20,8 @@ public class JobEvent extends AbstractEvent {
private
String
jobName
;
private
String
jobStage
;
private
String
jobStatus
;
private
Date
jobStarted
_a
t
;
private
Date
jobFinished
_a
t
;
private
Date
jobStarted
A
t
;
private
Date
jobFinished
A
t
;
private
Integer
jobDuration
;
private
Boolean
jobAllowFailure
;
private
String
jobFailureReason
;
...
...
@@ -103,22 +105,61 @@ public class JobEvent extends AbstractEvent {
this
.
jobStatus
=
jobStatus
;
}
public
Date
getJobStartedAt
()
{
return
jobStartedAt
;
}
public
void
setJobStartedAt
(
Date
jobStartedAt
)
{
this
.
jobStartedAt
=
jobStartedAt
;
}
/**
* @deprecated Replaced by {@link #getJobStartedAt()}
* @return the jobstarted at Date
*/
@Deprecated
@JsonIgnore
public
Date
getJobStarted_at
()
{
return
jobStarted
_a
t
;
return
jobStarted
A
t
;
}
public
void
setJobStarted_at
(
Date
jobStarted_at
)
{
this
.
jobStarted_at
=
jobStarted_at
;
/**
* @deprecated Replaced by {@link #setJobStartedAt(Date)}
* @param jobStartedAt new jobstarted at value
*/
@Deprecated
@JsonIgnore
public
void
setJobStarted_at
(
Date
jobStartedAt
)
{
this
.
jobStartedAt
=
jobStartedAt
;
}
public
Date
getJobFinished
_a
t
()
{
return
jobFinished
_a
t
;
public
Date
getJobFinished
A
t
()
{
return
jobFinished
A
t
;
}
public
void
setJobFinished
_a
t
(
Date
jobFinished
_a
t
)
{
this
.
jobFinished
_a
t
=
jobFinished
_a
t
;
public
void
setJobFinished
A
t
(
Date
jobFinished
A
t
)
{
this
.
jobFinished
A
t
=
jobFinished
A
t
;
}
/**
* @deprecated Replaced by {@link #getJobFinishedAt()}
* @return the jobfinished at Date
*/
@Deprecated
@JsonIgnore
public
Date
getJobFinished_at
()
{
return
jobFinishedAt
;
}
/**
* @deprecated Replaced by {@link #setJobFinishedAt(Date)}
* @param jobFinishedAt new jobfinished at value
*/
@Deprecated
@JsonIgnore
public
void
setJobFinished_at
(
Date
jobFinishedAt
)
{
this
.
jobFinishedAt
=
jobFinishedAt
;
}
public
Integer
getJobDuration
()
{
return
jobDuration
;
}
...
...
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