Skip to content

Commit 6c69cb3

Browse files
gy2006gy2006
committed
move git hook to git.hook package
1 parent d80aeed commit 6c69cb3

27 files changed

+85
-94
lines changed

‎core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
import com.flowci.core.flow.event.FlowCreatedEvent;
2929
import com.flowci.core.flow.event.FlowDeletedEvent;
3030
import com.flowci.core.flow.event.FlowInitEvent;
31-
import com.flowci.core.githook.domain.GitPingTrigger;
32-
import com.flowci.core.githook.domain.GitTrigger;
33-
import com.flowci.core.githook.event.GitHookEvent;
31+
import com.flowci.core.git.hook.domain.GitPingTrigger;
32+
import com.flowci.core.git.hook.domain.GitTrigger;
33+
import com.flowci.core.git.hook.event.GitHookEvent;
3434
import com.flowci.core.job.domain.Job;
3535
import com.flowci.core.job.event.CreateNewJobEvent;
3636
import com.flowci.core.secret.domain.Secret;

‎core/src/main/java/com/flowci/core/githook/controller/GithookController.java‎ renamed to ‎core/src/main/java/com/flowci/core/git/hook/controller/GithookController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.flowci.core.githook.controller;
17+
package com.flowci.core.git.hook.controller;
1818

1919
import com.flowci.core.common.domain.GitSource;
2020
import com.flowci.core.common.manager.SpringEventManager;
21-
import com.flowci.core.githook.converter.*;
22-
import com.flowci.core.githook.domain.GitTrigger;
23-
import com.flowci.core.githook.event.GitHookEvent;
21+
import com.flowci.core.git.hook.converter.*;
22+
import com.flowci.core.git.hook.domain.GitTrigger;
23+
import com.flowci.core.git.hook.event.GitHookEvent;
2424
import com.flowci.exception.ArgumentException;
2525
import com.flowci.util.StringHelper;
2626
import lombok.extern.log4j.Log4j2;

‎core/src/main/java/com/flowci/core/githook/converter/GerritConverter.java‎ renamed to ‎core/src/main/java/com/flowci/core/git/hook/converter/GerritConverter.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.flowci.core.githook.converter;
1+
package com.flowci.core.git.hook.converter;
22

33
import com.fasterxml.jackson.annotation.JsonAlias;
44
import com.flowci.core.common.domain.GitSource;
5-
import com.flowci.core.githook.domain.GitPatchSetTrigger;
6-
import com.flowci.core.githook.domain.GitTrigger;
7-
import com.flowci.core.githook.domain.GitTriggerable;
8-
import com.flowci.core.githook.domain.GitUser;
9-
import com.flowci.core.githook.util.BranchHelper;
5+
import com.flowci.core.git.hook.domain.GitPatchSetTrigger;
6+
import com.flowci.core.git.hook.domain.GitTrigger;
7+
import com.flowci.core.git.hook.domain.GitTriggerable;
8+
import com.flowci.core.git.hook.domain.GitUser;
9+
import com.flowci.core.git.hook.util.BranchHelper;
1010
import com.flowci.util.StringHelper;
1111
import com.google.common.collect.ImmutableMap;
1212
import lombok.extern.log4j.Log4j2;

‎core/src/main/java/com/flowci/core/githook/converter/GitHubConverter.java‎ renamed to ‎core/src/main/java/com/flowci/core/git/hook/converter/GitHubConverter.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.flowci.core.githook.converter;
17+
package com.flowci.core.git.hook.converter;
1818

