Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
target/
*.log
*.class
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"java.compile.nullAnalysis.mode": "automatic",
"java.configuration.updateBuildConfiguration": "interactive"
}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Prerequisites
#
- JDK 17 or 21
#######
- JDK 21
- Maven 3.9
- MySQL 8

Expand Down
12 changes: 12 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,18 @@

<build>
<plugins>
<!-- Maven Compiler Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<release>17</release>
<source>17</source>
<target>17</target>
</configuration>
</plugin>

<!-- Jetty Plugin -->
<plugin>
<groupId>org.eclipse.jetty</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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())
Expand All @@ -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());
Expand All @@ -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")
Expand All @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -15,9 +14,6 @@
@Controller
public class RabbitMqController {

@Autowired
private RabbitMqUtil rabbitMqUtil;

@GetMapping("/user/rabbit")
public ModelAndView checkRabbitMqStatus() {
ModelAndView modelAndView = new ModelAndView();
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -14,7 +13,6 @@

import javax.validation.Valid;
import java.util.List;
import java.util.UUID;

@Controller
public class UserController {
Expand All @@ -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());
Expand All @@ -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";
Expand Down Expand Up @@ -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());
Expand All @@ -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();
}
}
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Boolean> future = (Future<Boolean>) mactiveClient.set(key,expireTime, user);
System.out.println("set status:" + future.get());
Result =" Data is From DB and Data Inserted In Cache !!";
mactiveClient.shutdown();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
}
}