From 8b62e1e63dda602d938e2b949172dcdd3e2f096d Mon Sep 17 00:00:00 2001
From: upagge <upagge@icloud.com>
Date: Wed, 17 Jun 2020 19:13:54 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=BE=D0=B5=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bot/bitbucketbot/scheduler/SchedulerComments.java |  2 +-
 .../bot/bitbucketbot/service/executor/Seeker.java     |  5 +----
 .../bitbucketbot/service/impl/ExecutorScanner.java    | 11 +++++++----
 src/main/resources/logback.xml                        |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

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<Optional<ResultScan>> {
 
-    private static final SecureRandom random = new SecureRandom();
     private final DataScan dataScan;
     private final String token;
 
     @Override
-    public Optional<ResultScan> call() throws Exception {
-//        Thread.sleep(random.nextInt(500) + 500L);
+    public Optional<ResultScan> 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<DataScan, ResultScan> {
 
     private final ExecutorService executorService;
-    private final List<Future<Optional<ResultScan>>> resultList = new ArrayList<>();
+    private List<Future<Optional<ResultScan>>> resultList = new ArrayList<>();
     private final BitbucketConfig bitbucketConfig;
 
     @Override
     public boolean registration(@NonNull List<DataScan> 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 @@
     </appender>
 
     <root level="info">
-        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="FILE"/>
     </root>
 
 </configuration>
\ No newline at end of file