From 7ff31c45ee5a5ee1cb0aec8c7298a06479ac877d Mon Sep 17 00:00:00 2001
From: Rohan Sircar <rohansircar@tuta.io>
Date: Wed, 27 May 2020 16:58:52 +0530
Subject: [PATCH] Imports cleanup

---
 .../ros/chatto/controller/ChatMessageController.java   |  8 ++------
 .../ros/chatto/controller/RegistrationController.java  |  2 --
 .../src/main/java/org/ros/chatto/model/ChatUser.java   | 10 +++++-----
 .../ros/chatto/security/TokenAuthenticationFilter.java |  1 -
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/chatto/src/main/java/org/ros/chatto/controller/ChatMessageController.java b/chatto/src/main/java/org/ros/chatto/controller/ChatMessageController.java
index 00ab9f8..6411a81 100644
--- a/chatto/src/main/java/org/ros/chatto/controller/ChatMessageController.java
+++ b/chatto/src/main/java/org/ros/chatto/controller/ChatMessageController.java
@@ -2,9 +2,6 @@ package org.ros.chatto.controller;
 
 import java.security.Principal;
 import java.time.Instant;
-import java.time.OffsetDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -93,9 +90,8 @@ public class ChatMessageController {
 			@PathVariable final String userName,
 			@PathVariable final Instant lastMessageTime,
 			final Principal principal) {
-		final List<ChatMessageDTO> chatMessageDTOs = chatService
-				.getNewMessages(principal.getName(), userName, 
-						Date.from(lastMessageTime));
+		final List<ChatMessageDTO> chatMessageDTOs = chatService.getNewMessages(
+				principal.getName(), userName, Date.from(lastMessageTime));
 		return chatMessageDTOs;
 	}
 
diff --git a/chatto/src/main/java/org/ros/chatto/controller/RegistrationController.java b/chatto/src/main/java/org/ros/chatto/controller/RegistrationController.java
index d5a342e..cbc395f 100644
--- a/chatto/src/main/java/org/ros/chatto/controller/RegistrationController.java
+++ b/chatto/src/main/java/org/ros/chatto/controller/RegistrationController.java
@@ -13,8 +13,6 @@ import javax.validation.Valid;
 import org.ros.chatto.dto.UserRegistrationDTO;
 import org.ros.chatto.service.CaptchaService;
 import org.ros.chatto.service.UserService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
diff --git a/chatto/src/main/java/org/ros/chatto/model/ChatUser.java b/chatto/src/main/java/org/ros/chatto/model/ChatUser.java
index 28ce85a..6d3ae8f 100644
--- a/chatto/src/main/java/org/ros/chatto/model/ChatUser.java
+++ b/chatto/src/main/java/org/ros/chatto/model/ChatUser.java
@@ -1,7 +1,6 @@
 package org.ros.chatto.model;
 
 import java.util.Date;
-import java.util.List;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -50,14 +49,15 @@ public class ChatUser {
 
 	@ToString.Exclude
 	@EqualsAndHashCode.Exclude
-	@OneToMany(mappedBy = "user", cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.DETACH,
-			CascadeType.REFRESH })
+	@OneToMany(mappedBy = "user", cascade = { CascadeType.PERSIST,
+			CascadeType.MERGE, CascadeType.DETACH, CascadeType.REFRESH })
 	@JsonBackReference
 	private Set<UserRole> userRoles;
 
 	// @ToString.Exclude
 	// @EqualsAndHashCode.Exclude
-	// @OneToMany(mappedBy = "fromUser", cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.DETACH,
-	// 		CascadeType.REFRESH })
+	// @OneToMany(mappedBy = "fromUser", cascade = { CascadeType.PERSIST,
+	// CascadeType.MERGE, CascadeType.DETACH,
+	// CascadeType.REFRESH })
 	// private List<ChatMessage> chatMessages;
 }
diff --git a/chatto/src/main/java/org/ros/chatto/security/TokenAuthenticationFilter.java b/chatto/src/main/java/org/ros/chatto/security/TokenAuthenticationFilter.java
index e1f3bb7..d9c447f 100644
--- a/chatto/src/main/java/org/ros/chatto/security/TokenAuthenticationFilter.java
+++ b/chatto/src/main/java/org/ros/chatto/security/TokenAuthenticationFilter.java
@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.List;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;