From a84c16a1012172314c767f69cd305e0905a66179 Mon Sep 17 00:00:00 2001
From: Rohan Sircar <rohansircar@tuta.io>
Date: Wed, 27 May 2020 16:37:11 +0530
Subject: [PATCH] Cleaned demo controller

---
 .../chatto/controller/DemoRestController.java | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/chatto/src/main/java/org/ros/chatto/controller/DemoRestController.java b/chatto/src/main/java/org/ros/chatto/controller/DemoRestController.java
index 92de025..5727e8d 100644
--- a/chatto/src/main/java/org/ros/chatto/controller/DemoRestController.java
+++ b/chatto/src/main/java/org/ros/chatto/controller/DemoRestController.java
@@ -19,7 +19,7 @@ import org.ros.chatto.repository.UserRepository;
 import org.ros.chatto.repository.UserRepositoryCustom;
 import org.ros.chatto.repository.UserRoleRepository;
 import org.ros.chatto.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
@@ -33,25 +33,28 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
+import lombok.RequiredArgsConstructor;
+
 @RestController
 @RequestMapping("/api/demo")
+@RequiredArgsConstructor
+@Lazy
 // @CrossOrigin(origins = "*", allowCredentials = "true", allowedHeaders = "*")
 public class DemoRestController {
 
-	@Autowired
-	UserRepository userRepository;
-	@Autowired
-	UserRepositoryCustom userRepositoryCustom;
-	@Autowired
-	RoleRepository roleRepository;
-	@Autowired
-	UserRoleRepository userRoleRepository;
-	@Autowired
-	MessageCipherRepository messageCipherRepository;
-	@Autowired
-	ChatMessageRepository chatMessageRepository;
-	@Autowired
-	private UserService userService;
+	private final UserRepository userRepository;
+
+	private final UserRepositoryCustom userRepositoryCustom;
+
+	private final RoleRepository roleRepository;
+
+	private final UserRoleRepository userRoleRepository;
+
+	private final MessageCipherRepository messageCipherRepository;
+
+	private final ChatMessageRepository chatMessageRepository;
+
+	private final UserService userService;
 
 	@GetMapping("/users")
 	public List<ChatUser> getAllUsers() {