Update and refactor

This commit is contained in:
Данил
2025-05-21 15:48:38 +07:00
parent 82a64c3ba3
commit fd627789c4
9 changed files with 15 additions and 18 deletions
+1 -1
View File
@@ -33,6 +33,6 @@ build/
.vscode/ .vscode/
###API_KEYS### ###API_KEYS###
src/main/java/com/Samsung/TaskTracker_Server/Repository/API_KEYS.java src/main/java/com/Samsung/TaskTraker_Server/Repository/API_KEYS.java
+2 -2
View File
@@ -9,9 +9,9 @@
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>com.Samsung</groupId> <groupId>com.Samsung</groupId>
<artifactId>TaskTracker_Server</artifactId> <artifactId>TaskTraker_Server</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<name>TaskTracker_Server</name> <name>TaskTraker_Server</name>
<description>Demo project for Spring Boot</description> <description>Demo project for Spring Boot</description>
<url/> <url/>
<licenses> <licenses>
@@ -1,4 +1,4 @@
package com.Samsung.TaskTracker_Server.Repository; package com.Samsung.TaskTraker_Server.Repository;
import java.io.*; import java.io.*;
import java.sql.*; import java.sql.*;
@@ -96,7 +96,6 @@ public class DataBase {
saveUser_stmt.setString(1, user.getLogin()); saveUser_stmt.setString(1, user.getLogin());
saveUser_stmt.setString(2, user.getPassword()); saveUser_stmt.setString(2, user.getPassword());
saveUser_stmt.setString(3, Serialize(user.getTaskList())); saveUser_stmt.setString(3, Serialize(user.getTaskList()));
//saveUser_stmt.executeUpdate();
TaskDBList.add(new TaskDB(saveUser_stmt)); TaskDBList.add(new TaskDB(saveUser_stmt));
} }
@@ -1,4 +1,4 @@
package com.Samsung.TaskTracker_Server.Repository; package com.Samsung.TaskTraker_Server.Repository;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects; import java.util.Objects;
@@ -1,4 +1,4 @@
package com.Samsung.TaskTracker_Server.Repository; package com.Samsung.TaskTraker_Server.Repository;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
@@ -42,7 +42,7 @@ public class User {
public void addTask(Task task) { public void addTask(Task task) {
if(TaskList.contains(task)) { if(TaskList.contains(task)) {
TaskList.remove(task); // Просто удаляем потаму, что равнение идёт только по ID TaskList.remove(task); // Просто удаляем потаму, что cравнение идёт только по ID
TaskList.add(task); TaskList.add(task);
} }
else { else {
@@ -1,4 +1,4 @@
package com.Samsung.TaskTracker_Server.Repository; package com.Samsung.TaskTraker_Server.Repository;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.*; import java.util.*;
@@ -1,11 +1,9 @@
package com.Samsung.TaskTracker_Server; package com.Samsung.TaskTraker_Server;
import com.Samsung.TaskTracker_Server.Repository.*; import com.Samsung.TaskTraker_Server.Repository.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ExitCodeGenerator; import org.springframework.boot.ExitCodeGenerator;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -16,10 +14,10 @@ import java.util.List;
@RestController @RestController
@RequestMapping("/") @RequestMapping("/")
@SpringBootApplication @SpringBootApplication
public class TaskTrackerServerApplication { public class TaskTrakerServerApplication {
private static volatile boolean isRunning = true; private static volatile boolean isRunning = true;
public static void main(String[] args) { public static void main(String[] args) {
ConfigurableApplicationContext context = SpringApplication.run(TaskTrackerServerApplication.class, args); ConfigurableApplicationContext context = SpringApplication.run(TaskTrakerServerApplication.class, args);
while (isRunning) { while (isRunning) {
try { try {
+1 -1
View File
@@ -1 +1 @@
spring.application.name=TaskTracker_Server spring.application.name=TaskTraker_Server
@@ -1,10 +1,10 @@
package com.Samsung.TaskTracker_Server; package com.Samsung.TaskTraker_Server;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest @SpringBootTest
class TaskTrackerServerApplicationTests { class TaskTrakerServerApplicationTests {
@Test @Test
void contextLoads() { void contextLoads() {