little fixes

Repost-Bot · Mar 6, 2020 · 36fcc7d · 36fcc7d
1 parent fb68a1e
commit 36fcc7d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/src/main/java/com/pluhin/repostbot/config/SourceServiceConfig.java b/src/main/java/com/pluhin/repostbot/config/SourceServiceConfig.java
@@ -1,9 +1,9 @@
 package com.pluhin.repostbot.config;
 
 import com.pluhin.repostbot.model.domainid.SourceDomainType;
-import com.pluhin.repostbot.service.DefaultGetSourceInfoService;
-import com.pluhin.repostbot.service.GetSourceInfoService;
-import com.pluhin.repostbot.service.VkGetSourceInfoService;
+import com.pluhin.repostbot.service.getsource.DefaultGetSourceInfoService;
+import com.pluhin.repostbot.service.getsource.GetSourceInfoService;
+import com.pluhin.repostbot.service.getsource.VkGetSourceInfoService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

diff --git a/src/main/java/com/pluhin/repostbot/service/DefaultSourceService.java b/src/main/java/com/pluhin/repostbot/service/DefaultSourceService.java
@@ -4,6 +4,7 @@
 import com.pluhin.repostbot.model.PostsSourceDTO;
 import com.pluhin.repostbot.model.domainid.SourceDomainId;
 import com.pluhin.repostbot.repository.SourcesRepository;
+import com.pluhin.repostbot.service.getsource.GetSourceInfoService;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.springframework.stereotype.Service;

diff --git a/src/main/java/com/pluhin/repostbot/service/getposts/DefaultGetPostsService.java b/src/main/java/com/pluhin/repostbot/service/getposts/DefaultGetPostsService.java
@@ -3,6 +3,7 @@
 import com.pluhin.repostbot.model.PostDTO;
 import com.pluhin.repostbot.model.domainid.SourceDomainId;
 import com.pluhin.repostbot.model.domainid.SourceDomainType;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -27,7 +28,7 @@ public static Builder builder() {
 
   public static class Builder {
 
-    private Map<SourceDomainType, GetPostsService> dictionary = new HashMap<>();
+    private Map<SourceDomainType, GetPostsService> dictionary = new EnumMap(SourceDomainType.class);
 
     public Builder put(SourceDomainType type, GetPostsService service) {
       dictionary.put(type, service);

diff --git a/.../service/DefaultGetSourceInfoService.java → ...etsource/DefaultGetSourceInfoService.java b/.../service/DefaultGetSourceInfoService.java → ...etsource/DefaultGetSourceInfoService.java
@@ -1,8 +1,9 @@
-package com.pluhin.repostbot.service;
+package com.pluhin.repostbot.service.getsource;
 
 import com.pluhin.repostbot.model.PostsSourceDTO;
 import com.pluhin.repostbot.model.domainid.SourceDomainId;
 import com.pluhin.repostbot.model.domainid.SourceDomainType;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -26,7 +27,7 @@ public static Builder builder() {
 
   public static class Builder {
 
-    private Map<SourceDomainType, GetSourceInfoService> dictionary = new HashMap<>();
+    private Map<SourceDomainType, GetSourceInfoService> dictionary = new EnumMap(SourceDomainType.class);
 
     public Builder put(SourceDomainType type, GetSourceInfoService service) {
       dictionary.put(type, service);

diff --git a/...postbot/service/GetSourceInfoService.java → ...rvice/getsource/GetSourceInfoService.java b/...postbot/service/GetSourceInfoService.java → ...rvice/getsource/GetSourceInfoService.java
@@ -1,4 +1,4 @@
-package com.pluhin.repostbot.service;
+package com.pluhin.repostbot.service.getsource;
 
 import com.pluhin.repostbot.model.PostsSourceDTO;
 import com.pluhin.repostbot.model.domainid.SourceDomainId;

diff --git a/...stbot/service/VkGetSourceInfoService.java → ...ice/getsource/VkGetSourceInfoService.java b/...stbot/service/VkGetSourceInfoService.java → ...ice/getsource/VkGetSourceInfoService.java
@@ -1,4 +1,4 @@
-package com.pluhin.repostbot.service;
+package com.pluhin.repostbot.service.getsource;
 
 import com.pluhin.repostbot.exception.GetSourceInfoException;
 import com.pluhin.repostbot.model.PostsSourceDTO;