From b570988a2bf8552ecfb597047f89fdb2002b7409 Mon Sep 17 00:00:00 2001 From: ece20becl09 Date: Sat, 21 Mar 2026 18:11:16 +0530 Subject: [PATCH 1/8] Update README with prerequisites and notes --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 786f8549c..f62ebae42 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prerequisites -# -- JDK 17 or 21 +####### +- JDK 21 - Maven 3.9 - MySQL 8 From 54b212f20e971a9b3a92d6138fd5a6083b6d2a62 Mon Sep 17 00:00:00 2001 From: ece20becl09 Date: Sat, 21 Mar 2026 18:11:46 +0530 Subject: [PATCH 2/8] Add workspace and build files --- .vscode/settings.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..7b016a89f --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.compile.nullAnalysis.mode": "automatic" +} \ No newline at end of file From 46496417fcc95036921c3c20d1c8bb15629b82ff Mon Sep 17 00:00:00 2001 From: ece20becl09 Date: Sat, 21 Mar 2026 18:21:04 +0530 Subject: [PATCH 3/8] Fix Java 17 build settings, ignore generated files, and update ElasticSearch controller to non-deprecated API --- .gitignore | 3 +++ .vscode/settings.json | 3 ++- pom.xml | 12 ++++++++++++ .../account/controller/ElasticSearchController.java | 11 +++++------ 4 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..4cc79f654 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +target/ +.vscode/ +*.log diff --git a/.vscode/settings.json b/.vscode/settings.json index 7b016a89f..e01206508 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,4 @@ { - "java.compile.nullAnalysis.mode": "automatic" + "java.compile.nullAnalysis.mode": "automatic", + "java.configuration.updateBuildConfiguration": "interactive" } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 04ca4f6b8..4ad51281a 100644 --- a/pom.xml +++ b/pom.xml @@ -254,6 +254,18 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 17 + 17 + 17 + + + org.eclipse.jetty diff --git a/src/main/java/com/visualpathit/account/controller/ElasticSearchController.java b/src/main/java/com/visualpathit/account/controller/ElasticSearchController.java index bb321cb7f..813899713 100644 --- a/src/main/java/com/visualpathit/account/controller/ElasticSearchController.java +++ b/src/main/java/com/visualpathit/account/controller/ElasticSearchController.java @@ -3,7 +3,6 @@ import java.io.IOException; import java.util.List; -import org.apache.http.HttpHost; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.delete.DeleteResponse; import org.elasticsearch.action.get.GetRequest; @@ -14,7 +13,6 @@ import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; -import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -39,7 +37,8 @@ public String insert(final Model model) throws IOException { try (RestHighLevelClient client = ElasticsearchUtil.getRestHighLevelClient()) { for (User user : users) { - IndexRequest indexRequest = new IndexRequest("users", "_doc", String.valueOf(user.getId())) + IndexRequest indexRequest = new IndexRequest("users") + .id(String.valueOf(user.getId())) .source(XContentFactory.jsonBuilder() .startObject() .field("name", user.getUsername()) @@ -64,7 +63,7 @@ public String insert(final Model model) throws IOException { @RequestMapping(value = "/rest/users/view/{id}", method = RequestMethod.GET) public String view(@PathVariable final String id, final Model model) throws IOException { try (RestHighLevelClient client = ElasticsearchUtil.getRestHighLevelClient()) { - GetRequest getRequest = new GetRequest("users", "_doc", id); + GetRequest getRequest = new GetRequest("users", id); GetResponse getResponse = client.get(getRequest, RequestOptions.DEFAULT); System.out.println(getResponse.getSourceAsString()); @@ -77,7 +76,7 @@ public String view(@PathVariable final String id, final Model model) throws IOEx @RequestMapping(value = "/rest/users/update/{id}", method = RequestMethod.GET) public String update(@PathVariable final String id, final Model model) throws IOException { try (RestHighLevelClient client = ElasticsearchUtil.getRestHighLevelClient()) { - UpdateRequest updateRequest = new UpdateRequest("users", "_doc", id) + UpdateRequest updateRequest = new UpdateRequest("users", id) .doc(XContentFactory.jsonBuilder() .startObject() .field("gender", "male") @@ -94,7 +93,7 @@ public String update(@PathVariable final String id, final Model model) throws IO @RequestMapping(value = "/rest/users/delete/{id}", method = RequestMethod.GET) public String delete(@PathVariable final String id, final Model model) throws IOException { try (RestHighLevelClient client = ElasticsearchUtil.getRestHighLevelClient()) { - DeleteRequest deleteRequest = new DeleteRequest("users", "_doc", id); + DeleteRequest deleteRequest = new DeleteRequest("users", id); DeleteResponse deleteResponse = client.delete(deleteRequest, RequestOptions.DEFAULT); System.out.println(deleteResponse.getResult().toString()); From 1eca1ca6635ed552a79d8a7f1fed47cde798df96 Mon Sep 17 00:00:00 2001 From: ece20becl09 Date: Sat, 21 Mar 2026 18:21:20 +0530 Subject: [PATCH 4/8] Ensure .vscode is ignored and untracked --- .vscode/settings.json | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index e01206508..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "java.compile.nullAnalysis.mode": "automatic", - "java.configuration.updateBuildConfiguration": "interactive" -} \ No newline at end of file From ada0138e3567542bb2ad2af1b7671b9f2fd1449e Mon Sep 17 00:00:00 2001 From: ece20becl09 Date: Sat, 21 Mar 2026 18:26:15 +0530 Subject: [PATCH 5/8] Fix static unused members, unused imports, generic Future type, and JUnit deprecated imports --- .../account/controller/FileUploadController.java | 1 - .../account/controller/RabbitMqController.java | 8 ++++---- .../account/controller/UserController.java | 14 +++++++------- .../account/repository/UserRepository.java | 2 -- .../account/utils/ElasticsearchUtil.java | 4 ---- .../visualpathit/account/utils/MemcachedUtils.java | 2 +- .../account/controllerTest/UserControllerTest.java | 1 - .../visualpathit/account/modelTest/RoleTest.java | 2 +- .../visualpathit/account/modelTest/UserTest.java | 2 +- .../setup/StandaloneMvcTestViewResolver.java | 3 ++- 10 files changed, 16 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/visualpathit/account/controller/FileUploadController.java b/src/main/java/com/visualpathit/account/controller/FileUploadController.java index 0de040a2d..63c987be8 100644 --- a/src/main/java/com/visualpathit/account/controller/FileUploadController.java +++ b/src/main/java/com/visualpathit/account/controller/FileUploadController.java @@ -3,7 +3,6 @@ import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; -import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/visualpathit/account/controller/RabbitMqController.java b/src/main/java/com/visualpathit/account/controller/RabbitMqController.java index 7ce311c4c..87e91913a 100644 --- a/src/main/java/com/visualpathit/account/controller/RabbitMqController.java +++ b/src/main/java/com/visualpathit/account/controller/RabbitMqController.java @@ -22,10 +22,10 @@ public class RabbitMqController { public ModelAndView checkRabbitMqStatus() { ModelAndView modelAndView = new ModelAndView(); ConnectionFactory factory = new ConnectionFactory(); - factory.setHost(RabbitMqUtil.getRabbitMqHost()); - factory.setPort(Integer.parseInt(RabbitMqUtil.getRabbitMqPort())); - factory.setUsername(RabbitMqUtil.getRabbitMqUser()); - factory.setPassword(RabbitMqUtil.getRabbitMqPassword()); + factory.setHost(rabbitMqUtil.getRabbitMqHost()); + factory.setPort(Integer.parseInt(rabbitMqUtil.getRabbitMqPort())); + factory.setUsername(rabbitMqUtil.getRabbitMqUser()); + factory.setPassword(rabbitMqUtil.getRabbitMqPassword()); Connection connection = null; try { diff --git a/src/main/java/com/visualpathit/account/controller/UserController.java b/src/main/java/com/visualpathit/account/controller/UserController.java index f57988dd8..d5d6ac2fa 100644 --- a/src/main/java/com/visualpathit/account/controller/UserController.java +++ b/src/main/java/com/visualpathit/account/controller/UserController.java @@ -131,13 +131,13 @@ public String userUpdateProfile(@PathVariable("username") String username, @Mode return "welcome"; } -// @GetMapping("/user/rabbit") -// public String rabbitmqSetUp() { -// for (int i = 0; i < 20; i++) { -// producerService.produceMessage(generateString()); -// } -// return "rabbitmq"; -// } + @GetMapping("/user/rabbit") + public String rabbitmqSetUp() { + for (int i = 0; i < 20; i++) { + producerService.produceMessage(generateString()); + } + return "rabbitmq"; + } private void updateUserDetails(User user, User userForm) { user.setUsername(userForm.getUsername()); diff --git a/src/main/java/com/visualpathit/account/repository/UserRepository.java b/src/main/java/com/visualpathit/account/repository/UserRepository.java index 149b656cf..b0231a9f2 100644 --- a/src/main/java/com/visualpathit/account/repository/UserRepository.java +++ b/src/main/java/com/visualpathit/account/repository/UserRepository.java @@ -1,7 +1,5 @@ package com.visualpathit.account.repository; -import java.util.List; - import org.springframework.data.jpa.repository.JpaRepository; import com.visualpathit.account.model.User; diff --git a/src/main/java/com/visualpathit/account/utils/ElasticsearchUtil.java b/src/main/java/com/visualpathit/account/utils/ElasticsearchUtil.java index b4d08685a..26f735c37 100644 --- a/src/main/java/com/visualpathit/account/utils/ElasticsearchUtil.java +++ b/src/main/java/com/visualpathit/account/utils/ElasticsearchUtil.java @@ -1,10 +1,6 @@ package com.visualpathit.account.utils; -import java.io.IOException; -import java.net.InetSocketAddress; - import org.apache.http.HttpHost; -import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestHighLevelClient; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/visualpathit/account/utils/MemcachedUtils.java b/src/main/java/com/visualpathit/account/utils/MemcachedUtils.java index 98e539154..a351b4e67 100644 --- a/src/main/java/com/visualpathit/account/utils/MemcachedUtils.java +++ b/src/main/java/com/visualpathit/account/utils/MemcachedUtils.java @@ -27,7 +27,7 @@ public static String memcachedSetData(User user,String key){ System.out.println("--------------------------------------------"); System.out.println("Client is ::"+ mactiveClient.getStats()); System.out.println("--------------------------------------------"); - Future future = mactiveClient.set(key,expireTime, user); + Future future = mactiveClient.set(key,expireTime, user); System.out.println("set status:" + future.get()); Result =" Data is From DB and Data Inserted In Cache !!"; mactiveClient.shutdown(); diff --git a/src/test/java/com/visualpathit/account/controllerTest/UserControllerTest.java b/src/test/java/com/visualpathit/account/controllerTest/UserControllerTest.java index f813fddd7..06023dfaf 100644 --- a/src/test/java/com/visualpathit/account/controllerTest/UserControllerTest.java +++ b/src/test/java/com/visualpathit/account/controllerTest/UserControllerTest.java @@ -14,7 +14,6 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; import com.visualpathit.account.controller.UserController; -import com.visualpathit.account.model.User; import com.visualpathit.account.service.UserService; import com.visualpathit.account.setup.StandaloneMvcTestViewResolver; diff --git a/src/test/java/com/visualpathit/account/modelTest/RoleTest.java b/src/test/java/com/visualpathit/account/modelTest/RoleTest.java index 07cede5f4..cce2ead90 100644 --- a/src/test/java/com/visualpathit/account/modelTest/RoleTest.java +++ b/src/test/java/com/visualpathit/account/modelTest/RoleTest.java @@ -1,6 +1,6 @@ package com.visualpathit.account.modelTest; -import junit.framework.Assert; +import org.junit.Assert; import java.util.HashSet; import java.util.Set; diff --git a/src/test/java/com/visualpathit/account/modelTest/UserTest.java b/src/test/java/com/visualpathit/account/modelTest/UserTest.java index a56950000..486a5ef59 100644 --- a/src/test/java/com/visualpathit/account/modelTest/UserTest.java +++ b/src/test/java/com/visualpathit/account/modelTest/UserTest.java @@ -1,6 +1,6 @@ package com.visualpathit.account.modelTest; -import junit.framework.Assert; +import org.junit.Assert; import java.util.HashSet; import java.util.Set; diff --git a/src/test/java/com/visualpathit/account/setup/StandaloneMvcTestViewResolver.java b/src/test/java/com/visualpathit/account/setup/StandaloneMvcTestViewResolver.java index 2fab8381c..c38aa5c51 100644 --- a/src/test/java/com/visualpathit/account/setup/StandaloneMvcTestViewResolver.java +++ b/src/test/java/com/visualpathit/account/setup/StandaloneMvcTestViewResolver.java @@ -1,5 +1,6 @@ package com.visualpathit.account.setup; +import org.springframework.lang.NonNull; import org.springframework.web.servlet.view.AbstractUrlBasedView; import org.springframework.web.servlet.view.InternalResourceView; import org.springframework.web.servlet.view.InternalResourceViewResolver; @@ -11,7 +12,7 @@ public StandaloneMvcTestViewResolver() { } @Override - protected AbstractUrlBasedView buildView(final String viewName) throws Exception { + protected @NonNull AbstractUrlBasedView buildView(final @NonNull String viewName) throws Exception { final InternalResourceView view = (InternalResourceView) super.buildView(viewName); // prevent checking for circular view paths view.setPreventDispatchLoop(false); From 12253991255ac97b4c697e198fbf10de40d7926f Mon Sep 17 00:00:00 2001 From: ece20becl09 Date: Sat, 21 Mar 2026 18:29:21 +0530 Subject: [PATCH 6/8] Use static access for RabbitMqUtil, add @NonNull annotations in UserValidator, and switch Mockito initMocks to openMocks --- .../account/controller/RabbitMqController.java | 11 ++++------- .../visualpathit/account/validator/UserValidator.java | 5 +++-- .../account/controllerTest/UserControllerTest.java | 9 ++++++++- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/visualpathit/account/controller/RabbitMqController.java b/src/main/java/com/visualpathit/account/controller/RabbitMqController.java index 87e91913a..0a4851387 100644 --- a/src/main/java/com/visualpathit/account/controller/RabbitMqController.java +++ b/src/main/java/com/visualpathit/account/controller/RabbitMqController.java @@ -15,17 +15,14 @@ @Controller public class RabbitMqController { - @Autowired - private RabbitMqUtil rabbitMqUtil; - @GetMapping("/user/rabbit") public ModelAndView checkRabbitMqStatus() { ModelAndView modelAndView = new ModelAndView(); ConnectionFactory factory = new ConnectionFactory(); - factory.setHost(rabbitMqUtil.getRabbitMqHost()); - factory.setPort(Integer.parseInt(rabbitMqUtil.getRabbitMqPort())); - factory.setUsername(rabbitMqUtil.getRabbitMqUser()); - factory.setPassword(rabbitMqUtil.getRabbitMqPassword()); + factory.setHost(RabbitMqUtil.getRabbitMqHost()); + factory.setPort(Integer.parseInt(RabbitMqUtil.getRabbitMqPort())); + factory.setUsername(RabbitMqUtil.getRabbitMqUser()); + factory.setPassword(RabbitMqUtil.getRabbitMqPassword()); Connection connection = null; try { diff --git a/src/main/java/com/visualpathit/account/validator/UserValidator.java b/src/main/java/com/visualpathit/account/validator/UserValidator.java index a6185b33a..8949598a2 100644 --- a/src/main/java/com/visualpathit/account/validator/UserValidator.java +++ b/src/main/java/com/visualpathit/account/validator/UserValidator.java @@ -4,6 +4,7 @@ import com.visualpathit.account.service.UserService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; import org.springframework.validation.Errors; import org.springframework.validation.ValidationUtils; @@ -15,12 +16,12 @@ public class UserValidator implements Validator { private UserService userService; @Override - public boolean supports(Class aClass) { + public boolean supports(@NonNull Class aClass) { return User.class.equals(aClass); } @Override - public void validate(Object o, Errors errors) { + public void validate(@NonNull Object o, @NonNull Errors errors) { User user = (User) o; ValidationUtils.rejectIfEmptyOrWhitespace(errors, "username", "NotEmpty"); diff --git a/src/test/java/com/visualpathit/account/controllerTest/UserControllerTest.java b/src/test/java/com/visualpathit/account/controllerTest/UserControllerTest.java index 06023dfaf..31b72047f 100644 --- a/src/test/java/com/visualpathit/account/controllerTest/UserControllerTest.java +++ b/src/test/java/com/visualpathit/account/controllerTest/UserControllerTest.java @@ -5,6 +5,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.InjectMocks; @@ -26,14 +27,20 @@ public class UserControllerTest { private UserController controller; private MockMvc mockMvc; + private AutoCloseable closeable; @Before public void setup() { - MockitoAnnotations.initMocks(this); + closeable = MockitoAnnotations.openMocks(this); mockMvc = MockMvcBuilders.standaloneSetup(controller) .setViewResolvers(new StandaloneMvcTestViewResolver()).build(); } + @After + public void tearDown() throws Exception { + closeable.close(); + } + @Test public void registrationTestforHappyFlow() throws Exception { mockMvc.perform(get("/registration")) From 1e0062d2d4c2d04bd827b5a5f98f07a397526492 Mon Sep 17 00:00:00 2001 From: ece20becl09 Date: Sat, 21 Mar 2026 18:31:05 +0530 Subject: [PATCH 7/8] Clean remaining java diagnostics: remove unused @Autowired import, add @NonNull param annotations --- .../visualpathit/account/controller/RabbitMqController.java | 1 - .../com/visualpathit/account/controller/UserController.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/visualpathit/account/controller/RabbitMqController.java b/src/main/java/com/visualpathit/account/controller/RabbitMqController.java index 0a4851387..d4d35ae05 100644 --- a/src/main/java/com/visualpathit/account/controller/RabbitMqController.java +++ b/src/main/java/com/visualpathit/account/controller/RabbitMqController.java @@ -1,6 +1,5 @@ package com.visualpathit.account.controller; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.ModelAndView; diff --git a/src/main/java/com/visualpathit/account/controller/UserController.java b/src/main/java/com/visualpathit/account/controller/UserController.java index d5d6ac2fa..df0e86f98 100644 --- a/src/main/java/com/visualpathit/account/controller/UserController.java +++ b/src/main/java/com/visualpathit/account/controller/UserController.java @@ -7,6 +7,7 @@ import com.visualpathit.account.utils.MemcachedUtils; import com.visualpathit.account.validator.UserValidator; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.lang.NonNull; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; @@ -38,7 +39,7 @@ public String registration(Model model) { } @PostMapping("/registration") - public String registration(@ModelAttribute("userForm") @Valid User userForm, BindingResult bindingResult, Model model) { + public String registration(@ModelAttribute("userForm") @Valid @NonNull User userForm, @NonNull BindingResult bindingResult, @NonNull Model model) { userValidator.validate(userForm, bindingResult); if (bindingResult.hasErrors()) { From b4952cbd4ca61cdff0adcd441902d859d1593f5f Mon Sep 17 00:00:00 2001 From: ece20becl09 Date: Sat, 21 Mar 2026 22:23:19 +0530 Subject: [PATCH 8/8] Clean project and added gitignore --- .gitignore | 3 +++ .vscode/settings.json | 4 ++++ .../controller/ElasticSearchController.java | 10 ++++------ .../account/controller/FileUploadController.java | 1 - .../account/controller/RabbitMqController.java | 4 ---- .../account/controller/UserController.java | 16 ++++++---------- .../account/repository/UserRepository.java | 2 -- .../account/utils/ElasticsearchUtil.java | 4 ---- .../account/utils/MemcachedUtils.java | 2 +- .../account/validator/UserValidator.java | 4 ++-- .../controllerTest/UserControllerTest.java | 3 +-- .../visualpathit/account/modelTest/RoleTest.java | 2 +- .../visualpathit/account/modelTest/UserTest.java | 2 +- .../setup/StandaloneMvcTestViewResolver.java | 9 ++++++--- 14 files changed, 29 insertions(+), 37 deletions(-) create mode 100644 .gitignore create mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..5e341c805 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +target/ +*.log +*.class \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..e01206508 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "java.compile.nullAnalysis.mode": "automatic", + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/src/main/java/com/visualpathit/account/controller/ElasticSearchController.java b/src/main/java/com/visualpathit/account/controller/ElasticSearchController.java index bb321cb7f..cca5fc25a 100644 --- a/src/main/java/com/visualpathit/account/controller/ElasticSearchController.java +++ b/src/main/java/com/visualpathit/account/controller/ElasticSearchController.java @@ -3,7 +3,6 @@ import java.io.IOException; import java.util.List; -import org.apache.http.HttpHost; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.delete.DeleteResponse; import org.elasticsearch.action.get.GetRequest; @@ -14,7 +13,6 @@ import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; -import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -39,7 +37,7 @@ public String insert(final Model model) throws IOException { try (RestHighLevelClient client = ElasticsearchUtil.getRestHighLevelClient()) { for (User user : users) { - IndexRequest indexRequest = new IndexRequest("users", "_doc", String.valueOf(user.getId())) + IndexRequest indexRequest = new IndexRequest("users").id(String.valueOf(user.getId())) .source(XContentFactory.jsonBuilder() .startObject() .field("name", user.getUsername()) @@ -64,7 +62,7 @@ public String insert(final Model model) throws IOException { @RequestMapping(value = "/rest/users/view/{id}", method = RequestMethod.GET) public String view(@PathVariable final String id, final Model model) throws IOException { try (RestHighLevelClient client = ElasticsearchUtil.getRestHighLevelClient()) { - GetRequest getRequest = new GetRequest("users", "_doc", id); + GetRequest getRequest = new GetRequest("users", id); GetResponse getResponse = client.get(getRequest, RequestOptions.DEFAULT); System.out.println(getResponse.getSourceAsString()); @@ -77,7 +75,7 @@ public String view(@PathVariable final String id, final Model model) throws IOEx @RequestMapping(value = "/rest/users/update/{id}", method = RequestMethod.GET) public String update(@PathVariable final String id, final Model model) throws IOException { try (RestHighLevelClient client = ElasticsearchUtil.getRestHighLevelClient()) { - UpdateRequest updateRequest = new UpdateRequest("users", "_doc", id) + UpdateRequest updateRequest = new UpdateRequest("users", id) .doc(XContentFactory.jsonBuilder() .startObject() .field("gender", "male") @@ -94,7 +92,7 @@ public String update(@PathVariable final String id, final Model model) throws IO @RequestMapping(value = "/rest/users/delete/{id}", method = RequestMethod.GET) public String delete(@PathVariable final String id, final Model model) throws IOException { try (RestHighLevelClient client = ElasticsearchUtil.getRestHighLevelClient()) { - DeleteRequest deleteRequest = new DeleteRequest("users", "_doc", id); + DeleteRequest deleteRequest = new DeleteRequest("users", id); DeleteResponse deleteResponse = client.delete(deleteRequest, RequestOptions.DEFAULT); System.out.println(deleteResponse.getResult().toString()); diff --git a/src/main/java/com/visualpathit/account/controller/FileUploadController.java b/src/main/java/com/visualpathit/account/controller/FileUploadController.java index 0de040a2d..63c987be8 100644 --- a/src/main/java/com/visualpathit/account/controller/FileUploadController.java +++ b/src/main/java/com/visualpathit/account/controller/FileUploadController.java @@ -3,7 +3,6 @@ import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; -import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/visualpathit/account/controller/RabbitMqController.java b/src/main/java/com/visualpathit/account/controller/RabbitMqController.java index 7ce311c4c..d4d35ae05 100644 --- a/src/main/java/com/visualpathit/account/controller/RabbitMqController.java +++ b/src/main/java/com/visualpathit/account/controller/RabbitMqController.java @@ -1,6 +1,5 @@ package com.visualpathit.account.controller; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.ModelAndView; @@ -15,9 +14,6 @@ @Controller public class RabbitMqController { - @Autowired - private RabbitMqUtil rabbitMqUtil; - @GetMapping("/user/rabbit") public ModelAndView checkRabbitMqStatus() { ModelAndView modelAndView = new ModelAndView(); diff --git a/src/main/java/com/visualpathit/account/controller/UserController.java b/src/main/java/com/visualpathit/account/controller/UserController.java index f57988dd8..7f99b4f32 100644 --- a/src/main/java/com/visualpathit/account/controller/UserController.java +++ b/src/main/java/com/visualpathit/account/controller/UserController.java @@ -1,7 +1,6 @@ package com.visualpathit.account.controller; import com.visualpathit.account.model.User; -import com.visualpathit.account.service.ProducerService; import com.visualpathit.account.service.SecurityService; import com.visualpathit.account.service.UserService; import com.visualpathit.account.utils.MemcachedUtils; @@ -14,7 +13,6 @@ import javax.validation.Valid; import java.util.List; -import java.util.UUID; @Controller public class UserController { @@ -28,9 +26,6 @@ public class UserController { @Autowired private UserValidator userValidator; - @Autowired - private ProducerService producerService; - @GetMapping("/registration") public String registration(Model model) { model.addAttribute("userForm", new User()); @@ -39,7 +34,7 @@ public String registration(Model model) { @PostMapping("/registration") public String registration(@ModelAttribute("userForm") @Valid User userForm, BindingResult bindingResult, Model model) { - userValidator.validate(userForm, bindingResult); + validateUser(userForm, bindingResult); if (bindingResult.hasErrors()) { return "registration"; @@ -139,6 +134,11 @@ public String userUpdateProfile(@PathVariable("username") String username, @Mode // return "rabbitmq"; // } + @SuppressWarnings("null") + private void validateUser(User user, org.springframework.validation.Errors errors) { + userValidator.validate(user, errors); + } + private void updateUserDetails(User user, User userForm) { user.setUsername(userForm.getUsername()); user.setUserEmail(userForm.getUserEmail()); @@ -158,8 +158,4 @@ private void updateUserDetails(User user, User userForm) { user.setSkills(userForm.getSkills()); user.setWorkingExperience(userForm.getWorkingExperience()); } - - private static String generateString() { - return "uuid = " + UUID.randomUUID().toString(); - } } diff --git a/src/main/java/com/visualpathit/account/repository/UserRepository.java b/src/main/java/com/visualpathit/account/repository/UserRepository.java index 149b656cf..b0231a9f2 100644 --- a/src/main/java/com/visualpathit/account/repository/UserRepository.java +++ b/src/main/java/com/visualpathit/account/repository/UserRepository.java @@ -1,7 +1,5 @@ package com.visualpathit.account.repository; -import java.util.List; - import org.springframework.data.jpa.repository.JpaRepository; import com.visualpathit.account.model.User; diff --git a/src/main/java/com/visualpathit/account/utils/ElasticsearchUtil.java b/src/main/java/com/visualpathit/account/utils/ElasticsearchUtil.java index b4d08685a..26f735c37 100644 --- a/src/main/java/com/visualpathit/account/utils/ElasticsearchUtil.java +++ b/src/main/java/com/visualpathit/account/utils/ElasticsearchUtil.java @@ -1,10 +1,6 @@ package com.visualpathit.account.utils; -import java.io.IOException; -import java.net.InetSocketAddress; - import org.apache.http.HttpHost; -import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestHighLevelClient; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/visualpathit/account/utils/MemcachedUtils.java b/src/main/java/com/visualpathit/account/utils/MemcachedUtils.java index 98e539154..43b5106b7 100644 --- a/src/main/java/com/visualpathit/account/utils/MemcachedUtils.java +++ b/src/main/java/com/visualpathit/account/utils/MemcachedUtils.java @@ -27,7 +27,7 @@ public static String memcachedSetData(User user,String key){ System.out.println("--------------------------------------------"); System.out.println("Client is ::"+ mactiveClient.getStats()); System.out.println("--------------------------------------------"); - Future future = mactiveClient.set(key,expireTime, user); + Future future = (Future) mactiveClient.set(key,expireTime, user); System.out.println("set status:" + future.get()); Result =" Data is From DB and Data Inserted In Cache !!"; mactiveClient.shutdown(); diff --git a/src/main/java/com/visualpathit/account/validator/UserValidator.java b/src/main/java/com/visualpathit/account/validator/UserValidator.java index a6185b33a..3981b69e9 100644 --- a/src/main/java/com/visualpathit/account/validator/UserValidator.java +++ b/src/main/java/com/visualpathit/account/validator/UserValidator.java @@ -15,12 +15,12 @@ public class UserValidator implements Validator { private UserService userService; @Override - public boolean supports(Class aClass) { + public boolean supports(@org.springframework.lang.NonNull Class aClass) { return User.class.equals(aClass); } @Override - public void validate(Object o, Errors errors) { + public void validate(@org.springframework.lang.NonNull Object o, @org.springframework.lang.NonNull Errors errors) { User user = (User) o; ValidationUtils.rejectIfEmptyOrWhitespace(errors, "username", "NotEmpty"); diff --git a/src/test/java/com/visualpathit/account/controllerTest/UserControllerTest.java b/src/test/java/com/visualpathit/account/controllerTest/UserControllerTest.java index f813fddd7..869ae7c9f 100644 --- a/src/test/java/com/visualpathit/account/controllerTest/UserControllerTest.java +++ b/src/test/java/com/visualpathit/account/controllerTest/UserControllerTest.java @@ -14,7 +14,6 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; import com.visualpathit.account.controller.UserController; -import com.visualpathit.account.model.User; import com.visualpathit.account.service.UserService; import com.visualpathit.account.setup.StandaloneMvcTestViewResolver; @@ -30,7 +29,7 @@ public class UserControllerTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); mockMvc = MockMvcBuilders.standaloneSetup(controller) .setViewResolvers(new StandaloneMvcTestViewResolver()).build(); } diff --git a/src/test/java/com/visualpathit/account/modelTest/RoleTest.java b/src/test/java/com/visualpathit/account/modelTest/RoleTest.java index 07cede5f4..cce2ead90 100644 --- a/src/test/java/com/visualpathit/account/modelTest/RoleTest.java +++ b/src/test/java/com/visualpathit/account/modelTest/RoleTest.java @@ -1,6 +1,6 @@ package com.visualpathit.account.modelTest; -import junit.framework.Assert; +import org.junit.Assert; import java.util.HashSet; import java.util.Set; diff --git a/src/test/java/com/visualpathit/account/modelTest/UserTest.java b/src/test/java/com/visualpathit/account/modelTest/UserTest.java index a56950000..486a5ef59 100644 --- a/src/test/java/com/visualpathit/account/modelTest/UserTest.java +++ b/src/test/java/com/visualpathit/account/modelTest/UserTest.java @@ -1,6 +1,6 @@ package com.visualpathit.account.modelTest; -import junit.framework.Assert; +import org.junit.Assert; import java.util.HashSet; import java.util.Set; diff --git a/src/test/java/com/visualpathit/account/setup/StandaloneMvcTestViewResolver.java b/src/test/java/com/visualpathit/account/setup/StandaloneMvcTestViewResolver.java index 2fab8381c..46ce69310 100644 --- a/src/test/java/com/visualpathit/account/setup/StandaloneMvcTestViewResolver.java +++ b/src/test/java/com/visualpathit/account/setup/StandaloneMvcTestViewResolver.java @@ -11,10 +11,13 @@ public StandaloneMvcTestViewResolver() { } @Override - protected AbstractUrlBasedView buildView(final String viewName) throws Exception { - final InternalResourceView view = (InternalResourceView) super.buildView(viewName); + @org.springframework.lang.NonNull + protected AbstractUrlBasedView buildView(@org.springframework.lang.NonNull final String viewName) throws Exception { + final AbstractUrlBasedView view = super.buildView(viewName); // prevent checking for circular view paths - view.setPreventDispatchLoop(false); + if (view instanceof InternalResourceView) { + ((InternalResourceView) view).setPreventDispatchLoop(false); + } return view; } }