From 6c1611af0819062677bf0edee030a245e0285920 Mon Sep 17 00:00:00 2001
From: NikolayNN <kolya.by@mail.ru>
Date: Mon, 8 Jan 2018 20:19:43 +0300
Subject: [PATCH] #34 renamed from SlackAPI to SlackAPIClient

---
 .../juja/microservices/slack/archive/Application.java  |  1 -
 .../microservices/slack/archive/SchedulerConfig.java   |  2 ++
 .../archive/api/{SlackApi.java => SlackApiClient.java} |  2 +-
 .../api/{SlackApiImpl.java => SlackApiClientImpl.java} |  4 ++--
 .../archive/service/impl/SlackApiServiceImpl.java      | 10 +++++-----
 ...ackApiImplTest.java => SlackApiClientImplTest.java} |  6 +++---
 6 files changed, 13 insertions(+), 12 deletions(-)
 rename slack-archive/src/main/java/juja/microservices/slack/archive/api/{SlackApi.java => SlackApiClient.java} (84%)
 rename slack-archive/src/main/java/juja/microservices/slack/archive/api/{SlackApiImpl.java => SlackApiClientImpl.java} (92%)
 rename slack-archive/src/test/java/juja/microservices/slack/archive/api/{SlackApiImplTest.java => SlackApiClientImplTest.java} (93%)

diff --git a/slack-archive/src/main/java/juja/microservices/slack/archive/Application.java b/slack-archive/src/main/java/juja/microservices/slack/archive/Application.java
index 6cb4d31..db8ed1e 100644
--- a/slack-archive/src/main/java/juja/microservices/slack/archive/Application.java
+++ b/slack-archive/src/main/java/juja/microservices/slack/archive/Application.java
@@ -16,7 +16,6 @@
 import java.util.List;
 
 @SpringBootApplication
