diff --git a/src/main/java/org/sadtech/bot/bitbucketbot/scheduler/SchedulerComments.java b/src/main/java/org/sadtech/bot/bitbucketbot/scheduler/SchedulerComments.java index 3dee34b..e609239 100644 --- a/src/main/java/org/sadtech/bot/bitbucketbot/scheduler/SchedulerComments.java +++ b/src/main/java/org/sadtech/bot/bitbucketbot/scheduler/SchedulerComments.java @@ -40,7 +40,7 @@ import java.util.stream.Collectors; public class SchedulerComments { private static final Integer COUNT = 100; - private static final Integer NO_COMMENT = 6; + private static final Integer NO_COMMENT = 20; private static final Pattern PATTERN = Pattern.compile("@[\\w]+"); private final CommentService commentService; diff --git a/src/main/java/org/sadtech/bot/bitbucketbot/service/executor/Seeker.java b/src/main/java/org/sadtech/bot/bitbucketbot/service/executor/Seeker.java index 7b23c25..c048902 100644 --- a/src/main/java/org/sadtech/bot/bitbucketbot/service/executor/Seeker.java +++ b/src/main/java/org/sadtech/bot/bitbucketbot/service/executor/Seeker.java @@ -4,20 +4,17 @@ import lombok.RequiredArgsConstructor; import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentJson; import org.sadtech.bot.bitbucketbot.service.Utils; -import java.security.SecureRandom; import java.util.Optional; import java.util.concurrent.Callable; @RequiredArgsConstructor public class Seeker implements Callable> { - private static final SecureRandom random = new SecureRandom(); private final DataScan dataScan; private final String token; @Override - public Optional call() throws Exception { -// Thread.sleep(random.nextInt(500) + 500L); + public Optional call() { return Utils.urlToJson(dataScan.getUrlComment(), token, CommentJson.class) .map(commentJson -> new ResultScan(dataScan.getUrlComment(), dataScan.getUrlPr(), commentJson)); } diff --git a/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/ExecutorScanner.java b/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/ExecutorScanner.java index ca35ea6..bda17fc 100644 --- a/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/ExecutorScanner.java +++ b/src/main/java/org/sadtech/bot/bitbucketbot/service/impl/ExecutorScanner.java @@ -24,14 +24,17 @@ import java.util.stream.Collectors; public class ExecutorScanner implements Executor { private final ExecutorService executorService; - private final List>> resultList = new ArrayList<>(); + private List>> resultList = new ArrayList<>(); private final BitbucketConfig bitbucketConfig; @Override public boolean registration(@NonNull List dataScans) { - dataScans.stream() - .map(dataScan -> new Seeker(dataScan, bitbucketConfig.getToken())) - .forEach(seeker -> executorService.submit(seeker)); + resultList.addAll( + dataScans.stream() + .map(dataScan -> new Seeker(dataScan, bitbucketConfig.getToken())) + .map(executorService::submit) + .collect(Collectors.toList()) + ); return true; } diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index e106cf3..0335154 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -18,7 +18,7 @@ - + \ No newline at end of file