1919
import com.fasterxml.jackson.annotation.JsonAlias;
2020
import com.fasterxml.jackson.annotation.JsonProperty;
2121
import com.flowci.core.common.domain.GitSource;
22-
import com.flowci.core.githook.domain.*;
23-
import com.flowci.core.githook.domain.GitPrTrigger.Source;
24-
import com.flowci.core.githook.domain.GitTrigger.GitEvent;
25-
import com.flowci.core.githook.util.BranchHelper;
22+
import com.flowci.core.git.hook.domain.*;
23+
import com.flowci.core.git.hook.util.BranchHelper;
2624
import com.flowci.exception.ArgumentException;
2725
import com.flowci.util.ObjectsHelper;
2826
import com.google.common.collect.ImmutableMap;
@@ -80,7 +78,7 @@ private static class PingEvent implements GitTriggerable {
8078
public GitPingTrigger toTrigger() {
8179
GitPingTrigger trigger = new GitPingTrigger();
8280
trigger.setSource(GitSource.GITHUB);
83-
trigger.setEvent(GitEvent.PING);
81+
trigger.setEvent(GitTrigger.GitEvent.PING);
8482
trigger.setActive(hook.active);
8583
trigger.setEvents(hook.events);
8684
trigger.setCreatedAt(hook.createdAt);
@@ -114,12 +112,12 @@ private static class PushTagEvent implements GitTriggerable {
114112

115113
public Author pusher;
116114

117-
private GitEvent getEvent() {
118-
return ref.startsWith(TagRefPrefix) ? GitEvent.TAG : GitEvent.PUSH;
115+
private GitTrigger.GitEvent getEvent() {
116+
return ref.startsWith(TagRefPrefix) ? GitTrigger.GitEvent.TAG : GitTrigger.GitEvent.PUSH;
119117
}
120118

121-
public GitPushTrigger createTriggerInstance(GitEvent event) {
122-
return event == GitEvent.PUSH ? new GitPushTrigger() : new GitTagTrigger();
119+
public GitPushTrigger createTriggerInstance(GitTrigger.GitEvent event) {
120+
return event == GitTrigger.GitEvent.PUSH ? new GitPushTrigger() : new GitTagTrigger();
123121
}
124122

125123
@Override
@@ -181,14 +179,14 @@ public GitPrTrigger toTrigger() {
181179
trigger.setNumOfFileChanges(prBody.numOfFileChanges);
182180
trigger.setMerged(prBody.merged);
183181

184-
Source head = new Source();
182+
GitPrTrigger.Source head = new GitPrTrigger.Source();
185183
head.setCommit(prBody.head.sha);
186184
head.setRef(prBody.head.ref);
187185
head.setRepoName(prBody.head.repo.fullName);
188186
head.setRepoUrl(prBody.head.repo.url);
189187
trigger.setHead(head);
190188

191-
Source base = new Source();
189+
GitPrTrigger.Source base = new GitPrTrigger.Source();
192190
base.setCommit(prBody.base.sha);
193191
base.setRef(prBody.base.ref);
194192
base.setRepoName(prBody.base.repo.fullName);
@@ -203,13 +201,13 @@ public GitPrTrigger toTrigger() {
203201
return trigger;
204202
}
205203

206-
private GitEvent getEvent() {
204+
private GitTrigger.GitEvent getEvent() {
207205
if (action.equals(PrOpen)) {
208-
return GitEvent.PR_OPENED;
206+
return GitTrigger.GitEvent.PR_OPENED;
209207
}
210208

211209
if (action.equals(PrClosed) && prBody.merged) {
212-
return GitEvent.PR_MERGED;
210+
return GitTrigger.GitEvent.PR_MERGED;
213211
}
214212

215213
throw new ArgumentException("Cannot handle action {0} from pull request", action);

‎core/src/main/java/com/flowci/core/githook/converter/GitLabConverter.java‎ renamed to ‎core/src/main/java/com/flowci/core/git/hook/converter/GitLabConverter.java‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.flowci.core.githook.converter;
17+
package com.flowci.core.git.hook.converter;
1818

1919
import com.fasterxml.jackson.annotation.JsonAlias;
2020
import com.fasterxml.jackson.annotation.JsonProperty;
2121
import com.flowci.core.common.domain.GitSource;
22-
import com.flowci.core.githook.domain.*;
23-
import com.flowci.core.githook.domain.GitTrigger.GitEvent;
24-
import com.flowci.core.githook.util.BranchHelper;
22+
import com.flowci.core.git.hook.domain.*;
23+
import com.flowci.core.git.hook.util.BranchHelper;
2524
import com.flowci.exception.ArgumentException;
2625
import com.flowci.util.ObjectsHelper;
2726
import com.flowci.util.StringHelper;
@@ -51,11 +50,11 @@ public class GitLabConverter extends TriggerConverter {
5150
public static final String PR = "Merge Request Hook";
5251

5352
private final Map<String, Function<InputStream, GitTrigger>> mapping =
54-
ImmutableMap.<String, Function<InputStream, GitTrigger>>builder()
55-
.put(Push, new EventConverter<>("Push", PushEvent.class))
56-
.put(Tag, new EventConverter<>("Tag", TagEvent.class))
57-
.put(PR, new EventConverter<>("PR", PrEvent.class))
58-
.build();
53+
ImmutableMap.<String, Function<InputStream, GitTrigger>>builder()
54+
.put(Push, new EventConverter<>("Push", PushEvent.class))
55+
.put(Tag, new EventConverter<>("Tag", TagEvent.class))
56+
.put(PR, new EventConverter<>("PR", PrEvent.class))
57+
.build();
5958

6059
@Override
6160
GitSource getGitSource() {
@@ -148,9 +147,9 @@ public GitPushTrigger createTriggerInstance() {
148147
return new GitPushTrigger();
149148
}
150149

151-
public GitEvent getEvent() {
150+
public GitTrigger.GitEvent getEvent() {
152151
if (name.equals(PushEvent)) {
153-
return GitEvent.PUSH;
152+
return GitTrigger.GitEvent.PUSH;
154153
}
155154

156155
throw new ArgumentException("Unsupported event '{0}' from gitlab", name);
@@ -167,9 +166,9 @@ public GitPushTrigger createTriggerInstance() {
167166
}
168167

169168
@Override
170-
public GitEvent getEvent() {
169+
public GitTrigger.GitEvent getEvent() {
171170
if (name.equals(TagEvent)) {
172-
return GitEvent.TAG;
171+
return GitTrigger.GitEvent.TAG;
173172
}
174173

175174
throw new ArgumentException("Unsupported event '{0}' from gitlab", name);
@@ -217,8 +216,8 @@ public GitTrigger toTrigger() {
217216
trigger.setBase(base);
218217

219218
GitUser sender = new GitUser()
220-
.setUsername(user.username)
221-
.setAvatarLink(user.avatar);
219+
.setUsername(user.username)
220+
.setAvatarLink(user.avatar);
222221
trigger.setSender(sender);
223222

224223
return trigger;

‎core/src/main/java/com/flowci/core/githook/converter/GiteeConverter.java‎ renamed to ‎core/src/main/java/com/flowci/core/git/hook/converter/GiteeConverter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.flowci.core.githook.converter;
17+
package com.flowci.core.git.hook.converter;
1818

1919
import com.fasterxml.jackson.annotation.JsonProperty;
2020
import com.flowci.core.common.domain.GitSource;
21-
import com.flowci.core.githook.domain.*;
22-
import com.flowci.core.githook.util.BranchHelper;
21+
import com.flowci.core.git.hook.domain.*;
22+
import com.flowci.core.git.hook.util.BranchHelper;
2323
import com.flowci.exception.ArgumentException;
2424
import com.flowci.util.ObjectsHelper;
2525
import com.google.common.collect.ImmutableMap;

‎core/src/main/java/com/flowci/core/githook/converter/GogsConverter.java‎ renamed to ‎core/src/main/java/com/flowci/core/git/hook/converter/GogsConverter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.flowci.core.githook.converter;
17+
package com.flowci.core.git.hook.converter;
1818

1919
import com.fasterxml.jackson.annotation.JsonAlias;
2020
import com.flowci.core.common.domain.GitSource;
21-
import com.flowci.core.githook.domain.*;
22-
import com.flowci.core.githook.util.BranchHelper;
21+
import com.flowci.core.git.hook.domain.*;
22+
import com.flowci.core.git.hook.util.BranchHelper;
2323
import com.flowci.exception.ArgumentException;
2424
import com.flowci.util.ObjectsHelper;
2525
import com.flowci.util.StringHelper;

‎core/src/main/java/com/flowci/core/githook/converter/TriggerConverter.java‎ renamed to ‎core/src/main/java/com/flowci/core/git/hook/converter/TriggerConverter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.flowci.core.githook.converter;
17+
package com.flowci.core.git.hook.converter;
1818

1919
import com.fasterxml.jackson.databind.ObjectMapper;
2020
import com.flowci.core.common.domain.GitSource;
21-
import com.flowci.core.githook.domain.GitTriggerable;
22-
import com.flowci.core.githook.domain.GitTrigger;
21+
import com.flowci.core.git.hook.domain.GitTrigger;
22+
import com.flowci.core.git.hook.domain.GitTriggerable;
2323
import lombok.extern.log4j.Log4j2;
2424
import org.springframework.beans.factory.annotation.Autowired;
2525

‎core/src/main/java/com/flowci/core/githook/domain/GitCommit.java‎ renamed to ‎core/src/main/java/com/flowci/core/git/hook/domain/GitCommit.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flowci.core.githook.domain;
1+
package com.flowci.core.git.hook.domain;
22

33
import lombok.*;
44

‎core/src/main/java/com/flowci/core/githook/domain/GitPatchSetTrigger.java‎ renamed to ‎core/src/main/java/com/flowci/core/git/hook/domain/GitPatchSetTrigger.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flowci.core.githook.domain;
1+
package com.flowci.core.git.hook.domain;
22

33
import com.flowci.domain.StringVars;
44
import com.flowci.util.StringHelper;

0 commit comments

Comments
 (0)