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/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 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..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..a792c26df 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; 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..3f2442097 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; @@ -14,7 +15,9 @@ public StandaloneMvcTestViewResolver() { protected AbstractUrlBasedView buildView(final String viewName) throws Exception { final InternalResourceView view = (InternalResourceView) super.buildView(viewName); // prevent checking for circular view paths - view.setPreventDispatchLoop(false); + if (view instanceof InternalResourceView) { + ((InternalResourceView) view).setPreventDispatchLoop(false); + } return view; } }