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
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class WebAppInitializer extends AbstractAnnotationConfigDispatcherServlet

@Override
protected Class<?>[] getRootConfigClasses() {
return new Class[]{SecurityConfig.class};
return new Class[]{/*SecurityConfig.class*/};
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
Expand All @@ -16,7 +15,6 @@
import ru.deft.homework.api.sessionmanager.SessionManager;
import ru.deft.homework.hibernate.dao.UserDaoHibernate;
import ru.deft.homework.hibernate.sessionmanager.SessionManagerHibernate;
import ru.deft.homework.service.impl.UserDetailsServiceImpl;

/*
* Created by sgolitsyn on 10/14/19
Expand Down
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
package ru.deft.homework.service.impl;

import lombok.RequiredArgsConstructor;
import lombok.extern.java.Log;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ru.deft.homework.api.model.User;
import ru.deft.homework.service.LoginService;

/*
* Created by sgolitsyn on 10/16/19
*/
@Log
@Service("userDetailsService")
@RequiredArgsConstructor
public class UserDetailsServiceImpl implements UserDetailsService {

@Autowired
private LoginService loginService;

@Override
@Transactional(readOnly = true)
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
User user = loginService.authenticate(username);
if (user == null) {
throw new UsernameNotFoundException("User not found.");
}
log.info("loadUserByUsername() : {}" + username);
return new org.springframework.security.core.userdetails.User(user.getName(), user.getPassword(), null);
}
}
//package ru.deft.homework.service.impl;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

такого не должно быть в гите.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

и не понятно, как это изменение относится к этому ДЗ.

//
//import lombok.RequiredArgsConstructor;
//import lombok.extern.java.Log;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.security.core.userdetails.UserDetails;
//import org.springframework.security.core.userdetails.UserDetailsService;
//import org.springframework.security.core.userdetails.UsernameNotFoundException;
//import org.springframework.stereotype.Service;
//import org.springframework.transaction.annotation.Transactional;
//import ru.deft.homework.api.model.User;
//import ru.deft.homework.service.LoginService;
//
///*
// * Created by sgolitsyn on 10/16/19
// */
//@Log
//@Service("userDetailsService")
//@RequiredArgsConstructor
//public class UserDetailsServiceImpl implements UserDetailsService {
//
// @Autowired
// private LoginService loginService;
//
// @Override
// @Transactional(readOnly = true)
// public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
// User user = loginService.authenticate(username);
// if (user == null) {
// throw new UsernameNotFoundException("User not found.");
// }
// log.info("loadUserByUsername() : {}" + username);
// return new org.springframework.security.core.userdetails.User(user.getName(), user.getPassword(), null);
// }
//}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ru.deft.homework.controller;
package ru.deft.homework.websocket.controller;

import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ru.deft.homework.controller;
package ru.deft.homework.websocket.controller;

import lombok.extern.java.Log;
import org.springframework.stereotype.Controller;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ru.deft.homework.controller;
package ru.deft.homework.websocket.controller;

/*
* Created by sgolitsyn on 10/15/19
Expand All @@ -8,13 +8,10 @@
import lombok.extern.java.Log;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import ru.deft.homework.api.model.User;
import ru.deft.homework.service.LoginService;

import javax.servlet.http.HttpSession;

@Log
@Controller
@RequestMapping(value = "/login")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ru.deft.homework.controller;
package ru.deft.homework.websocket.controller;

import lombok.RequiredArgsConstructor;
import lombok.extern.java.Log;
Expand Down
31 changes: 31 additions & 0 deletions otus_2019_06/hw16-maven/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**
!**/src/test/**

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/

### VS Code ###
.vscode/
31 changes: 31 additions & 0 deletions otus_2019_06/hw16-maven/dbservice/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**
!**/src/test/**

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/

### VS Code ###
.vscode/
60 changes: 60 additions & 0 deletions otus_2019_06/hw16-maven/dbservice/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.2.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>ru.deft</groupId>
<artifactId>homework</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>dbservice</name>
<description>DB service for RMI</description>

<properties>
<java.version>11</java.version>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//package ru.deft.homework.client;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

зачем это комитить в гит?

//
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
//import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
//import org.springframework.context.annotation.Bean;
//import ru.deft.homework.rmi.DBServiceEcho;
//
//import java.net.MalformedURLException;
//import java.rmi.Naming;
//import java.rmi.NotBoundException;
//import java.rmi.RemoteException;
//
///*
// * Created by sgolitsyn on 12/6/19
// */
//@Slf4j
//public class DBServiceClient {
//
// public static void main(String[] args) throws RemoteException, MalformedURLException, NotBoundException {
// DBServiceEcho echoInterface = (DBServiceEcho) Naming.lookup("rmi://localhost/DBServiceServer");
// var dataFromServer = echoInterface.requestToDBService("from DBServiceClient", "message");
// log.info("response from the server:{}", dataFromServer);
// }
//
// @Bean
// ServletWebServerFactory servletWebServerFactory() {
// return new TomcatServletWebServerFactory();
// }
//}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package ru.deft.homework.db;

public interface DBService {
String getUserData(long id);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package ru.deft.homework.db.impl;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.deft.homework.db.DBService;

import java.util.HashMap;
import java.util.Map;

public class DBServiceImpl implements DBService {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Удаляйте неиспользуемые классы.

private static final Logger logger = LoggerFactory.getLogger(DBServiceImpl.class);
private final Map<Long, String> database = new HashMap<>();

private void initDatabase() {
database.put(1L, "val1");
database.put(2L, "val2");
database.put(3L, "val3");
}

public DBServiceImpl() {
initDatabase();
}

public String getUserData(long id) {
logger.info("get data for id:{}", id);
return database.get(id);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package ru.deft.homework.model;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class Message {

private String from;
private String message;

public Message(String message) {
this.message = message;
}

@Override
public String toString() {
return "Message [from=" + from + ", message=" + message + "]";
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package ru.deft.homework.rmi;

import java.rmi.Remote;
import java.rmi.RemoteException;

/*
* Created by sgolitsyn on 12/7/19
*/
public interface DBServiceEcho extends Remote {

String requestToDBService(String from, String message) throws RemoteException;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package ru.deft.homework.rmi;

import java.rmi.Remote;
import java.rmi.RemoteException;

/*
* Created by sgolitsyn on 12/7/19
*/
public interface MessageSystemEcho extends Remote {

String requestToMessageSystem(String from, String message) throws RemoteException;

}
Loading