Changes
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -36,4 +36,6 @@ build/
|
||||
.vscode/
|
||||
|
||||
### Mac OS ###
|
||||
.DS_Store
|
||||
.DS_Store
|
||||
|
||||
*.log
|
||||
6
pom.xml
6
pom.xml
@@ -33,6 +33,12 @@
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.xerial</groupId>
|
||||
<artifactId>sqlite-jdbc</artifactId>
|
||||
<version>3.51.3.0</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@@ -1,3 +1,5 @@
|
||||
package client;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
@@ -1,3 +1,6 @@
|
||||
package server;
|
||||
|
||||
import user.User;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
@@ -64,7 +67,7 @@ public class ChatServer implements Runnable {
|
||||
String username = msg.substring(6).strip();
|
||||
user = getOrCreateUser(username);
|
||||
clientSockets.add(socket);
|
||||
logger.info("Client sie połączył");
|
||||
logger.info("client.Client sie połączył");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -81,6 +84,7 @@ public class ChatServer implements Runnable {
|
||||
try {
|
||||
serverSocket = new ServerSocket(port);
|
||||
|
||||
logger.error("Test");
|
||||
|
||||
while (true) {
|
||||
Socket clientSocket = serverSocket.accept();
|
||||
14
src/main/java/server/Controller.java
Normal file
14
src/main/java/server/Controller.java
Normal file
@@ -0,0 +1,14 @@
|
||||
package server;
|
||||
|
||||
public class Controller {
|
||||
|
||||
public void route(String path) {
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
package server;
|
||||
|
||||
public class Main {
|
||||
|
||||
public static void main(String[] args) {
|
||||
ChatServer chatServer = new ChatServer(9000);
|
||||
|
||||
|
||||
|
||||
Thread serverThread = new Thread(chatServer);
|
||||
serverThread.start();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
4
src/main/java/server/Service.java
Normal file
4
src/main/java/server/Service.java
Normal file
@@ -0,0 +1,4 @@
|
||||
package server;
|
||||
|
||||
public class Service {
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
public class User {
|
||||
package user;
|
||||
|
||||
public class User {
|
||||
private String username;
|
||||
|
||||
public User(String username) {
|
||||
@@ -13,4 +14,11 @@ public class User {
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "User{" +
|
||||
"username='" + username + '\'' +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
20
src/main/java/user/UserController.java
Normal file
20
src/main/java/user/UserController.java
Normal file
@@ -0,0 +1,20 @@
|
||||
package user;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
public class UserController {
|
||||
|
||||
private UserService service;
|
||||
|
||||
public UserController(UserService service) {
|
||||
this.service = service;
|
||||
}
|
||||
|
||||
public Optional<User> loginIntoUser(
|
||||
String username,
|
||||
String password
|
||||
) {
|
||||
return service.loginIntoUser(username, password);
|
||||
}
|
||||
|
||||
}
|
||||
6
src/main/java/user/UserDao.java
Normal file
6
src/main/java/user/UserDao.java
Normal file
@@ -0,0 +1,6 @@
|
||||
package user;
|
||||
|
||||
public class UserDao {
|
||||
|
||||
|
||||
}
|
||||
29
src/main/java/user/UserService.java
Normal file
29
src/main/java/user/UserService.java
Normal file
@@ -0,0 +1,29 @@
|
||||
package user;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
public class UserService {
|
||||
private static final Logger logger = LogManager.getLogger();
|
||||
|
||||
private UserDao userDao;
|
||||
|
||||
public UserService(UserDao userDao) {
|
||||
this.userDao = userDao;
|
||||
}
|
||||
|
||||
public Optional<User> loginIntoUser(
|
||||
String username,
|
||||
String pass
|
||||
) {
|
||||
try {
|
||||
return Optional.empty();
|
||||
} catch (Exception e) {
|
||||
logger.error("Error while login into user: {}", e.toString());
|
||||
return Optional.empty();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,7 +4,7 @@
|
||||
<Console name="Console" target="SYSTEM_OUT">
|
||||
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
|
||||
</Console>
|
||||
<File name="File" fileName="all.log" immediateFlush="true" append="true" >
|
||||
<File name="File" fileName="logs/all.log" immediateFlush="true" append="true" >
|
||||
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
|
||||
</File>
|
||||
</Appenders>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import server.ChatServer;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
Reference in New Issue
Block a user