diff --git a/build.gradle b/build.gradle index e3b7309..9a8cf16 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { group = 'com.javanauta' version = '0.0.1-SNAPSHOT' -description = 'Demo project for Spring Boot' +description = 'Task Scheduler - Task scheduler module' java { toolchain { diff --git a/src/main/java/com/javanauta/taskscheduler/TaskSchedulerApplication.java b/src/main/java/com/javanauta/ts/taskscheduler/TaskSchedulerApplication.java similarity index 90% rename from src/main/java/com/javanauta/taskscheduler/TaskSchedulerApplication.java rename to src/main/java/com/javanauta/ts/taskscheduler/TaskSchedulerApplication.java index a5dc459..67bd09f 100644 --- a/src/main/java/com/javanauta/taskscheduler/TaskSchedulerApplication.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/TaskSchedulerApplication.java @@ -1,4 +1,4 @@ -package com.javanauta.taskscheduler; +package com.javanauta.ts.taskscheduler; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/com/javanauta/taskscheduler/business/TaskService.java b/src/main/java/com/javanauta/ts/taskscheduler/business/TaskService.java similarity index 75% rename from src/main/java/com/javanauta/taskscheduler/business/TaskService.java rename to src/main/java/com/javanauta/ts/taskscheduler/business/TaskService.java index aed3815..93072f3 100644 --- a/src/main/java/com/javanauta/taskscheduler/business/TaskService.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/business/TaskService.java @@ -1,16 +1,14 @@ -package com.javanauta.taskscheduler.business; +package com.javanauta.ts.taskscheduler.business; -import com.javanauta.taskscheduler.business.dto.TaskDTO; -import com.javanauta.taskscheduler.business.mapper.TaskConverter; -import com.javanauta.taskscheduler.business.mapper.TaskUpdateConverter; -import com.javanauta.taskscheduler.infrastructure.entity.Task; -import com.javanauta.taskscheduler.infrastructure.enums.NotificationStatusEnum; -import com.javanauta.taskscheduler.infrastructure.exception.ResourceNotFoundException; -import com.javanauta.taskscheduler.infrastructure.repository.TaskRepository; -import com.javanauta.taskscheduler.infrastructure.security.JwtUtil; +import com.javanauta.ts.taskscheduler.business.dto.TaskDTO; +import com.javanauta.ts.taskscheduler.business.mapper.TaskConverter; +import com.javanauta.ts.taskscheduler.business.mapper.TaskUpdateConverter; +import com.javanauta.ts.taskscheduler.infrastructure.entity.Task; +import com.javanauta.ts.taskscheduler.infrastructure.enums.NotificationStatusEnum; +import com.javanauta.ts.taskscheduler.infrastructure.exception.ResourceNotFoundException; +import com.javanauta.ts.taskscheduler.infrastructure.repository.TaskRepository; +import com.javanauta.ts.taskscheduler.infrastructure.security.JwtUtil; import lombok.RequiredArgsConstructor; -import org.osgi.resource.Resource; -import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Service; import java.time.LocalDateTime; diff --git a/src/main/java/com/javanauta/taskscheduler/business/dto/TaskDTO.java b/src/main/java/com/javanauta/ts/taskscheduler/business/dto/TaskDTO.java similarity index 84% rename from src/main/java/com/javanauta/taskscheduler/business/dto/TaskDTO.java rename to src/main/java/com/javanauta/ts/taskscheduler/business/dto/TaskDTO.java index a0ef054..b306202 100644 --- a/src/main/java/com/javanauta/taskscheduler/business/dto/TaskDTO.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/business/dto/TaskDTO.java @@ -1,7 +1,7 @@ -package com.javanauta.taskscheduler.business.dto; +package com.javanauta.ts.taskscheduler.business.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.javanauta.taskscheduler.infrastructure.enums.NotificationStatusEnum; +import com.javanauta.ts.taskscheduler.infrastructure.enums.NotificationStatusEnum; import lombok.*; import java.time.LocalDateTime; diff --git a/src/main/java/com/javanauta/taskscheduler/business/dto/UserDTO.java b/src/main/java/com/javanauta/ts/taskscheduler/business/dto/UserDTO.java similarity index 75% rename from src/main/java/com/javanauta/taskscheduler/business/dto/UserDTO.java rename to src/main/java/com/javanauta/ts/taskscheduler/business/dto/UserDTO.java index c5059be..ca9ed1c 100644 --- a/src/main/java/com/javanauta/taskscheduler/business/dto/UserDTO.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/business/dto/UserDTO.java @@ -1,4 +1,4 @@ -package com.javanauta.taskscheduler.business.dto; +package com.javanauta.ts.taskscheduler.business.dto; import lombok.*; diff --git a/src/main/java/com/javanauta/taskscheduler/business/mapper/TaskConverter.java b/src/main/java/com/javanauta/ts/taskscheduler/business/mapper/TaskConverter.java similarity index 62% rename from src/main/java/com/javanauta/taskscheduler/business/mapper/TaskConverter.java rename to src/main/java/com/javanauta/ts/taskscheduler/business/mapper/TaskConverter.java index 3cbb472..35d7d9a 100644 --- a/src/main/java/com/javanauta/taskscheduler/business/mapper/TaskConverter.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/business/mapper/TaskConverter.java @@ -1,7 +1,7 @@ -package com.javanauta.taskscheduler.business.mapper; +package com.javanauta.ts.taskscheduler.business.mapper; -import com.javanauta.taskscheduler.business.dto.TaskDTO; -import com.javanauta.taskscheduler.infrastructure.entity.Task; +import com.javanauta.ts.taskscheduler.business.dto.TaskDTO; +import com.javanauta.ts.taskscheduler.infrastructure.entity.Task; import org.mapstruct.Mapper; import java.util.List; diff --git a/src/main/java/com/javanauta/taskscheduler/business/mapper/TaskUpdateConverter.java b/src/main/java/com/javanauta/ts/taskscheduler/business/mapper/TaskUpdateConverter.java similarity index 65% rename from src/main/java/com/javanauta/taskscheduler/business/mapper/TaskUpdateConverter.java rename to src/main/java/com/javanauta/ts/taskscheduler/business/mapper/TaskUpdateConverter.java index 15b0bfe..1e232f4 100644 --- a/src/main/java/com/javanauta/taskscheduler/business/mapper/TaskUpdateConverter.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/business/mapper/TaskUpdateConverter.java @@ -1,7 +1,7 @@ -package com.javanauta.taskscheduler.business.mapper; +package com.javanauta.ts.taskscheduler.business.mapper; -import com.javanauta.taskscheduler.business.dto.TaskDTO; -import com.javanauta.taskscheduler.infrastructure.entity.Task; +import com.javanauta.ts.taskscheduler.business.dto.TaskDTO; +import com.javanauta.ts.taskscheduler.infrastructure.entity.Task; import org.mapstruct.Mapper; import org.mapstruct.MappingTarget; import org.mapstruct.NullValuePropertyMappingStrategy; diff --git a/src/main/java/com/javanauta/taskscheduler/controller/TaskController.java b/src/main/java/com/javanauta/ts/taskscheduler/controller/TaskController.java similarity index 84% rename from src/main/java/com/javanauta/taskscheduler/controller/TaskController.java rename to src/main/java/com/javanauta/ts/taskscheduler/controller/TaskController.java index 809b23d..0032a1f 100644 --- a/src/main/java/com/javanauta/taskscheduler/controller/TaskController.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/controller/TaskController.java @@ -1,12 +1,9 @@ -package com.javanauta.taskscheduler.controller; +package com.javanauta.ts.taskscheduler.controller; -import com.javanauta.taskscheduler.business.TaskService; -import com.javanauta.taskscheduler.business.dto.TaskDTO; -import com.javanauta.taskscheduler.infrastructure.enums.NotificationStatusEnum; -import feign.Param; +import com.javanauta.ts.taskscheduler.business.TaskService; +import com.javanauta.ts.taskscheduler.business.dto.TaskDTO; +import com.javanauta.ts.taskscheduler.infrastructure.enums.NotificationStatusEnum; import lombok.RequiredArgsConstructor; -import org.apache.coyote.Response; -import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/javanauta/taskscheduler/infrastructure/client/UserClient.java b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/client/UserClient.java similarity index 78% rename from src/main/java/com/javanauta/taskscheduler/infrastructure/client/UserClient.java rename to src/main/java/com/javanauta/ts/taskscheduler/infrastructure/client/UserClient.java index 7fa06d0..49e63a7 100644 --- a/src/main/java/com/javanauta/taskscheduler/infrastructure/client/UserClient.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/client/UserClient.java @@ -1,6 +1,6 @@ -package com.javanauta.taskscheduler.infrastructure.client; +package com.javanauta.ts.taskscheduler.infrastructure.client; -import com.javanauta.taskscheduler.business.dto.UserDTO; +import com.javanauta.ts.taskscheduler.business.dto.UserDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestHeader; diff --git a/src/main/java/com/javanauta/taskscheduler/infrastructure/entity/Task.java b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/entity/Task.java similarity index 79% rename from src/main/java/com/javanauta/taskscheduler/infrastructure/entity/Task.java rename to src/main/java/com/javanauta/ts/taskscheduler/infrastructure/entity/Task.java index b2cd884..a814029 100644 --- a/src/main/java/com/javanauta/taskscheduler/infrastructure/entity/Task.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/entity/Task.java @@ -1,6 +1,6 @@ -package com.javanauta.taskscheduler.infrastructure.entity; +package com.javanauta.ts.taskscheduler.infrastructure.entity; -import com.javanauta.taskscheduler.infrastructure.enums.NotificationStatusEnum; +import com.javanauta.ts.taskscheduler.infrastructure.enums.NotificationStatusEnum; import lombok.*; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.mapping.Document; diff --git a/src/main/java/com/javanauta/taskscheduler/infrastructure/enums/NotificationStatusEnum.java b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/enums/NotificationStatusEnum.java similarity index 56% rename from src/main/java/com/javanauta/taskscheduler/infrastructure/enums/NotificationStatusEnum.java rename to src/main/java/com/javanauta/ts/taskscheduler/infrastructure/enums/NotificationStatusEnum.java index 093d896..d0df46d 100644 --- a/src/main/java/com/javanauta/taskscheduler/infrastructure/enums/NotificationStatusEnum.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/enums/NotificationStatusEnum.java @@ -1,4 +1,4 @@ -package com.javanauta.taskscheduler.infrastructure.enums; +package com.javanauta.ts.taskscheduler.infrastructure.enums; public enum NotificationStatusEnum { PENDING, diff --git a/src/main/java/com/javanauta/taskscheduler/infrastructure/exception/ResourceNotFoundException.java b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/exception/ResourceNotFoundException.java similarity index 79% rename from src/main/java/com/javanauta/taskscheduler/infrastructure/exception/ResourceNotFoundException.java rename to src/main/java/com/javanauta/ts/taskscheduler/infrastructure/exception/ResourceNotFoundException.java index 3b14c96..5d4dd61 100644 --- a/src/main/java/com/javanauta/taskscheduler/infrastructure/exception/ResourceNotFoundException.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/exception/ResourceNotFoundException.java @@ -1,4 +1,4 @@ -package com.javanauta.taskscheduler.infrastructure.exception; +package com.javanauta.ts.taskscheduler.infrastructure.exception; public class ResourceNotFoundException extends RuntimeException { public ResourceNotFoundException(String message) { diff --git a/src/main/java/com/javanauta/taskscheduler/infrastructure/repository/TaskRepository.java b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/repository/TaskRepository.java similarity index 75% rename from src/main/java/com/javanauta/taskscheduler/infrastructure/repository/TaskRepository.java rename to src/main/java/com/javanauta/ts/taskscheduler/infrastructure/repository/TaskRepository.java index ec4fbd6..c912480 100644 --- a/src/main/java/com/javanauta/taskscheduler/infrastructure/repository/TaskRepository.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/repository/TaskRepository.java @@ -1,6 +1,6 @@ -package com.javanauta.taskscheduler.infrastructure.repository; +package com.javanauta.ts.taskscheduler.infrastructure.repository; -import com.javanauta.taskscheduler.infrastructure.entity.Task; +import com.javanauta.ts.taskscheduler.infrastructure.entity.Task; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/javanauta/taskscheduler/infrastructure/security/JwtRequestFilter.java b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/security/JwtRequestFilter.java similarity index 95% rename from src/main/java/com/javanauta/taskscheduler/infrastructure/security/JwtRequestFilter.java rename to src/main/java/com/javanauta/ts/taskscheduler/infrastructure/security/JwtRequestFilter.java index 30d8ce7..18392ca 100644 --- a/src/main/java/com/javanauta/taskscheduler/infrastructure/security/JwtRequestFilter.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/security/JwtRequestFilter.java @@ -1,4 +1,4 @@ -package com.javanauta.taskscheduler.infrastructure.security; +package com.javanauta.ts.taskscheduler.infrastructure.security; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/src/main/java/com/javanauta/taskscheduler/infrastructure/security/JwtUtil.java b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/security/JwtUtil.java similarity index 93% rename from src/main/java/com/javanauta/taskscheduler/infrastructure/security/JwtUtil.java rename to src/main/java/com/javanauta/ts/taskscheduler/infrastructure/security/JwtUtil.java index 530ba22..1869c46 100644 --- a/src/main/java/com/javanauta/taskscheduler/infrastructure/security/JwtUtil.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/security/JwtUtil.java @@ -1,4 +1,4 @@ -package com.javanauta.taskscheduler.infrastructure.security; +package com.javanauta.ts.taskscheduler.infrastructure.security; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/src/main/java/com/javanauta/taskscheduler/infrastructure/security/SecurityConfig.java b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/security/SecurityConfig.java similarity index 80% rename from src/main/java/com/javanauta/taskscheduler/infrastructure/security/SecurityConfig.java rename to src/main/java/com/javanauta/ts/taskscheduler/infrastructure/security/SecurityConfig.java index f85ca7d..acd1a03 100644 --- a/src/main/java/com/javanauta/taskscheduler/infrastructure/security/SecurityConfig.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/security/SecurityConfig.java @@ -1,18 +1,12 @@ -package com.javanauta.taskscheduler.infrastructure.security; +package com.javanauta.ts.taskscheduler.infrastructure.security; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpMethod; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; diff --git a/src/main/java/com/javanauta/taskscheduler/infrastructure/security/UserDetailsServiceImpl.java b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/security/UserDetailsServiceImpl.java similarity index 76% rename from src/main/java/com/javanauta/taskscheduler/infrastructure/security/UserDetailsServiceImpl.java rename to src/main/java/com/javanauta/ts/taskscheduler/infrastructure/security/UserDetailsServiceImpl.java index dc1c16c..202ef7a 100644 --- a/src/main/java/com/javanauta/taskscheduler/infrastructure/security/UserDetailsServiceImpl.java +++ b/src/main/java/com/javanauta/ts/taskscheduler/infrastructure/security/UserDetailsServiceImpl.java @@ -1,7 +1,7 @@ -package com.javanauta.taskscheduler.infrastructure.security; +package com.javanauta.ts.taskscheduler.infrastructure.security; -import com.javanauta.taskscheduler.business.dto.UserDTO; -import com.javanauta.taskscheduler.infrastructure.client.UserClient; +import com.javanauta.ts.taskscheduler.business.dto.UserDTO; +import com.javanauta.ts.taskscheduler.infrastructure.client.UserClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Service; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7705e91..fa0f274 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,8 @@ spring.application.name=task-scheduler +spring.application.description=Task Scheduler - Task scheduler module + spring.data.mongodb.uri=mongodb://localhost:27017 -spring.data.mongodb.database=task_scheduler_db +spring.data.mongodb.database=ts_task_scheduler_db user.url=localhost:8080