-@EnableScheduling
 public class Application {
 
     public static void main(String[] args) {
diff --git a/slack-archive/src/main/java/juja/microservices/slack/archive/SchedulerConfig.java b/slack-archive/src/main/java/juja/microservices/slack/archive/SchedulerConfig.java
index a0531b4..55384a9 100644
--- a/slack-archive/src/main/java/juja/microservices/slack/archive/SchedulerConfig.java
+++ b/slack-archive/src/main/java/juja/microservices/slack/archive/SchedulerConfig.java
@@ -1,11 +1,13 @@
 package juja.microservices.slack.archive;
 
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.SchedulingConfigurer;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 
 @Configuration
+@EnableScheduling
 public class SchedulerConfig implements SchedulingConfigurer {
 
     private final int POOL_SIZE = 2;
diff --git a/slack-archive/src/main/java/juja/microservices/slack/archive/api/SlackApi.java b/slack-archive/src/main/java/juja/microservices/slack/archive/api/SlackApiClient.java
similarity index 84%
rename from slack-archive/src/main/java/juja/microservices/slack/archive/api/SlackApi.java
rename to slack-archive/src/main/java/juja/microservices/slack/archive/api/SlackApiClient.java
index 8eab475..eaef38e 100644
--- a/slack-archive/src/main/java/juja/microservices/slack/archive/api/SlackApi.java
+++ b/slack-archive/src/main/java/juja/microservices/slack/archive/api/SlackApiClient.java
@@ -4,7 +4,7 @@
 
 import java.util.List;
 
-public interface SlackApi {
+public interface SlackApiClient {
 
     List<ChannelDTO> receiveChannelsList();
 }
diff --git a/slack-archive/src/main/java/juja/microservices/slack/archive/api/SlackApiImpl.java b/slack-archive/src/main/java/juja/microservices/slack/archive/api/SlackApiClientImpl.java
similarity index 92%
rename from slack-archive/src/main/java/juja/microservices/slack/archive/api/SlackApiImpl.java
rename to slack-archive/src/main/java/juja/microservices/slack/archive/api/SlackApiClientImpl.java
index ec2b074..1a326e4 100644
--- a/slack-archive/src/main/java/juja/microservices/slack/archive/api/SlackApiImpl.java
+++ b/slack-archive/src/main/java/juja/microservices/slack/archive/api/SlackApiClientImpl.java
@@ -14,7 +14,7 @@
 
 @Repository
 @Slf4j
-public class SlackApiImpl implements SlackApi {
+public class SlackApiClientImpl implements SlackApiClient {
 
     private final RestTemplate restTemplate;
 
@@ -23,7 +23,7 @@ public class SlackApiImpl implements SlackApi {
     @Value("${slack.api.channels.urltemplate}")
     private String slackApiChannelsUrlTemplate;
 
-    public SlackApiImpl(RestTemplate restTemplate) {
+    public SlackApiClientImpl(RestTemplate restTemplate) {
         this.restTemplate = restTemplate;
     }
 
diff --git a/slack-archive/src/main/java/juja/microservices/slack/archive/service/impl/SlackApiServiceImpl.java b/slack-archive/src/main/java/juja/microservices/slack/archive/service/impl/SlackApiServiceImpl.java
index 9738d65..ee0c513 100644
--- a/slack-archive/src/main/java/juja/microservices/slack/archive/service/impl/SlackApiServiceImpl.java
+++ b/slack-archive/src/main/java/juja/microservices/slack/archive/service/impl/SlackApiServiceImpl.java
@@ -1,7 +1,7 @@
 package juja.microservices.slack.archive.service.impl;
 
 import juja.microservices.slack.archive.model.dto.ChannelDTO;
-import juja.microservices.slack.archive.api.SlackApi;
+import juja.microservices.slack.archive.api.SlackApiClient;
 import juja.microservices.slack.archive.service.SlackApiService;
 import org.springframework.stereotype.Service;
 
@@ -10,14 +10,14 @@
 @Service
 public class SlackApiServiceImpl implements SlackApiService {
 
-    private SlackApi slackApi;
+    private SlackApiClient slackApiClient;
 
-    public SlackApiServiceImpl(SlackApi slackApi) {
-        this.slackApi = slackApi;
+    public SlackApiServiceImpl(SlackApiClient slackApiClient) {
+        this.slackApiClient = slackApiClient;
     }
 
     @Override
     public List<ChannelDTO> receiveChannels() {
-        return slackApi.receiveChannelsList();
+        return slackApiClient.receiveChannelsList();
     }
 }
diff --git a/slack-archive/src/test/java/juja/microservices/slack/archive/api/SlackApiImplTest.java b/slack-archive/src/test/java/juja/microservices/slack/archive/api/SlackApiClientImplTest.java
similarity index 93%
rename from slack-archive/src/test/java/juja/microservices/slack/archive/api/SlackApiImplTest.java
rename to slack-archive/src/test/java/juja/microservices/slack/archive/api/SlackApiClientImplTest.java
index b022647..30b8092 100644
--- a/slack-archive/src/test/java/juja/microservices/slack/archive/api/SlackApiImplTest.java
+++ b/slack-archive/src/test/java/juja/microservices/slack/archive/api/SlackApiClientImplTest.java
@@ -24,12 +24,12 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class SlackApiImplTest {
+public class SlackApiClientImplTest {
 
     @Inject
     private RestTemplate restTemplate;
     @Inject
-    private SlackApi slackApi;
+    private SlackApiClient slackApiClient;
     private MockRestServiceServer mockServer;
     @Value("${slack.api.token}")
     private String slackApiToken;
@@ -54,7 +54,7 @@ public void receiveChannelsList() throws Exception {
                .andExpect(method(HttpMethod.GET))
                .andRespond(withSuccess(Util.readStringFromFile("api/channels.json"), MediaType.APPLICATION_JSON));
 
-        List<ChannelDTO> result = slackApi.receiveChannelsList();
+        List<ChannelDTO> result = slackApiClient.receiveChannelsList();
 
         assertEquals(expectedChannels, result);
     }