-
Notifications
You must be signed in to change notification settings - Fork 5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CAMEL-21256: camel-github startingSha=last does not work with large h…
…istory (#15678) * CAMEL-21256: use most recent sha when startingSha=last, prevent CommitConsumer.poll() logic from executing until after CommitConsume.doStart() method completes. * CAMEL-21256: fix formatting of CommitConsumer constructor arguments * CAMEL-21256: fix formatting on line 87 of CommitConsumer * CAMEL-21256: remove extra empty line from CommitConsumerLastTest
- Loading branch information
1 parent
c4f2981
commit 3df3821
Showing
2 changed files
with
176 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
...thub/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerLastTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.camel.component.github.consumer; | ||
|
|
||
| import org.apache.camel.BindToRegistry; | ||
| import org.apache.camel.Exchange; | ||
| import org.apache.camel.Processor; | ||
| import org.apache.camel.builder.RouteBuilder; | ||
| import org.apache.camel.component.github.GitHubComponentTestBase; | ||
| import org.apache.camel.component.github.GitHubConstants; | ||
| import org.apache.camel.support.DefaultScheduledPollConsumerScheduler; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| public class CommitConsumerLastTest extends GitHubComponentTestBase { | ||
|
|
||
| @BindToRegistry("myScheduler") | ||
| private final MyScheduler scheduler = createScheduler(); | ||
|
|
||
| private MyScheduler createScheduler() { | ||
| MyScheduler scheduler = new MyScheduler(); | ||
| scheduler.setDelay(100); | ||
| scheduler.setInitialDelay(0); | ||
| return scheduler; | ||
| } | ||
|
|
||
| @Override | ||
| protected RouteBuilder createRouteBuilder() { | ||
| return new RouteBuilder() { | ||
|
|
||
| @Override | ||
| public void configure() { | ||
| from("github://commit/master?startingSha=last&repoOwner=anotherguy&repoName=somerepo&scheduler=#myScheduler") | ||
| .routeId("foo").noAutoStartup() | ||
| .process(new GitHubCommitProcessor()) | ||
| .to(mockResultEndpoint); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Test | ||
| public void commitConsumerLongHistoryLastShaTest() throws Exception { | ||
| for (int i = 0; i < 2000; i++) { | ||
| commitService.addRepositoryCommit("existing commit " + i); | ||
| } | ||
|
|
||
| mockResultEndpoint.setAssertPeriod(500); | ||
| mockResultEndpoint.expectedBodiesReceived("new commit 1", "new commit 2"); | ||
|
|
||
| context.getRouteController().startAllRoutes(); | ||
|
|
||
| commitService.addRepositoryCommit("new commit 1"); | ||
| commitService.addRepositoryCommit("new commit 2"); | ||
|
|
||
| mockResultEndpoint.assertIsSatisfied(); | ||
| } | ||
|
|
||
| public class GitHubCommitProcessor implements Processor { | ||
| @Override | ||
| public void process(Exchange exchange) { | ||
| String author = exchange.getMessage().getHeader(GitHubConstants.GITHUB_COMMIT_AUTHOR, String.class); | ||
| String sha = exchange.getMessage().getHeader(GitHubConstants.GITHUB_COMMIT_SHA, String.class); | ||
| if (log.isDebugEnabled()) { | ||
| System.out.println(sha); | ||
| log.debug("Got commit with author: {}: SHA {}", author, sha); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private static final class MyScheduler extends DefaultScheduledPollConsumerScheduler { | ||
|
|
||
| @Override | ||
| public void startScheduler() { | ||
| super.startScheduler(); | ||
| try { | ||
| /* | ||
| adding a delay to the CommitConsumer.doStart() method to force the CommitConsumer.poll() | ||
| method to be called before the CommitConsumer.doStart() finishes which could leave the | ||
| lastSha variable null | ||
| */ | ||
| Thread.sleep(200); | ||
| } catch (InterruptedException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } | ||
| } |