diff --git a/.github/workflows/build-back.yml b/.github/workflows/build-back.yml index 2048b4e..50ae197 100644 --- a/.github/workflows/build-back.yml +++ b/.github/workflows/build-back.yml @@ -15,4 +15,4 @@ jobs: distribution: 'temurin' cache: maven - name: build - run: mvn -Dmaven.test.skip=true compile -f backend/pom.xml + run: mvn -Dmaven.test.skip=true compile -f backend/core/pom.xml diff --git a/backend/cache/pom.xml b/backend/cache/pom.xml new file mode 100644 index 0000000..acf5b96 --- /dev/null +++ b/backend/cache/pom.xml @@ -0,0 +1,95 @@ + + + 4.0.0 + + messenger + com.mercure + 1.3.0 + + + com.mercure + cache + 1.0-SNAPSHOT + + cache + + http://www.example.com + + + UTF-8 + 17 + + + + + + org.junit + junit-bom + 5.11.0 + pom + import + + + + + + + org.junit.jupiter + junit-jupiter-api + test + + + + org.junit.jupiter + junit-jupiter-params + test + + + + + + + + + maven-clean-plugin + 3.4.0 + + + + maven-resources-plugin + 3.3.1 + + + maven-compiler-plugin + 3.13.0 + + + maven-surefire-plugin + 3.3.0 + + + maven-jar-plugin + 3.4.2 + + + maven-install-plugin + 3.1.2 + + + maven-deploy-plugin + 3.1.2 + + + + maven-site-plugin + 3.12.1 + + + maven-project-info-reports-plugin + 3.6.1 + + + + + diff --git a/backend/cache/src/main/java/com/mercure/App.java b/backend/cache/src/main/java/com/mercure/App.java new file mode 100644 index 0000000..bf59563 --- /dev/null +++ b/backend/cache/src/main/java/com/mercure/App.java @@ -0,0 +1,10 @@ +package com.mercure; + +/** + * Hello world! + */ +public class App { + public static void main(String[] args) { + System.out.println("Hello World!"); + } +} diff --git a/backend/cache/src/test/java/com/mercure/AppTest.java b/backend/cache/src/test/java/com/mercure/AppTest.java new file mode 100644 index 0000000..091fd22 --- /dev/null +++ b/backend/cache/src/test/java/com/mercure/AppTest.java @@ -0,0 +1,19 @@ +package com.mercure; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +/** + * Unit test for simple App. + */ +public class AppTest { + + /** + * Rigorous Test :-) + */ + @Test + public void shouldAnswerWithTrue() { + assertTrue(true); + } +} diff --git a/backend/cache/target/cache-1.0-SNAPSHOT.jar b/backend/cache/target/cache-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..a7e6ef8 Binary files /dev/null and b/backend/cache/target/cache-1.0-SNAPSHOT.jar differ diff --git a/backend/cache/target/cache-1.0-SNAPSHOT.jar.original b/backend/cache/target/cache-1.0-SNAPSHOT.jar.original new file mode 100644 index 0000000..67117e1 Binary files /dev/null and b/backend/cache/target/cache-1.0-SNAPSHOT.jar.original differ diff --git a/backend/cache/target/classes/com/mercure/App.class b/backend/cache/target/classes/com/mercure/App.class new file mode 100644 index 0000000..e114d4f Binary files /dev/null and b/backend/cache/target/classes/com/mercure/App.class differ diff --git a/backend/cache/target/maven-archiver/pom.properties b/backend/cache/target/maven-archiver/pom.properties new file mode 100644 index 0000000..5e117d1 --- /dev/null +++ b/backend/cache/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=cache +groupId=com.mercure +version=1.0-SNAPSHOT diff --git a/backend/cache/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/backend/cache/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..c54a9bd --- /dev/null +++ b/backend/cache/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +com/mercure/App.class diff --git a/backend/cache/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/backend/cache/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..ecca5fc --- /dev/null +++ b/backend/cache/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +/IdeaProjects/react-spring-messenger-project/backend/cache/src/main/java/com/mercure/App.java diff --git a/backend/cache/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/backend/cache/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 0000000..0d02560 --- /dev/null +++ b/backend/cache/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +com/mercure/AppTest.class diff --git a/backend/cache/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/backend/cache/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..cda14c4 --- /dev/null +++ b/backend/cache/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +/IdeaProjects/react-spring-messenger-project/backend/cache/src/test/java/com/mercure/AppTest.java diff --git a/backend/cache/target/test-classes/com/mercure/AppTest.class b/backend/cache/target/test-classes/com/mercure/AppTest.class new file mode 100644 index 0000000..3e66de7 Binary files /dev/null and b/backend/cache/target/test-classes/com/mercure/AppTest.class differ diff --git a/backend/core/pom.xml b/backend/core/pom.xml new file mode 100644 index 0000000..ef06de9 --- /dev/null +++ b/backend/core/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + + messenger + com.mercure + 1.3.0 + + + com.mercure + core + 1.0-SNAPSHOT + + core + + http://www.example.com + + + UTF-8 + 17 + + + + + + org.junit + junit-bom + 5.11.0 + pom + import + + + + + + + org.junit.jupiter + junit-jupiter-api + test + + + + org.junit.jupiter + junit-jupiter-params + test + + + junit + junit + test + + + org.junit.jupiter + junit-jupiter + test + + + org.junit.jupiter + junit-jupiter + test + + + + + + + + + maven-clean-plugin + 3.4.0 + + + + maven-resources-plugin + 3.3.1 + + + maven-compiler-plugin + 3.13.0 + + + maven-surefire-plugin + 3.3.0 + + + maven-jar-plugin + 3.4.2 + + + maven-install-plugin + 3.1.2 + + + maven-deploy-plugin + 3.1.2 + + + + maven-site-plugin + 3.12.1 + + + maven-project-info-reports-plugin + 3.6.1 + + + + + diff --git a/backend/src/main/java/com/mercure/WsNativeApplication.java b/backend/core/src/main/java/com/mercure/WsNativeApplication.java similarity index 100% rename from backend/src/main/java/com/mercure/WsNativeApplication.java rename to backend/core/src/main/java/com/mercure/WsNativeApplication.java diff --git a/backend/src/main/java/com/mercure/config/CacheConfig.java b/backend/core/src/main/java/com/mercure/config/CacheConfig.java similarity index 100% rename from backend/src/main/java/com/mercure/config/CacheConfig.java rename to backend/core/src/main/java/com/mercure/config/CacheConfig.java diff --git a/backend/src/main/java/com/mercure/config/HandShakeInterceptor.java b/backend/core/src/main/java/com/mercure/config/HandShakeInterceptor.java similarity index 100% rename from backend/src/main/java/com/mercure/config/HandShakeInterceptor.java rename to backend/core/src/main/java/com/mercure/config/HandShakeInterceptor.java diff --git a/backend/src/main/java/com/mercure/config/JwtWebConfig.java b/backend/core/src/main/java/com/mercure/config/JwtWebConfig.java similarity index 95% rename from backend/src/main/java/com/mercure/config/JwtWebConfig.java rename to backend/core/src/main/java/com/mercure/config/JwtWebConfig.java index 5b21b95..a74ace8 100644 --- a/backend/src/main/java/com/mercure/config/JwtWebConfig.java +++ b/backend/core/src/main/java/com/mercure/config/JwtWebConfig.java @@ -8,8 +8,8 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import lombok.AllArgsConstructor; import lombok.NonNull; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; @@ -20,12 +20,11 @@ import java.io.IOException; @Component +@AllArgsConstructor public class JwtWebConfig extends OncePerRequestFilter { - @Autowired private CustomUserDetailsService userDetailsService; - @Autowired private JwtUtil jwtUtil; @Override diff --git a/backend/src/main/java/com/mercure/config/ResourceConfig.java b/backend/core/src/main/java/com/mercure/config/ResourceConfig.java similarity index 100% rename from backend/src/main/java/com/mercure/config/ResourceConfig.java rename to backend/core/src/main/java/com/mercure/config/ResourceConfig.java diff --git a/backend/src/main/java/com/mercure/config/SecurityConfig.java b/backend/core/src/main/java/com/mercure/config/SecurityConfig.java similarity index 95% rename from backend/src/main/java/com/mercure/config/SecurityConfig.java rename to backend/core/src/main/java/com/mercure/config/SecurityConfig.java index 41635e8..faf8b80 100644 --- a/backend/src/main/java/com/mercure/config/SecurityConfig.java +++ b/backend/core/src/main/java/com/mercure/config/SecurityConfig.java @@ -1,7 +1,8 @@ package com.mercure.config; import com.mercure.service.CustomUserDetailsService; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; @@ -17,13 +18,13 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; @Configuration +@AllArgsConstructor +@NoArgsConstructor public class SecurityConfig { - @Autowired - public JwtWebConfig jwtWebConfig; + private JwtWebConfig jwtWebConfig; - @Autowired - public CustomUserDetailsService customUserDetailsService; + private CustomUserDetailsService customUserDetailsService; @Bean public PasswordEncoder passwordEncoder() { diff --git a/backend/src/main/java/com/mercure/config/WebSocketSecurityConfig.java b/backend/core/src/main/java/com/mercure/config/WebSocketSecurityConfig.java similarity index 100% rename from backend/src/main/java/com/mercure/config/WebSocketSecurityConfig.java rename to backend/core/src/main/java/com/mercure/config/WebSocketSecurityConfig.java diff --git a/backend/src/main/java/com/mercure/config/WsConfig.java b/backend/core/src/main/java/com/mercure/config/WsConfig.java similarity index 100% rename from backend/src/main/java/com/mercure/config/WsConfig.java rename to backend/core/src/main/java/com/mercure/config/WsConfig.java diff --git a/backend/src/main/java/com/mercure/controller/ApiController.java b/backend/core/src/main/java/com/mercure/controller/ApiController.java similarity index 96% rename from backend/src/main/java/com/mercure/controller/ApiController.java rename to backend/core/src/main/java/com/mercure/controller/ApiController.java index a5da912..8e14187 100644 --- a/backend/src/main/java/com/mercure/controller/ApiController.java +++ b/backend/core/src/main/java/com/mercure/controller/ApiController.java @@ -16,9 +16,8 @@ import com.mercure.utils.StaticVariable; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.util.WebUtils; @@ -27,23 +26,18 @@ @RestController @CrossOrigin(allowCredentials = "true", origins = "http://localhost:3000") +@AllArgsConstructor +@Slf4j public class ApiController { - private final Logger log = LoggerFactory.getLogger(ApiController.class); - - @Autowired private UserService userService; - @Autowired private GroupService groupService; - @Autowired private GroupMapper groupMapper; - @Autowired private GroupUserJoinService groupUserJoinService; - @Autowired private JwtUtil jwtUtil; @GetMapping(value = "/users/all/{groupUrl}") diff --git a/backend/src/main/java/com/mercure/controller/AuthenticationController.java b/backend/core/src/main/java/com/mercure/controller/AuthenticationController.java similarity index 93% rename from backend/src/main/java/com/mercure/controller/AuthenticationController.java rename to backend/core/src/main/java/com/mercure/controller/AuthenticationController.java index 0d5cda5..33a286d 100644 --- a/backend/src/main/java/com/mercure/controller/AuthenticationController.java +++ b/backend/core/src/main/java/com/mercure/controller/AuthenticationController.java @@ -17,9 +17,8 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -32,29 +31,22 @@ @RestController @CrossOrigin(allowCredentials = "true", origins = "http://localhost:3000", methods = {RequestMethod.GET, RequestMethod.POST}) +@AllArgsConstructor +@Slf4j public class AuthenticationController { - private final Logger log = LoggerFactory.getLogger(AuthenticationController.class); - - @Autowired private JwtUtil jwtTokenUtil; - @Autowired private CustomUserDetailsService userDetailsService; - @Autowired private UserMapper userMapper; - @Autowired private UserService userService; - @Autowired private GroupService groupService; - @Autowired private GroupMapper groupMapper; - @Autowired private AuthenticationManager authenticationManager; @PostMapping(value = "/auth") diff --git a/backend/src/main/java/com/mercure/controller/MessageController.java b/backend/core/src/main/java/com/mercure/controller/MessageController.java similarity index 74% rename from backend/src/main/java/com/mercure/controller/MessageController.java rename to backend/core/src/main/java/com/mercure/controller/MessageController.java index 6d51f3c..9424ef9 100644 --- a/backend/src/main/java/com/mercure/controller/MessageController.java +++ b/backend/core/src/main/java/com/mercure/controller/MessageController.java @@ -3,9 +3,8 @@ import com.mercure.dto.WrapperMessageDTO; import com.mercure.service.GroupUserJoinService; import com.mercure.service.MessageService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import java.util.Date; @@ -13,25 +12,23 @@ @RestController @RequestMapping(value = "/messages") @CrossOrigin(allowCredentials = "true", origins = "http://localhost:3000") +@AllArgsConstructor +@Slf4j public class MessageController { - private final Logger log = LoggerFactory.getLogger(MessageController.class); - - @Autowired private MessageService messageService; - @Autowired private GroupUserJoinService groupUserJoinService; @GetMapping(value = "{offset}/group/{groupUrl}") public WrapperMessageDTO fetchGroupMessages(@PathVariable String groupUrl, @PathVariable int offset) throws Exception { - this.log.debug("Fetching messages from conversation"); + log.debug("Fetching messages from conversation"); return this.messageService.getConversationMessage(groupUrl, offset); } @GetMapping(value = "seen/group/{groupUrl}/user/{userId}") public void markMessageAsSeen(@PathVariable String groupUrl, @PathVariable int userId) { - this.log.debug("Mark message as seen"); + log.debug("Mark message as seen"); this.groupUserJoinService.saveLastMessageDate(userId, groupUrl); } } diff --git a/backend/src/main/java/com/mercure/controller/PingController.java b/backend/core/src/main/java/com/mercure/controller/PingController.java similarity index 100% rename from backend/src/main/java/com/mercure/controller/PingController.java rename to backend/core/src/main/java/com/mercure/controller/PingController.java diff --git a/backend/src/main/java/com/mercure/controller/SearchController.java b/backend/core/src/main/java/com/mercure/controller/SearchController.java similarity index 91% rename from backend/src/main/java/com/mercure/controller/SearchController.java rename to backend/core/src/main/java/com/mercure/controller/SearchController.java index 226cb0d..b677bd3 100644 --- a/backend/src/main/java/com/mercure/controller/SearchController.java +++ b/backend/core/src/main/java/com/mercure/controller/SearchController.java @@ -5,7 +5,7 @@ import com.mercure.entity.UserEntity; import com.mercure.service.MessageService; import com.mercure.service.UserService; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; import org.springframework.security.core.Authentication; import org.springframework.web.bind.annotation.*; @@ -14,12 +14,11 @@ @RestController @RequestMapping(value = "/search") @CrossOrigin(allowCredentials = "true", origins = "http://localhost:3000") +@AllArgsConstructor public class SearchController { - @Autowired private UserService userService; - @Autowired private MessageService messageService; @PostMapping() diff --git a/backend/src/main/java/com/mercure/controller/WsController.java b/backend/core/src/main/java/com/mercure/controller/WsController.java similarity index 95% rename from backend/src/main/java/com/mercure/controller/WsController.java rename to backend/core/src/main/java/com/mercure/controller/WsController.java index b8b6178..4947fa0 100644 --- a/backend/src/main/java/com/mercure/controller/WsController.java +++ b/backend/core/src/main/java/com/mercure/controller/WsController.java @@ -10,9 +10,8 @@ import com.mercure.utils.MessageTypeEnum; import com.mercure.utils.RtcActionEnum; import com.mercure.utils.TransportActionEnum; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.handler.annotation.DestinationVariable; import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.handler.annotation.MessageMapping; @@ -25,26 +24,20 @@ import java.util.List; @RestController +@AllArgsConstructor +@Slf4j public class WsController { - private final Logger log = LoggerFactory.getLogger(WsController.class); - - @Autowired private GroupService groupService; - @Autowired private MessageService messageService; - @Autowired private SimpMessagingTemplate messagingTemplate; - @Autowired private GroupUserJoinService groupUserJoinService; - @Autowired private UserSeenMessageService seenMessageService; - @Autowired private RtcService rtcService; @MessageMapping("/message") diff --git a/backend/src/main/java/com/mercure/controller/WsFileController.java b/backend/core/src/main/java/com/mercure/controller/WsFileController.java similarity index 95% rename from backend/src/main/java/com/mercure/controller/WsFileController.java rename to backend/core/src/main/java/com/mercure/controller/WsFileController.java index 372422d..1a975ec 100644 --- a/backend/src/main/java/com/mercure/controller/WsFileController.java +++ b/backend/core/src/main/java/com/mercure/controller/WsFileController.java @@ -9,37 +9,32 @@ import com.mercure.service.UserSeenMessageService; import com.mercure.utils.MessageTypeEnum; import com.mercure.utils.TransportActionEnum; +import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.messaging.simp.SimpMessagingTemplate; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.util.Arrays; import java.util.List; @RestController @CrossOrigin(allowCredentials = "true", origins = "http://localhost:3000", methods = {RequestMethod.GET, RequestMethod.POST}) +@AllArgsConstructor public class WsFileController { private static final Logger log = LoggerFactory.getLogger(WsFileController.class); - @Autowired private MessageService messageService; - @Autowired private GroupService groupService; - @Autowired private SimpMessagingTemplate messagingTemplate; - @Autowired private StorageService storageService; - @Autowired private UserSeenMessageService seenMessageService; /** diff --git a/backend/src/main/java/com/mercure/dto/AuthUserDTO.java b/backend/core/src/main/java/com/mercure/dto/AuthUserDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/AuthUserDTO.java rename to backend/core/src/main/java/com/mercure/dto/AuthUserDTO.java diff --git a/backend/src/main/java/com/mercure/dto/AuthenticationUserDTO.java b/backend/core/src/main/java/com/mercure/dto/AuthenticationUserDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/AuthenticationUserDTO.java rename to backend/core/src/main/java/com/mercure/dto/AuthenticationUserDTO.java diff --git a/backend/src/main/java/com/mercure/dto/CreateGroupDTO.java b/backend/core/src/main/java/com/mercure/dto/CreateGroupDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/CreateGroupDTO.java rename to backend/core/src/main/java/com/mercure/dto/CreateGroupDTO.java diff --git a/backend/src/main/java/com/mercure/dto/GroupMemberDTO.java b/backend/core/src/main/java/com/mercure/dto/GroupMemberDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/GroupMemberDTO.java rename to backend/core/src/main/java/com/mercure/dto/GroupMemberDTO.java diff --git a/backend/src/main/java/com/mercure/dto/InputTransportDTO.java b/backend/core/src/main/java/com/mercure/dto/InputTransportDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/InputTransportDTO.java rename to backend/core/src/main/java/com/mercure/dto/InputTransportDTO.java diff --git a/backend/src/main/java/com/mercure/dto/JwtDTO.java b/backend/core/src/main/java/com/mercure/dto/JwtDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/JwtDTO.java rename to backend/core/src/main/java/com/mercure/dto/JwtDTO.java diff --git a/backend/src/main/java/com/mercure/dto/LeaveGroupDTO.java b/backend/core/src/main/java/com/mercure/dto/LeaveGroupDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/LeaveGroupDTO.java rename to backend/core/src/main/java/com/mercure/dto/LeaveGroupDTO.java diff --git a/backend/src/main/java/com/mercure/dto/LightUserDTO.java b/backend/core/src/main/java/com/mercure/dto/LightUserDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/LightUserDTO.java rename to backend/core/src/main/java/com/mercure/dto/LightUserDTO.java diff --git a/backend/src/main/java/com/mercure/dto/MessageDTO.java b/backend/core/src/main/java/com/mercure/dto/MessageDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/MessageDTO.java rename to backend/core/src/main/java/com/mercure/dto/MessageDTO.java diff --git a/backend/src/main/java/com/mercure/dto/NotificationDTO.java b/backend/core/src/main/java/com/mercure/dto/NotificationDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/NotificationDTO.java rename to backend/core/src/main/java/com/mercure/dto/NotificationDTO.java diff --git a/backend/src/main/java/com/mercure/dto/OutputTransportDTO.java b/backend/core/src/main/java/com/mercure/dto/OutputTransportDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/OutputTransportDTO.java rename to backend/core/src/main/java/com/mercure/dto/OutputTransportDTO.java diff --git a/backend/src/main/java/com/mercure/dto/RtcTransportDTO.java b/backend/core/src/main/java/com/mercure/dto/RtcTransportDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/RtcTransportDTO.java rename to backend/core/src/main/java/com/mercure/dto/RtcTransportDTO.java diff --git a/backend/src/main/java/com/mercure/dto/WrapperMessageDTO.java b/backend/core/src/main/java/com/mercure/dto/WrapperMessageDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/WrapperMessageDTO.java rename to backend/core/src/main/java/com/mercure/dto/WrapperMessageDTO.java diff --git a/backend/src/main/java/com/mercure/dto/search/FullTextSearchDTO.java b/backend/core/src/main/java/com/mercure/dto/search/FullTextSearchDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/search/FullTextSearchDTO.java rename to backend/core/src/main/java/com/mercure/dto/search/FullTextSearchDTO.java diff --git a/backend/src/main/java/com/mercure/dto/search/FullTextSearchDatabaseResponse.java b/backend/core/src/main/java/com/mercure/dto/search/FullTextSearchDatabaseResponse.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/search/FullTextSearchDatabaseResponse.java rename to backend/core/src/main/java/com/mercure/dto/search/FullTextSearchDatabaseResponse.java diff --git a/backend/src/main/java/com/mercure/dto/search/FullTextSearchDatabaseResponseDTO.java b/backend/core/src/main/java/com/mercure/dto/search/FullTextSearchDatabaseResponseDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/search/FullTextSearchDatabaseResponseDTO.java rename to backend/core/src/main/java/com/mercure/dto/search/FullTextSearchDatabaseResponseDTO.java diff --git a/backend/src/main/java/com/mercure/dto/search/FullTextSearchResponseDTO.java b/backend/core/src/main/java/com/mercure/dto/search/FullTextSearchResponseDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/search/FullTextSearchResponseDTO.java rename to backend/core/src/main/java/com/mercure/dto/search/FullTextSearchResponseDTO.java diff --git a/backend/src/main/java/com/mercure/dto/user/GroupCallDTO.java b/backend/core/src/main/java/com/mercure/dto/user/GroupCallDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/user/GroupCallDTO.java rename to backend/core/src/main/java/com/mercure/dto/user/GroupCallDTO.java diff --git a/backend/src/main/java/com/mercure/dto/user/GroupDTO.java b/backend/core/src/main/java/com/mercure/dto/user/GroupDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/user/GroupDTO.java rename to backend/core/src/main/java/com/mercure/dto/user/GroupDTO.java diff --git a/backend/src/main/java/com/mercure/dto/user/GroupWrapperDTO.java b/backend/core/src/main/java/com/mercure/dto/user/GroupWrapperDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/user/GroupWrapperDTO.java rename to backend/core/src/main/java/com/mercure/dto/user/GroupWrapperDTO.java diff --git a/backend/src/main/java/com/mercure/dto/user/InitUserDTO.java b/backend/core/src/main/java/com/mercure/dto/user/InitUserDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/dto/user/InitUserDTO.java rename to backend/core/src/main/java/com/mercure/dto/user/InitUserDTO.java diff --git a/backend/src/main/java/com/mercure/entity/FileEntity.java b/backend/core/src/main/java/com/mercure/entity/FileEntity.java similarity index 100% rename from backend/src/main/java/com/mercure/entity/FileEntity.java rename to backend/core/src/main/java/com/mercure/entity/FileEntity.java diff --git a/backend/src/main/java/com/mercure/entity/GroupEntity.java b/backend/core/src/main/java/com/mercure/entity/GroupEntity.java similarity index 100% rename from backend/src/main/java/com/mercure/entity/GroupEntity.java rename to backend/core/src/main/java/com/mercure/entity/GroupEntity.java diff --git a/backend/src/main/java/com/mercure/entity/GroupRoleKey.java b/backend/core/src/main/java/com/mercure/entity/GroupRoleKey.java similarity index 96% rename from backend/src/main/java/com/mercure/entity/GroupRoleKey.java rename to backend/core/src/main/java/com/mercure/entity/GroupRoleKey.java index 79e32d7..86aad4f 100644 --- a/backend/src/main/java/com/mercure/entity/GroupRoleKey.java +++ b/backend/core/src/main/java/com/mercure/entity/GroupRoleKey.java @@ -7,7 +7,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; -import java.io.Serializable; import java.util.Objects; @Embeddable diff --git a/backend/src/main/java/com/mercure/entity/GroupUser.java b/backend/core/src/main/java/com/mercure/entity/GroupUser.java similarity index 100% rename from backend/src/main/java/com/mercure/entity/GroupUser.java rename to backend/core/src/main/java/com/mercure/entity/GroupUser.java diff --git a/backend/src/main/java/com/mercure/entity/MessageEntity.java b/backend/core/src/main/java/com/mercure/entity/MessageEntity.java similarity index 100% rename from backend/src/main/java/com/mercure/entity/MessageEntity.java rename to backend/core/src/main/java/com/mercure/entity/MessageEntity.java diff --git a/backend/src/main/java/com/mercure/entity/MessageUserEntity.java b/backend/core/src/main/java/com/mercure/entity/MessageUserEntity.java similarity index 100% rename from backend/src/main/java/com/mercure/entity/MessageUserEntity.java rename to backend/core/src/main/java/com/mercure/entity/MessageUserEntity.java diff --git a/backend/src/main/java/com/mercure/entity/MessageUserKey.java b/backend/core/src/main/java/com/mercure/entity/MessageUserKey.java similarity index 100% rename from backend/src/main/java/com/mercure/entity/MessageUserKey.java rename to backend/core/src/main/java/com/mercure/entity/MessageUserKey.java diff --git a/backend/src/main/java/com/mercure/entity/UserEntity.java b/backend/core/src/main/java/com/mercure/entity/UserEntity.java similarity index 100% rename from backend/src/main/java/com/mercure/entity/UserEntity.java rename to backend/core/src/main/java/com/mercure/entity/UserEntity.java diff --git a/backend/src/main/java/com/mercure/mapper/GroupCallMapper.java b/backend/core/src/main/java/com/mercure/mapper/GroupCallMapper.java similarity index 93% rename from backend/src/main/java/com/mercure/mapper/GroupCallMapper.java rename to backend/core/src/main/java/com/mercure/mapper/GroupCallMapper.java index 47e325e..d7bbc8c 100644 --- a/backend/src/main/java/com/mercure/mapper/GroupCallMapper.java +++ b/backend/core/src/main/java/com/mercure/mapper/GroupCallMapper.java @@ -4,7 +4,6 @@ import com.mercure.entity.GroupEntity; import com.mercure.service.cache.RoomCacheService; import lombok.AllArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -14,7 +13,6 @@ @AllArgsConstructor public class GroupCallMapper { - @Autowired private RoomCacheService roomCacheService; public GroupCallDTO toGroupCall(GroupEntity group) { diff --git a/backend/src/main/java/com/mercure/mapper/GroupMapper.java b/backend/core/src/main/java/com/mercure/mapper/GroupMapper.java similarity index 95% rename from backend/src/main/java/com/mercure/mapper/GroupMapper.java rename to backend/core/src/main/java/com/mercure/mapper/GroupMapper.java index 75cd32d..9fd1003 100644 --- a/backend/src/main/java/com/mercure/mapper/GroupMapper.java +++ b/backend/core/src/main/java/com/mercure/mapper/GroupMapper.java @@ -5,22 +5,19 @@ import com.mercure.entity.*; import com.mercure.service.*; import com.mercure.utils.MessageTypeEnum; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @Service +@AllArgsConstructor public class GroupMapper { - @Autowired private MessageService messageService; - @Autowired private UserSeenMessageService seenMessageService; - @Autowired private GroupUserJoinService groupUserJoinService; - @Autowired private UserService userService; public GroupDTO toGroupDTO(GroupEntity grp, int userId) { diff --git a/backend/src/main/java/com/mercure/mapper/UserMapper.java b/backend/core/src/main/java/com/mercure/mapper/UserMapper.java similarity index 96% rename from backend/src/main/java/com/mercure/mapper/UserMapper.java rename to backend/core/src/main/java/com/mercure/mapper/UserMapper.java index a568ae8..d92f709 100644 --- a/backend/src/main/java/com/mercure/mapper/UserMapper.java +++ b/backend/core/src/main/java/com/mercure/mapper/UserMapper.java @@ -8,7 +8,7 @@ import com.mercure.entity.UserEntity; import com.mercure.utils.ComparatorListGroupDTO; import com.mercure.utils.ComparatorListWrapperGroupDTO; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -17,12 +17,11 @@ import java.util.Set; @Service +@AllArgsConstructor public class UserMapper { - @Autowired private GroupMapper groupMapper; - @Autowired private GroupCallMapper groupCallMapper; /** diff --git a/backend/src/main/java/com/mercure/model/MessageModel.java b/backend/core/src/main/java/com/mercure/model/MessageModel.java similarity index 100% rename from backend/src/main/java/com/mercure/model/MessageModel.java rename to backend/core/src/main/java/com/mercure/model/MessageModel.java diff --git a/backend/src/main/java/com/mercure/model/UserModel.java b/backend/core/src/main/java/com/mercure/model/UserModel.java similarity index 100% rename from backend/src/main/java/com/mercure/model/UserModel.java rename to backend/core/src/main/java/com/mercure/model/UserModel.java diff --git a/backend/src/main/java/com/mercure/repository/FileRepository.java b/backend/core/src/main/java/com/mercure/repository/FileRepository.java similarity index 100% rename from backend/src/main/java/com/mercure/repository/FileRepository.java rename to backend/core/src/main/java/com/mercure/repository/FileRepository.java diff --git a/backend/src/main/java/com/mercure/repository/GroupRepository.java b/backend/core/src/main/java/com/mercure/repository/GroupRepository.java similarity index 100% rename from backend/src/main/java/com/mercure/repository/GroupRepository.java rename to backend/core/src/main/java/com/mercure/repository/GroupRepository.java diff --git a/backend/src/main/java/com/mercure/repository/GroupUserJoinRepository.java b/backend/core/src/main/java/com/mercure/repository/GroupUserJoinRepository.java similarity index 100% rename from backend/src/main/java/com/mercure/repository/GroupUserJoinRepository.java rename to backend/core/src/main/java/com/mercure/repository/GroupUserJoinRepository.java diff --git a/backend/src/main/java/com/mercure/repository/MessageRepository.java b/backend/core/src/main/java/com/mercure/repository/MessageRepository.java similarity index 100% rename from backend/src/main/java/com/mercure/repository/MessageRepository.java rename to backend/core/src/main/java/com/mercure/repository/MessageRepository.java diff --git a/backend/src/main/java/com/mercure/repository/UserRepository.java b/backend/core/src/main/java/com/mercure/repository/UserRepository.java similarity index 100% rename from backend/src/main/java/com/mercure/repository/UserRepository.java rename to backend/core/src/main/java/com/mercure/repository/UserRepository.java diff --git a/backend/src/main/java/com/mercure/repository/UserSeenMessageRepository.java b/backend/core/src/main/java/com/mercure/repository/UserSeenMessageRepository.java similarity index 100% rename from backend/src/main/java/com/mercure/repository/UserSeenMessageRepository.java rename to backend/core/src/main/java/com/mercure/repository/UserSeenMessageRepository.java diff --git a/backend/src/main/java/com/mercure/service/CustomUserDetailsService.java b/backend/core/src/main/java/com/mercure/service/CustomUserDetailsService.java similarity index 93% rename from backend/src/main/java/com/mercure/service/CustomUserDetailsService.java rename to backend/core/src/main/java/com/mercure/service/CustomUserDetailsService.java index 17257a6..823f321 100644 --- a/backend/src/main/java/com/mercure/service/CustomUserDetailsService.java +++ b/backend/core/src/main/java/com/mercure/service/CustomUserDetailsService.java @@ -2,7 +2,7 @@ import com.mercure.entity.UserEntity; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; import org.springframework.security.authentication.DisabledException; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; @@ -10,9 +10,9 @@ import org.springframework.stereotype.Service; @Service +@AllArgsConstructor public class CustomUserDetailsService implements UserDetailsService { - @Autowired private UserService userService; @Override diff --git a/backend/src/main/java/com/mercure/service/FileService.java b/backend/core/src/main/java/com/mercure/service/FileService.java similarity index 90% rename from backend/src/main/java/com/mercure/service/FileService.java rename to backend/core/src/main/java/com/mercure/service/FileService.java index bcfd93b..e0c7769 100644 --- a/backend/src/main/java/com/mercure/service/FileService.java +++ b/backend/core/src/main/java/com/mercure/service/FileService.java @@ -2,15 +2,15 @@ import com.mercure.entity.FileEntity; import com.mercure.repository.FileRepository; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; @Service +@AllArgsConstructor public class FileService { - @Autowired private FileRepository fileRepository; public FileEntity save(FileEntity f) { diff --git a/backend/src/main/java/com/mercure/service/GroupService.java b/backend/core/src/main/java/com/mercure/service/GroupService.java similarity index 97% rename from backend/src/main/java/com/mercure/service/GroupService.java rename to backend/core/src/main/java/com/mercure/service/GroupService.java index 8b1c13e..00848d1 100644 --- a/backend/src/main/java/com/mercure/service/GroupService.java +++ b/backend/core/src/main/java/com/mercure/service/GroupService.java @@ -4,9 +4,9 @@ import com.mercure.entity.*; import com.mercure.repository.GroupRepository; import com.mercure.utils.GroupTypeEnum; +import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.sql.Timestamp; @@ -14,17 +14,15 @@ import java.util.stream.Collectors; @Service +@AllArgsConstructor public class GroupService { private static final Logger log = LoggerFactory.getLogger(GroupService.class); - @Autowired private GroupRepository groupRepository; - @Autowired private UserService userService; - @Autowired private GroupUserJoinService groupUserJoinService; public int findGroupByUrl(String url) { diff --git a/backend/src/main/java/com/mercure/service/GroupUserJoinService.java b/backend/core/src/main/java/com/mercure/service/GroupUserJoinService.java similarity index 95% rename from backend/src/main/java/com/mercure/service/GroupUserJoinService.java rename to backend/core/src/main/java/com/mercure/service/GroupUserJoinService.java index b666441..66c12dd 100644 --- a/backend/src/main/java/com/mercure/service/GroupUserJoinService.java +++ b/backend/core/src/main/java/com/mercure/service/GroupUserJoinService.java @@ -1,13 +1,11 @@ package com.mercure.service; -import com.mercure.controller.WsFileController; import com.mercure.entity.GroupRoleKey; import com.mercure.entity.GroupUser; import com.mercure.repository.GroupUserJoinRepository; -import org.aspectj.weaver.ast.Test; +import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.sql.Timestamp; @@ -16,17 +14,15 @@ import java.util.Optional; @Service +@AllArgsConstructor public class GroupUserJoinService { private static final Logger log = LoggerFactory.getLogger(GroupUserJoinService.class); - @Autowired private GroupUserJoinRepository groupUserJoinRepository; - @Autowired private MessageService messageService; - @Autowired private GroupService groupService; public GroupUser save(GroupUser groupUser) { diff --git a/backend/src/main/java/com/mercure/service/MessageService.java b/backend/core/src/main/java/com/mercure/service/MessageService.java similarity index 96% rename from backend/src/main/java/com/mercure/service/MessageService.java rename to backend/core/src/main/java/com/mercure/service/MessageService.java index a33b8c0..5e37f18 100644 --- a/backend/src/main/java/com/mercure/service/MessageService.java +++ b/backend/core/src/main/java/com/mercure/service/MessageService.java @@ -1,18 +1,15 @@ package com.mercure.service; import com.mercure.dto.MessageDTO; -import com.mercure.dto.NotificationDTO; import com.mercure.dto.WrapperMessageDTO; import com.mercure.dto.search.FullTextSearchDatabaseResponse; import com.mercure.dto.search.FullTextSearchDatabaseResponseDTO; import com.mercure.dto.search.FullTextSearchResponseDTO; import com.mercure.entity.*; import com.mercure.repository.MessageRepository; -import com.mercure.utils.DbInit; import com.mercure.utils.MessageTypeEnum; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; @@ -21,23 +18,18 @@ import java.util.stream.Collectors; @Service +@AllArgsConstructor +@Slf4j public class MessageService { - private static Logger log = LoggerFactory.getLogger(MessageService.class); - - @Autowired private MessageRepository messageRepository; - @Autowired private FileService fileService; - @Autowired private GroupService groupService; - @Autowired private UserService userService; - @Autowired private GroupUserJoinService groupUserJoinService; public MessageEntity createAndSaveMessage(int userId, int groupId, String type, String data) { diff --git a/backend/src/main/java/com/mercure/service/StorageService.java b/backend/core/src/main/java/com/mercure/service/StorageService.java similarity index 96% rename from backend/src/main/java/com/mercure/service/StorageService.java rename to backend/core/src/main/java/com/mercure/service/StorageService.java index cbc1ad7..d60aed1 100644 --- a/backend/src/main/java/com/mercure/service/StorageService.java +++ b/backend/core/src/main/java/com/mercure/service/StorageService.java @@ -3,9 +3,9 @@ import com.mercure.entity.FileEntity; import com.mercure.utils.StaticVariable; import jakarta.annotation.PostConstruct; +import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; @@ -20,14 +20,13 @@ import java.util.UUID; @Service +@AllArgsConstructor public class StorageService { private static final Logger log = LoggerFactory.getLogger(StorageService.class); - @Autowired private FileService fileService; - @PostConstruct public void init() { try { diff --git a/backend/src/main/java/com/mercure/service/UserSeenMessageService.java b/backend/core/src/main/java/com/mercure/service/UserSeenMessageService.java similarity index 92% rename from backend/src/main/java/com/mercure/service/UserSeenMessageService.java rename to backend/core/src/main/java/com/mercure/service/UserSeenMessageService.java index 2f20ef0..c3c09a9 100644 --- a/backend/src/main/java/com/mercure/service/UserSeenMessageService.java +++ b/backend/core/src/main/java/com/mercure/service/UserSeenMessageService.java @@ -2,19 +2,18 @@ import com.mercure.entity.*; import com.mercure.repository.UserSeenMessageRepository; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Optional; @Service +@AllArgsConstructor public class UserSeenMessageService { - @Autowired private UserSeenMessageRepository seenMessageRepository; - @Autowired private GroupService groupService; @Transactional diff --git a/backend/src/main/java/com/mercure/service/UserService.java b/backend/core/src/main/java/com/mercure/service/UserService.java similarity index 94% rename from backend/src/main/java/com/mercure/service/UserService.java rename to backend/core/src/main/java/com/mercure/service/UserService.java index 287a8db..18c43ab 100644 --- a/backend/src/main/java/com/mercure/service/UserService.java +++ b/backend/core/src/main/java/com/mercure/service/UserService.java @@ -7,9 +7,9 @@ import com.mercure.mapper.UserMapper; import com.mercure.repository.UserRepository; import jakarta.transaction.Transactional; +import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -19,21 +19,18 @@ @Service @Getter @Setter +@AllArgsConstructor public class UserService { - @Autowired private UserMapper userMapper; - @Autowired private PasswordEncoder passwordEncoder; - @Autowired private UserRepository userRepository; - @Autowired private GroupUserJoinService groupUserJoinService; - private Map wsSessions = new HashMap<>(); + private static Map wsSessions = new HashMap<>(); public void deleteAll() { userRepository.deleteAll(); diff --git a/backend/src/main/java/com/mercure/service/cache/CallsCacheService.java b/backend/core/src/main/java/com/mercure/service/cache/CallsCacheService.java similarity index 94% rename from backend/src/main/java/com/mercure/service/cache/CallsCacheService.java rename to backend/core/src/main/java/com/mercure/service/cache/CallsCacheService.java index 6233f79..9a0caf8 100644 --- a/backend/src/main/java/com/mercure/service/cache/CallsCacheService.java +++ b/backend/core/src/main/java/com/mercure/service/cache/CallsCacheService.java @@ -1,6 +1,6 @@ package com.mercure.service.cache; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; import org.springframework.stereotype.Service; @@ -9,9 +9,9 @@ import java.util.List; @Service +@AllArgsConstructor public class CallsCacheService { - @Autowired private CacheManager cacheManager; private Cache getCache() { diff --git a/backend/src/main/java/com/mercure/service/cache/RoomCacheService.java b/backend/core/src/main/java/com/mercure/service/cache/RoomCacheService.java similarity index 91% rename from backend/src/main/java/com/mercure/service/cache/RoomCacheService.java rename to backend/core/src/main/java/com/mercure/service/cache/RoomCacheService.java index 892222f..5dab3a9 100644 --- a/backend/src/main/java/com/mercure/service/cache/RoomCacheService.java +++ b/backend/core/src/main/java/com/mercure/service/cache/RoomCacheService.java @@ -1,6 +1,7 @@ package com.mercure.service.cache; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; import org.springframework.stereotype.Service; @@ -9,9 +10,10 @@ import java.util.concurrent.ConcurrentHashMap; @Service +@AllArgsConstructor +@NoArgsConstructor public class RoomCacheService { - @Autowired private CacheManager cacheManager; private Cache getCache() { diff --git a/backend/src/main/java/com/mercure/service/rtc/RtcService.java b/backend/core/src/main/java/com/mercure/service/rtc/RtcService.java similarity index 96% rename from backend/src/main/java/com/mercure/service/rtc/RtcService.java rename to backend/core/src/main/java/com/mercure/service/rtc/RtcService.java index 973411f..51ec8bb 100644 --- a/backend/src/main/java/com/mercure/service/rtc/RtcService.java +++ b/backend/core/src/main/java/com/mercure/service/rtc/RtcService.java @@ -7,32 +7,28 @@ import com.mercure.service.cache.CallsCacheService; import com.mercure.service.cache.RoomCacheService; import com.mercure.utils.RtcActionEnum; +import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.simp.SimpMessagingTemplate; import org.springframework.stereotype.Service; import java.util.List; @Service +@AllArgsConstructor public class RtcService { private final Logger log = LoggerFactory.getLogger(RtcService.class); - @Autowired private GroupUserJoinService groupUserJoinService; - @Autowired private GroupService groupService; - @Autowired private RoomCacheService roomCacheService; - @Autowired private CallsCacheService callsCacheService; - @Autowired private SimpMessagingTemplate messagingTemplate; public Object getOfferFromRoom(String roomUrl) { diff --git a/backend/src/main/java/com/mercure/utils/ColorsUtils.java b/backend/core/src/main/java/com/mercure/utils/ColorsUtils.java similarity index 100% rename from backend/src/main/java/com/mercure/utils/ColorsUtils.java rename to backend/core/src/main/java/com/mercure/utils/ColorsUtils.java diff --git a/backend/src/main/java/com/mercure/utils/ComparatorListGroupDTO.java b/backend/core/src/main/java/com/mercure/utils/ComparatorListGroupDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/utils/ComparatorListGroupDTO.java rename to backend/core/src/main/java/com/mercure/utils/ComparatorListGroupDTO.java diff --git a/backend/src/main/java/com/mercure/utils/ComparatorListWrapperGroupDTO.java b/backend/core/src/main/java/com/mercure/utils/ComparatorListWrapperGroupDTO.java similarity index 100% rename from backend/src/main/java/com/mercure/utils/ComparatorListWrapperGroupDTO.java rename to backend/core/src/main/java/com/mercure/utils/ComparatorListWrapperGroupDTO.java diff --git a/backend/src/main/java/com/mercure/utils/DbInit.java b/backend/core/src/main/java/com/mercure/utils/DbInit.java similarity index 100% rename from backend/src/main/java/com/mercure/utils/DbInit.java rename to backend/core/src/main/java/com/mercure/utils/DbInit.java diff --git a/backend/src/main/java/com/mercure/utils/GroupTypeEnum.java b/backend/core/src/main/java/com/mercure/utils/GroupTypeEnum.java similarity index 100% rename from backend/src/main/java/com/mercure/utils/GroupTypeEnum.java rename to backend/core/src/main/java/com/mercure/utils/GroupTypeEnum.java diff --git a/backend/src/main/java/com/mercure/utils/JwtUtil.java b/backend/core/src/main/java/com/mercure/utils/JwtUtil.java similarity index 100% rename from backend/src/main/java/com/mercure/utils/JwtUtil.java rename to backend/core/src/main/java/com/mercure/utils/JwtUtil.java diff --git a/backend/src/main/java/com/mercure/utils/MessageTypeEnum.java b/backend/core/src/main/java/com/mercure/utils/MessageTypeEnum.java similarity index 100% rename from backend/src/main/java/com/mercure/utils/MessageTypeEnum.java rename to backend/core/src/main/java/com/mercure/utils/MessageTypeEnum.java diff --git a/backend/src/main/java/com/mercure/utils/RtcActionEnum.java b/backend/core/src/main/java/com/mercure/utils/RtcActionEnum.java similarity index 100% rename from backend/src/main/java/com/mercure/utils/RtcActionEnum.java rename to backend/core/src/main/java/com/mercure/utils/RtcActionEnum.java diff --git a/backend/src/main/java/com/mercure/utils/StaticVariable.java b/backend/core/src/main/java/com/mercure/utils/StaticVariable.java similarity index 100% rename from backend/src/main/java/com/mercure/utils/StaticVariable.java rename to backend/core/src/main/java/com/mercure/utils/StaticVariable.java diff --git a/backend/src/main/java/com/mercure/utils/TransportActionEnum.java b/backend/core/src/main/java/com/mercure/utils/TransportActionEnum.java similarity index 100% rename from backend/src/main/java/com/mercure/utils/TransportActionEnum.java rename to backend/core/src/main/java/com/mercure/utils/TransportActionEnum.java diff --git a/backend/src/main/resources/application-dev.properties b/backend/core/src/main/resources/application-dev.properties similarity index 100% rename from backend/src/main/resources/application-dev.properties rename to backend/core/src/main/resources/application-dev.properties diff --git a/backend/src/main/resources/application.properties b/backend/core/src/main/resources/application.properties similarity index 100% rename from backend/src/main/resources/application.properties rename to backend/core/src/main/resources/application.properties diff --git a/backend/src/main/resources/banner/banner.txt b/backend/core/src/main/resources/banner/banner.txt similarity index 100% rename from backend/src/main/resources/banner/banner.txt rename to backend/core/src/main/resources/banner/banner.txt diff --git a/backend/src/main/resources/db/changelog-master.xml b/backend/core/src/main/resources/db/changelog-master.xml similarity index 100% rename from backend/src/main/resources/db/changelog-master.xml rename to backend/core/src/main/resources/db/changelog-master.xml diff --git a/backend/src/main/resources/db/changelog/addGroupColumn.xml b/backend/core/src/main/resources/db/changelog/addGroupColumn.xml similarity index 100% rename from backend/src/main/resources/db/changelog/addGroupColumn.xml rename to backend/core/src/main/resources/db/changelog/addGroupColumn.xml diff --git a/backend/src/main/resources/db/changelog/addMessageSeenFlagGroupUser.xml b/backend/core/src/main/resources/db/changelog/addMessageSeenFlagGroupUser.xml similarity index 100% rename from backend/src/main/resources/db/changelog/addMessageSeenFlagGroupUser.xml rename to backend/core/src/main/resources/db/changelog/addMessageSeenFlagGroupUser.xml diff --git a/backend/src/main/resources/db/changelog/addTimestampOnGroupTable.xml b/backend/core/src/main/resources/db/changelog/addTimestampOnGroupTable.xml similarity index 100% rename from backend/src/main/resources/db/changelog/addTimestampOnGroupTable.xml rename to backend/core/src/main/resources/db/changelog/addTimestampOnGroupTable.xml diff --git a/backend/src/main/resources/db/changelog/createFileBlobTable.xml b/backend/core/src/main/resources/db/changelog/createFileBlobTable.xml similarity index 100% rename from backend/src/main/resources/db/changelog/createFileBlobTable.xml rename to backend/core/src/main/resources/db/changelog/createFileBlobTable.xml diff --git a/backend/src/main/resources/db/changelog/createGroupTable.xml b/backend/core/src/main/resources/db/changelog/createGroupTable.xml similarity index 100% rename from backend/src/main/resources/db/changelog/createGroupTable.xml rename to backend/core/src/main/resources/db/changelog/createGroupTable.xml diff --git a/backend/src/main/resources/db/changelog/createJoinTableGroupUser.xml b/backend/core/src/main/resources/db/changelog/createJoinTableGroupUser.xml similarity index 100% rename from backend/src/main/resources/db/changelog/createJoinTableGroupUser.xml rename to backend/core/src/main/resources/db/changelog/createJoinTableGroupUser.xml diff --git a/backend/src/main/resources/db/changelog/createJoinTableMessageUserSeen.xml b/backend/core/src/main/resources/db/changelog/createJoinTableMessageUserSeen.xml similarity index 100% rename from backend/src/main/resources/db/changelog/createJoinTableMessageUserSeen.xml rename to backend/core/src/main/resources/db/changelog/createJoinTableMessageUserSeen.xml diff --git a/backend/src/main/resources/db/changelog/createJoinTableUserGroup.xml b/backend/core/src/main/resources/db/changelog/createJoinTableUserGroup.xml similarity index 100% rename from backend/src/main/resources/db/changelog/createJoinTableUserGroup.xml rename to backend/core/src/main/resources/db/changelog/createJoinTableUserGroup.xml diff --git a/backend/src/main/resources/db/changelog/createMessageWsTable.xml b/backend/core/src/main/resources/db/changelog/createMessageWsTable.xml similarity index 100% rename from backend/src/main/resources/db/changelog/createMessageWsTable.xml rename to backend/core/src/main/resources/db/changelog/createMessageWsTable.xml diff --git a/backend/src/main/resources/db/changelog/createUserTable.xml b/backend/core/src/main/resources/db/changelog/createUserTable.xml similarity index 100% rename from backend/src/main/resources/db/changelog/createUserTable.xml rename to backend/core/src/main/resources/db/changelog/createUserTable.xml diff --git a/backend/src/main/resources/db/changelog/deleteSeenColumnInMessage.xml b/backend/core/src/main/resources/db/changelog/deleteSeenColumnInMessage.xml similarity index 100% rename from backend/src/main/resources/db/changelog/deleteSeenColumnInMessage.xml rename to backend/core/src/main/resources/db/changelog/deleteSeenColumnInMessage.xml diff --git a/backend/core/src/test/java/com/mercure/AppTest.java b/backend/core/src/test/java/com/mercure/AppTest.java new file mode 100644 index 0000000..4266d51 --- /dev/null +++ b/backend/core/src/test/java/com/mercure/AppTest.java @@ -0,0 +1,20 @@ +package com.mercure; + +import org.junit.Test; + +import static org.junit.Assert.assertTrue; + + +/** + * Unit test for simple App. + */ +public class AppTest { + + /** + * Rigorous Test :-) + */ + @Test + public void shouldAnswerWithTrue() { + assertTrue(true); + } +} diff --git a/backend/src/test/java/com/mercure/mapper/GroupCallMapperTest.java b/backend/core/src/test/java/com/mercure/mapper/GroupCallMapperTest.java similarity index 82% rename from backend/src/test/java/com/mercure/mapper/GroupCallMapperTest.java rename to backend/core/src/test/java/com/mercure/mapper/GroupCallMapperTest.java index 692ea77..d496b8c 100644 --- a/backend/src/test/java/com/mercure/mapper/GroupCallMapperTest.java +++ b/backend/core/src/test/java/com/mercure/mapper/GroupCallMapperTest.java @@ -3,15 +3,14 @@ import com.mercure.dto.user.GroupCallDTO; import com.mercure.entity.GroupEntity; import com.mercure.service.cache.RoomCacheService; -import org.junit.jupiter.api.*; +import org.junit.Test; +import static org.junit.Assert.assertNotEquals; -import static org.junit.jupiter.api.Assertions.*; public class GroupCallMapperTest { @Test - @DisplayName("GroupCallMapperTest") public void compare() { RoomCacheService roomCacheService = new RoomCacheService(); GroupCallMapper groupCallMapper = new GroupCallMapper(roomCacheService); diff --git a/backend/core/target/classes/application-dev.properties b/backend/core/target/classes/application-dev.properties new file mode 100644 index 0000000..2004759 --- /dev/null +++ b/backend/core/target/classes/application-dev.properties @@ -0,0 +1,28 @@ +server.port=9090 + +spring.main.allow-circular-references=true +spring.liquibase.enabled=true + +spring.liquibase.url=jdbc:mysql://db:3306/fastlitemessage +spring.liquibase.change-log=classpath:/db/changelog-master.xml +spring.liquibase.user=root +spring.liquibase.password=password +logging.level.liquibase=info + +spring.batch.job.enabled=false +spring.batch.jdbc.initialize-schema=always + +spring.datasource.url=jdbc:mysql://db:3306/fastlitemessage +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.username=root +spring.datasource.password=password +spring.jpa.hibernate.use-new-id-generator-mappings=true +spring.jpa.open-in-view=false + +spring.servlet.multipart.max-file-size=5MB +spring.servlet.multipart.max-request-size=5MB + +logging.level.org.springframework.security = info +logging.level.org.springframework.web.cors.reactive.DefaultCorsProcessor=info + +server.ssl.enabled=false \ No newline at end of file diff --git a/backend/core/target/classes/application.properties b/backend/core/target/classes/application.properties new file mode 100644 index 0000000..8df060e --- /dev/null +++ b/backend/core/target/classes/application.properties @@ -0,0 +1,32 @@ +server.port=9090 + +spring.main.allow-circular-references=true +spring.liquibase.enabled=true + +spring.banner.location=classpath:/banner/banner.txt + +spring.liquibase.url=jdbc:mysql://127.0.0.1:3306/fastlitemessage_dev?createDatabaseIfNotExist=true +spring.liquibase.change-log=classpath:/db/changelog-master.xml +spring.liquibase.user=root +spring.liquibase.password=root +logging.level.liquibase=info +spring.jpa.open-in-view=false +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect + +spring.batch.job.enabled=false +spring.batch.jdbc.initialize-schema=always + +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/fastlitemessage_dev +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.username=root +spring.datasource.password=root + +spring.servlet.multipart.max-file-size=5MB +spring.servlet.multipart.max-request-size=5MB + +logging.level.web=debug +logging.level.org.springframework.security=trace +#logging.level.org.springframework.web.cors.reactive.DefaultCorsProcessor=off + +server.servlet.context-path=/api +server.ssl.enabled=false \ No newline at end of file diff --git a/backend/core/target/classes/banner/banner.txt b/backend/core/target/classes/banner/banner.txt new file mode 100644 index 0000000..bac8eb3 --- /dev/null +++ b/backend/core/target/classes/banner/banner.txt @@ -0,0 +1,6 @@ + _____ _ _ _ _ __ __ + | ___|_ _ ___| |_| | (_) |_ ___| \/ | ___ ___ ___ ___ _ __ __ _ ___ _ __ + | |_ / _` / __| __| | | | __/ _ \ |\/| |/ _ \/ __/ __|/ _ \ '_ \ / _` |/ _ \ '__| + | _| (_| \__ \ |_| |___| | || __/ | | | __/\__ \__ \ __/ | | | (_| | __/ | + |_| \__,_|___/\__|_____|_|\__\___|_| |_|\___||___/___/\___|_| |_|\__, |\___|_| + |___/ \ No newline at end of file diff --git a/backend/core/target/classes/com/mercure/WsNativeApplication.class b/backend/core/target/classes/com/mercure/WsNativeApplication.class new file mode 100644 index 0000000..b8b86e8 Binary files /dev/null and b/backend/core/target/classes/com/mercure/WsNativeApplication.class differ diff --git a/backend/core/target/classes/com/mercure/config/CacheConfig.class b/backend/core/target/classes/com/mercure/config/CacheConfig.class new file mode 100644 index 0000000..3b8ddc8 Binary files /dev/null and b/backend/core/target/classes/com/mercure/config/CacheConfig.class differ diff --git a/backend/core/target/classes/com/mercure/config/HandShakeInterceptor.class b/backend/core/target/classes/com/mercure/config/HandShakeInterceptor.class new file mode 100644 index 0000000..06eeea2 Binary files /dev/null and b/backend/core/target/classes/com/mercure/config/HandShakeInterceptor.class differ diff --git a/backend/core/target/classes/com/mercure/config/JwtWebConfig.class b/backend/core/target/classes/com/mercure/config/JwtWebConfig.class new file mode 100644 index 0000000..7a106dd Binary files /dev/null and b/backend/core/target/classes/com/mercure/config/JwtWebConfig.class differ diff --git a/backend/core/target/classes/com/mercure/config/ResourceConfig.class b/backend/core/target/classes/com/mercure/config/ResourceConfig.class new file mode 100644 index 0000000..45f4d1c Binary files /dev/null and b/backend/core/target/classes/com/mercure/config/ResourceConfig.class differ diff --git a/backend/core/target/classes/com/mercure/config/SecurityConfig.class b/backend/core/target/classes/com/mercure/config/SecurityConfig.class new file mode 100644 index 0000000..c1382b0 Binary files /dev/null and b/backend/core/target/classes/com/mercure/config/SecurityConfig.class differ diff --git a/backend/core/target/classes/com/mercure/config/WebSocketSecurityConfig.class b/backend/core/target/classes/com/mercure/config/WebSocketSecurityConfig.class new file mode 100644 index 0000000..b2142c9 Binary files /dev/null and b/backend/core/target/classes/com/mercure/config/WebSocketSecurityConfig.class differ diff --git a/backend/core/target/classes/com/mercure/config/WsConfig.class b/backend/core/target/classes/com/mercure/config/WsConfig.class new file mode 100644 index 0000000..6969a29 Binary files /dev/null and b/backend/core/target/classes/com/mercure/config/WsConfig.class differ diff --git a/backend/core/target/classes/com/mercure/controller/ApiController.class b/backend/core/target/classes/com/mercure/controller/ApiController.class new file mode 100644 index 0000000..baf412d Binary files /dev/null and b/backend/core/target/classes/com/mercure/controller/ApiController.class differ diff --git a/backend/core/target/classes/com/mercure/controller/AuthenticationController.class b/backend/core/target/classes/com/mercure/controller/AuthenticationController.class new file mode 100644 index 0000000..2d44a79 Binary files /dev/null and b/backend/core/target/classes/com/mercure/controller/AuthenticationController.class differ diff --git a/backend/core/target/classes/com/mercure/controller/MessageController.class b/backend/core/target/classes/com/mercure/controller/MessageController.class new file mode 100644 index 0000000..d14cfaa Binary files /dev/null and b/backend/core/target/classes/com/mercure/controller/MessageController.class differ diff --git a/backend/core/target/classes/com/mercure/controller/PingController.class b/backend/core/target/classes/com/mercure/controller/PingController.class new file mode 100644 index 0000000..408715a Binary files /dev/null and b/backend/core/target/classes/com/mercure/controller/PingController.class differ diff --git a/backend/core/target/classes/com/mercure/controller/SearchController.class b/backend/core/target/classes/com/mercure/controller/SearchController.class new file mode 100644 index 0000000..35df18b Binary files /dev/null and b/backend/core/target/classes/com/mercure/controller/SearchController.class differ diff --git a/backend/core/target/classes/com/mercure/controller/WsController$1.class b/backend/core/target/classes/com/mercure/controller/WsController$1.class new file mode 100644 index 0000000..860c969 Binary files /dev/null and b/backend/core/target/classes/com/mercure/controller/WsController$1.class differ diff --git a/backend/core/target/classes/com/mercure/controller/WsController.class b/backend/core/target/classes/com/mercure/controller/WsController.class new file mode 100644 index 0000000..ad09933 Binary files /dev/null and b/backend/core/target/classes/com/mercure/controller/WsController.class differ diff --git a/backend/core/target/classes/com/mercure/controller/WsFileController.class b/backend/core/target/classes/com/mercure/controller/WsFileController.class new file mode 100644 index 0000000..af34784 Binary files /dev/null and b/backend/core/target/classes/com/mercure/controller/WsFileController.class differ diff --git a/backend/core/target/classes/com/mercure/dto/AuthUserDTO.class b/backend/core/target/classes/com/mercure/dto/AuthUserDTO.class new file mode 100644 index 0000000..71d8895 Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/AuthUserDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/AuthenticationUserDTO.class b/backend/core/target/classes/com/mercure/dto/AuthenticationUserDTO.class new file mode 100644 index 0000000..b75ccd7 Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/AuthenticationUserDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/CreateGroupDTO.class b/backend/core/target/classes/com/mercure/dto/CreateGroupDTO.class new file mode 100644 index 0000000..76d0c2d Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/CreateGroupDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/GroupMemberDTO.class b/backend/core/target/classes/com/mercure/dto/GroupMemberDTO.class new file mode 100644 index 0000000..07bf694 Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/GroupMemberDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/InputTransportDTO.class b/backend/core/target/classes/com/mercure/dto/InputTransportDTO.class new file mode 100644 index 0000000..4417dff Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/InputTransportDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/JwtDTO.class b/backend/core/target/classes/com/mercure/dto/JwtDTO.class new file mode 100644 index 0000000..2c1d183 Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/JwtDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/LeaveGroupDTO.class b/backend/core/target/classes/com/mercure/dto/LeaveGroupDTO.class new file mode 100644 index 0000000..0446b85 Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/LeaveGroupDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/LightUserDTO.class b/backend/core/target/classes/com/mercure/dto/LightUserDTO.class new file mode 100644 index 0000000..db8fcbe Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/LightUserDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/MessageDTO.class b/backend/core/target/classes/com/mercure/dto/MessageDTO.class new file mode 100644 index 0000000..e083493 Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/MessageDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/NotificationDTO.class b/backend/core/target/classes/com/mercure/dto/NotificationDTO.class new file mode 100644 index 0000000..128e1ef Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/NotificationDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/OutputTransportDTO.class b/backend/core/target/classes/com/mercure/dto/OutputTransportDTO.class new file mode 100644 index 0000000..378fe01 Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/OutputTransportDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/RtcTransportDTO.class b/backend/core/target/classes/com/mercure/dto/RtcTransportDTO.class new file mode 100644 index 0000000..c825fd2 Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/RtcTransportDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/WrapperMessageDTO.class b/backend/core/target/classes/com/mercure/dto/WrapperMessageDTO.class new file mode 100644 index 0000000..b083bc1 Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/WrapperMessageDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/search/FullTextSearchDTO.class b/backend/core/target/classes/com/mercure/dto/search/FullTextSearchDTO.class new file mode 100644 index 0000000..c2bd25f Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/search/FullTextSearchDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/search/FullTextSearchDatabaseResponse.class b/backend/core/target/classes/com/mercure/dto/search/FullTextSearchDatabaseResponse.class new file mode 100644 index 0000000..eeb1e2a Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/search/FullTextSearchDatabaseResponse.class differ diff --git a/backend/core/target/classes/com/mercure/dto/search/FullTextSearchDatabaseResponseDTO.class b/backend/core/target/classes/com/mercure/dto/search/FullTextSearchDatabaseResponseDTO.class new file mode 100644 index 0000000..8479658 Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/search/FullTextSearchDatabaseResponseDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/search/FullTextSearchResponseDTO.class b/backend/core/target/classes/com/mercure/dto/search/FullTextSearchResponseDTO.class new file mode 100644 index 0000000..c35295a Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/search/FullTextSearchResponseDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/user/GroupCallDTO.class b/backend/core/target/classes/com/mercure/dto/user/GroupCallDTO.class new file mode 100644 index 0000000..cca3f6a Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/user/GroupCallDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/user/GroupDTO.class b/backend/core/target/classes/com/mercure/dto/user/GroupDTO.class new file mode 100644 index 0000000..9be036c Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/user/GroupDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/user/GroupWrapperDTO.class b/backend/core/target/classes/com/mercure/dto/user/GroupWrapperDTO.class new file mode 100644 index 0000000..1cd324a Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/user/GroupWrapperDTO.class differ diff --git a/backend/core/target/classes/com/mercure/dto/user/InitUserDTO.class b/backend/core/target/classes/com/mercure/dto/user/InitUserDTO.class new file mode 100644 index 0000000..bd719f5 Binary files /dev/null and b/backend/core/target/classes/com/mercure/dto/user/InitUserDTO.class differ diff --git a/backend/core/target/classes/com/mercure/entity/FileEntity.class b/backend/core/target/classes/com/mercure/entity/FileEntity.class new file mode 100644 index 0000000..c817f80 Binary files /dev/null and b/backend/core/target/classes/com/mercure/entity/FileEntity.class differ diff --git a/backend/core/target/classes/com/mercure/entity/GroupEntity.class b/backend/core/target/classes/com/mercure/entity/GroupEntity.class new file mode 100644 index 0000000..acd553f Binary files /dev/null and b/backend/core/target/classes/com/mercure/entity/GroupEntity.class differ diff --git a/backend/core/target/classes/com/mercure/entity/GroupRoleKey.class b/backend/core/target/classes/com/mercure/entity/GroupRoleKey.class new file mode 100644 index 0000000..f1efc71 Binary files /dev/null and b/backend/core/target/classes/com/mercure/entity/GroupRoleKey.class differ diff --git a/backend/core/target/classes/com/mercure/entity/GroupUser.class b/backend/core/target/classes/com/mercure/entity/GroupUser.class new file mode 100644 index 0000000..acd63bf Binary files /dev/null and b/backend/core/target/classes/com/mercure/entity/GroupUser.class differ diff --git a/backend/core/target/classes/com/mercure/entity/MessageEntity.class b/backend/core/target/classes/com/mercure/entity/MessageEntity.class new file mode 100644 index 0000000..d3d0c04 Binary files /dev/null and b/backend/core/target/classes/com/mercure/entity/MessageEntity.class differ diff --git a/backend/core/target/classes/com/mercure/entity/MessageUserEntity.class b/backend/core/target/classes/com/mercure/entity/MessageUserEntity.class new file mode 100644 index 0000000..63b85db Binary files /dev/null and b/backend/core/target/classes/com/mercure/entity/MessageUserEntity.class differ diff --git a/backend/core/target/classes/com/mercure/entity/MessageUserKey.class b/backend/core/target/classes/com/mercure/entity/MessageUserKey.class new file mode 100644 index 0000000..3a384d9 Binary files /dev/null and b/backend/core/target/classes/com/mercure/entity/MessageUserKey.class differ diff --git a/backend/core/target/classes/com/mercure/entity/UserEntity.class b/backend/core/target/classes/com/mercure/entity/UserEntity.class new file mode 100644 index 0000000..8a62fe0 Binary files /dev/null and b/backend/core/target/classes/com/mercure/entity/UserEntity.class differ diff --git a/backend/core/target/classes/com/mercure/mapper/GroupCallMapper.class b/backend/core/target/classes/com/mercure/mapper/GroupCallMapper.class new file mode 100644 index 0000000..37cacec Binary files /dev/null and b/backend/core/target/classes/com/mercure/mapper/GroupCallMapper.class differ diff --git a/backend/core/target/classes/com/mercure/mapper/GroupMapper.class b/backend/core/target/classes/com/mercure/mapper/GroupMapper.class new file mode 100644 index 0000000..81fa47b Binary files /dev/null and b/backend/core/target/classes/com/mercure/mapper/GroupMapper.class differ diff --git a/backend/core/target/classes/com/mercure/mapper/UserMapper.class b/backend/core/target/classes/com/mercure/mapper/UserMapper.class new file mode 100644 index 0000000..42f0ceb Binary files /dev/null and b/backend/core/target/classes/com/mercure/mapper/UserMapper.class differ diff --git a/backend/core/target/classes/com/mercure/model/MessageModel.class b/backend/core/target/classes/com/mercure/model/MessageModel.class new file mode 100644 index 0000000..b8bd452 Binary files /dev/null and b/backend/core/target/classes/com/mercure/model/MessageModel.class differ diff --git a/backend/core/target/classes/com/mercure/model/UserModel.class b/backend/core/target/classes/com/mercure/model/UserModel.class new file mode 100644 index 0000000..e14410e Binary files /dev/null and b/backend/core/target/classes/com/mercure/model/UserModel.class differ diff --git a/backend/core/target/classes/com/mercure/repository/FileRepository.class b/backend/core/target/classes/com/mercure/repository/FileRepository.class new file mode 100644 index 0000000..2f44407 Binary files /dev/null and b/backend/core/target/classes/com/mercure/repository/FileRepository.class differ diff --git a/backend/core/target/classes/com/mercure/repository/GroupRepository.class b/backend/core/target/classes/com/mercure/repository/GroupRepository.class new file mode 100644 index 0000000..f6acc99 Binary files /dev/null and b/backend/core/target/classes/com/mercure/repository/GroupRepository.class differ diff --git a/backend/core/target/classes/com/mercure/repository/GroupUserJoinRepository.class b/backend/core/target/classes/com/mercure/repository/GroupUserJoinRepository.class new file mode 100644 index 0000000..ca99d50 Binary files /dev/null and b/backend/core/target/classes/com/mercure/repository/GroupUserJoinRepository.class differ diff --git a/backend/core/target/classes/com/mercure/repository/MessageRepository.class b/backend/core/target/classes/com/mercure/repository/MessageRepository.class new file mode 100644 index 0000000..9fa320a Binary files /dev/null and b/backend/core/target/classes/com/mercure/repository/MessageRepository.class differ diff --git a/backend/core/target/classes/com/mercure/repository/UserRepository.class b/backend/core/target/classes/com/mercure/repository/UserRepository.class new file mode 100644 index 0000000..7a0b0f0 Binary files /dev/null and b/backend/core/target/classes/com/mercure/repository/UserRepository.class differ diff --git a/backend/core/target/classes/com/mercure/repository/UserSeenMessageRepository.class b/backend/core/target/classes/com/mercure/repository/UserSeenMessageRepository.class new file mode 100644 index 0000000..13849de Binary files /dev/null and b/backend/core/target/classes/com/mercure/repository/UserSeenMessageRepository.class differ diff --git a/backend/core/target/classes/com/mercure/service/CustomUserDetailsService.class b/backend/core/target/classes/com/mercure/service/CustomUserDetailsService.class new file mode 100644 index 0000000..52458fe Binary files /dev/null and b/backend/core/target/classes/com/mercure/service/CustomUserDetailsService.class differ diff --git a/backend/core/target/classes/com/mercure/service/FileService.class b/backend/core/target/classes/com/mercure/service/FileService.class new file mode 100644 index 0000000..7e2a814 Binary files /dev/null and b/backend/core/target/classes/com/mercure/service/FileService.class differ diff --git a/backend/core/target/classes/com/mercure/service/GroupService.class b/backend/core/target/classes/com/mercure/service/GroupService.class new file mode 100644 index 0000000..730bd3f Binary files /dev/null and b/backend/core/target/classes/com/mercure/service/GroupService.class differ diff --git a/backend/core/target/classes/com/mercure/service/GroupUserJoinService.class b/backend/core/target/classes/com/mercure/service/GroupUserJoinService.class new file mode 100644 index 0000000..f67665a Binary files /dev/null and b/backend/core/target/classes/com/mercure/service/GroupUserJoinService.class differ diff --git a/backend/core/target/classes/com/mercure/service/MessageService.class b/backend/core/target/classes/com/mercure/service/MessageService.class new file mode 100644 index 0000000..1e2bd26 Binary files /dev/null and b/backend/core/target/classes/com/mercure/service/MessageService.class differ diff --git a/backend/core/target/classes/com/mercure/service/StorageService.class b/backend/core/target/classes/com/mercure/service/StorageService.class new file mode 100644 index 0000000..9c0b685 Binary files /dev/null and b/backend/core/target/classes/com/mercure/service/StorageService.class differ diff --git a/backend/core/target/classes/com/mercure/service/UserSeenMessageService.class b/backend/core/target/classes/com/mercure/service/UserSeenMessageService.class new file mode 100644 index 0000000..4393bf2 Binary files /dev/null and b/backend/core/target/classes/com/mercure/service/UserSeenMessageService.class differ diff --git a/backend/core/target/classes/com/mercure/service/UserService.class b/backend/core/target/classes/com/mercure/service/UserService.class new file mode 100644 index 0000000..18d1055 Binary files /dev/null and b/backend/core/target/classes/com/mercure/service/UserService.class differ diff --git a/backend/core/target/classes/com/mercure/service/cache/CallsCacheService.class b/backend/core/target/classes/com/mercure/service/cache/CallsCacheService.class new file mode 100644 index 0000000..5ce351b Binary files /dev/null and b/backend/core/target/classes/com/mercure/service/cache/CallsCacheService.class differ diff --git a/backend/core/target/classes/com/mercure/service/cache/RoomCacheService.class b/backend/core/target/classes/com/mercure/service/cache/RoomCacheService.class new file mode 100644 index 0000000..ad5f48a Binary files /dev/null and b/backend/core/target/classes/com/mercure/service/cache/RoomCacheService.class differ diff --git a/backend/core/target/classes/com/mercure/service/rtc/RtcService$1.class b/backend/core/target/classes/com/mercure/service/rtc/RtcService$1.class new file mode 100644 index 0000000..5f51c28 Binary files /dev/null and b/backend/core/target/classes/com/mercure/service/rtc/RtcService$1.class differ diff --git a/backend/core/target/classes/com/mercure/service/rtc/RtcService.class b/backend/core/target/classes/com/mercure/service/rtc/RtcService.class new file mode 100644 index 0000000..331f8bf Binary files /dev/null and b/backend/core/target/classes/com/mercure/service/rtc/RtcService.class differ diff --git a/backend/core/target/classes/com/mercure/utils/ColorsUtils.class b/backend/core/target/classes/com/mercure/utils/ColorsUtils.class new file mode 100644 index 0000000..2dc24d6 Binary files /dev/null and b/backend/core/target/classes/com/mercure/utils/ColorsUtils.class differ diff --git a/backend/core/target/classes/com/mercure/utils/ComparatorListGroupDTO.class b/backend/core/target/classes/com/mercure/utils/ComparatorListGroupDTO.class new file mode 100644 index 0000000..4811ed2 Binary files /dev/null and b/backend/core/target/classes/com/mercure/utils/ComparatorListGroupDTO.class differ diff --git a/backend/core/target/classes/com/mercure/utils/ComparatorListWrapperGroupDTO.class b/backend/core/target/classes/com/mercure/utils/ComparatorListWrapperGroupDTO.class new file mode 100644 index 0000000..5b6dea5 Binary files /dev/null and b/backend/core/target/classes/com/mercure/utils/ComparatorListWrapperGroupDTO.class differ diff --git a/backend/core/target/classes/com/mercure/utils/DbInit.class b/backend/core/target/classes/com/mercure/utils/DbInit.class new file mode 100644 index 0000000..41099cb Binary files /dev/null and b/backend/core/target/classes/com/mercure/utils/DbInit.class differ diff --git a/backend/core/target/classes/com/mercure/utils/GroupTypeEnum.class b/backend/core/target/classes/com/mercure/utils/GroupTypeEnum.class new file mode 100644 index 0000000..bd75fd8 Binary files /dev/null and b/backend/core/target/classes/com/mercure/utils/GroupTypeEnum.class differ diff --git a/backend/core/target/classes/com/mercure/utils/JwtUtil.class b/backend/core/target/classes/com/mercure/utils/JwtUtil.class new file mode 100644 index 0000000..76a8948 Binary files /dev/null and b/backend/core/target/classes/com/mercure/utils/JwtUtil.class differ diff --git a/backend/core/target/classes/com/mercure/utils/MessageTypeEnum.class b/backend/core/target/classes/com/mercure/utils/MessageTypeEnum.class new file mode 100644 index 0000000..41f967f Binary files /dev/null and b/backend/core/target/classes/com/mercure/utils/MessageTypeEnum.class differ diff --git a/backend/core/target/classes/com/mercure/utils/RtcActionEnum.class b/backend/core/target/classes/com/mercure/utils/RtcActionEnum.class new file mode 100644 index 0000000..e52eb30 Binary files /dev/null and b/backend/core/target/classes/com/mercure/utils/RtcActionEnum.class differ diff --git a/backend/core/target/classes/com/mercure/utils/StaticVariable.class b/backend/core/target/classes/com/mercure/utils/StaticVariable.class new file mode 100644 index 0000000..7e94826 Binary files /dev/null and b/backend/core/target/classes/com/mercure/utils/StaticVariable.class differ diff --git a/backend/core/target/classes/com/mercure/utils/TransportActionEnum.class b/backend/core/target/classes/com/mercure/utils/TransportActionEnum.class new file mode 100644 index 0000000..b1ea6d8 Binary files /dev/null and b/backend/core/target/classes/com/mercure/utils/TransportActionEnum.class differ diff --git a/backend/core/target/classes/db/changelog-master.xml b/backend/core/target/classes/db/changelog-master.xml new file mode 100644 index 0000000..3e5f964 --- /dev/null +++ b/backend/core/target/classes/db/changelog-master.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/backend/core/target/classes/db/changelog/addGroupColumn.xml b/backend/core/target/classes/db/changelog/addGroupColumn.xml new file mode 100644 index 0000000..9d643d6 --- /dev/null +++ b/backend/core/target/classes/db/changelog/addGroupColumn.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/core/target/classes/db/changelog/addMessageSeenFlagGroupUser.xml b/backend/core/target/classes/db/changelog/addMessageSeenFlagGroupUser.xml new file mode 100644 index 0000000..2dad347 --- /dev/null +++ b/backend/core/target/classes/db/changelog/addMessageSeenFlagGroupUser.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/core/target/classes/db/changelog/addTimestampOnGroupTable.xml b/backend/core/target/classes/db/changelog/addTimestampOnGroupTable.xml new file mode 100644 index 0000000..0685cd8 --- /dev/null +++ b/backend/core/target/classes/db/changelog/addTimestampOnGroupTable.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/core/target/classes/db/changelog/createFileBlobTable.xml b/backend/core/target/classes/db/changelog/createFileBlobTable.xml new file mode 100644 index 0000000..feb1d1e --- /dev/null +++ b/backend/core/target/classes/db/changelog/createFileBlobTable.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/core/target/classes/db/changelog/createGroupTable.xml b/backend/core/target/classes/db/changelog/createGroupTable.xml new file mode 100644 index 0000000..3536819 --- /dev/null +++ b/backend/core/target/classes/db/changelog/createGroupTable.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/core/target/classes/db/changelog/createJoinTableGroupUser.xml b/backend/core/target/classes/db/changelog/createJoinTableGroupUser.xml new file mode 100644 index 0000000..a4d9bdd --- /dev/null +++ b/backend/core/target/classes/db/changelog/createJoinTableGroupUser.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/core/target/classes/db/changelog/createJoinTableMessageUserSeen.xml b/backend/core/target/classes/db/changelog/createJoinTableMessageUserSeen.xml new file mode 100644 index 0000000..1a579ac --- /dev/null +++ b/backend/core/target/classes/db/changelog/createJoinTableMessageUserSeen.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/core/target/classes/db/changelog/createJoinTableUserGroup.xml b/backend/core/target/classes/db/changelog/createJoinTableUserGroup.xml new file mode 100644 index 0000000..a578854 --- /dev/null +++ b/backend/core/target/classes/db/changelog/createJoinTableUserGroup.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/core/target/classes/db/changelog/createMessageWsTable.xml b/backend/core/target/classes/db/changelog/createMessageWsTable.xml new file mode 100644 index 0000000..7f4c082 --- /dev/null +++ b/backend/core/target/classes/db/changelog/createMessageWsTable.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/core/target/classes/db/changelog/createUserTable.xml b/backend/core/target/classes/db/changelog/createUserTable.xml new file mode 100644 index 0000000..5a92047 --- /dev/null +++ b/backend/core/target/classes/db/changelog/createUserTable.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/core/target/classes/db/changelog/deleteSeenColumnInMessage.xml b/backend/core/target/classes/db/changelog/deleteSeenColumnInMessage.xml new file mode 100644 index 0000000..c1ef229 --- /dev/null +++ b/backend/core/target/classes/db/changelog/deleteSeenColumnInMessage.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/core/target/core-1.0-SNAPSHOT.jar b/backend/core/target/core-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..564de75 Binary files /dev/null and b/backend/core/target/core-1.0-SNAPSHOT.jar differ diff --git a/backend/core/target/core-1.0-SNAPSHOT.jar.original b/backend/core/target/core-1.0-SNAPSHOT.jar.original new file mode 100644 index 0000000..61feb92 Binary files /dev/null and b/backend/core/target/core-1.0-SNAPSHOT.jar.original differ diff --git a/backend/core/target/maven-archiver/pom.properties b/backend/core/target/maven-archiver/pom.properties new file mode 100644 index 0000000..d4c4282 --- /dev/null +++ b/backend/core/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=core +groupId=com.mercure +version=1.0-SNAPSHOT diff --git a/backend/core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/backend/core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..b5161f1 --- /dev/null +++ b/backend/core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,78 @@ +com/mercure/mapper/UserMapper.class +com/mercure/entity/MessageUserKey.class +com/mercure/repository/UserSeenMessageRepository.class +com/mercure/service/CustomUserDetailsService.class +com/mercure/dto/user/GroupCallDTO.class +com/mercure/model/MessageModel.class +com/mercure/controller/WsController$1.class +com/mercure/config/JwtWebConfig.class +com/mercure/dto/user/GroupWrapperDTO.class +com/mercure/dto/InputTransportDTO.class +com/mercure/service/GroupService.class +com/mercure/dto/CreateGroupDTO.class +com/mercure/dto/search/FullTextSearchDatabaseResponse.class +com/mercure/dto/search/FullTextSearchDatabaseResponseDTO.class +com/mercure/service/MessageService.class +com/mercure/controller/PingController.class +com/mercure/controller/WsController.class +com/mercure/entity/GroupRoleKey.class +com/mercure/utils/DbInit.class +com/mercure/dto/user/GroupDTO.class +com/mercure/utils/JwtUtil.class +com/mercure/dto/WrapperMessageDTO.class +com/mercure/entity/GroupEntity.class +com/mercure/repository/GroupRepository.class +com/mercure/repository/GroupUserJoinRepository.class +com/mercure/service/UserService.class +com/mercure/service/FileService.class +com/mercure/dto/search/FullTextSearchResponseDTO.class +com/mercure/controller/AuthenticationController.class +com/mercure/entity/MessageUserEntity.class +com/mercure/service/GroupUserJoinService.class +com/mercure/entity/MessageEntity.class +com/mercure/entity/FileEntity.class +com/mercure/dto/MessageDTO.class +com/mercure/dto/LeaveGroupDTO.class +com/mercure/repository/FileRepository.class +com/mercure/controller/WsFileController.class +com/mercure/config/CacheConfig.class +com/mercure/utils/StaticVariable.class +com/mercure/dto/OutputTransportDTO.class +com/mercure/config/HandShakeInterceptor.class +com/mercure/utils/TransportActionEnum.class +com/mercure/dto/LightUserDTO.class +com/mercure/utils/MessageTypeEnum.class +com/mercure/config/SecurityConfig.class +com/mercure/service/cache/RoomCacheService.class +com/mercure/utils/RtcActionEnum.class +com/mercure/entity/UserEntity.class +com/mercure/mapper/GroupCallMapper.class +com/mercure/utils/GroupTypeEnum.class +com/mercure/service/StorageService.class +com/mercure/model/UserModel.class +com/mercure/dto/GroupMemberDTO.class +com/mercure/dto/RtcTransportDTO.class +com/mercure/controller/MessageController.class +com/mercure/dto/AuthUserDTO.class +com/mercure/entity/GroupUser.class +com/mercure/dto/NotificationDTO.class +com/mercure/WsNativeApplication.class +com/mercure/controller/ApiController.class +com/mercure/dto/AuthenticationUserDTO.class +com/mercure/config/WsConfig.class +com/mercure/repository/UserRepository.class +com/mercure/service/rtc/RtcService.class +com/mercure/service/rtc/RtcService$1.class +com/mercure/utils/ColorsUtils.class +com/mercure/dto/JwtDTO.class +com/mercure/mapper/GroupMapper.class +com/mercure/service/UserSeenMessageService.class +com/mercure/dto/user/InitUserDTO.class +com/mercure/config/ResourceConfig.class +com/mercure/service/cache/CallsCacheService.class +com/mercure/repository/MessageRepository.class +com/mercure/controller/SearchController.class +com/mercure/dto/search/FullTextSearchDTO.class +com/mercure/config/WebSocketSecurityConfig.class +com/mercure/utils/ComparatorListGroupDTO.class +com/mercure/utils/ComparatorListWrapperGroupDTO.class diff --git a/backend/core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/backend/core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..da956dd --- /dev/null +++ b/backend/core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,76 @@ +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/WsNativeApplication.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/config/CacheConfig.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/config/HandShakeInterceptor.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/config/JwtWebConfig.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/config/ResourceConfig.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/config/SecurityConfig.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/config/WebSocketSecurityConfig.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/config/WsConfig.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/controller/ApiController.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/controller/AuthenticationController.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/controller/MessageController.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/controller/PingController.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/controller/SearchController.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/controller/WsController.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/controller/WsFileController.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/AuthUserDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/AuthenticationUserDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/CreateGroupDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/GroupMemberDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/InputTransportDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/JwtDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/LeaveGroupDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/LightUserDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/MessageDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/NotificationDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/OutputTransportDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/RtcTransportDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/WrapperMessageDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/search/FullTextSearchDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/search/FullTextSearchDatabaseResponse.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/search/FullTextSearchDatabaseResponseDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/search/FullTextSearchResponseDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/user/GroupCallDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/user/GroupDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/user/GroupWrapperDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/dto/user/InitUserDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/entity/FileEntity.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/entity/GroupEntity.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/entity/GroupRoleKey.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/entity/GroupUser.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/entity/MessageEntity.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/entity/MessageUserEntity.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/entity/MessageUserKey.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/entity/UserEntity.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/mapper/GroupCallMapper.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/mapper/GroupMapper.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/mapper/UserMapper.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/model/MessageModel.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/model/UserModel.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/repository/FileRepository.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/repository/GroupRepository.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/repository/GroupUserJoinRepository.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/repository/MessageRepository.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/repository/UserRepository.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/repository/UserSeenMessageRepository.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/service/CustomUserDetailsService.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/service/FileService.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/service/GroupService.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/service/GroupUserJoinService.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/service/MessageService.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/service/StorageService.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/service/UserSeenMessageService.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/service/UserService.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/service/cache/CallsCacheService.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/service/cache/RoomCacheService.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/service/rtc/RtcService.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/utils/ColorsUtils.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/utils/ComparatorListGroupDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/utils/ComparatorListWrapperGroupDTO.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/utils/DbInit.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/utils/GroupTypeEnum.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/utils/JwtUtil.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/utils/MessageTypeEnum.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/utils/RtcActionEnum.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/utils/StaticVariable.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/main/java/com/mercure/utils/TransportActionEnum.java diff --git a/backend/core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/backend/core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 0000000..fd052b0 --- /dev/null +++ b/backend/core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1,2 @@ +com/mercure/AppTest.class +com/mercure/mapper/GroupCallMapperTest.class diff --git a/backend/core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/backend/core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..ee8d272 --- /dev/null +++ b/backend/core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1,2 @@ +/IdeaProjects/react-spring-messenger-project/backend/core/src/test/java/com/mercure/AppTest.java +/IdeaProjects/react-spring-messenger-project/backend/core/src/test/java/com/mercure/mapper/GroupCallMapperTest.java diff --git a/backend/core/target/test-classes/com/mercure/AppTest.class b/backend/core/target/test-classes/com/mercure/AppTest.class new file mode 100644 index 0000000..657f8a4 Binary files /dev/null and b/backend/core/target/test-classes/com/mercure/AppTest.class differ diff --git a/backend/core/target/test-classes/com/mercure/mapper/GroupCallMapperTest.class b/backend/core/target/test-classes/com/mercure/mapper/GroupCallMapperTest.class new file mode 100644 index 0000000..4b628c1 Binary files /dev/null and b/backend/core/target/test-classes/com/mercure/mapper/GroupCallMapperTest.class differ diff --git a/backend/pom.xml b/backend/pom.xml index 60be53a..888d470 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -1,180 +1,162 @@ - - - 4.0.0 - + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.2.4 + + pom + com.mercure + messenger + 1.3.0 + wsnative + Chat application cross platform + + 17 + + + + dev + + dev + + + true + + + + prod + + prod + + + + + + org.springframework.boot + spring-boot-starter-data-jpa + 3.2.4 + + + org.springframework.boot + spring-boot-starter-security + 3.2.4 + + + com.google.guava + guava + 33.1.0-jre + + + jakarta.servlet + jakarta.servlet-api + 6.1.0-M2 + provided + + + org.springframework.security + spring-security-messaging + 6.2.3 + + + org.springframework.boot + spring-boot-starter-web + 3.2.4 + + + com.mysql + mysql-connector-j + 8.3.0 + + + org.liquibase + liquibase-core + 4.27.0 + + + org.springframework.boot + spring-boot-starter-websocket + 3.2.4 + + + com.google.code.gson + gson + 2.10.1 + + + io.jsonwebtoken + jjwt + 0.9.1 + + + org.springframework.boot + spring-boot-starter-batch + 3.2.4 + + + org.springframework.boot + spring-boot-starter-cache + 3.2.4 + + + org.projectlombok + lombok + 1.18.32 + provided + + + org.liquibase + liquibase-maven-plugin + 4.27.0 + + + org.springframework.boot + spring-boot-starter-actuator + + + org.mockito + mockito-inline + 5.2.0 + compile + + + org.mockito + mockito-junit-jupiter + 5.2.0 + compile + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + 17 + + + + + + org.springframework.boot - spring-boot-starter-parent - 3.2.4 - - - com.mercure - messenger - 1.3.0 - wsnative - Chat application cross platform - - - 17 - - - - - dev - - dev - - - true - - - - prod - - prod - - - - - - - org.springframework.boot - spring-boot-starter-data-jpa - 3.2.4 - - - - org.springframework.boot - spring-boot-starter-security - 3.2.4 - - - - com.google.guava - guava - 33.1.0-jre - - - - jakarta.servlet - jakarta.servlet-api - 6.1.0-M2 - provided - - - - org.springframework.security - spring-security-messaging - 6.2.3 - - - - org.springframework.boot - spring-boot-starter-web - 3.2.4 - - - - com.mysql - mysql-connector-j - 8.3.0 - - - - org.liquibase - liquibase-core - 4.27.0 - - - - org.springframework.boot - spring-boot-starter-websocket - 3.2.4 - - - - com.google.code.gson - gson - 2.10.1 - - - - io.jsonwebtoken - jjwt - 0.9.1 - - - - org.springframework.boot - spring-boot-starter-batch - 3.2.4 - - - - org.springframework.boot - spring-boot-starter-cache - 3.2.4 - - - - org.projectlombok - lombok - 1.18.32 - provided - - - - org.liquibase - liquibase-maven-plugin - 4.27.0 - - - org.springframework.boot - spring-boot-starter-actuator - - - - org.mockito - mockito-inline - 5.2.0 - compile - - - - org.mockito - mockito-junit-jupiter - 5.2.0 - compile - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - 17 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.liquibase - liquibase-maven-plugin - 4.10.0 - - src/main/resources/liquibase.properties - - - - - \ No newline at end of file + spring-boot-maven-plugin + + + org.liquibase + liquibase-maven-plugin + 4.10.0 + + src/main/resources/liquibase.properties + + + + + + core + rtc + cache + + diff --git a/backend/rtc/pom.xml b/backend/rtc/pom.xml new file mode 100644 index 0000000..f4d2a17 --- /dev/null +++ b/backend/rtc/pom.xml @@ -0,0 +1,94 @@ + + + 4.0.0 + + messenger + com.mercure + 1.3.0 + + + com.mercure + rtc + 1.0-SNAPSHOT + + rtc + + http://www.example.com + + + UTF-8 + 17 + + + + + + org.junit + junit-bom + 5.11.0 + pom + import + + + + + + + org.junit.jupiter + junit-jupiter-api + test + + + + org.junit.jupiter + junit-jupiter-params + test + + + + + + + + + maven-clean-plugin + 3.4.0 + + + + maven-resources-plugin + 3.3.1 + + + maven-compiler-plugin + 3.13.0 + + + maven-surefire-plugin + 3.3.0 + + + maven-jar-plugin + 3.4.2 + + + maven-install-plugin + 3.1.2 + + + maven-deploy-plugin + 3.1.2 + + + + maven-site-plugin + 3.12.1 + + + maven-project-info-reports-plugin + 3.6.1 + + + + + diff --git a/backend/rtc/src/main/java/com/mercure/App.java b/backend/rtc/src/main/java/com/mercure/App.java new file mode 100644 index 0000000..bf59563 --- /dev/null +++ b/backend/rtc/src/main/java/com/mercure/App.java @@ -0,0 +1,10 @@ +package com.mercure; + +/** + * Hello world! + */ +public class App { + public static void main(String[] args) { + System.out.println("Hello World!"); + } +} diff --git a/backend/rtc/src/test/java/com/mercure/AppTest.java b/backend/rtc/src/test/java/com/mercure/AppTest.java new file mode 100644 index 0000000..091fd22 --- /dev/null +++ b/backend/rtc/src/test/java/com/mercure/AppTest.java @@ -0,0 +1,19 @@ +package com.mercure; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +/** + * Unit test for simple App. + */ +public class AppTest { + + /** + * Rigorous Test :-) + */ + @Test + public void shouldAnswerWithTrue() { + assertTrue(true); + } +} diff --git a/backend/rtc/target/classes/com/mercure/App.class b/backend/rtc/target/classes/com/mercure/App.class new file mode 100644 index 0000000..e114d4f Binary files /dev/null and b/backend/rtc/target/classes/com/mercure/App.class differ diff --git a/backend/rtc/target/maven-archiver/pom.properties b/backend/rtc/target/maven-archiver/pom.properties new file mode 100644 index 0000000..2145d3a --- /dev/null +++ b/backend/rtc/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=rtc +groupId=com.mercure +version=1.0-SNAPSHOT diff --git a/backend/rtc/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/backend/rtc/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..c54a9bd --- /dev/null +++ b/backend/rtc/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +com/mercure/App.class diff --git a/backend/rtc/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/backend/rtc/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..0ca8b26 --- /dev/null +++ b/backend/rtc/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +/IdeaProjects/react-spring-messenger-project/backend/rtc/src/main/java/com/mercure/App.java diff --git a/backend/rtc/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/backend/rtc/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 0000000..0d02560 --- /dev/null +++ b/backend/rtc/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +com/mercure/AppTest.class diff --git a/backend/rtc/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/backend/rtc/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..b124e08 --- /dev/null +++ b/backend/rtc/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +/IdeaProjects/react-spring-messenger-project/backend/rtc/src/test/java/com/mercure/AppTest.java diff --git a/backend/rtc/target/rtc-1.0-SNAPSHOT.jar b/backend/rtc/target/rtc-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..f5a9bd1 Binary files /dev/null and b/backend/rtc/target/rtc-1.0-SNAPSHOT.jar differ diff --git a/backend/rtc/target/rtc-1.0-SNAPSHOT.jar.original b/backend/rtc/target/rtc-1.0-SNAPSHOT.jar.original new file mode 100644 index 0000000..e1a6755 Binary files /dev/null and b/backend/rtc/target/rtc-1.0-SNAPSHOT.jar.original differ diff --git a/backend/rtc/target/test-classes/com/mercure/AppTest.class b/backend/rtc/target/test-classes/com/mercure/AppTest.class new file mode 100644 index 0000000..3e66de7 Binary files /dev/null and b/backend/rtc/target/test-classes/com/mercure/AppTest.class differ