From 92c2c4fd7b095677c8814e60a7debfcf3bdb1c41 Mon Sep 17 00:00:00 2001
From: Mark Struchkov <upagge@icloud.com>
Date: Wed, 9 Jan 2019 11:09:00 +0300
Subject: [PATCH] Refactoring: Code Style and Optimize import

---
 .../org/sadtech/consultant/database/entity/Person.java | 10 ++++------
 .../sadtech/consultant/database/entity/SaveUnit.java   |  1 -
 .../org/sadtech/consultant/database/entity/Unit.java   |  1 -
 .../consultant/database/service/PersonService.java     |  4 ++++
 .../consultant/database/service/UnitService.java       |  1 +
 .../database/service/impl/MessageServiceImpl.java      |  1 -
 .../consultant/processing/MessageLogicService.java     |  1 -
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/sadtech/consultant/database/entity/Person.java b/src/main/java/org/sadtech/consultant/database/entity/Person.java
index 7ab5275..cf92adf 100644
--- a/src/main/java/org/sadtech/consultant/database/entity/Person.java
+++ b/src/main/java/org/sadtech/consultant/database/entity/Person.java
@@ -3,7 +3,8 @@ package org.sadtech.consultant.database.entity;
 import lombok.Data;
 
 import javax.persistence.*;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 @Entity
 @Data
@@ -25,11 +26,8 @@ public class Person {
     private String token;
 
     @ElementCollection
-    @CollectionTable(name="PersonSocialNetworks")
-    @MapKeyColumn(name="KeysSocialNetworks", length = 20)
+    @CollectionTable(name = "PersonSocialNetworks")
+    @MapKeyColumn(name = "KeysSocialNetworks", length = 20)
     private Map<String, Integer> socialNetworks = new HashMap<>();
 
-//    @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="idMess")
-//    private List<Message> messages;
-
 }
diff --git a/src/main/java/org/sadtech/consultant/database/entity/SaveUnit.java b/src/main/java/org/sadtech/consultant/database/entity/SaveUnit.java
index 68c696c..b5df08e 100644
--- a/src/main/java/org/sadtech/consultant/database/entity/SaveUnit.java
+++ b/src/main/java/org/sadtech/consultant/database/entity/SaveUnit.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.Table;
 
 @Entity
 @Data
diff --git a/src/main/java/org/sadtech/consultant/database/entity/Unit.java b/src/main/java/org/sadtech/consultant/database/entity/Unit.java
index 247df8b..a267686 100644
--- a/src/main/java/org/sadtech/consultant/database/entity/Unit.java
+++ b/src/main/java/org/sadtech/consultant/database/entity/Unit.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.Table;
 
 @Entity
 @Data
diff --git a/src/main/java/org/sadtech/consultant/database/service/PersonService.java b/src/main/java/org/sadtech/consultant/database/service/PersonService.java
index db476ea..0872760 100644
--- a/src/main/java/org/sadtech/consultant/database/service/PersonService.java
+++ b/src/main/java/org/sadtech/consultant/database/service/PersonService.java
@@ -7,8 +7,12 @@ import java.util.Map;
 public interface PersonService {
 
     void addUser(Person user);
+
     void removeUser(Long id);
+
     Person getUserByID(Long id);
+
     Map<String, Integer> getSocialNetwork(Long id);
+
     Person getUserBySocialNetworksId(String type, Integer socialNetworksId);
 }
diff --git a/src/main/java/org/sadtech/consultant/database/service/UnitService.java b/src/main/java/org/sadtech/consultant/database/service/UnitService.java
index 9de39e8..eafedba 100644
--- a/src/main/java/org/sadtech/consultant/database/service/UnitService.java
+++ b/src/main/java/org/sadtech/consultant/database/service/UnitService.java
@@ -5,6 +5,7 @@ import org.sadtech.consultant.database.entity.Unit;
 public interface UnitService {
 
     void addUnit(Unit unit);
+
     void removeUnit(Long id);
 
 }
diff --git a/src/main/java/org/sadtech/consultant/database/service/impl/MessageServiceImpl.java b/src/main/java/org/sadtech/consultant/database/service/impl/MessageServiceImpl.java
index 284a997..f5d967b 100644
--- a/src/main/java/org/sadtech/consultant/database/service/impl/MessageServiceImpl.java
+++ b/src/main/java/org/sadtech/consultant/database/service/impl/MessageServiceImpl.java
@@ -5,7 +5,6 @@ import org.sadtech.consultant.database.repository.MessageRepository;
 import org.sadtech.consultant.database.service.MessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
diff --git a/src/main/java/org/sadtech/consultant/processing/MessageLogicService.java b/src/main/java/org/sadtech/consultant/processing/MessageLogicService.java
index 7b37ba7..1ed910a 100644
--- a/src/main/java/org/sadtech/consultant/processing/MessageLogicService.java
+++ b/src/main/java/org/sadtech/consultant/processing/MessageLogicService.java
@@ -1,7 +1,6 @@
 package org.sadtech.consultant.processing;
 
 import org.sadtech.consultant.database.entity.Message;
-import org.sadtech.consultant.database.entity.Person;
 import org.sadtech.consultant.database.service.MessageService;
 import org.springframework.stereotype.Component;