From 9ba4ac20b7a7d923428676d111396dd1cb1fabee Mon Sep 17 00:00:00 2001 From: agree0002 Date: Sat, 15 Nov 2025 19:28:55 +0900 Subject: [PATCH 1/7] Revert "Merge pull request #362 from agree0002/refactor/#350" This reverts commit 9aa0ea453d7105868186fb478d1344ba79236e81, reversing changes made to 5d27a141b61f94c68ca9ae40b390f73fec93fcba. --- build.gradle | 51 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../api/auth/config/AuthBeansConfig.java | 6 - .../api/auth/config/AuthSecurityConfig.java | 92 +++--- .../api/auth/config/TemplateConfig.java | 4 +- .../domain/oauth2/cookie/CookieUtils.java | 149 +++------ ...eOAuth2AuthorizationRequestRepository.java | 50 +-- .../Oauth2AuthenticationFailureHandler.java | 4 +- .../Oauth2AuthenticationSuccessHandler.java | 6 +- .../oauth2/majorInfo/domain/MajorInfo.java | 2 +- .../majorInfo/domain/valueObject/College.java | 6 +- .../majorInfo/domain/valueObject/Major.java | 6 +- .../majorInfo/dto/MajorInfoSaveDto.java | 2 +- .../oauth2/member/domain/entity/Member.java | 4 +- .../domain/entity/UpdateNameRequest.java | 2 +- .../member/domain/valueObject/Email.java | 4 +- .../member/domain/valueObject/Generation.java | 4 +- .../member/domain/valueObject/Grade.java | 4 +- .../domain/valueObject/IbasInformation.java | 2 +- .../member/domain/valueObject/Introduce.java | 6 +- .../member/domain/valueObject/Name.java | 6 +- .../member/domain/valueObject/Phone.java | 4 +- .../domain/valueObject/SchoolInformation.java | 2 +- .../member/domain/valueObject/StudentId.java | 6 +- .../dto/ApprovedMemberManagementDto.java | 8 +- .../member/dto/ApprovedMemberSummaryDto.java | 4 +- .../domain/oauth2/member/dto/ContactDto.java | 2 +- .../oauth2/member/dto/ExecutiveMemberDto.java | 6 +- .../oauth2/member/dto/HallOfFameDto.java | 10 +- .../member/dto/HandleNameRequestDto.java | 4 +- .../oauth2/member/dto/MyProfileDto.java | 2 +- .../dto/NotApprovedMemberManagementDto.java | 2 +- .../oauth2/member/dto/ProfileNameDto.java | 2 +- .../member/dto/UpdateNameRequestDto.java | 4 +- .../member/security/DefaultRoleHierarchy.java | 10 +- .../domain/entity/MemberSocialAccount.java | 2 +- .../socialAccount/domain/valueObject/UID.java | 6 +- .../domain/token/CustomRequestMatcher.java | 2 +- .../domain/token/JwtAccessDeniedHandler.java | 6 +- .../api/auth/domain/token/TokenResolver.java | 2 +- .../token/jwtUtils/JwtTokenResolver.java | 2 +- .../domain/token/jwtUtils/JwtTokenUtil.java | 142 +-------- .../jwtUtils/refreshToken/RefreshToken.java | 2 +- .../JwtAuthenticationEntryPoint.java | 6 +- .../JwtAuthenticationFilter.java | 32 +- .../domain/oauth2/cookie/CookieUtilsTest.java | 69 +---- ...th2AuthorizationRequestRepositoryTest.java | 2 +- ...auth2AuthenticationFailureHandlerTest.java | 2 +- ...auth2AuthenticationSuccessHandlerTest.java | 2 +- .../domain/token/JwtTokenReIssueTest.java | 2 +- .../auth/domain/token/JwtTokenUtilTest.java | 2 +- ...kenAuthenticationProcessingFilterTest.java | 8 +- .../main/java/com/inhabas/api/JpaConfig.java | 4 +- .../sshTunneling/SshTunnelingInitializer.java | 4 +- .../com/inhabas/api/config/SwaggerConfig.java | 2 +- .../inhabas/api/config/WebSecurityConfig.java | 285 ++++++++---------- .../com/inhabas/api/domain/BaseEntity.java | 6 +- .../api/domain/board/domain/AlbumBoard.java | 2 +- .../api/domain/board/domain/BaseBoard.java | 2 +- .../board/domain/valueObject/Content.java | 6 +- .../board/domain/valueObject/Title.java | 6 +- .../api/domain/board/dto/BoardCountDto.java | 4 +- .../board/usecase/BoardSecurityChecker.java | 2 +- .../domain/budget/domain/BudgetHistory.java | 2 +- .../domain/BudgetSupportApplication.java | 2 +- .../budget/domain/valueObject/Account.java | 6 +- .../budget/domain/valueObject/Details.java | 6 +- .../budget/domain/valueObject/Price.java | 4 +- .../domain/valueObject/RejectReason.java | 6 +- .../dto/BudgetApplicationDetailDto.java | 8 +- .../budget/dto/BudgetApplicationDto.java | 4 +- .../dto/BudgetApplicationRegisterForm.java | 10 +- .../BudgetApplicationStatusChangeRequest.java | 2 +- .../budget/dto/BudgetHistoryCreateForm.java | 10 +- .../budget/dto/BudgetHistoryDetailDto.java | 8 +- .../domain/budget/dto/BudgetHistoryDto.java | 8 +- .../api/domain/club/domain/ClubHistory.java | 2 +- .../club/dto/ClubActivityDetailDto.java | 6 +- .../api/domain/club/dto/ClubActivityDto.java | 6 +- .../api/domain/club/dto/ClubHistoryDto.java | 4 +- .../domain/club/dto/SaveClubActivityDto.java | 6 +- .../domain/club/dto/SaveClubHistoryDto.java | 2 +- .../api/domain/comment/domain/Comment.java | 2 +- .../comment/domain/valueObject/Content.java | 6 +- .../domain/comment/dto/CommentDetailDto.java | 6 +- .../domain/comment/dto/CommentSaveDto.java | 4 +- .../domain/comment/dto/CommentUpdateDto.java | 2 +- .../api/domain/comment/dto/WriterInfo.java | 6 +- .../comment/usecase/CommentServiceImpl.java | 2 +- .../domain/contest/domain/ContestBoard.java | 22 +- .../domain/contest/domain/ContestField.java | 16 +- .../domain/valueObject/Association.java | 6 +- .../domain/valueObject/ContestFieldName.java | 6 +- .../contest/domain/valueObject/Topic.java | 6 +- .../contest/dto/ContestBoardDetailDto.java | 6 +- .../domain/contest/dto/ContestBoardDto.java | 6 +- .../contest/dto/SaveContestBoardDto.java | 8 +- .../api/domain/file/domain/BaseFile.java | 2 +- .../api/domain/file/domain/BoardFile.java | 2 +- .../file/domain/valueObject/FileName.java | 6 +- .../file/domain/valueObject/FileUrl.java | 6 +- .../api/domain/file/dto/FileDownloadDto.java | 4 +- .../api/domain/lecture/domain/Lecture.java | 6 +- .../api/domain/lecture/domain/Student.java | 2 +- .../converter/LectureStatusConverter.java | 4 +- .../converter/StudentStatusConverter.java | 2 +- .../lecture/dto/LectureRegisterForm.java | 6 +- .../dto/LectureStatusUpdateRequest.java | 2 +- .../domain/lecture/dto/LectureUpdateForm.java | 2 +- .../usecase/LectureSecurityChecker.java | 2 +- .../lecture/usecase/LectureServiceImpl.java | 2 +- .../usecase/LectureStudentServiceImpl.java | 2 +- .../inhabas/api/domain/menu/domain/Menu.java | 2 +- .../api/domain/menu/domain/MenuGroup.java | 2 +- .../menu/domain/valueObject/Description.java | 6 +- .../domain/valueObject/MenuGroupName.java | 6 +- .../menu/domain/valueObject/MenuId.java | 8 +- .../menu/domain/valueObject/MenuName.java | 6 +- .../menu/repository/MenuRepositoryImpl.java | 57 ++-- .../api/domain/myInfo/dto/MyBoardDto.java | 6 +- .../dto/MyBudgetSupportApplicationDto.java | 4 +- .../api/domain/myInfo/dto/MyCommentDto.java | 6 +- .../normalBoard/domain/NormalBoard.java | 2 +- .../normalBoard/dto/NormalBoardDetailDto.java | 6 +- .../normalBoard/dto/NormalBoardDto.java | 6 +- .../normalBoard/dto/SaveNormalBoardDto.java | 2 +- .../api/domain/policy/domain/PolicyTerm.java | 2 +- .../api/domain/policy/domain/PolicyType.java | 2 +- .../api/domain/policy/dto/PolicyTermDto.java | 2 +- .../domain/policy/dto/SavePolicyTernDto.java | 2 +- .../domain/project/domain/ProjectBoard.java | 20 +- .../project/dto/ProjectBoardDetailDto.java | 6 +- .../domain/project/dto/ProjectBoardDto.java | 6 +- .../project/dto/SaveProjectBoardDto.java | 2 +- .../questionnaire/domain/Questionnaire.java | 2 +- .../scholarship/domain/Scholarship.java | 16 +- .../domain/ScholarshipHistory.java | 24 +- .../dto/SaveScholarshipBoardDto.java | 6 +- .../dto/SaveScholarshipHistoryDto.java | 6 +- .../dto/ScholarshipBoardDetailDto.java | 6 +- .../scholarship/dto/ScholarshipBoardDto.java | 6 +- .../domain/signUp/domain/entity/Answer.java | 2 +- .../api/domain/signUp/dto/AnswerDto.java | 2 +- .../signUp/dto/ApplicationDetailDto.java | 2 +- .../domain/signUp/dto/QuestionAnswerDto.java | 6 +- .../api/domain/signUp/dto/SignUpDto.java | 8 +- .../signUp/usecase/AnswerServiceImpl.java | 2 +- .../domain/entity/SignUpSchedule.java | 2 +- .../signUpSchedule/dto/SignUpScheduleDto.java | 4 +- .../global/dto/PagedPinnedResponseDto.java | 2 +- .../api/global/dto/PagedResponseDto.java | 2 +- .../api/web/BudgetApplicationController.java | 2 +- .../api/web/BudgetHistoryController.java | 2 +- .../api/web/ClubActivityController.java | 2 +- .../api/web/ClubHistoryController.java | 2 +- .../inhabas/api/web/CommentController.java | 2 +- .../api/web/ContestBoardController.java | 9 +- .../inhabas/api/web/ExceptionController.java | 2 +- .../inhabas/api/web/LectureController.java | 4 +- .../com/inhabas/api/web/MyInfoController.java | 2 +- .../api/web/NormalBoardController.java | 2 +- .../inhabas/api/web/PolicyTermController.java | 2 +- .../api/web/ProjectBoardController.java | 2 +- .../api/web/ScholarshipController.java | 2 +- .../api/web/ScholarshipHistoryController.java | 2 +- .../com/inhabas/api/web/SignUpController.java | 2 +- .../api/web/SignUpScheduleController.java | 2 +- .../SignUpControllerInterceptor.java | 4 +- .../club/dto/ClubActivityDetailDtoTest.java | 8 +- .../domain/club/dto/ClubActivityDtoTest.java | 8 +- .../domain/club/dto/ClubHistoryDtoTest.java | 8 +- .../club/dto/SaveClubActivityDtoTest.java | 8 +- .../club/dto/SaveClubHistoryDtoTest.java | 8 +- .../comment/usecase/CommentServiceTest.java | 2 +- .../dto/ContestBoardDetailDtoTest.java | 8 +- .../contest/dto/SaveContestBoardDtoTest.java | 8 +- .../domain/file/dto/FileDownloadDtoTest.java | 8 +- .../usecase/LectureStudentServiceDBTest.java | 2 +- .../api/domain/myInfo/dto/MyBoardDtoTest.java | 8 +- .../dto/MyBudgetSupportApplicationsTest.java | 8 +- .../domain/myInfo/dto/MyCommentDtoTest.java | 8 +- .../dto/NormalBoardDetailDtoTest.java | 8 +- .../normalBoard/dto/NormalBoardDtoTest.java | 8 +- .../dto/SaveNormalBoardDtoTest.java | 8 +- .../domain/policy/dto/PolicyTermDtoTest.java | 8 +- .../policy/dto/SavePolicyTernDtoTest.java | 8 +- .../dto/ProjectBoardDetailDtoTest.java | 8 +- .../project/dto/ProjectBoardDtoTest.java | 8 +- .../project/dto/SaveProjectBoardDtoTest.java | 8 +- .../dto/SaveScholarshipBoardDtoTest.java | 8 +- .../dto/SaveScholarshipHistoryDtoTest.java | 8 +- .../dto/ScholarshipBoardDetailDtoTest.java | 8 +- .../dto/ScholarshipBoardDtoTest.java | 8 +- .../repository/AnswerRepositoryTest.java | 2 +- .../testAnnotataion/CustomSpringBootTest.java | 3 +- 195 files changed, 765 insertions(+), 1078 deletions(-) diff --git a/build.gradle b/build.gradle index 50af1e314..899d45bcc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { - id 'org.springframework.boot' version '3.3.5' - id 'io.spring.dependency-management' version '1.1.6' + id 'org.springframework.boot' version '2.7.18' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' id 'java-library' - id 'com.diffplug.spotless' version '6.25.0' + id 'com.diffplug.spotless' version '6.13.0' } spotless { @@ -20,7 +20,7 @@ spotless { //임포트 순서 정리 importOrder( "java", - "jakarta", + "javax", "lombok", "org.springframework", "", @@ -64,33 +64,26 @@ subprojects { } } - testing { - suites { - test { - useJUnitJupiter() - } - } - } - dependencies { annotationProcessor( 'org.projectlombok:lombok', 'org.springframework.boot:spring-boot-configuration-processor', 'jakarta.persistence:jakarta.persistence-api', 'jakarta.annotation:jakarta.annotation-api', - 'com.querydsl:querydsl-apt:5.0.0:jakarta' + "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jpa" ) implementation ( 'org.springframework.boot:spring-boot-starter-web', 'org.springframework.boot:spring-boot-starter-validation', - 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0', + 'org.springdoc:springdoc-openapi-ui:1.7.0', 'com.google.code.findbugs:jsr305:3.0.2', + 'io.awspring.cloud:spring-cloud-starter-aws:2.4.4', // cloud config - 'org.springframework.cloud:spring-cloud-starter-config:4.1.4', + 'org.springframework.cloud:spring-cloud-starter-config:3.1.8', 'org.springframework.boot:spring-boot-starter-actuator', - 'org.springframework.cloud:spring-cloud-starter-bootstrap:4.1.4', + 'org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.8', // mail 'org.springframework.boot:spring-boot-starter-mail', @@ -111,6 +104,10 @@ subprojects { ) } + test { + useJUnitPlatform() + } + } project(':module-jpa') { @@ -120,8 +117,8 @@ project(':module-jpa') { dependencies { api ( 'org.springframework.boot:spring-boot-starter-data-jpa', - 'com.querydsl:querydsl-jpa:5.0.0:jakarta', - 'com.jcraft:jsch:0.1.55', + 'com.querydsl:querydsl-jpa', // query dsl + 'com.jcraft:jsch:0.1.55', // 로컬 개발용 db ssh tunneling, https://mavenlibs.com/maven/dependency/com.jcraft/jsch // 'org.mariadb.jdbc:mariadb-java-client', 'com.mysql:mysql-connector-j', 'com.h2database:h2' @@ -136,18 +133,18 @@ project(':module-auth') { dependencies { api project(':module-jpa') // jwt - api 'io.jsonwebtoken:jjwt-api:0.11.5' - runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5', + api 'io.jsonwebtoken:jjwt-api:0.11.2' + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2', // Uncomment the next line if you want to use RSASSA-PSS (PS256, PS384, PS512) algorithms: //'org.bouncycastle:bcprov-jdk15on:1.60', - 'io.jsonwebtoken:jjwt-jackson:0.11.5' + 'io.jsonwebtoken:jjwt-jackson:0.11.2' // or 'io.jsonwebtoken:jjwt-gson:0.11.2' for gson // security api 'org.springframework.boot:spring-boot-starter-security' api 'org.springframework.boot:spring-boot-starter-oauth2-client' - api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' + api 'javax.xml.bind:jaxb-api' testImplementation 'org.springframework.security:spring-security-test' - testImplementation 'org.mockito:mockito-inline:5.2.0' + testImplementation 'org.mockito:mockito-inline:2.13.0' } } @@ -158,10 +155,9 @@ project(':module-fileStorage') { dependencies { api project(':module-jpa') - api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' - implementation 'com.amazonaws:aws-java-sdk-s3:1.12.188' + api 'javax.xml.bind:jaxb-api' testImplementation 'org.springframework.security:spring-security-test' - testImplementation 'org.mockito:mockito-inline:5.2.0' + testImplementation 'org.mockito:mockito-inline:2.13.0' } } @@ -171,7 +167,6 @@ project(':resource-server') { api project(':module-auth') api project(':module-fileStorage') api 'org.springframework.boot:spring-boot-starter-security' - implementation 'com.amazonaws:aws-java-sdk-s3:1.12.188' testImplementation 'org.springframework.security:spring-security-test' } @@ -179,7 +174,7 @@ project(':resource-server') { delete file('src/main/generated') } - tasks.register('cleanGeneratedDir', Delete) { + task cleanGeneratedDir(type: Delete) { delete file('src/main/generated') } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 48c0a02ca..84d1f85fd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/module-auth/src/main/java/com/inhabas/api/auth/config/AuthBeansConfig.java b/module-auth/src/main/java/com/inhabas/api/auth/config/AuthBeansConfig.java index a432e3db6..e5a6d4f39 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/config/AuthBeansConfig.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/config/AuthBeansConfig.java @@ -4,7 +4,6 @@ import lombok.RequiredArgsConstructor; -import org.springframework.boot.ApplicationRunner; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -36,11 +35,6 @@ public class AuthBeansConfig { private final AuthProperties authProperties; private final RefreshTokenRepository refreshTokenRepository; - @Bean - public ApplicationRunner jwtSecretKeyStrengthChecker(JwtTokenUtil jwtTokenUtil) { - return args -> jwtTokenUtil.validateSecretKeyStrength(); - } - @Bean public HttpCookieOAuth2AuthorizationRequestRepository httpCookieOAuth2AuthorizationRequestRepository() { diff --git a/module-auth/src/main/java/com/inhabas/api/auth/config/AuthSecurityConfig.java b/module-auth/src/main/java/com/inhabas/api/auth/config/AuthSecurityConfig.java index 7479742cc..4cb67a490 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/config/AuthSecurityConfig.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/config/AuthSecurityConfig.java @@ -2,16 +2,13 @@ import lombok.RequiredArgsConstructor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService; -import org.springframework.security.web.SecurityFilterChain; import org.springframework.web.cors.CorsUtils; import com.inhabas.api.auth.domain.oauth2.CustomOAuth2UserService; @@ -21,10 +18,9 @@ @Order(0) // 인증 관련 security filter chain 은 우선순위가 가장 높아야 함. @EnableWebSecurity -@Configuration @RequiredArgsConstructor @Profile({"dev1", "dev2", "local", "prod1", "prod2"}) // 테스트에는 포함시키지 않음. -public class AuthSecurityConfig { +public class AuthSecurityConfig extends WebSecurityConfigurerAdapter { private final CustomOAuth2UserService customOAuth2UserService; private final OAuth2AuthorizedClientService authorizedClientService; @@ -33,40 +29,62 @@ public class AuthSecurityConfig { private final HttpCookieOAuth2AuthorizationRequestRepository httpCookieOAuth2AuthorizationRequestRepository; - @Bean - @Order(0) - public SecurityFilterChain authSecurityFilterChain(HttpSecurity http) throws Exception { + /** + * 소셜 로그인 api
+ *
+ * 진행과정은 아래와 같다.
+ * + *
    + *
  1. 사용자가 소셜로그인 시작. (프론트에서 redirect_url 보내줘야함.) + *
  2. OAuth2 인증 진행 -> 기존 회원인지 검사 + *
      + *
    1. 성공 -> OAuth2AuthenticationSuccessHandler + *
        + *
      1. 프론트에서 보내준 redirect_url 검증 (-> 실패하면 failure handler 에서 처리) + *
      2. jwt 토큰 발급 및 로그인 처리 + *
      3. 리다이렉트 + *
      + *
    2. 실패 -> OAuth2AuthenticationFailureHandler + *
    + *
+ * + * 회원가입이나, jwt 토큰 발급을 위한 url 로 함부로 접근할 수 없게 하기 위해 jwt 토근이 발급되기 이전까지는 OAuth2 인증 결과를 세션을 통해서 유지함. + * 따라서 critical 한 url 에 대해서 OAuth2 인증이 완료된 세션에 한해서만 허용. + */ + @Override + protected void configure(HttpSecurity http) throws Exception { - http - // /login/** 경로에만 이 보안 체인 적용 - .securityMatcher("/login/**") + http.requestMatchers() + .antMatchers("/login/**") + .and() // 세션 생성 금지 - .sessionManagement( - session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) - .cors(cors -> {}) - .csrf(AbstractHttpConfigurer::disable) - .authorizeHttpRequests( - authorize -> - authorize - .requestMatchers(request -> CorsUtils.isPreFlightRequest(request)) - .permitAll() - .anyRequest() - .permitAll()) + .sessionManagement() + .sessionCreationPolicy(SessionCreationPolicy.STATELESS) + .and() + .cors() + .and() + .authorizeRequests() + .requestMatchers(CorsUtils::isPreFlightRequest) + .permitAll() + .anyRequest() + .permitAll() + .and() + .csrf() + .disable() + // Oauth 로그인 설정 - .oauth2Login( - oauth2 -> - oauth2 - .authorizedClientService(authorizedClientService) - .authorizationEndpoint( - authorization -> - authorization - .baseUri("/login/oauth2/authorization") - .authorizationRequestRepository( - httpCookieOAuth2AuthorizationRequestRepository)) - .userInfoEndpoint(userInfo -> userInfo.userService(customOAuth2UserService)) - .failureHandler(oauth2AuthenticationFailureHandler) - .successHandler(oauth2AuthenticationSuccessHandler)); + .oauth2Login() + .authorizedClientService(authorizedClientService) + .authorizationEndpoint() + .baseUri("/login/oauth2/authorization") + .authorizationRequestRepository(httpCookieOAuth2AuthorizationRequestRepository) + .and() - return http.build(); + // 사용자 정보를 가져오는 엔드포인트에 대한 설정 + .userInfoEndpoint() + .userService(customOAuth2UserService) + .and() + .failureHandler(oauth2AuthenticationFailureHandler) + .successHandler(oauth2AuthenticationSuccessHandler); } } diff --git a/module-auth/src/main/java/com/inhabas/api/auth/config/TemplateConfig.java b/module-auth/src/main/java/com/inhabas/api/auth/config/TemplateConfig.java index 6c64986d8..e238c1a02 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/config/TemplateConfig.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/config/TemplateConfig.java @@ -4,8 +4,8 @@ import org.springframework.context.annotation.Configuration; import org.thymeleaf.TemplateEngine; -import org.thymeleaf.spring6.SpringTemplateEngine; -import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver; +import org.thymeleaf.spring5.SpringTemplateEngine; +import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; import org.thymeleaf.templatemode.TemplateMode; @Configuration diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtils.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtils.java index de5eec814..521c40957 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtils.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtils.java @@ -1,45 +1,26 @@ package com.inhabas.api.auth.domain.oauth2.cookie; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.time.Duration; import java.util.Base64; +import java.util.Objects; import java.util.Optional; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import org.springframework.http.ResponseCookie; import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest; +import org.springframework.util.SerializationUtils; -public interface CookieUtils { - - enum SameSite { - LAX("Lax"), - STRICT("Strict"), - NONE("None"); - private final String value; - - SameSite(String v) { - this.value = v; - } +import io.micrometer.core.instrument.util.StringUtils; - @Override - public String toString() { - return value; - } - } +public interface CookieUtils { /** request 에 담겨 있는 쿠키를 꺼낸다. */ static Optional resolveCookie(HttpServletRequest request, String cookieName) { Cookie[] cookies = request.getCookies(); - if (cookies != null) { + if (cookies != null && cookies.length > 0) { for (Cookie cookie : cookies) { if (cookie.getName().equals(cookieName)) { return Optional.of(cookie); @@ -50,80 +31,38 @@ static Optional resolveCookie(HttpServletRequest request, String cookieN return Optional.empty(); } - /** 기본 삭제: SameSite=Lax, Secure=request.isSecure(), path="/" 로 설정하여 Max-Age=0 으로 파기. */ + /** 쿠키를 지우는 작업은 없고, maxAge 를 0으로 설정해서 브라우저가 파기하도록 한다. */ static void deleteCookie( HttpServletRequest request, HttpServletResponse response, String cookieName) { - // 동일 이름 쿠키를 빈 값과 Max-Age=0 으로 덮어써서 삭제 - deleteCookie(request, response, cookieName, SameSite.LAX, null); - } - - /** - * 생성 시와 동일한 속성으로 삭제할 수 있도록 SameSite/Secure 를 제어하는 오버로드. secure=null 이면 request.isSecure() 사용. - * SameSite=None 이면 Secure=true 강제. - */ - static void deleteCookie( - HttpServletRequest request, - HttpServletResponse response, - String cookieName, - SameSite sameSite, - Boolean secure) { - - boolean secureFlag = secure != null ? secure : request.isSecure(); - if (sameSite == SameSite.NONE && !secureFlag) { - // 브라우저 정책: SameSite=None 은 Secure 필요. 강제 상승. - secureFlag = true; + Cookie[] cookies = request.getCookies(); + if (cookies != null && cookies.length > 0) { + for (Cookie cookie : cookies) { + if (cookie.getName().equals(cookieName)) { + cookie.setValue(""); + cookie.setPath("/"); + cookie.setMaxAge(0); + response.addCookie(cookie); + break; + } + } } - - ResponseCookie rc = - ResponseCookie.from(cookieName, "") - .path("/") - .httpOnly(true) - .secure(secureFlag) - .maxAge(Duration.ZERO) - .sameSite(sameSite.toString()) - .build(); - response.addHeader("Set-Cookie", rc.toString()); - } - - /** 기본값: SameSite=Lax, Secure=request.isSecure() */ - static void setCookie( - HttpServletRequest request, - HttpServletResponse response, - String cookieName, - String cookieContents, - int maxAge) { - setCookie(request, response, cookieName, cookieContents, maxAge, SameSite.LAX, null); } /** - * SameSite/Secure 를 제어할 수 있는 오버로드. secure=null 이면 request.isSecure() 사용. SameSite=None 이면 - * Secure=true 강제. + * @param response 응답에 쿠키를 적어서 보내줌 + * @param cookieName key + * @param cookieContents value + * @param maxAge 초 단위 */ static void setCookie( - HttpServletRequest request, - HttpServletResponse response, - String cookieName, - String cookieContents, - int maxAge, - SameSite sameSite, - Boolean secure) { - - boolean secureFlag = secure != null ? secure : request.isSecure(); - if (sameSite == SameSite.NONE && !secureFlag) { - // 브라우저 정책: SameSite=None 은 Secure 필요. 강제 상승. - secureFlag = true; - } + HttpServletResponse response, String cookieName, String cookieContents, int maxAge) { - ResponseCookie rc = - ResponseCookie.from(cookieName, cookieContents) - .path("/") - .httpOnly(true) - .secure(secureFlag) - .maxAge(Duration.ofSeconds(Math.max(0, maxAge))) - .sameSite(sameSite.toString()) - .build(); - response.addHeader("Set-Cookie", rc.toString()); + Cookie cookie = new Cookie(cookieName, cookieContents); + cookie.setPath("/"); + cookie.setHttpOnly(true); + cookie.setMaxAge(maxAge); + response.addCookie(cookie); } /** @@ -131,14 +70,8 @@ static void setCookie( * @return 브라우저 쿠키에 담기 위해 OAuth2AuthorizationRequest 를 string 으로 변환. */ static String serialize(OAuth2AuthorizationRequest request) { - try (ByteArrayOutputStream bos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(bos)) { - oos.writeObject(request); - oos.flush(); - return Base64.getUrlEncoder().encodeToString(bos.toByteArray()); - } catch (IOException e) { - throw new IllegalStateException("Failed to serialize OAuth2AuthorizationRequest", e); - } + + return Base64.getUrlEncoder().encodeToString(SerializationUtils.serialize(request)); } /** @@ -148,19 +81,13 @@ static String serialize(OAuth2AuthorizationRequest request) { */ static T deserialize(Cookie cookie, Class clz) { - if (cookie == null || isBlank(cookie.getValue())) return null; - try { - byte[] data = Base64.getUrlDecoder().decode(cookie.getValue()); - try (ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(data))) { - Object obj = ois.readObject(); - return clz.cast(obj); - } - } catch (IOException | ClassNotFoundException | IllegalArgumentException ex) { - return null; - } + if (isDeleted(cookie)) return null; + else + return clz.cast( + SerializationUtils.deserialize(Base64.getUrlDecoder().decode(cookie.getValue()))); } - private static boolean isBlank(String s) { - return s == null || s.trim().isEmpty(); + private static boolean isDeleted(Cookie cookie) { + return StringUtils.isBlank(cookie.getValue()) || Objects.isNull(cookie.getValue()); } } diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepository.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepository.java index 172982f8b..9173941e4 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepository.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepository.java @@ -1,7 +1,7 @@ package com.inhabas.api.auth.domain.oauth2.cookie; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.springframework.security.oauth2.client.web.AuthorizationRequestRepository; import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest; @@ -35,37 +35,28 @@ public void saveAuthorizationRequest( HttpServletRequest request, HttpServletResponse response) { if (authorizationRequest == null) { - CookieUtils.deleteCookie( - request, - response, - OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME, - CookieUtils.SameSite.LAX, - null); - CookieUtils.deleteCookie( - request, response, REDIRECT_URL_PARAM_COOKIE_NAME, CookieUtils.SameSite.LAX, null); + CookieUtils.deleteCookie(request, response, OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME); + CookieUtils.deleteCookie(request, response, REDIRECT_URL_PARAM_COOKIE_NAME); return; } CookieUtils.setCookie( - request, response, OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME, CookieUtils.serialize(authorizationRequest), - cookieExpireSeconds, - CookieUtils.SameSite.LAX, - null); + cookieExpireSeconds); String redirectUrlAfterLogin = request.getParameter(REDIRECT_URL_PARAM_COOKIE_NAME); if (StringUtils.isNotBlank(redirectUrlAfterLogin)) { CookieUtils.setCookie( - request, - response, - REDIRECT_URL_PARAM_COOKIE_NAME, - redirectUrlAfterLogin, - cookieExpireSeconds, - CookieUtils.SameSite.LAX, - null); + response, REDIRECT_URL_PARAM_COOKIE_NAME, redirectUrlAfterLogin, cookieExpireSeconds); } } + @Deprecated + @Override + public OAuth2AuthorizationRequest removeAuthorizationRequest(HttpServletRequest request) { + return null; + } + /** * OAuth2AuthorizationRequest 를 쿠키에서 제거함. * @@ -77,25 +68,14 @@ public OAuth2AuthorizationRequest removeAuthorizationRequest( // 쿠키 삭제하기 전에 쿠키 문자열을 객체로 변환 OAuth2AuthorizationRequest authorizationRequest = this.loadAuthorizationRequest(request); - CookieUtils.deleteCookie( - request, - response, - OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME, - CookieUtils.SameSite.LAX, - null); + CookieUtils.deleteCookie(request, response, OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME); return authorizationRequest; } /** redirect_url이 담긴 쿠키는 인증이 완전히 완료된 후에 제거되어야함. */ public void clearCookies(HttpServletRequest request, HttpServletResponse response) { - CookieUtils.deleteCookie( - request, - response, - OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME, - CookieUtils.SameSite.LAX, - null); - CookieUtils.deleteCookie( - request, response, REDIRECT_URL_PARAM_COOKIE_NAME, CookieUtils.SameSite.LAX, null); + CookieUtils.deleteCookie(request, response, OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME); + CookieUtils.deleteCookie(request, response, REDIRECT_URL_PARAM_COOKIE_NAME); } } diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandler.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandler.java index c249ae698..78a374ad0 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandler.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandler.java @@ -4,8 +4,8 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandler.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandler.java index 879c29010..8cd4277df 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandler.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandler.java @@ -4,9 +4,9 @@ import java.io.IOException; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/MajorInfo.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/MajorInfo.java index 59217e65d..fe539ed29 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/MajorInfo.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/MajorInfo.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.oauth2.majorInfo.domain; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/College.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/College.java index 4eba43d12..33aff6517 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/College.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/College.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/Major.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/Major.java index 4c9f25298..8bc1428f4 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/Major.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/Major.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/dto/MajorInfoSaveDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/dto/MajorInfoSaveDto.java index 7d92ba2e6..ae19f0939 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/dto/MajorInfoSaveDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/dto/MajorInfoSaveDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.oauth2.majorInfo.dto; -import jakarta.validation.constraints.NotBlank; +import javax.validation.constraints.NotBlank; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/Member.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/Member.java index 164a92473..4c73b7ef6 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/Member.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/Member.java @@ -4,7 +4,7 @@ import java.time.LocalDateTime; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Builder; @@ -26,7 +26,7 @@ uniqueConstraints = { @UniqueConstraint( name = "UNIQUE_PROVIDER_UID", - columnNames = {"provider", "UID"}) + columnNames = {"provider", "uid"}) }) @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/UpdateNameRequest.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/UpdateNameRequest.java index 8d6b73921..9bbb2a070 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/UpdateNameRequest.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/UpdateNameRequest.java @@ -4,7 +4,7 @@ import java.time.LocalDateTime; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Email.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Email.java index 6f0aaeb74..732c7e054 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Email.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Email.java @@ -3,8 +3,8 @@ import java.util.Objects; import java.util.regex.Pattern; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; +import javax.persistence.Column; +import javax.persistence.Embeddable; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Generation.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Generation.java index d720f04f7..339f99c65 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Generation.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Generation.java @@ -2,8 +2,8 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; +import javax.persistence.Column; +import javax.persistence.Embeddable; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Grade.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Grade.java index fa2f54201..a650a227f 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Grade.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Grade.java @@ -2,8 +2,8 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; +import javax.persistence.Column; +import javax.persistence.Embeddable; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/IbasInformation.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/IbasInformation.java index 3e50a99f8..3a76f7e8d 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/IbasInformation.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/IbasInformation.java @@ -3,7 +3,7 @@ import java.time.LocalDateTime; import java.util.Objects; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Introduce.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Introduce.java index 2c3274d15..9cc85840f 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Introduce.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Introduce.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Name.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Name.java index 8f02f2a61..f5503b0c5 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Name.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Name.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Phone.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Phone.java index 89c90c375..266853ff1 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Phone.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Phone.java @@ -3,8 +3,8 @@ import java.util.Objects; import java.util.regex.Pattern; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; +import javax.persistence.Column; +import javax.persistence.Embeddable; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/SchoolInformation.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/SchoolInformation.java index addf3d12d..4baeabec1 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/SchoolInformation.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/SchoolInformation.java @@ -2,7 +2,7 @@ import java.util.Objects; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/StudentId.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/StudentId.java index b6dab2046..3cdd5eb9c 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/StudentId.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/StudentId.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberManagementDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberManagementDto.java index d52b88afb..7ec5602e5 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberManagementDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberManagementDto.java @@ -1,9 +1,9 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Positive; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberSummaryDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberSummaryDto.java index 8fd9ce415..eddb9a894 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberSummaryDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberSummaryDto.java @@ -1,7 +1,7 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ContactDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ContactDto.java index d80a7d8b0..9a502ee6c 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ContactDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ContactDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import jakarta.validation.constraints.NotBlank; +import javax.validation.constraints.NotBlank; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ExecutiveMemberDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ExecutiveMemberDto.java index 6eae631ec..fad17c2a0 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ExecutiveMemberDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ExecutiveMemberDto.java @@ -1,8 +1,8 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HallOfFameDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HallOfFameDto.java index 658654e8b..e8c0c3116 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HallOfFameDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HallOfFameDto.java @@ -1,10 +1,10 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HandleNameRequestDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HandleNameRequestDto.java index 9a8088973..393296f2c 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HandleNameRequestDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HandleNameRequestDto.java @@ -1,7 +1,7 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/MyProfileDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/MyProfileDto.java index 2ec223200..1b0a941e3 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/MyProfileDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/MyProfileDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import jakarta.validation.constraints.*; +import javax.validation.constraints.*; import lombok.*; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/NotApprovedMemberManagementDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/NotApprovedMemberManagementDto.java index b2c3c6fe6..a75d237c8 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/NotApprovedMemberManagementDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/NotApprovedMemberManagementDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import jakarta.validation.constraints.*; +import javax.validation.constraints.*; import lombok.*; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ProfileNameDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ProfileNameDto.java index 8878d29e8..a0cd73328 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ProfileNameDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ProfileNameDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import jakarta.validation.constraints.NotBlank; +import javax.validation.constraints.NotBlank; import lombok.*; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/UpdateNameRequestDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/UpdateNameRequestDto.java index 46f8d27a7..1e75ed0b4 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/UpdateNameRequestDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/UpdateNameRequestDto.java @@ -2,8 +2,8 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/security/DefaultRoleHierarchy.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/security/DefaultRoleHierarchy.java index a56e96c48..d0956a32c 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/security/DefaultRoleHierarchy.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/security/DefaultRoleHierarchy.java @@ -29,6 +29,8 @@ public class DefaultRoleHierarchy implements Hierarchical { @Override public RoleHierarchy getHierarchy() { + RoleHierarchyImpl roleHierarchy = new RoleHierarchyImpl(); + Map> roleHierarchyMap = new HashMap<>() { { @@ -60,12 +62,14 @@ public RoleHierarchy getHierarchy() { put(SECRETARY, Arrays.asList(BASIC, DEACTIVATED, NOT_APPROVED, ANONYMOUS)); put(BASIC, Arrays.asList(DEACTIVATED, NOT_APPROVED, ANONYMOUS)); put(DEACTIVATED, Arrays.asList(NOT_APPROVED, ANONYMOUS)); - put(NOT_APPROVED, Collections.singletonList(ANONYMOUS)); - put(SIGNING_UP, Collections.singletonList(ANONYMOUS)); + put(NOT_APPROVED, Arrays.asList(ANONYMOUS)); + put(SIGNING_UP, Arrays.asList(ANONYMOUS)); } }; String roles = RoleHierarchyUtils.roleHierarchyFromMap(roleHierarchyMap); - return RoleHierarchyImpl.fromHierarchy(roles); + roleHierarchy.setHierarchy(roles); + + return roleHierarchy; } } diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/entity/MemberSocialAccount.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/entity/MemberSocialAccount.java index 11d3b6b11..ea0209c9d 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/entity/MemberSocialAccount.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/entity/MemberSocialAccount.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.oauth2.socialAccount.domain.entity; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/valueObject/UID.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/valueObject/UID.java index 24a663abf..a6b19cc6b 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/valueObject/UID.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/valueObject/UID.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/CustomRequestMatcher.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/CustomRequestMatcher.java index b407debc5..6f491bbe0 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/CustomRequestMatcher.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/CustomRequestMatcher.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.token; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/JwtAccessDeniedHandler.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/JwtAccessDeniedHandler.java index 40d9c72a5..85413c89a 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/JwtAccessDeniedHandler.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/JwtAccessDeniedHandler.java @@ -5,9 +5,9 @@ import java.io.IOException; import java.io.OutputStream; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/TokenResolver.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/TokenResolver.java index 55f083aee..bffb1d09f 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/TokenResolver.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/TokenResolver.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.token; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; public interface TokenResolver { diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/JwtTokenResolver.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/JwtTokenResolver.java index 3f04af41c..e112f30fd 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/JwtTokenResolver.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/JwtTokenResolver.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.token.jwtUtils; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import org.springframework.util.StringUtils; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/JwtTokenUtil.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/JwtTokenUtil.java index b3b55bcf4..8fe1980b8 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/JwtTokenUtil.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/JwtTokenUtil.java @@ -3,11 +3,8 @@ import java.security.Key; import java.util.Date; import java.util.List; -import java.util.UUID; import java.util.stream.Collectors; -import jakarta.annotation.PostConstruct; - import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -31,7 +28,6 @@ import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; import io.jsonwebtoken.security.SignatureException; -import io.jsonwebtoken.security.WeakKeyException; // https://github.com/jwtk/jjwt @Slf4j @@ -44,116 +40,35 @@ public class JwtTokenUtil implements TokenUtil { @Value("${jwt.secretKey}") private String SECRET_KEY; - @Value("${jwt.issuer:inhabas.com}") - private String ISSUER; - - @Value("${jwt.audience:inhabas-client}") - private String AUDIENCE; - - private final Long ACCESS_TOKEN_VALID_MILLIS = 30 * 60 * 1000L; // 0.5 hour - private static final Long REFRESH_TOKEN_VALID_MILLIS = 7 * 24 * 60 * 60 * 1000L; // 7 days + private final Long ACCESS_TOKEN_VALID_MILLISECOND = 30 * 60 * 1000L; // 0.5 hour + private static final Long REFRESH_TOKEN_VALID_MILLI_SECOND = 7 * 24 * 60 * 60 * 1000L; // 7 days private static final String AUTHORITY = "authorities"; private static final String MEMBER_ID = "memberId"; private static final String MEMBER_NAME = "memberName"; private static final String MEMBER_PICTURE = "memberPicture"; - private static final int MIN_HS512_KEY_BYTES = 64; // 512 bits - - // 캐시된 키와 파서 - private volatile Key signingKey; - private volatile JwtParser jwtParser; - - @PostConstruct - public void init() { - validateSecretKeyStrength(); - } - - /** HS512 용 시크릿 키 강도 검증 및 Key/Parser 캐싱. */ - public void validateSecretKeyStrength() { - if (SECRET_KEY == null || SECRET_KEY.trim().isEmpty()) { - throw new IllegalStateException("jwt.secretKey is not configured or blank"); - } - - final byte[] decoded; - try { - decoded = Decoders.BASE64.decode(SECRET_KEY.trim()); - } catch (IllegalArgumentException e) { - throw new IllegalStateException("jwt.secretKey must be Base64-encoded", e); - } - - if (decoded.length < MIN_HS512_KEY_BYTES) { - throw new IllegalStateException( - "Weak jwt.secretKey for HS512: require >= 64 bytes after Base64 decoding, got " - + decoded.length - + " bytes"); - } - - try { - // 키/파서 캐시 생성 (WeakKeyException 등 조기 검출) - Key key = Keys.hmacShaKeyFor(decoded); - this.signingKey = key; - this.jwtParser = - Jwts.parserBuilder() - .setSigningKey(key) - .requireIssuer(ISSUER) - .requireAudience(AUDIENCE) - .build(); - } catch (WeakKeyException e) { - throw new IllegalStateException("Weak jwt.secretKey: " + e.getMessage(), e); - } - } - - private Key getSigningKey() { - Key key = this.signingKey; - if (key != null) { - return key; - } - // lazy-init (테스트 등 부팅 훅 없이 사용되는 경우 대비) - Key newKey = Keys.hmacShaKeyFor(Decoders.BASE64.decode(SECRET_KEY)); - this.signingKey = newKey; - return newKey; - } - - private JwtParser getJwtParser() { - JwtParser parser = this.jwtParser; - if (parser != null) { - return parser; - } - // lazy-init - JwtParser newParser = - Jwts.parserBuilder() - .setSigningKey(getSigningKey()) - .requireIssuer(ISSUER) - .requireAudience(AUDIENCE) - .build(); - this.jwtParser = newParser; - return newParser; - } @Override public String createAccessToken(Authentication authentication) { - return createToken(authentication, ACCESS_TOKEN_VALID_MILLIS); + return createToken(authentication, ACCESS_TOKEN_VALID_MILLISECOND); } @Override public String createRefreshToken(Authentication authentication) { - String token = this.createToken(authentication, REFRESH_TOKEN_VALID_MILLIS); + String token = this.createToken(authentication, REFRESH_TOKEN_VALID_MILLI_SECOND); refreshTokenRepository.save(new RefreshToken(token)); return token; } @Override public Long getExpiration() { - // 초 단위로 통일 - return this.ACCESS_TOKEN_VALID_MILLIS / 1000; + return this.ACCESS_TOKEN_VALID_MILLISECOND / 1000; } private String createToken(Authentication authentication, Long expiration) { - if (authentication == null) { - throw new IllegalArgumentException("authentication must not be null"); - } + assert authentication != null; OAuth2UserInfo oAuth2UserInfo = OAuth2UserInfoFactory.getOAuth2UserInfo((OAuth2AuthenticationToken) authentication); @@ -168,13 +83,10 @@ private String createToken(Authentication authentication, Long expiration) { Date now = new Date(); Date expiryDate = new Date(now.getTime() + expiration); - final Key key = getSigningKey(); + final Key key = Keys.hmacShaKeyFor(Decoders.BASE64.decode(SECRET_KEY)); return Jwts.builder() .setHeaderParam(Header.TYPE, Header.JWT_TYPE) - .setIssuer(ISSUER) - .setAudience(AUDIENCE) - .setId(UUID.randomUUID().toString()) .setSubject(uid) .claim(MEMBER_ID, customOAuth2User.getMemberId()) .claim(MEMBER_NAME, customOAuth2User.getMemberName()) @@ -190,7 +102,7 @@ private String createToken(Authentication authentication, Long expiration) { public void validate(String token) { try { - getJwtParser().parseClaimsJws(token); + Jwts.parserBuilder().setSigningKey(SECRET_KEY).build().parseClaimsJws(token); } catch (SecurityException ex) { log.error("Invalid JWT signature"); throw new InvalidTokenException(); @@ -218,11 +130,8 @@ public JwtAuthenticationToken getAuthentication(String token) throws JwtExceptio Claims claims = this.parseClaims(token); - Number memberIdNumber = claims.get(MEMBER_ID, Number.class); - Long memberId = memberIdNumber == null ? null : memberIdNumber.longValue(); - + Long memberId = claims.get(MEMBER_ID, Long.class); List rawAuthorities = claims.get(AUTHORITY, List.class); - if (rawAuthorities == null) rawAuthorities = List.of(); List grantedAuthorities = rawAuthorities.stream() @@ -236,7 +145,7 @@ public JwtAuthenticationToken getAuthentication(String token) throws JwtExceptio /* 토큰 body 에 넣어둔 사용자 정보를 가져옴 * validation 검사를 먼저 꼭 해야함! */ private Claims parseClaims(String token) throws JwtException { - return getJwtParser().parseClaimsJws(token).getBody(); + return Jwts.parserBuilder().setSigningKey(SECRET_KEY).build().parseClaimsJws(token).getBody(); } @Override @@ -253,37 +162,14 @@ public TokenDto reissueAccessTokenUsing(String refreshToken) throws InvalidToken private TokenDto createAccessTokenOnly(Claims claims) { Date now = new Date(); - final Key key = getSigningKey(); - - // 화이트리스트 기반으로 클레임 재구성: 필요한 필드만 복사 - String subject = claims.getSubject(); - Number memberIdNumber = claims.get(MEMBER_ID, Number.class); - Long memberId = memberIdNumber == null ? null : memberIdNumber.longValue(); - String memberName = claims.get(MEMBER_NAME, String.class); - String memberPicture = claims.get(MEMBER_PICTURE, String.class); - List rawAuthorities = claims.get(AUTHORITY, List.class); - - List authorities = - rawAuthorities == null - ? List.of() - : rawAuthorities.stream() - .filter(v -> v instanceof String) - .map(v -> (String) v) - .collect(Collectors.toList()); + final Key key = Keys.hmacShaKeyFor(Decoders.BASE64.decode(SECRET_KEY)); String accessToken = Jwts.builder() .setHeaderParam(Header.TYPE, Header.JWT_TYPE) - .setIssuer(ISSUER) - .setAudience(AUDIENCE) - .setId(UUID.randomUUID().toString()) - .setSubject(subject) - .claim(MEMBER_ID, memberId) - .claim(MEMBER_NAME, memberName) - .claim(MEMBER_PICTURE, memberPicture) - .claim(AUTHORITY, authorities) + .setClaims(claims) .setIssuedAt(now) - .setExpiration(new Date(now.getTime() + ACCESS_TOKEN_VALID_MILLIS)) + .setExpiration(new Date(now.getTime() + ACCESS_TOKEN_VALID_MILLISECOND)) .signWith(key, SignatureAlgorithm.HS512) .compact(); @@ -291,7 +177,7 @@ private TokenDto createAccessTokenOnly(Claims claims) { .grantType("Bearer") .accessToken(accessToken) .refreshToken("") - .accessTokenExpireDate(ACCESS_TOKEN_VALID_MILLIS / 1000) // 초 단위 + .accessTokenExpireDate(ACCESS_TOKEN_VALID_MILLISECOND) .build(); } } diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/refreshToken/RefreshToken.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/refreshToken/RefreshToken.java index be4da461d..81259f68e 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/refreshToken/RefreshToken.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/refreshToken/RefreshToken.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationEntryPoint.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationEntryPoint.java index f0d186162..72bf2b928 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationEntryPoint.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationEntryPoint.java @@ -5,9 +5,9 @@ import java.io.IOException; import java.io.OutputStream; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationFilter.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationFilter.java index e1523de54..dae574bb0 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationFilter.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationFilter.java @@ -6,10 +6,10 @@ import java.io.OutputStream; import java.util.Collections; -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,6 @@ import org.springframework.security.web.util.matcher.RequestMatcher; import com.fasterxml.jackson.databind.ObjectMapper; -import com.inhabas.api.auth.domain.error.ErrorCode; import com.inhabas.api.auth.domain.error.ErrorResponse; import com.inhabas.api.auth.domain.error.authException.CustomAuthException; import com.inhabas.api.auth.domain.token.TokenResolver; @@ -48,7 +47,7 @@ public JwtAuthenticationFilter( @Override public Authentication attemptAuthentication( HttpServletRequest request, HttpServletResponse response) - throws AuthenticationException, IOException { + throws AuthenticationException, IOException, ServletException { final String token = tokenResolver.resolveAccessTokenOrNull(request); @@ -81,27 +80,14 @@ protected void successfulAuthentication( @Override protected void unsuccessfulAuthentication( HttpServletRequest request, HttpServletResponse response, AuthenticationException failed) - throws IOException { + throws IOException, ServletException { SecurityContextHolder.clearContext(); - log.info("Failed to process authentication request: {}", failed.getMessage()); + log.info("Failed to process authentication request", failed); + response.setStatus(((CustomAuthException) failed).getErrorCode().getStatus()); response.setContentType(MediaType.APPLICATION_JSON_VALUE); - - if (failed instanceof CustomAuthException) { - response.setStatus(((CustomAuthException) failed).getErrorCode().getStatus()); - try (OutputStream os = response.getOutputStream()) { - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.writeValue( - os, ErrorResponse.of(((CustomAuthException) failed).getErrorCode())); - os.flush(); - } - return; - } - - // 일반 인증 실패에 대해서는 401로 응답하고 자세한 정보를 노출하지 않음 - response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); try (OutputStream os = response.getOutputStream()) { ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.writeValue(os, ErrorResponse.of(ErrorCode.JWT_INVALID)); + objectMapper.writeValue(os, ErrorResponse.of(((CustomAuthException) failed).getErrorCode())); os.flush(); } } diff --git a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtilsTest.java b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtilsTest.java index ec504a0a8..31af7b3bf 100644 --- a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtilsTest.java +++ b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtilsTest.java @@ -8,7 +8,7 @@ import java.util.Optional; import java.util.Set; -import jakarta.servlet.http.Cookie; +import javax.servlet.http.Cookie; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; @@ -44,13 +44,12 @@ public void resolveCookieFromRequest() { @Test public void saveCookieToResponse() { // given - MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); String cookieName = "myCookie"; String cookieContents = "hello"; // when - CookieUtils.setCookie(request, response, cookieName, cookieContents, 180); + CookieUtils.setCookie(response, cookieName, cookieContents, 180); // then Cookie resolvedCookie = response.getCookie(cookieName); @@ -84,9 +83,7 @@ public void removeCookieOfRequest() { @DisplayName("성공적으로 serialize 한다.") @Test public void serializingTest() - throws InvocationTargetException, - InstantiationException, - IllegalAccessException, + throws InvocationTargetException, InstantiationException, IllegalAccessException, NoSuchMethodException { // reflection Constructor constructor = @@ -98,7 +95,7 @@ public void serializingTest() OAuth2AuthorizationRequest.Builder builder = (OAuth2AuthorizationRequest.Builder) constructor.newInstance(AuthorizationGrantType.AUTHORIZATION_CODE); - OAuth2AuthorizationRequest requestObj = + OAuth2AuthorizationRequest request = builder .authorizationUri("https://kauth.kakao.com/oauth/authorize") .clientId("1234") @@ -110,7 +107,7 @@ public void serializingTest() .build(); // when - String serializedRequest = CookieUtils.serialize(requestObj); + String serializedRequest = CookieUtils.serialize(request); // then assertTrue(Base64.isBase64(serializedRequest)); @@ -119,9 +116,7 @@ public void serializingTest() @DisplayName("성공적으로 deserialize 한다.") @Test public void deserializingTest() - throws NoSuchMethodException, - InvocationTargetException, - InstantiationException, + throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException { // reflection @@ -155,56 +150,4 @@ public void deserializingTest() // then assertThat(deserializedRequest).usingRecursiveComparison().isEqualTo(originalRequest); } - - @DisplayName("역직렬화 실패 시 null 반환한다.") - @Test - public void deserializeReturnsNullOnInvalidBase64OrPayload() { - // given - Cookie invalid = new Cookie("bad", "not_base64!!"); - - // when - OAuth2AuthorizationRequest result = - CookieUtils.deserialize(invalid, OAuth2AuthorizationRequest.class); - - // then - assertThat(result).isNull(); - } - - @DisplayName("setCookie 시 SameSite=Lax 헤더를 추가한다.") - @Test - public void setCookieAddsSameSiteHeader() { - // given - MockHttpServletRequest request = new MockHttpServletRequest(); - MockHttpServletResponse response = new MockHttpServletResponse(); - - // when - CookieUtils.setCookie(request, response, "s", "v", 60); - - // then - java.util.List setCookies = response.getHeaders("Set-Cookie"); - assertThat(setCookies).isNotEmpty(); - assertThat(String.join(" ", setCookies)).contains("SameSite=Lax"); - } - - @DisplayName("deleteCookie 시 SameSite=Lax, Max-Age=0, HttpOnly를 포함한다.") - @Test - public void deleteCookieAddsAttributesProperly() { - // given - MockHttpServletRequest request = new MockHttpServletRequest(); - MockHttpServletResponse response = new MockHttpServletResponse(); - Cookie cookie = new Cookie("del", "bye"); - cookie.setMaxAge(120); - request.setCookies(cookie); - - // when - CookieUtils.deleteCookie(request, response, "del"); - - // then - java.util.List setCookies = response.getHeaders("Set-Cookie"); - assertThat(setCookies).isNotEmpty(); - String combined = String.join(" ", setCookies); - assertThat(combined).contains("SameSite=Lax"); - assertThat(combined).contains("Max-Age=0"); - assertThat(combined).contains("HttpOnly"); - } } diff --git a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepositoryTest.java b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepositoryTest.java index fbaee6c97..1c8677a70 100644 --- a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepositoryTest.java +++ b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepositoryTest.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.function.Predicate; -import jakarta.servlet.http.Cookie; +import javax.servlet.http.Cookie; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandlerTest.java b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandlerTest.java index ba04a8591..b14405358 100644 --- a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandlerTest.java +++ b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandlerTest.java @@ -6,7 +6,7 @@ import java.io.IOException; -import jakarta.servlet.http.Cookie; +import javax.servlet.http.Cookie; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandlerTest.java b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandlerTest.java index ed99aeedd..2bfaffcc4 100644 --- a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandlerTest.java +++ b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandlerTest.java @@ -12,7 +12,7 @@ import java.util.Map; import java.util.Set; -import jakarta.servlet.http.Cookie; +import javax.servlet.http.Cookie; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/module-auth/src/test/java/com/inhabas/api/auth/domain/token/JwtTokenReIssueTest.java b/module-auth/src/test/java/com/inhabas/api/auth/domain/token/JwtTokenReIssueTest.java index 03725c85c..989014e7e 100644 --- a/module-auth/src/test/java/com/inhabas/api/auth/domain/token/JwtTokenReIssueTest.java +++ b/module-auth/src/test/java/com/inhabas/api/auth/domain/token/JwtTokenReIssueTest.java @@ -6,7 +6,7 @@ import static org.mockito.BDDMockito.then; import static org.mockito.Mockito.*; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import com.inhabas.api.auth.domain.token.exception.InvalidTokenException; import com.inhabas.api.auth.domain.token.jwtUtils.JwtTokenReIssuer; diff --git a/module-auth/src/test/java/com/inhabas/api/auth/domain/token/JwtTokenUtilTest.java b/module-auth/src/test/java/com/inhabas/api/auth/domain/token/JwtTokenUtilTest.java index 06869c878..bf5cee8a8 100644 --- a/module-auth/src/test/java/com/inhabas/api/auth/domain/token/JwtTokenUtilTest.java +++ b/module-auth/src/test/java/com/inhabas/api/auth/domain/token/JwtTokenUtilTest.java @@ -80,7 +80,7 @@ public void createJwtTokenTest() { @Test public void nullAuthenticationTokenTest() { - assertThrows(IllegalArgumentException.class, () -> jwtTokenUtil.createAccessToken(null)); + assertThrows(AssertionError.class, () -> jwtTokenUtil.createAccessToken(null)); } @DisplayName("토큰을 정상적으로 decode") diff --git a/module-auth/src/test/java/com/inhabas/api/auth/domain/token/TokenAuthenticationProcessingFilterTest.java b/module-auth/src/test/java/com/inhabas/api/auth/domain/token/TokenAuthenticationProcessingFilterTest.java index 193328fc4..caec1bdbd 100644 --- a/module-auth/src/test/java/com/inhabas/api/auth/domain/token/TokenAuthenticationProcessingFilterTest.java +++ b/module-auth/src/test/java/com/inhabas/api/auth/domain/token/TokenAuthenticationProcessingFilterTest.java @@ -20,10 +20,10 @@ // import java.util.HashMap; // import java.util.List; // import java.util.Map; -// import jakarta.servlet.FilterChain; -// import jakarta.servlet.ServletException; -// import jakarta.servlet.http.HttpServletRequest; -// import jakarta.servlet.http.HttpServletResponse; +// import javax.servlet.FilterChain; +// import javax.servlet.ServletException; +// import javax.servlet.http.HttpServletRequest; +// import javax.servlet.http.HttpServletResponse; // import org.junit.jupiter.api.BeforeEach; // import org.junit.jupiter.api.DisplayName; // import org.junit.jupiter.api.Test; diff --git a/module-jpa/src/main/java/com/inhabas/api/JpaConfig.java b/module-jpa/src/main/java/com/inhabas/api/JpaConfig.java index 4e50fdaa7..51b37774c 100644 --- a/module-jpa/src/main/java/com/inhabas/api/JpaConfig.java +++ b/module-jpa/src/main/java/com/inhabas/api/JpaConfig.java @@ -1,7 +1,7 @@ package com.inhabas.api; -import jakarta.persistence.EntityManager; -import jakarta.persistence.PersistenceContext; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/module-jpa/src/main/java/com/inhabas/api/sshTunneling/SshTunnelingInitializer.java b/module-jpa/src/main/java/com/inhabas/api/sshTunneling/SshTunnelingInitializer.java index b44664e93..a65c42df0 100644 --- a/module-jpa/src/main/java/com/inhabas/api/sshTunneling/SshTunnelingInitializer.java +++ b/module-jpa/src/main/java/com/inhabas/api/sshTunneling/SshTunnelingInitializer.java @@ -4,8 +4,8 @@ import java.util.Properties; -import jakarta.annotation.PreDestroy; -import jakarta.validation.constraints.NotNull; +import javax.annotation.PreDestroy; +import javax.validation.constraints.NotNull; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/config/SwaggerConfig.java b/resource-server/src/main/java/com/inhabas/api/config/SwaggerConfig.java index b6d8dd2ce..664f68786 100644 --- a/resource-server/src/main/java/com/inhabas/api/config/SwaggerConfig.java +++ b/resource-server/src/main/java/com/inhabas/api/config/SwaggerConfig.java @@ -11,7 +11,7 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; import org.apache.http.HttpHeaders; -import org.springdoc.core.models.GroupedOpenApi; +import org.springdoc.core.GroupedOpenApi; @Configuration public class SwaggerConfig { diff --git a/resource-server/src/main/java/com/inhabas/api/config/WebSecurityConfig.java b/resource-server/src/main/java/com/inhabas/api/config/WebSecurityConfig.java index f5b9d36f2..9bdbee858 100644 --- a/resource-server/src/main/java/com/inhabas/api/config/WebSecurityConfig.java +++ b/resource-server/src/main/java/com/inhabas/api/config/WebSecurityConfig.java @@ -3,36 +3,28 @@ import static com.inhabas.api.auth.domain.oauth2.member.domain.valueObject.Role.*; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; import org.springframework.http.HttpMethod; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.ProviderManager; -import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; +import org.springframework.security.access.expression.SecurityExpressionHandler; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer; -import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.FilterInvocation; +import org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter; import org.springframework.security.web.util.matcher.AndRequestMatcher; -import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.CorsUtils; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import com.inhabas.api.auth.config.AuthBeansConfig; import com.inhabas.api.auth.domain.oauth2.member.security.Hierarchical; @@ -50,10 +42,10 @@ public class WebSecurityConfig { private static final String[] AUTH_WHITELIST_SWAGGER = { - "/swagger-ui/**", "/swagger/**", "/docs/**", "/v3/api-docs/**", "/swagger-resources/**" + "/swagger-ui/**", "/swagger/**", "/docs/**" }; private static final String[] AUTH_WHITELIST_STATIC = { - "/static/css/**", "/static/js/**", "/**/*.ico", "/favicon.ico" + "/static/css/**", "/static/js/**", "*.ico" }; private static final String[] AUTH_WHITELIST_TOKEN = {"/token/**"}; private static final String[] AUTH_WHITELIST_PATH = { @@ -68,170 +60,144 @@ public class WebSecurityConfig { "/club/activity/**", "/club/activities" }; private static final String[] AUTH_WHITELIST_NORMAL_BOARD = {"/board/count"}; + private static final String[] AUTH_WHITELIST_PROJECT_BOARD = {"/project/count"}; + private static final String[] AUTH_WHITELIST_CONTEST_BOARD = {"/contest/count"}; - @Configuration - @EnableMethodSecurity(jsr250Enabled = true) + @Order(1) + @EnableGlobalMethodSecurity(prePostEnabled = true, jsr250Enabled = true) @EnableWebSecurity @RequiredArgsConstructor @Profile({"local", "dev1", "dev2", "default_mvc_test", "prod1", "prod2", "integration_test"}) - public static class ApiSecurityForDev { + public static class ApiSecurityForDev extends WebSecurityConfigurerAdapter { private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint; private final JwtAccessDeniedHandler jwtAccessDeniedHandler; private final Hierarchical hierarchy; private final JwtTokenUtil jwtTokenUtil; - private final AuthBeansConfig authBeansConfig; private final JwtAuthenticationProvider jwtAuthenticationProvider; + private final AuthBeansConfig authBeansConfig; - @Value("${cors.allowed-origins:*}") - private String allowedOriginsProp; - - @Bean - public AuthenticationManager authenticationManager() { - return new ProviderManager(List.of(jwtAuthenticationProvider)); - } - - @Bean - public CorsConfigurationSource corsConfigurationSource() { - CorsConfiguration config = new CorsConfiguration(); - - List origins = - Arrays.stream(allowedOriginsProp.split(",")) - .map(String::trim) - .filter(s -> !s.isEmpty()) - .collect(Collectors.toList()); - - boolean wildcard = origins.contains("*"); - if (wildcard) { - // 패턴 전체 허용 시, 자격 증명은 허용하지 않음 (보안 권장) - config.setAllowedOriginPatterns(List.of("*")); - config.setAllowCredentials(false); - } else { - config.setAllowedOrigins(origins); - config.setAllowCredentials(true); - } - - config.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); - config.setAllowedHeaders(List.of("*")); - config.setExposedHeaders(List.of("Authorization", "Content-Disposition")); - config.setMaxAge(3600L); - - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - source.registerCorsConfiguration("/**", config); - return source; + @Override + public void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.authenticationProvider(jwtAuthenticationProvider); } - @Bean - public WebSecurityCustomizer webSecurityCustomizer() { - return (web) -> {}; + @Override + public void configure(WebSecurity web) throws Exception { + web.ignoring() + .antMatchers(HttpMethod.GET, AUTH_WHITELIST_POLICY) + .antMatchers(HttpMethod.GET, AUTH_WHITELIST_SIGNUP) + .antMatchers(HttpMethod.GET, AUTH_WHITELIST_CLUB) + .antMatchers(HttpMethod.GET, AUTH_WHITELIST_NORMAL_BOARD) + .antMatchers(HttpMethod.GET, AUTH_WHITELIST_PROJECT_BOARD) + .antMatchers(HttpMethod.GET, AUTH_WHITELIST_CONTEST_BOARD) + .antMatchers(AUTH_WHITELIST_SWAGGER) + .antMatchers(AUTH_WHITELIST_STATIC) + .antMatchers(AUTH_WHITELIST_PATH); } - @Bean - @Order(1) - public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { - http.anonymous( - anonymous -> anonymous.principal("anonymousUser").authorities("ROLE_" + ANONYMOUS)) - .httpBasic(httpBasic -> httpBasic.disable()) - .sessionManagement( - sessionManagement -> - sessionManagement.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) - .cors(cors -> cors.configurationSource(corsConfigurationSource())) - .csrf(AbstractHttpConfigurer::disable) - .headers( - headers -> - headers - .referrerPolicy( - r -> r.policy(ReferrerPolicyHeaderWriter.ReferrerPolicy.NO_REFERRER)) - .frameOptions(frame -> frame.sameOrigin())) - .exceptionHandling( - exceptionHandling -> - exceptionHandling - .authenticationEntryPoint(jwtAuthenticationEntryPoint) - .accessDeniedHandler(jwtAccessDeniedHandler)) - .authorizeHttpRequests( - authorize -> - authorize - .requestMatchers(CorsUtils::isPreFlightRequest) - .permitAll() - // Swagger 및 공개 경로는 필터 체인은 타되 인가만 면제 - .requestMatchers(pathMatchers(AUTH_WHITELIST_SWAGGER)) - .permitAll() - .requestMatchers(pathMatchers(AUTH_WHITELIST_STATIC)) - .permitAll() - .requestMatchers(pathMatchers(AUTH_WHITELIST_PATH)) - .permitAll() - // GET 공개 엔드포인트들 - .requestMatchers(methodMatchers(HttpMethod.GET, AUTH_WHITELIST_POLICY)) - .permitAll() - .requestMatchers(methodMatchers(HttpMethod.GET, AUTH_WHITELIST_SIGNUP)) - .permitAll() - .requestMatchers(methodMatchers(HttpMethod.GET, AUTH_WHITELIST_CLUB)) - .permitAll() - .requestMatchers(methodMatchers(HttpMethod.GET, AUTH_WHITELIST_NORMAL_BOARD)) - .permitAll() - .requestMatchers(methodMatchers(HttpMethod.GET, AUTH_WHITELIST_PROJECT_BOARD)) - .permitAll() - .requestMatchers(methodMatchers(HttpMethod.GET, AUTH_WHITELIST_CONTEST_BOARD)) - .permitAll() - // 나머지 기존 인가 규칙 유지 - .requestMatchers(pathMatchers("/myInfo/requests")) - .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) - .requestMatchers(pathMatchers("/myInfo/request/**")) - .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) - .requestMatchers(pathMatchers("/members/executive")) - .hasRole(ANONYMOUS.toString()) - .requestMatchers(pathMatchers("/members/hof")) - .hasRole(DEACTIVATED.toString()) - .requestMatchers(pathMatchers("/members/approved/role")) - .hasRole(SECRETARY.toString()) - .requestMatchers(pathMatchers("/members/approved/type")) - .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) - .requestMatchers(pathMatchers("/members/**", "/member/**")) - .hasAnyRole(SECRETARY.toString(), EXECUTIVES.toString()) - .requestMatchers( - pathMatchers( - "/budget/history/**", - "/budget/histories", - "/budget/application/**", - "/budget/applications")) - .hasRole(DEACTIVATED.toString()) - .requestMatchers(pathMatchers("/lecture/**/status")) - .hasRole(EXECUTIVES.toString()) - .requestMatchers(pathMatchers("/lecture/**")) - .hasRole(DEACTIVATED.toString()) - .requestMatchers(methodMatchers(HttpMethod.PUT, "/signUp/schedule")) - .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) - .requestMatchers(pathMatchers("/signUp/check")) - .hasAnyRole(ANONYMOUS.toString(), SIGNING_UP.toString()) - .requestMatchers(pathMatchers("/signUp/**")) - .hasRole(SIGNING_UP.toString()) - .requestMatchers(pathMatchers("/club/history/**")) - .hasRole(EXECUTIVES.toString()) - .requestMatchers(methodMatchers(HttpMethod.PUT, "/policy/**")) - .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) - .requestMatchers(pathMatchers("/scholarship/history/**")) - .hasRole(SECRETARY.toString()) - .anyRequest() - .hasRole(ANONYMOUS.toString())); + @Override + protected void configure(HttpSecurity http) throws Exception { + http + // OAuth 관련 경로 제외 모든 경로 + .requestMatchers() + .antMatchers("/**") + .and() + .anonymous() + .authorities("ROLE_" + ANONYMOUS) + .and() + // HTTP 기본 인증 비활성화 + .httpBasic() + .disable() + // 세션 생성 금지 + .sessionManagement() + .sessionCreationPolicy(SessionCreationPolicy.STATELESS) + .and() + // API 이므로 CORS 활성화, CSRF 비활성화 + .cors() + .and() + .csrf() + .disable() + + // 인증 예외 처리시 jwtAuthenticationEntryPoint 사용 + .exceptionHandling() + .authenticationEntryPoint(jwtAuthenticationEntryPoint) + .accessDeniedHandler(jwtAccessDeniedHandler) + .and() + .authorizeRequests() + // 권한 부여 표현식 + .expressionHandler(expressionHandler()) + // Preflight 방식 + .requestMatchers(CorsUtils::isPreFlightRequest) + .permitAll() + .antMatchers("/myInfo/requests") + .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) + .antMatchers("/myInfo/request/**") + .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) + + // 회원 관리 + .antMatchers("/members/executive") + .hasRole(ANONYMOUS.toString()) + .antMatchers("/members/hof") + .hasRole(DEACTIVATED.toString()) + .antMatchers("/members/approved/role") + .hasRole(SECRETARY.toString()) + .antMatchers("/members/approved/type") + .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) + .antMatchers("/members/**", "/member/**") + .hasAnyRole(SECRETARY.toString(), EXECUTIVES.toString()) + // 회계내역 + .antMatchers( + "/budget/history/**", + "/budget/histories", + "/budget/application/**", + "/budget/applications") + .hasRole(DEACTIVATED.toString()) + // 강의 + .antMatchers("/lecture/**/status") + .hasRole(EXECUTIVES.toString()) + .antMatchers("/lecture/**") + .hasRole(DEACTIVATED.toString()) + + // 회원가입 일정 수정 + .antMatchers(HttpMethod.PUT, "/signUp/schedule") + .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) + + // 회원가입은 ANONYMOUS 권한은 명시적으로 부여받은 상태에서만 가능 + .antMatchers("/signUp/check") + .hasRole(ANONYMOUS.toString()) + .antMatchers("/signUp/**") + .hasRole(SIGNING_UP.toString()) + + // 동아리 연혁 수정 + .antMatchers("/club/history/**") + .hasRole(EXECUTIVES.toString()) + + // 정책 수정 + .antMatchers(HttpMethod.PUT, "/policy/**") + .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) + + // 장학회 연혁 수정 + .antMatchers("/scholarship/history/**") + .hasRole(SECRETARY.toString()) + + // 그 외 + .anyRequest() + .hasRole(ANONYMOUS.toString()); http.addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class); - - return http.build(); } - private static RequestMatcher[] pathMatchers(String... patterns) { - return Arrays.stream(patterns).map(AntPathRequestMatcher::new).toArray(RequestMatcher[]::new); - } - - private static RequestMatcher[] methodMatchers(HttpMethod method, String... patterns) { - return Arrays.stream(patterns) - .map(p -> new AntPathRequestMatcher(p, method.name())) - .toArray(RequestMatcher[]::new); + @Bean + public SecurityExpressionHandler expressionHandler() { + DefaultWebSecurityExpressionHandler webSecurityExpressionHandler = + new DefaultWebSecurityExpressionHandler(); + webSecurityExpressionHandler.setRoleHierarchy(hierarchy.getHierarchy()); + return webSecurityExpressionHandler; } - @Bean public JwtAuthenticationFilter jwtAuthenticationFilter() throws Exception { final List skipPaths = new ArrayList<>(); @@ -247,7 +213,8 @@ public JwtAuthenticationFilter jwtAuthenticationFilter() throws Exception { final JwtAuthenticationFilter filter = new JwtAuthenticationFilter( requestMatcher, jwtTokenUtil, authBeansConfig.tokenResolver()); - filter.setAuthenticationManager(authenticationManager()); + + filter.setAuthenticationManager(super.authenticationManager()); return filter; } } diff --git a/resource-server/src/main/java/com/inhabas/api/domain/BaseEntity.java b/resource-server/src/main/java/com/inhabas/api/domain/BaseEntity.java index e756cd31a..b70b337df 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/BaseEntity.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/BaseEntity.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import jakarta.persistence.Column; -import jakarta.persistence.EntityListeners; -import jakarta.persistence.MappedSuperclass; +import javax.persistence.Column; +import javax.persistence.EntityListeners; +import javax.persistence.MappedSuperclass; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/AlbumBoard.java b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/AlbumBoard.java index 4f66cbd8d..0afe1347e 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/AlbumBoard.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/AlbumBoard.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/BaseBoard.java b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/BaseBoard.java index 478bf5436..7fa8cedd6 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/BaseBoard.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/BaseBoard.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Objects; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Content.java b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Content.java index 3736107b1..47f6142fc 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Content.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Content.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Title.java b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Title.java index c8aee22e7..70b938e9d 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Title.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Title.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/board/dto/BoardCountDto.java b/resource-server/src/main/java/com/inhabas/api/domain/board/dto/BoardCountDto.java index e092a0ec2..fc56c03d0 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/board/dto/BoardCountDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/board/dto/BoardCountDto.java @@ -1,7 +1,7 @@ package com.inhabas.api.domain.board.dto; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.PositiveOrZero; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.PositiveOrZero; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/board/usecase/BoardSecurityChecker.java b/resource-server/src/main/java/com/inhabas/api/domain/board/usecase/BoardSecurityChecker.java index adf41216d..31ae7a515 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/board/usecase/BoardSecurityChecker.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/board/usecase/BoardSecurityChecker.java @@ -9,7 +9,7 @@ import java.util.Set; import java.util.stream.Collectors; -import jakarta.persistence.EntityNotFoundException; +import javax.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetHistory.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetHistory.java index 635be4df8..51f75f9af 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetHistory.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetHistory.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetSupportApplication.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetSupportApplication.java index d7f4d8069..b0a4b2b2e 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetSupportApplication.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetSupportApplication.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Account.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Account.java index 4b7b113f8..ba1115877 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Account.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Account.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Details.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Details.java index da90d2b05..0f957f08c 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Details.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Details.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Price.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Price.java index 7a41ee0d9..1815937ba 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Price.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Price.java @@ -2,8 +2,8 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; +import javax.persistence.Column; +import javax.persistence.Embeddable; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/RejectReason.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/RejectReason.java index 13627149c..bdb01ffc9 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/RejectReason.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/RejectReason.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDetailDto.java index eb522b86c..2fa69a266 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDetailDto.java @@ -3,10 +3,10 @@ import java.time.LocalDateTime; import java.util.List; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Past; -import jakarta.validation.constraints.PositiveOrZero; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Past; +import javax.validation.constraints.PositiveOrZero; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDto.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDto.java index 6ecfc7937..892ad24bb 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDto.java @@ -2,8 +2,8 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationRegisterForm.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationRegisterForm.java index c0a6f0f7e..04d984e47 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationRegisterForm.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationRegisterForm.java @@ -4,11 +4,11 @@ import java.util.ArrayList; import java.util.List; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Past; -import jakarta.validation.constraints.PositiveOrZero; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Past; +import javax.validation.constraints.PositiveOrZero; +import javax.validation.constraints.Size; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationStatusChangeRequest.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationStatusChangeRequest.java index 03b412605..4e8af9c7e 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationStatusChangeRequest.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationStatusChangeRequest.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.budget.dto; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryCreateForm.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryCreateForm.java index c03c3c6a4..280a4b0ae 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryCreateForm.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryCreateForm.java @@ -3,11 +3,11 @@ import java.time.LocalDateTime; import java.util.List; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Past; -import jakarta.validation.constraints.PositiveOrZero; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Past; +import javax.validation.constraints.PositiveOrZero; +import javax.validation.constraints.Size; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDetailDto.java index 3b3352cdc..83ff4972e 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDetailDto.java @@ -3,10 +3,10 @@ import java.time.LocalDateTime; import java.util.List; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Past; -import jakarta.validation.constraints.PositiveOrZero; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Past; +import javax.validation.constraints.PositiveOrZero; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDto.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDto.java index a0e918431..ce51b0009 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDto.java @@ -2,10 +2,10 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Past; -import jakarta.validation.constraints.PositiveOrZero; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Past; +import javax.validation.constraints.PositiveOrZero; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/club/domain/ClubHistory.java b/resource-server/src/main/java/com/inhabas/api/domain/club/domain/ClubHistory.java index 67785f28c..12bebf6a7 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/club/domain/ClubHistory.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/club/domain/ClubHistory.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDto.java index a8aa86006..153d4e9fa 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDto.java @@ -3,9 +3,9 @@ import java.time.LocalDateTime; import java.util.List; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDto.java b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDto.java index e1e1875aa..64e80c3e1 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubHistoryDto.java b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubHistoryDto.java index bc3c25a60..d7edf8dde 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubHistoryDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubHistoryDto.java @@ -2,8 +2,8 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubActivityDto.java b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubActivityDto.java index 5c5452ae4..8e677ec36 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubActivityDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubActivityDto.java @@ -3,9 +3,9 @@ import java.util.ArrayList; import java.util.List; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDto.java b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDto.java index db93b4b26..1f2b7d83b 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDto.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/Comment.java b/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/Comment.java index 30d169f4e..d73110d7c 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/Comment.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/Comment.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Objects; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/valueObject/Content.java b/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/valueObject/Content.java index a3d6621bf..fd9921058 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/valueObject/Content.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/valueObject/Content.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentDetailDto.java index 65983a45b..0d559137a 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentDetailDto.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentSaveDto.java b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentSaveDto.java index dc7294729..1e1f4dde6 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentSaveDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentSaveDto.java @@ -1,7 +1,7 @@ package com.inhabas.api.domain.comment.dto; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Positive; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentUpdateDto.java b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentUpdateDto.java index c63cba208..639f9685d 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentUpdateDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentUpdateDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.comment.dto; -import jakarta.validation.constraints.NotBlank; +import javax.validation.constraints.NotBlank; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/WriterInfo.java b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/WriterInfo.java index 73a932806..e82badc6c 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/WriterInfo.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/WriterInfo.java @@ -1,8 +1,8 @@ package com.inhabas.api.domain.comment.dto; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/comment/usecase/CommentServiceImpl.java b/resource-server/src/main/java/com/inhabas/api/domain/comment/usecase/CommentServiceImpl.java index e2cf99952..e59960593 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/comment/usecase/CommentServiceImpl.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/comment/usecase/CommentServiceImpl.java @@ -2,7 +2,7 @@ import java.util.List; -import jakarta.persistence.EntityManager; +import javax.persistence.EntityManager; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestBoard.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestBoard.java index 1a56d723c..438e152a7 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestBoard.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestBoard.java @@ -7,17 +7,17 @@ import java.util.Collections; import java.util.List; -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.DiscriminatorValue; -import jakarta.persistence.Embedded; -import jakarta.persistence.Entity; -import jakarta.persistence.EntityListeners; -import jakarta.persistence.ForeignKey; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.DiscriminatorValue; +import javax.persistence.Embedded; +import javax.persistence.Entity; +import javax.persistence.EntityListeners; +import javax.persistence.ForeignKey; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestField.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestField.java index c132f0341..a9200a0d4 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestField.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestField.java @@ -1,13 +1,13 @@ package com.inhabas.api.domain.contest.domain; -import jakarta.persistence.Column; -import jakarta.persistence.Embedded; -import jakarta.persistence.Entity; -import jakarta.persistence.EntityListeners; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; +import javax.persistence.Column; +import javax.persistence.Embedded; +import javax.persistence.Entity; +import javax.persistence.EntityListeners; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Association.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Association.java index 3d3117610..12e82d2db 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Association.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Association.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/ContestFieldName.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/ContestFieldName.java index 4c2e362d1..85e45a708 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/ContestFieldName.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/ContestFieldName.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Topic.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Topic.java index 8200da5cf..fde048d86 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Topic.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Topic.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDto.java index ef650abc4..f31d5b201 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDto.java @@ -3,9 +3,9 @@ import java.time.LocalDateTime; import java.util.List; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDto.java index efa2c0fbb..937e38f28 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDto.java index 182d5b19c..71ea46aa7 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDto.java @@ -4,10 +4,10 @@ import java.util.ArrayList; import java.util.List; -import jakarta.validation.constraints.Future; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Future; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BaseFile.java b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BaseFile.java index 6f9bf328f..c4bea7a80 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BaseFile.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BaseFile.java @@ -3,7 +3,7 @@ import java.time.LocalDateTime; import java.util.Objects; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BoardFile.java b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BoardFile.java index 21e683672..ee39f16dc 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BoardFile.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BoardFile.java @@ -2,7 +2,7 @@ import java.util.Objects; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileName.java b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileName.java index 12dd1c2ae..179524b1a 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileName.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileName.java @@ -4,9 +4,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileUrl.java b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileUrl.java index 8ee8fbe1d..296e9f5cf 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileUrl.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileUrl.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/file/dto/FileDownloadDto.java b/resource-server/src/main/java/com/inhabas/api/domain/file/dto/FileDownloadDto.java index 8af72855d..1e7636954 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/file/dto/FileDownloadDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/file/dto/FileDownloadDto.java @@ -1,7 +1,7 @@ package com.inhabas.api.domain.file.dto; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Lecture.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Lecture.java index 010f874d0..c8e449ae7 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Lecture.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Lecture.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import jakarta.persistence.*; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; +import javax.persistence.*; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Student.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Student.java index 2e338a333..ce7ccdcfc 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Student.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Student.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.lecture.domain; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/LectureStatusConverter.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/LectureStatusConverter.java index 1a5404371..2cba4d2bd 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/LectureStatusConverter.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/LectureStatusConverter.java @@ -2,8 +2,8 @@ import java.util.Objects; -import jakarta.persistence.AttributeConverter; -import jakarta.persistence.Converter; +import javax.persistence.AttributeConverter; +import javax.persistence.Converter; import com.inhabas.api.domain.lecture.domain.valueObject.LectureStatus; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/StudentStatusConverter.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/StudentStatusConverter.java index ca284364f..2ae1ea6fa 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/StudentStatusConverter.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/StudentStatusConverter.java @@ -2,7 +2,7 @@ import java.util.Objects; -import jakarta.persistence.AttributeConverter; +import javax.persistence.AttributeConverter; import com.inhabas.api.domain.lecture.domain.valueObject.StudentStatus; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureRegisterForm.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureRegisterForm.java index ed8a1d478..631672e15 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureRegisterForm.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureRegisterForm.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.Future; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.Future; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureStatusUpdateRequest.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureStatusUpdateRequest.java index aa8e3cde6..55d62e3b0 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureStatusUpdateRequest.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureStatusUpdateRequest.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.lecture.dto; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureUpdateForm.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureUpdateForm.java index a283cfd06..fbfadef40 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureUpdateForm.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureUpdateForm.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.lecture.dto; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureSecurityChecker.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureSecurityChecker.java index b616c1bc5..6aeeb8c9e 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureSecurityChecker.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureSecurityChecker.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.lecture.usecase; -import jakarta.persistence.EntityNotFoundException; +import javax.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureServiceImpl.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureServiceImpl.java index a5587ce64..a18b9be3a 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureServiceImpl.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureServiceImpl.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.lecture.usecase; -import jakarta.persistence.EntityNotFoundException; +import javax.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceImpl.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceImpl.java index 40ef37540..f2e2e0a2c 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceImpl.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceImpl.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Collectors; -import jakarta.persistence.EntityNotFoundException; +import javax.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/Menu.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/Menu.java index 220bdb5b5..87ff7c8d7 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/Menu.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/Menu.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.menu.domain; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/MenuGroup.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/MenuGroup.java index 3507b9d1e..62c1fd129 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/MenuGroup.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/MenuGroup.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.menu.domain; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/Description.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/Description.java index e8ecdcbff..17387fbe0 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/Description.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/Description.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuGroupName.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuGroupName.java index 329e6938a..7685ad32f 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuGroupName.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuGroupName.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; @Embeddable public class MenuGroupName { diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuId.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuId.java index 87e377d4c..baef2f476 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuId.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuId.java @@ -3,10 +3,10 @@ import java.io.Serializable; import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuName.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuName.java index e02489941..f38f60849 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuName.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuName.java @@ -2,9 +2,9 @@ import java.util.Objects; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Transient; @Embeddable public class MenuName { diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/repository/MenuRepositoryImpl.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/repository/MenuRepositoryImpl.java index 44cfdb9e7..d66d02255 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/repository/MenuRepositoryImpl.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/repository/MenuRepositoryImpl.java @@ -1,11 +1,9 @@ package com.inhabas.api.domain.menu.repository; import static com.inhabas.api.domain.menu.domain.QMenu.menu; +import static com.querydsl.core.group.GroupBy.list; -import java.util.ArrayList; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; @@ -15,6 +13,8 @@ import com.inhabas.api.domain.menu.domain.valueObject.MenuId; import com.inhabas.api.domain.menu.dto.MenuDto; import com.inhabas.api.domain.menu.dto.MenuGroupDto; +import com.querydsl.core.group.GroupBy; +import com.querydsl.core.types.Projections; import com.querydsl.jpa.impl.JPAQueryFactory; @RequiredArgsConstructor @@ -23,35 +23,28 @@ public class MenuRepositoryImpl implements MenuRepositoryCustom { private final JPAQueryFactory jpaQueryFactory; public List findAllMenuByMenuGroup() { - // Hibernate 6 호환: transform/ScrollableResults 없이 한 번에 조회 후 Java에서 그룹핑 - List menus = - jpaQueryFactory - .selectFrom(menu) - .join(menu.menuGroup) - .fetchJoin() - .orderBy(menu.menuGroup.id.asc(), menu.priority.asc()) - .fetch(); - - // 그룹 이름 캐싱 (id -> name), 첫 등장 값 유지 - Map groupNames = new LinkedHashMap<>(); - menus.forEach( - m -> groupNames.putIfAbsent(m.getMenuGroup().getId(), m.getMenuGroup().getName())); - - // 메뉴를 그룹 ID 별로, 입력 순서 유지하며 모음 - Map> grouped = - menus.stream() - .collect( - Collectors.groupingBy( - m -> m.getMenuGroup().getId(), - LinkedHashMap::new, - Collectors.mapping(MenuDto::convert, Collectors.toList()))); - - List result = new ArrayList<>(grouped.size()); - grouped.forEach( - (groupId, menuDtos) -> - result.add(new MenuGroupDto(groupId, groupNames.get(groupId), menuDtos))); - - return result; + return jpaQueryFactory + .from(menu) + .orderBy(menu.menuGroup.id.asc()) + .orderBy(menu.priority.asc()) + .transform( + GroupBy.groupBy(menu.menuGroup) + .as( + list( + Projections.constructor( + MenuDto.class, + menu.id, + menu.priority, + menu.name.value, + menu.type, // enum type + menu.description.value)))) + .entrySet() + .stream() + .map( + entry -> + new MenuGroupDto( + entry.getKey().getId(), entry.getKey().getName(), entry.getValue())) + .collect(Collectors.toList()); } @Override diff --git a/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBoardDto.java index f80693a45..ec28e046d 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBoardDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationDto.java b/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationDto.java index 958d46f6c..ad88e33b8 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationDto.java @@ -2,8 +2,8 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyCommentDto.java b/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyCommentDto.java index 3db3bbd8c..635843c0b 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyCommentDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyCommentDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/domain/NormalBoard.java b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/domain/NormalBoard.java index 77aa0a238..b985f7cd7 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/domain/NormalBoard.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/domain/NormalBoard.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.List; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDto.java index b672da2db..4cd2a07a2 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDto.java @@ -3,9 +3,9 @@ import java.time.LocalDateTime; import java.util.List; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDto.java index 421b22632..9fd9470e9 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDto.java index b201f290c..83106850d 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDto.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import jakarta.validation.constraints.NotBlank; +import javax.validation.constraints.NotBlank; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyTerm.java b/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyTerm.java index e379dbb03..4a2e78b81 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyTerm.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyTerm.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.policy.domain; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyType.java b/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyType.java index a295e9786..8b4a7d670 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyType.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyType.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.policy.domain; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/PolicyTermDto.java b/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/PolicyTermDto.java index 3fc9e647f..fe7b985f7 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/PolicyTermDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/PolicyTermDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.policy.dto; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDto.java b/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDto.java index 1a03dc5a7..7c97a62ad 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.policy.dto; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/project/domain/ProjectBoard.java b/resource-server/src/main/java/com/inhabas/api/domain/project/domain/ProjectBoard.java index ebd050345..f8b4afc15 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/project/domain/ProjectBoard.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/project/domain/ProjectBoard.java @@ -5,16 +5,16 @@ import java.util.Collections; import java.util.List; -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.DiscriminatorValue; -import jakarta.persistence.Embedded; -import jakarta.persistence.Entity; -import jakarta.persistence.EntityListeners; -import jakarta.persistence.Inheritance; -import jakarta.persistence.InheritanceType; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.DiscriminatorValue; +import javax.persistence.Embedded; +import javax.persistence.Entity; +import javax.persistence.EntityListeners; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.OneToMany; +import javax.persistence.Table; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDto.java index 7308cdc1b..92e58a051 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDto.java @@ -3,9 +3,9 @@ import java.time.LocalDateTime; import java.util.List; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDto.java index 15ee618f2..2bdfa57e1 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDto.java index 8bd9b5d63..92d1dbf88 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDto.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import jakarta.validation.constraints.NotBlank; +import javax.validation.constraints.NotBlank; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/questionnaire/domain/Questionnaire.java b/resource-server/src/main/java/com/inhabas/api/domain/questionnaire/domain/Questionnaire.java index ebad137ff..14289ce85 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/questionnaire/domain/Questionnaire.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/questionnaire/domain/Questionnaire.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.questionnaire.domain; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/Scholarship.java b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/Scholarship.java index 13168163b..d3956cdd1 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/Scholarship.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/Scholarship.java @@ -5,14 +5,14 @@ import java.util.Collections; import java.util.List; -import jakarta.persistence.Column; -import jakarta.persistence.DiscriminatorValue; -import jakarta.persistence.Embedded; -import jakarta.persistence.Entity; -import jakarta.persistence.EntityListeners; -import jakarta.persistence.Inheritance; -import jakarta.persistence.InheritanceType; -import jakarta.persistence.Table; +import javax.persistence.Column; +import javax.persistence.DiscriminatorValue; +import javax.persistence.Embedded; +import javax.persistence.Entity; +import javax.persistence.EntityListeners; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/ScholarshipHistory.java b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/ScholarshipHistory.java index 63a46775d..e8e2978c6 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/ScholarshipHistory.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/ScholarshipHistory.java @@ -2,18 +2,18 @@ import java.time.LocalDateTime; -import jakarta.persistence.Column; -import jakarta.persistence.Embedded; -import jakarta.persistence.Entity; -import jakarta.persistence.EntityListeners; -import jakarta.persistence.FetchType; -import jakarta.persistence.ForeignKey; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; +import javax.persistence.Column; +import javax.persistence.Embedded; +import javax.persistence.Entity; +import javax.persistence.EntityListeners; +import javax.persistence.FetchType; +import javax.persistence.ForeignKey; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDto.java index 03b0b3c1f..0aeb77a9d 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDto.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Past; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Past; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDto.java b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDto.java index 3fed7234f..f4090d877 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Past; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Past; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDto.java index 448761830..35dc5038a 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDto.java @@ -3,9 +3,9 @@ import java.time.LocalDateTime; import java.util.List; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDto.java index f36e82265..9d49f0437 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUp/domain/entity/Answer.java b/resource-server/src/main/java/com/inhabas/api/domain/signUp/domain/entity/Answer.java index 8a9c92ab1..1c15be972 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUp/domain/entity/Answer.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUp/domain/entity/Answer.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.signUp.domain.entity; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/AnswerDto.java b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/AnswerDto.java index 46f7d5c31..104946cd8 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/AnswerDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/AnswerDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.signUp.dto; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.Positive; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/ApplicationDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/ApplicationDetailDto.java index 59f12b403..702bbb4fe 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/ApplicationDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/ApplicationDetailDto.java @@ -3,7 +3,7 @@ import java.time.LocalDateTime; import java.util.List; -import jakarta.validation.constraints.*; +import javax.validation.constraints.*; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/QuestionAnswerDto.java b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/QuestionAnswerDto.java index dc5766284..69a5a5cbc 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/QuestionAnswerDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/QuestionAnswerDto.java @@ -1,8 +1,8 @@ package com.inhabas.api.domain.signUp.dto; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/SignUpDto.java b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/SignUpDto.java index bc47332fc..25d43b4dd 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/SignUpDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/SignUpDto.java @@ -1,9 +1,9 @@ package com.inhabas.api.domain.signUp.dto; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Positive; import lombok.Builder; import lombok.Data; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUp/usecase/AnswerServiceImpl.java b/resource-server/src/main/java/com/inhabas/api/domain/signUp/usecase/AnswerServiceImpl.java index ab10596d6..5a17e5aba 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUp/usecase/AnswerServiceImpl.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUp/usecase/AnswerServiceImpl.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.stream.Collectors; -import jakarta.persistence.EntityNotFoundException; +import javax.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/domain/entity/SignUpSchedule.java b/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/domain/entity/SignUpSchedule.java index 44a346a0a..fddf7b9c7 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/domain/entity/SignUpSchedule.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/domain/entity/SignUpSchedule.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import jakarta.persistence.*; +import javax.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/dto/SignUpScheduleDto.java b/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/dto/SignUpScheduleDto.java index 53cc50e32..c194df037 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/dto/SignUpScheduleDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/dto/SignUpScheduleDto.java @@ -2,8 +2,8 @@ import java.time.LocalDateTime; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/resource-server/src/main/java/com/inhabas/api/global/dto/PagedPinnedResponseDto.java b/resource-server/src/main/java/com/inhabas/api/global/dto/PagedPinnedResponseDto.java index efa8076f3..30851468f 100644 --- a/resource-server/src/main/java/com/inhabas/api/global/dto/PagedPinnedResponseDto.java +++ b/resource-server/src/main/java/com/inhabas/api/global/dto/PagedPinnedResponseDto.java @@ -2,7 +2,7 @@ import java.util.List; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Builder; import lombok.Data; diff --git a/resource-server/src/main/java/com/inhabas/api/global/dto/PagedResponseDto.java b/resource-server/src/main/java/com/inhabas/api/global/dto/PagedResponseDto.java index c3941df0c..cf74a59d3 100644 --- a/resource-server/src/main/java/com/inhabas/api/global/dto/PagedResponseDto.java +++ b/resource-server/src/main/java/com/inhabas/api/global/dto/PagedResponseDto.java @@ -2,7 +2,7 @@ import java.util.List; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Builder; import lombok.Data; diff --git a/resource-server/src/main/java/com/inhabas/api/web/BudgetApplicationController.java b/resource-server/src/main/java/com/inhabas/api/web/BudgetApplicationController.java index 0494274dc..b68a8ca30 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/BudgetApplicationController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/BudgetApplicationController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/BudgetHistoryController.java b/resource-server/src/main/java/com/inhabas/api/web/BudgetHistoryController.java index 1e9e773a9..a23e4180a 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/BudgetHistoryController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/BudgetHistoryController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/ClubActivityController.java b/resource-server/src/main/java/com/inhabas/api/web/ClubActivityController.java index b791e01d7..458b60908 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/ClubActivityController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/ClubActivityController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/ClubHistoryController.java b/resource-server/src/main/java/com/inhabas/api/web/ClubHistoryController.java index 410e27ff4..e3ffbacfb 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/ClubHistoryController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/ClubHistoryController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/CommentController.java b/resource-server/src/main/java/com/inhabas/api/web/CommentController.java index 53b1ba459..114acbcf4 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/CommentController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/CommentController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/ContestBoardController.java b/resource-server/src/main/java/com/inhabas/api/web/ContestBoardController.java index 1b319ccce..02ea1d667 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/ContestBoardController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/ContestBoardController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,6 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import com.inhabas.api.auth.domain.error.ErrorResponse; -import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; import com.inhabas.api.domain.board.dto.BoardCountDto; import com.inhabas.api.domain.board.repository.BaseBoardRepository; import com.inhabas.api.domain.contest.domain.ContestType; @@ -245,12 +244,6 @@ public ResponseEntity updateContestBoard( return ResponseEntity.noContent().build(); } - // 잘못된 경로(boardsId 누락)로 들어오는 요청을 400으로 처리 - @PostMapping(path = "/contest/{contestType}/") - public ResponseEntity updateContestBoardInvalidPath(@PathVariable ContestType contestType) { - throw new InvalidInputException(); - } - @Operation(summary = "공모전 게시글 삭제") @DeleteMapping("contest/{contestType}/{boardId}") @PreAuthorize("@boardSecurityChecker.boardWriterOnly(#boardId) or hasRole('VICE_CHIEF')") diff --git a/resource-server/src/main/java/com/inhabas/api/web/ExceptionController.java b/resource-server/src/main/java/com/inhabas/api/web/ExceptionController.java index 6115d72a2..e4d2ab25f 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/ExceptionController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/ExceptionController.java @@ -8,7 +8,7 @@ import static com.inhabas.api.auth.domain.error.ErrorCode.SIGNUP_NOT_AVAILABLE; import static org.springframework.http.HttpStatus.*; -import jakarta.validation.ConstraintViolationException; +import javax.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/LectureController.java b/resource-server/src/main/java/com/inhabas/api/web/LectureController.java index 9f736879c..749aa9c23 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/LectureController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/LectureController.java @@ -2,8 +2,8 @@ import java.util.Map; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/MyInfoController.java b/resource-server/src/main/java/com/inhabas/api/web/MyInfoController.java index 8b3915947..3c1bad5bd 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/MyInfoController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/MyInfoController.java @@ -2,7 +2,7 @@ import java.util.List; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/NormalBoardController.java b/resource-server/src/main/java/com/inhabas/api/web/NormalBoardController.java index 89d3e3bad..f5b15dbf6 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/NormalBoardController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/NormalBoardController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/PolicyTermController.java b/resource-server/src/main/java/com/inhabas/api/web/PolicyTermController.java index e3839133a..16006691b 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/PolicyTermController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/PolicyTermController.java @@ -2,7 +2,7 @@ import java.util.List; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/ProjectBoardController.java b/resource-server/src/main/java/com/inhabas/api/web/ProjectBoardController.java index dc330c6e8..0dc8f88ae 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/ProjectBoardController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/ProjectBoardController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/ScholarshipController.java b/resource-server/src/main/java/com/inhabas/api/web/ScholarshipController.java index d51699305..1e3768ad7 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/ScholarshipController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/ScholarshipController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/ScholarshipHistoryController.java b/resource-server/src/main/java/com/inhabas/api/web/ScholarshipHistoryController.java index dcc0d252d..7207e851f 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/ScholarshipHistoryController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/ScholarshipHistoryController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/SignUpController.java b/resource-server/src/main/java/com/inhabas/api/web/SignUpController.java index 4ec50bdae..a57843b35 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/SignUpController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/SignUpController.java @@ -2,7 +2,7 @@ import java.util.*; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/SignUpScheduleController.java b/resource-server/src/main/java/com/inhabas/api/web/SignUpScheduleController.java index 3535604ba..658eb0b2c 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/SignUpScheduleController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/SignUpScheduleController.java @@ -1,6 +1,6 @@ package com.inhabas.api.web; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/interceptor/SignUpControllerInterceptor.java b/resource-server/src/main/java/com/inhabas/api/web/interceptor/SignUpControllerInterceptor.java index 12a928165..3d7128c12 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/interceptor/SignUpControllerInterceptor.java +++ b/resource-server/src/main/java/com/inhabas/api/web/interceptor/SignUpControllerInterceptor.java @@ -1,7 +1,7 @@ package com.inhabas.api.web.interceptor; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDtoTest.java index 2953b8edf..2c4b630bc 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDtoTest.java @@ -4,10 +4,10 @@ import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDtoTest.java index 05cf35d1b..7b8d97377 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDtoTest.java @@ -4,10 +4,10 @@ import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubHistoryDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubHistoryDtoTest.java index 6ee5f7f65..bdca9ec01 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubHistoryDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubHistoryDtoTest.java @@ -5,10 +5,10 @@ import java.time.LocalDateTime; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubActivityDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubActivityDtoTest.java index f5dde4790..468373bf6 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubActivityDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubActivityDtoTest.java @@ -5,10 +5,10 @@ import java.util.Arrays; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDtoTest.java index 6391c6eb3..3aa41316c 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDtoTest.java @@ -2,10 +2,10 @@ import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.assertj.core.api.Assertions; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/comment/usecase/CommentServiceTest.java b/resource-server/src/test/java/com/inhabas/api/domain/comment/usecase/CommentServiceTest.java index 6cf3c01d6..be0b38d9d 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/comment/usecase/CommentServiceTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/comment/usecase/CommentServiceTest.java @@ -9,7 +9,7 @@ import java.util.Optional; -import jakarta.persistence.EntityManager; +import javax.persistence.EntityManager; import org.springframework.test.util.ReflectionTestUtils; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDtoTest.java index 19b0848b4..41507db8b 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDtoTest.java @@ -6,10 +6,10 @@ import java.util.ArrayList; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import com.inhabas.api.domain.file.dto.FileDownloadDto; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDtoTest.java index b781d62fd..905e9b267 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDtoTest.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.assertj.core.api.Assertions; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/file/dto/FileDownloadDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/file/dto/FileDownloadDtoTest.java index 46e0a7ec2..fbe61dbf0 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/file/dto/FileDownloadDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/file/dto/FileDownloadDtoTest.java @@ -4,10 +4,10 @@ import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceDBTest.java b/resource-server/src/test/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceDBTest.java index 5e52c9161..3769bd43f 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceDBTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceDBTest.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.lecture.usecase; -import jakarta.persistence.EntityManager; +import javax.persistence.EntityManager; import org.springframework.beans.factory.annotation.Autowired; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBoardDtoTest.java index b6929d57e..10ecb41a0 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBoardDtoTest.java @@ -6,10 +6,10 @@ import java.time.LocalDateTime; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationsTest.java b/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationsTest.java index d66faa1d1..d55b62549 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationsTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationsTest.java @@ -5,10 +5,10 @@ import java.time.LocalDateTime; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import com.inhabas.api.auth.domain.oauth2.member.domain.valueObject.RequestStatus; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyCommentDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyCommentDtoTest.java index 0b687b4e3..309f75c14 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyCommentDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyCommentDtoTest.java @@ -6,10 +6,10 @@ import java.time.LocalDateTime; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDtoTest.java index 81d6f4449..8d02ebb52 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDtoTest.java @@ -7,10 +7,10 @@ import java.util.List; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import com.inhabas.api.domain.file.dto.FileDownloadDto; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDtoTest.java index 75c9493e1..34a201203 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDtoTest.java @@ -5,10 +5,10 @@ import java.time.LocalDateTime; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDtoTest.java index 7ad27d628..91dbc3154 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDtoTest.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.springframework.web.multipart.MultipartFile; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/PolicyTermDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/PolicyTermDtoTest.java index 706907f4a..0fda6ea32 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/PolicyTermDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/PolicyTermDtoTest.java @@ -4,10 +4,10 @@ import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDtoTest.java index 97c9074a9..c7c1f9752 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDtoTest.java @@ -4,10 +4,10 @@ import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDtoTest.java index 7663f6443..67415c46f 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDtoTest.java @@ -7,10 +7,10 @@ import java.util.List; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import com.inhabas.api.domain.file.dto.FileDownloadDto; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDtoTest.java index baa3fc9bc..40bad63f5 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDtoTest.java @@ -5,10 +5,10 @@ import java.time.LocalDateTime; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDtoTest.java index 606a1bcf7..9be4561bb 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDtoTest.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.springframework.web.multipart.MultipartFile; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDtoTest.java index 4491148e4..fcff66428 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDtoTest.java @@ -5,10 +5,10 @@ import java.time.LocalDateTime; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDtoTest.java index 21ded8fe6..f6fadbd96 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDtoTest.java @@ -4,10 +4,10 @@ import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDtoTest.java index 255b7bcf5..b2db7e477 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDtoTest.java @@ -6,10 +6,10 @@ import java.util.ArrayList; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.springframework.test.util.ReflectionTestUtils; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDtoTest.java index 0a9ab30c1..f75ff733c 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDtoTest.java @@ -5,10 +5,10 @@ import java.time.LocalDateTime; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.springframework.test.util.ReflectionTestUtils; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/signUp/repository/AnswerRepositoryTest.java b/resource-server/src/test/java/com/inhabas/api/domain/signUp/repository/AnswerRepositoryTest.java index 5a4ce9097..5080e5eef 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/signUp/repository/AnswerRepositoryTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/signUp/repository/AnswerRepositoryTest.java @@ -34,7 +34,7 @@ void findByMember_Id() { // given Member member = memberRepository.save(MemberTest.signingUpMember1()); Questionnaire questionnaire = new Questionnaire(1L, "hello"); - questionnaire = questionnaireRepository.saveAndFlush(questionnaire); + questionnaireRepository.save(questionnaire); String content = "Ok... bye"; Answer answer = new Answer(member, questionnaire, content); diff --git a/resource-server/src/test/java/com/inhabas/testAnnotataion/CustomSpringBootTest.java b/resource-server/src/test/java/com/inhabas/testAnnotataion/CustomSpringBootTest.java index 61205f371..b913abe5a 100644 --- a/resource-server/src/test/java/com/inhabas/testAnnotataion/CustomSpringBootTest.java +++ b/resource-server/src/test/java/com/inhabas/testAnnotataion/CustomSpringBootTest.java @@ -5,11 +5,12 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import javax.transaction.Transactional; + import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.annotation.AliasFor; import org.springframework.test.context.ActiveProfiles; -import org.springframework.transaction.annotation.Transactional; @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) From a486c94d26a8e62bb1e57d5281537a9fcb2b4102 Mon Sep 17 00:00:00 2001 From: agree0002 Date: Sat, 15 Nov 2025 22:34:48 +0900 Subject: [PATCH 2/7] =?UTF-8?q?[refactor/#350]=20javax=20->=20jakarta=20?= =?UTF-8?q?=EB=A7=88=EC=9D=B4=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 14 +++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- .../domain/oauth2/cookie/CookieUtils.java | 6 ++--- ...eOAuth2AuthorizationRequestRepository.java | 4 ++-- .../Oauth2AuthenticationFailureHandler.java | 4 ++-- .../Oauth2AuthenticationSuccessHandler.java | 6 ++--- .../oauth2/majorInfo/domain/MajorInfo.java | 2 +- .../majorInfo/domain/valueObject/College.java | 6 ++--- .../majorInfo/domain/valueObject/Major.java | 6 ++--- .../majorInfo/dto/MajorInfoSaveDto.java | 2 +- .../oauth2/member/domain/entity/Member.java | 2 +- .../domain/entity/UpdateNameRequest.java | 2 +- .../member/domain/valueObject/Email.java | 4 ++-- .../member/domain/valueObject/Generation.java | 4 ++-- .../member/domain/valueObject/Grade.java | 4 ++-- .../domain/valueObject/IbasInformation.java | 2 +- .../member/domain/valueObject/Introduce.java | 6 ++--- .../member/domain/valueObject/Name.java | 6 ++--- .../member/domain/valueObject/Phone.java | 4 ++-- .../domain/valueObject/SchoolInformation.java | 2 +- .../member/domain/valueObject/StudentId.java | 6 ++--- .../dto/ApprovedMemberManagementDto.java | 8 +++---- .../member/dto/ApprovedMemberSummaryDto.java | 4 ++-- .../domain/oauth2/member/dto/ContactDto.java | 2 +- .../oauth2/member/dto/ExecutiveMemberDto.java | 6 ++--- .../oauth2/member/dto/HallOfFameDto.java | 10 ++++---- .../member/dto/HandleNameRequestDto.java | 4 ++-- .../oauth2/member/dto/MyProfileDto.java | 2 +- .../dto/NotApprovedMemberManagementDto.java | 2 +- .../oauth2/member/dto/ProfileNameDto.java | 2 +- .../member/dto/UpdateNameRequestDto.java | 4 ++-- .../domain/entity/MemberSocialAccount.java | 2 +- .../socialAccount/domain/valueObject/UID.java | 6 ++--- .../domain/token/CustomRequestMatcher.java | 2 +- .../domain/token/JwtAccessDeniedHandler.java | 6 ++--- .../api/auth/domain/token/TokenResolver.java | 2 +- .../token/jwtUtils/JwtTokenResolver.java | 2 +- .../jwtUtils/refreshToken/RefreshToken.java | 2 +- .../JwtAuthenticationEntryPoint.java | 6 ++--- .../JwtAuthenticationFilter.java | 8 +++---- .../domain/oauth2/cookie/CookieUtilsTest.java | 10 +++++--- ...th2AuthorizationRequestRepositoryTest.java | 2 +- ...auth2AuthenticationFailureHandlerTest.java | 2 +- ...auth2AuthenticationSuccessHandlerTest.java | 2 +- .../domain/token/JwtTokenReIssueTest.java | 2 +- ...kenAuthenticationProcessingFilterTest.java | 8 +++---- .../main/java/com/inhabas/api/JpaConfig.java | 4 ++-- .../sshTunneling/SshTunnelingInitializer.java | 4 ++-- .../com/inhabas/api/domain/BaseEntity.java | 6 ++--- .../api/domain/board/domain/AlbumBoard.java | 2 +- .../api/domain/board/domain/BaseBoard.java | 2 +- .../board/domain/valueObject/Content.java | 6 ++--- .../board/domain/valueObject/Title.java | 6 ++--- .../api/domain/board/dto/BoardCountDto.java | 4 ++-- .../board/usecase/BoardSecurityChecker.java | 2 +- .../domain/budget/domain/BudgetHistory.java | 2 +- .../domain/BudgetSupportApplication.java | 2 +- .../budget/domain/valueObject/Account.java | 6 ++--- .../budget/domain/valueObject/Details.java | 6 ++--- .../budget/domain/valueObject/Price.java | 4 ++-- .../domain/valueObject/RejectReason.java | 6 ++--- .../dto/BudgetApplicationDetailDto.java | 8 +++---- .../budget/dto/BudgetApplicationDto.java | 4 ++-- .../dto/BudgetApplicationRegisterForm.java | 10 ++++---- .../BudgetApplicationStatusChangeRequest.java | 2 +- .../budget/dto/BudgetHistoryCreateForm.java | 10 ++++---- .../budget/dto/BudgetHistoryDetailDto.java | 8 +++---- .../domain/budget/dto/BudgetHistoryDto.java | 8 +++---- .../api/domain/club/domain/ClubHistory.java | 2 +- .../club/dto/ClubActivityDetailDto.java | 6 ++--- .../api/domain/club/dto/ClubActivityDto.java | 6 ++--- .../api/domain/club/dto/ClubHistoryDto.java | 4 ++-- .../domain/club/dto/SaveClubActivityDto.java | 6 ++--- .../domain/club/dto/SaveClubHistoryDto.java | 2 +- .../api/domain/comment/domain/Comment.java | 2 +- .../comment/domain/valueObject/Content.java | 6 ++--- .../domain/comment/dto/CommentDetailDto.java | 6 ++--- .../domain/comment/dto/CommentSaveDto.java | 4 ++-- .../domain/comment/dto/CommentUpdateDto.java | 2 +- .../api/domain/comment/dto/WriterInfo.java | 6 ++--- .../comment/usecase/CommentServiceImpl.java | 2 +- .../domain/contest/domain/ContestBoard.java | 22 ++++++++--------- .../domain/contest/domain/ContestField.java | 16 ++++++------- .../domain/valueObject/Association.java | 6 ++--- .../domain/valueObject/ContestFieldName.java | 6 ++--- .../contest/domain/valueObject/Topic.java | 6 ++--- .../contest/dto/ContestBoardDetailDto.java | 6 ++--- .../domain/contest/dto/ContestBoardDto.java | 6 ++--- .../contest/dto/SaveContestBoardDto.java | 8 +++---- .../api/domain/file/domain/BaseFile.java | 2 +- .../api/domain/file/domain/BoardFile.java | 2 +- .../file/domain/valueObject/FileName.java | 6 ++--- .../file/domain/valueObject/FileUrl.java | 6 ++--- .../api/domain/file/dto/FileDownloadDto.java | 4 ++-- .../api/domain/lecture/domain/Lecture.java | 6 ++--- .../api/domain/lecture/domain/Student.java | 2 +- .../converter/LectureStatusConverter.java | 4 ++-- .../converter/StudentStatusConverter.java | 2 +- .../lecture/dto/LectureRegisterForm.java | 6 ++--- .../dto/LectureStatusUpdateRequest.java | 2 +- .../domain/lecture/dto/LectureUpdateForm.java | 2 +- .../usecase/LectureSecurityChecker.java | 2 +- .../lecture/usecase/LectureServiceImpl.java | 2 +- .../usecase/LectureStudentServiceImpl.java | 2 +- .../inhabas/api/domain/menu/domain/Menu.java | 2 +- .../api/domain/menu/domain/MenuGroup.java | 2 +- .../menu/domain/valueObject/Description.java | 6 ++--- .../domain/valueObject/MenuGroupName.java | 6 ++--- .../menu/domain/valueObject/MenuId.java | 8 +++---- .../menu/domain/valueObject/MenuName.java | 6 ++--- .../api/domain/myInfo/dto/MyBoardDto.java | 6 ++--- .../dto/MyBudgetSupportApplicationDto.java | 4 ++-- .../api/domain/myInfo/dto/MyCommentDto.java | 6 ++--- .../normalBoard/domain/NormalBoard.java | 2 +- .../normalBoard/dto/NormalBoardDetailDto.java | 6 ++--- .../normalBoard/dto/NormalBoardDto.java | 6 ++--- .../normalBoard/dto/SaveNormalBoardDto.java | 2 +- .../api/domain/policy/domain/PolicyTerm.java | 2 +- .../api/domain/policy/domain/PolicyType.java | 2 +- .../api/domain/policy/dto/PolicyTermDto.java | 2 +- .../domain/policy/dto/SavePolicyTernDto.java | 2 +- .../domain/project/domain/ProjectBoard.java | 20 ++++++++-------- .../project/dto/ProjectBoardDetailDto.java | 6 ++--- .../domain/project/dto/ProjectBoardDto.java | 6 ++--- .../project/dto/SaveProjectBoardDto.java | 2 +- .../questionnaire/domain/Questionnaire.java | 2 +- .../scholarship/domain/Scholarship.java | 16 ++++++------- .../domain/ScholarshipHistory.java | 24 +++++++++---------- .../dto/SaveScholarshipBoardDto.java | 6 ++--- .../dto/SaveScholarshipHistoryDto.java | 6 ++--- .../dto/ScholarshipBoardDetailDto.java | 6 ++--- .../scholarship/dto/ScholarshipBoardDto.java | 6 ++--- .../domain/signUp/domain/entity/Answer.java | 2 +- .../api/domain/signUp/dto/AnswerDto.java | 2 +- .../signUp/dto/ApplicationDetailDto.java | 2 +- .../domain/signUp/dto/QuestionAnswerDto.java | 6 ++--- .../api/domain/signUp/dto/SignUpDto.java | 8 +++---- .../signUp/usecase/AnswerServiceImpl.java | 2 +- .../domain/entity/SignUpSchedule.java | 2 +- .../signUpSchedule/dto/SignUpScheduleDto.java | 4 ++-- .../global/dto/PagedPinnedResponseDto.java | 2 +- .../api/global/dto/PagedResponseDto.java | 2 +- .../api/web/BudgetApplicationController.java | 2 +- .../api/web/BudgetHistoryController.java | 2 +- .../api/web/ClubActivityController.java | 2 +- .../api/web/ClubHistoryController.java | 2 +- .../inhabas/api/web/CommentController.java | 2 +- .../api/web/ContestBoardController.java | 2 +- .../inhabas/api/web/ExceptionController.java | 2 +- .../inhabas/api/web/LectureController.java | 4 ++-- .../com/inhabas/api/web/MyInfoController.java | 2 +- .../api/web/NormalBoardController.java | 2 +- .../inhabas/api/web/PolicyTermController.java | 2 +- .../api/web/ProjectBoardController.java | 2 +- .../api/web/ScholarshipController.java | 2 +- .../api/web/ScholarshipHistoryController.java | 2 +- .../com/inhabas/api/web/SignUpController.java | 2 +- .../api/web/SignUpScheduleController.java | 2 +- .../SignUpControllerInterceptor.java | 4 ++-- .../club/dto/ClubActivityDetailDtoTest.java | 8 +++---- .../domain/club/dto/ClubActivityDtoTest.java | 8 +++---- .../domain/club/dto/ClubHistoryDtoTest.java | 8 +++---- .../club/dto/SaveClubActivityDtoTest.java | 8 +++---- .../club/dto/SaveClubHistoryDtoTest.java | 8 +++---- .../comment/usecase/CommentServiceTest.java | 2 +- .../dto/ContestBoardDetailDtoTest.java | 8 +++---- .../contest/dto/SaveContestBoardDtoTest.java | 8 +++---- .../domain/file/dto/FileDownloadDtoTest.java | 8 +++---- .../usecase/LectureStudentServiceDBTest.java | 2 +- .../api/domain/myInfo/dto/MyBoardDtoTest.java | 8 +++---- .../dto/MyBudgetSupportApplicationsTest.java | 8 +++---- .../domain/myInfo/dto/MyCommentDtoTest.java | 8 +++---- .../dto/NormalBoardDetailDtoTest.java | 8 +++---- .../normalBoard/dto/NormalBoardDtoTest.java | 8 +++---- .../dto/SaveNormalBoardDtoTest.java | 8 +++---- .../domain/policy/dto/PolicyTermDtoTest.java | 8 +++---- .../policy/dto/SavePolicyTernDtoTest.java | 8 +++---- .../dto/ProjectBoardDetailDtoTest.java | 8 +++---- .../project/dto/ProjectBoardDtoTest.java | 8 +++---- .../project/dto/SaveProjectBoardDtoTest.java | 8 +++---- .../dto/SaveScholarshipBoardDtoTest.java | 8 +++---- .../dto/SaveScholarshipHistoryDtoTest.java | 8 +++---- .../dto/ScholarshipBoardDetailDtoTest.java | 8 +++---- .../dto/ScholarshipBoardDtoTest.java | 8 +++---- .../testAnnotataion/CustomSpringBootTest.java | 2 +- 185 files changed, 462 insertions(+), 460 deletions(-) diff --git a/build.gradle b/build.gradle index 899d45bcc..cbf4c6814 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { - id 'org.springframework.boot' version '2.7.18' - id 'io.spring.dependency-management' version '1.0.15.RELEASE' + id 'org.springframework.boot' version '3.5.7' + id 'io.spring.dependency-management' version '1.1.6' id 'java-library' - id 'com.diffplug.spotless' version '6.13.0' + id 'com.diffplug.spotless' version '6.23.3' } spotless { @@ -20,7 +20,7 @@ spotless { //임포트 순서 정리 importOrder( "java", - "javax", + "jakarta", "lombok", "org.springframework", "", @@ -70,7 +70,7 @@ subprojects { 'org.springframework.boot:spring-boot-configuration-processor', 'jakarta.persistence:jakarta.persistence-api', 'jakarta.annotation:jakarta.annotation-api', - "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jpa" + "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta" ) implementation ( @@ -117,7 +117,7 @@ project(':module-jpa') { dependencies { api ( 'org.springframework.boot:spring-boot-starter-data-jpa', - 'com.querydsl:querydsl-jpa', // query dsl + "com.querydsl:querydsl-jpa:${dependencyManagement.importedProperties['querydsl.version']}:jakarta", // query dsl 'com.jcraft:jsch:0.1.55', // 로컬 개발용 db ssh tunneling, https://mavenlibs.com/maven/dependency/com.jcraft/jsch // 'org.mariadb.jdbc:mariadb-java-client', 'com.mysql:mysql-connector-j', @@ -142,7 +142,6 @@ project(':module-auth') { // security api 'org.springframework.boot:spring-boot-starter-security' api 'org.springframework.boot:spring-boot-starter-oauth2-client' - api 'javax.xml.bind:jaxb-api' testImplementation 'org.springframework.security:spring-security-test' testImplementation 'org.mockito:mockito-inline:2.13.0' } @@ -155,7 +154,6 @@ project(':module-fileStorage') { dependencies { api project(':module-jpa') - api 'javax.xml.bind:jaxb-api' testImplementation 'org.springframework.security:spring-security-test' testImplementation 'org.mockito:mockito-inline:2.13.0' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84d1f85fd..5c82cb032 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtils.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtils.java index 521c40957..836c9deb7 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtils.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtils.java @@ -4,9 +4,9 @@ import java.util.Objects; import java.util.Optional; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest; import org.springframework.util.SerializationUtils; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepository.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepository.java index 9173941e4..068adb89a 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepository.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepository.java @@ -1,7 +1,7 @@ package com.inhabas.api.auth.domain.oauth2.cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.oauth2.client.web.AuthorizationRequestRepository; import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandler.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandler.java index 78a374ad0..c249ae698 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandler.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandler.java @@ -4,8 +4,8 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandler.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandler.java index 8cd4277df..879c29010 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandler.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandler.java @@ -4,9 +4,9 @@ import java.io.IOException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/MajorInfo.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/MajorInfo.java index fe539ed29..59217e65d 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/MajorInfo.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/MajorInfo.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.oauth2.majorInfo.domain; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/College.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/College.java index 33aff6517..4eba43d12 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/College.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/College.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/Major.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/Major.java index 8bc1428f4..4c9f25298 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/Major.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/domain/valueObject/Major.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/dto/MajorInfoSaveDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/dto/MajorInfoSaveDto.java index ae19f0939..7d92ba2e6 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/dto/MajorInfoSaveDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/majorInfo/dto/MajorInfoSaveDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.oauth2.majorInfo.dto; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/Member.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/Member.java index 4c73b7ef6..14cca38eb 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/Member.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/Member.java @@ -4,7 +4,7 @@ import java.time.LocalDateTime; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/UpdateNameRequest.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/UpdateNameRequest.java index 9bbb2a070..8d6b73921 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/UpdateNameRequest.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/UpdateNameRequest.java @@ -4,7 +4,7 @@ import java.time.LocalDateTime; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Email.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Email.java index 732c7e054..6f0aaeb74 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Email.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Email.java @@ -3,8 +3,8 @@ import java.util.Objects; import java.util.regex.Pattern; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Generation.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Generation.java index 339f99c65..d720f04f7 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Generation.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Generation.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Grade.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Grade.java index a650a227f..fa2f54201 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Grade.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Grade.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/IbasInformation.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/IbasInformation.java index 3a76f7e8d..3e50a99f8 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/IbasInformation.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/IbasInformation.java @@ -3,7 +3,7 @@ import java.time.LocalDateTime; import java.util.Objects; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Introduce.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Introduce.java index 9cc85840f..2c3274d15 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Introduce.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Introduce.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Name.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Name.java index f5503b0c5..8f02f2a61 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Name.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Name.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Phone.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Phone.java index 266853ff1..89c90c375 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Phone.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/Phone.java @@ -3,8 +3,8 @@ import java.util.Objects; import java.util.regex.Pattern; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/SchoolInformation.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/SchoolInformation.java index 4baeabec1..addf3d12d 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/SchoolInformation.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/SchoolInformation.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/StudentId.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/StudentId.java index 3cdd5eb9c..b6dab2046 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/StudentId.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/valueObject/StudentId.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberManagementDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberManagementDto.java index 7ec5602e5..d52b88afb 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberManagementDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberManagementDto.java @@ -1,9 +1,9 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Positive; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberSummaryDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberSummaryDto.java index eddb9a894..8fd9ce415 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberSummaryDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ApprovedMemberSummaryDto.java @@ -1,7 +1,7 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ContactDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ContactDto.java index 9a502ee6c..d80a7d8b0 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ContactDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ContactDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ExecutiveMemberDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ExecutiveMemberDto.java index fad17c2a0..6eae631ec 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ExecutiveMemberDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ExecutiveMemberDto.java @@ -1,8 +1,8 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HallOfFameDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HallOfFameDto.java index e8c0c3116..658654e8b 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HallOfFameDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HallOfFameDto.java @@ -1,10 +1,10 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HandleNameRequestDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HandleNameRequestDto.java index 393296f2c..9a8088973 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HandleNameRequestDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/HandleNameRequestDto.java @@ -1,7 +1,7 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/MyProfileDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/MyProfileDto.java index 1b0a941e3..2ec223200 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/MyProfileDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/MyProfileDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import lombok.*; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/NotApprovedMemberManagementDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/NotApprovedMemberManagementDto.java index a75d237c8..b2c3c6fe6 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/NotApprovedMemberManagementDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/NotApprovedMemberManagementDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import lombok.*; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ProfileNameDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ProfileNameDto.java index a0cd73328..8878d29e8 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ProfileNameDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/ProfileNameDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.oauth2.member.dto; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import lombok.*; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/UpdateNameRequestDto.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/UpdateNameRequestDto.java index 1e75ed0b4..46f8d27a7 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/UpdateNameRequestDto.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/dto/UpdateNameRequestDto.java @@ -2,8 +2,8 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/entity/MemberSocialAccount.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/entity/MemberSocialAccount.java index ea0209c9d..11d3b6b11 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/entity/MemberSocialAccount.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/entity/MemberSocialAccount.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.oauth2.socialAccount.domain.entity; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/valueObject/UID.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/valueObject/UID.java index a6b19cc6b..24a663abf 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/valueObject/UID.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/socialAccount/domain/valueObject/UID.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/CustomRequestMatcher.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/CustomRequestMatcher.java index 6f491bbe0..b407debc5 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/CustomRequestMatcher.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/CustomRequestMatcher.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.token; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/JwtAccessDeniedHandler.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/JwtAccessDeniedHandler.java index 85413c89a..40d9c72a5 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/JwtAccessDeniedHandler.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/JwtAccessDeniedHandler.java @@ -5,9 +5,9 @@ import java.io.IOException; import java.io.OutputStream; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/TokenResolver.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/TokenResolver.java index bffb1d09f..55f083aee 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/TokenResolver.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/TokenResolver.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.token; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public interface TokenResolver { diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/JwtTokenResolver.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/JwtTokenResolver.java index e112f30fd..3f04af41c 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/JwtTokenResolver.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/JwtTokenResolver.java @@ -1,6 +1,6 @@ package com.inhabas.api.auth.domain.token.jwtUtils; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.util.StringUtils; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/refreshToken/RefreshToken.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/refreshToken/RefreshToken.java index 81259f68e..be4da461d 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/refreshToken/RefreshToken.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/jwtUtils/refreshToken/RefreshToken.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationEntryPoint.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationEntryPoint.java index 72bf2b928..f0d186162 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationEntryPoint.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationEntryPoint.java @@ -5,9 +5,9 @@ import java.io.IOException; import java.io.OutputStream; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationFilter.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationFilter.java index dae574bb0..9109abef8 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationFilter.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/token/securityFilter/JwtAuthenticationFilter.java @@ -6,10 +6,10 @@ import java.io.OutputStream; import java.util.Collections; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtilsTest.java b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtilsTest.java index 31af7b3bf..974f1694e 100644 --- a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtilsTest.java +++ b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/CookieUtilsTest.java @@ -8,7 +8,7 @@ import java.util.Optional; import java.util.Set; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; @@ -83,7 +83,9 @@ public void removeCookieOfRequest() { @DisplayName("성공적으로 serialize 한다.") @Test public void serializingTest() - throws InvocationTargetException, InstantiationException, IllegalAccessException, + throws InvocationTargetException, + InstantiationException, + IllegalAccessException, NoSuchMethodException { // reflection Constructor constructor = @@ -116,7 +118,9 @@ public void serializingTest() @DisplayName("성공적으로 deserialize 한다.") @Test public void deserializingTest() - throws NoSuchMethodException, InvocationTargetException, InstantiationException, + throws NoSuchMethodException, + InvocationTargetException, + InstantiationException, IllegalAccessException { // reflection diff --git a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepositoryTest.java b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepositoryTest.java index 1c8677a70..fbaee6c97 100644 --- a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepositoryTest.java +++ b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepositoryTest.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.function.Predicate; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandlerTest.java b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandlerTest.java index b14405358..ba04a8591 100644 --- a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandlerTest.java +++ b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationFailureHandlerTest.java @@ -6,7 +6,7 @@ import java.io.IOException; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandlerTest.java b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandlerTest.java index 2bfaffcc4..ed99aeedd 100644 --- a/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandlerTest.java +++ b/module-auth/src/test/java/com/inhabas/api/auth/domain/oauth2/handler/Oauth2AuthenticationSuccessHandlerTest.java @@ -12,7 +12,7 @@ import java.util.Map; import java.util.Set; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/module-auth/src/test/java/com/inhabas/api/auth/domain/token/JwtTokenReIssueTest.java b/module-auth/src/test/java/com/inhabas/api/auth/domain/token/JwtTokenReIssueTest.java index 989014e7e..03725c85c 100644 --- a/module-auth/src/test/java/com/inhabas/api/auth/domain/token/JwtTokenReIssueTest.java +++ b/module-auth/src/test/java/com/inhabas/api/auth/domain/token/JwtTokenReIssueTest.java @@ -6,7 +6,7 @@ import static org.mockito.BDDMockito.then; import static org.mockito.Mockito.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import com.inhabas.api.auth.domain.token.exception.InvalidTokenException; import com.inhabas.api.auth.domain.token.jwtUtils.JwtTokenReIssuer; diff --git a/module-auth/src/test/java/com/inhabas/api/auth/domain/token/TokenAuthenticationProcessingFilterTest.java b/module-auth/src/test/java/com/inhabas/api/auth/domain/token/TokenAuthenticationProcessingFilterTest.java index caec1bdbd..193328fc4 100644 --- a/module-auth/src/test/java/com/inhabas/api/auth/domain/token/TokenAuthenticationProcessingFilterTest.java +++ b/module-auth/src/test/java/com/inhabas/api/auth/domain/token/TokenAuthenticationProcessingFilterTest.java @@ -20,10 +20,10 @@ // import java.util.HashMap; // import java.util.List; // import java.util.Map; -// import javax.servlet.FilterChain; -// import javax.servlet.ServletException; -// import javax.servlet.http.HttpServletRequest; -// import javax.servlet.http.HttpServletResponse; +// import jakarta.servlet.FilterChain; +// import jakarta.servlet.ServletException; +// import jakarta.servlet.http.HttpServletRequest; +// import jakarta.servlet.http.HttpServletResponse; // import org.junit.jupiter.api.BeforeEach; // import org.junit.jupiter.api.DisplayName; // import org.junit.jupiter.api.Test; diff --git a/module-jpa/src/main/java/com/inhabas/api/JpaConfig.java b/module-jpa/src/main/java/com/inhabas/api/JpaConfig.java index 51b37774c..4e50fdaa7 100644 --- a/module-jpa/src/main/java/com/inhabas/api/JpaConfig.java +++ b/module-jpa/src/main/java/com/inhabas/api/JpaConfig.java @@ -1,7 +1,7 @@ package com.inhabas.api; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/module-jpa/src/main/java/com/inhabas/api/sshTunneling/SshTunnelingInitializer.java b/module-jpa/src/main/java/com/inhabas/api/sshTunneling/SshTunnelingInitializer.java index a65c42df0..b44664e93 100644 --- a/module-jpa/src/main/java/com/inhabas/api/sshTunneling/SshTunnelingInitializer.java +++ b/module-jpa/src/main/java/com/inhabas/api/sshTunneling/SshTunnelingInitializer.java @@ -4,8 +4,8 @@ import java.util.Properties; -import javax.annotation.PreDestroy; -import javax.validation.constraints.NotNull; +import jakarta.annotation.PreDestroy; +import jakarta.validation.constraints.NotNull; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/BaseEntity.java b/resource-server/src/main/java/com/inhabas/api/domain/BaseEntity.java index b70b337df..e756cd31a 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/BaseEntity.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/BaseEntity.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.EntityListeners; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/AlbumBoard.java b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/AlbumBoard.java index 0afe1347e..4f66cbd8d 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/AlbumBoard.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/AlbumBoard.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/BaseBoard.java b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/BaseBoard.java index 7fa8cedd6..478bf5436 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/BaseBoard.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/BaseBoard.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Objects; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Content.java b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Content.java index 47f6142fc..3736107b1 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Content.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Content.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Title.java b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Title.java index 70b938e9d..c8aee22e7 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Title.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/board/domain/valueObject/Title.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/board/dto/BoardCountDto.java b/resource-server/src/main/java/com/inhabas/api/domain/board/dto/BoardCountDto.java index fc56c03d0..e092a0ec2 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/board/dto/BoardCountDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/board/dto/BoardCountDto.java @@ -1,7 +1,7 @@ package com.inhabas.api.domain.board.dto; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.PositiveOrZero; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.PositiveOrZero; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/board/usecase/BoardSecurityChecker.java b/resource-server/src/main/java/com/inhabas/api/domain/board/usecase/BoardSecurityChecker.java index 31ae7a515..adf41216d 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/board/usecase/BoardSecurityChecker.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/board/usecase/BoardSecurityChecker.java @@ -9,7 +9,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetHistory.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetHistory.java index 51f75f9af..635be4df8 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetHistory.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetHistory.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetSupportApplication.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetSupportApplication.java index b0a4b2b2e..d7f4d8069 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetSupportApplication.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/BudgetSupportApplication.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Account.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Account.java index ba1115877..4b7b113f8 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Account.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Account.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Details.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Details.java index 0f957f08c..da90d2b05 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Details.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Details.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Price.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Price.java index 1815937ba..7a41ee0d9 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Price.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/Price.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/RejectReason.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/RejectReason.java index bdb01ffc9..13627149c 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/RejectReason.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/domain/valueObject/RejectReason.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDetailDto.java index 2fa69a266..eb522b86c 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDetailDto.java @@ -3,10 +3,10 @@ import java.time.LocalDateTime; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Past; -import javax.validation.constraints.PositiveOrZero; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Past; +import jakarta.validation.constraints.PositiveOrZero; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDto.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDto.java index 892ad24bb..6ecfc7937 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationDto.java @@ -2,8 +2,8 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationRegisterForm.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationRegisterForm.java index 04d984e47..c0a6f0f7e 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationRegisterForm.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationRegisterForm.java @@ -4,11 +4,11 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Past; -import javax.validation.constraints.PositiveOrZero; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Past; +import jakarta.validation.constraints.PositiveOrZero; +import jakarta.validation.constraints.Size; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationStatusChangeRequest.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationStatusChangeRequest.java index 4e8af9c7e..03b412605 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationStatusChangeRequest.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetApplicationStatusChangeRequest.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.budget.dto; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryCreateForm.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryCreateForm.java index 280a4b0ae..c03c3c6a4 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryCreateForm.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryCreateForm.java @@ -3,11 +3,11 @@ import java.time.LocalDateTime; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Past; -import javax.validation.constraints.PositiveOrZero; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Past; +import jakarta.validation.constraints.PositiveOrZero; +import jakarta.validation.constraints.Size; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDetailDto.java index 83ff4972e..3b3352cdc 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDetailDto.java @@ -3,10 +3,10 @@ import java.time.LocalDateTime; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Past; -import javax.validation.constraints.PositiveOrZero; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Past; +import jakarta.validation.constraints.PositiveOrZero; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDto.java b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDto.java index ce51b0009..a0e918431 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/budget/dto/BudgetHistoryDto.java @@ -2,10 +2,10 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Past; -import javax.validation.constraints.PositiveOrZero; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Past; +import jakarta.validation.constraints.PositiveOrZero; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/club/domain/ClubHistory.java b/resource-server/src/main/java/com/inhabas/api/domain/club/domain/ClubHistory.java index 12bebf6a7..67785f28c 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/club/domain/ClubHistory.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/club/domain/ClubHistory.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDto.java index 153d4e9fa..a8aa86006 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDto.java @@ -3,9 +3,9 @@ import java.time.LocalDateTime; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDto.java b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDto.java index 64e80c3e1..e1e1875aa 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubActivityDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubHistoryDto.java b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubHistoryDto.java index d7edf8dde..bc3c25a60 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubHistoryDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/ClubHistoryDto.java @@ -2,8 +2,8 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubActivityDto.java b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubActivityDto.java index 8e677ec36..5c5452ae4 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubActivityDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubActivityDto.java @@ -3,9 +3,9 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDto.java b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDto.java index 1f2b7d83b..db93b4b26 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDto.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/Comment.java b/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/Comment.java index d73110d7c..30d169f4e 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/Comment.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/Comment.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Objects; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/valueObject/Content.java b/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/valueObject/Content.java index fd9921058..a3d6621bf 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/valueObject/Content.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/comment/domain/valueObject/Content.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentDetailDto.java index 0d559137a..65983a45b 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentDetailDto.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentSaveDto.java b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentSaveDto.java index 1e1f4dde6..dc7294729 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentSaveDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentSaveDto.java @@ -1,7 +1,7 @@ package com.inhabas.api.domain.comment.dto; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Positive; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentUpdateDto.java b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentUpdateDto.java index 639f9685d..c63cba208 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentUpdateDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/CommentUpdateDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.comment.dto; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/WriterInfo.java b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/WriterInfo.java index e82badc6c..73a932806 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/WriterInfo.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/comment/dto/WriterInfo.java @@ -1,8 +1,8 @@ package com.inhabas.api.domain.comment.dto; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/comment/usecase/CommentServiceImpl.java b/resource-server/src/main/java/com/inhabas/api/domain/comment/usecase/CommentServiceImpl.java index e59960593..e2cf99952 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/comment/usecase/CommentServiceImpl.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/comment/usecase/CommentServiceImpl.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestBoard.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestBoard.java index 438e152a7..1a56d723c 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestBoard.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestBoard.java @@ -7,17 +7,17 @@ import java.util.Collections; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.ForeignKey; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestField.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestField.java index a9200a0d4..c132f0341 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestField.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/ContestField.java @@ -1,13 +1,13 @@ package com.inhabas.api.domain.contest.domain; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Association.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Association.java index 12e82d2db..3d3117610 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Association.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Association.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/ContestFieldName.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/ContestFieldName.java index 85e45a708..4c2e362d1 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/ContestFieldName.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/ContestFieldName.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Topic.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Topic.java index fde048d86..8200da5cf 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Topic.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/domain/valueObject/Topic.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDto.java index f31d5b201..ef650abc4 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDto.java @@ -3,9 +3,9 @@ import java.time.LocalDateTime; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDto.java index 937e38f28..efa2c0fbb 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/ContestBoardDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDto.java index 71ea46aa7..182d5b19c 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDto.java @@ -4,10 +4,10 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.constraints.Future; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Future; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BaseFile.java b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BaseFile.java index c4bea7a80..6f9bf328f 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BaseFile.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BaseFile.java @@ -3,7 +3,7 @@ import java.time.LocalDateTime; import java.util.Objects; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BoardFile.java b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BoardFile.java index ee39f16dc..21e683672 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BoardFile.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/BoardFile.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileName.java b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileName.java index 179524b1a..12dd1c2ae 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileName.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileName.java @@ -4,9 +4,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileUrl.java b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileUrl.java index 296e9f5cf..8ee8fbe1d 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileUrl.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/file/domain/valueObject/FileUrl.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import com.inhabas.api.auth.domain.error.businessException.InvalidInputException; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/file/dto/FileDownloadDto.java b/resource-server/src/main/java/com/inhabas/api/domain/file/dto/FileDownloadDto.java index 1e7636954..8af72855d 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/file/dto/FileDownloadDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/file/dto/FileDownloadDto.java @@ -1,7 +1,7 @@ package com.inhabas.api.domain.file.dto; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Lecture.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Lecture.java index c8e449ae7..010f874d0 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Lecture.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Lecture.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import javax.persistence.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Student.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Student.java index ce7ccdcfc..2e338a333 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Student.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/Student.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.lecture.domain; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/LectureStatusConverter.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/LectureStatusConverter.java index 2cba4d2bd..1a5404371 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/LectureStatusConverter.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/LectureStatusConverter.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import com.inhabas.api.domain.lecture.domain.valueObject.LectureStatus; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/StudentStatusConverter.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/StudentStatusConverter.java index 2ae1ea6fa..ca284364f 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/StudentStatusConverter.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/domain/converter/StudentStatusConverter.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import com.inhabas.api.domain.lecture.domain.valueObject.StudentStatus; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureRegisterForm.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureRegisterForm.java index 631672e15..ed8a1d478 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureRegisterForm.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureRegisterForm.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import javax.validation.constraints.Future; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Future; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureStatusUpdateRequest.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureStatusUpdateRequest.java index 55d62e3b0..aa8e3cde6 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureStatusUpdateRequest.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureStatusUpdateRequest.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.lecture.dto; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureUpdateForm.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureUpdateForm.java index fbfadef40..a283cfd06 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureUpdateForm.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/dto/LectureUpdateForm.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.lecture.dto; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureSecurityChecker.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureSecurityChecker.java index 6aeeb8c9e..b616c1bc5 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureSecurityChecker.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureSecurityChecker.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.lecture.usecase; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureServiceImpl.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureServiceImpl.java index a18b9be3a..a5587ce64 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureServiceImpl.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureServiceImpl.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.lecture.usecase; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceImpl.java b/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceImpl.java index f2e2e0a2c..40ef37540 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceImpl.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceImpl.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/Menu.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/Menu.java index 87ff7c8d7..220bdb5b5 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/Menu.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/Menu.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.menu.domain; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/MenuGroup.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/MenuGroup.java index 62c1fd129..3507b9d1e 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/MenuGroup.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/MenuGroup.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.menu.domain; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/Description.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/Description.java index 17387fbe0..e8ecdcbff 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/Description.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/Description.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuGroupName.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuGroupName.java index 7685ad32f..329e6938a 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuGroupName.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuGroupName.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; @Embeddable public class MenuGroupName { diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuId.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuId.java index baef2f476..87e377d4c 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuId.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuId.java @@ -3,10 +3,10 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuName.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuName.java index f38f60849..e02489941 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuName.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuName.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; @Embeddable public class MenuName { diff --git a/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBoardDto.java index ec28e046d..f80693a45 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBoardDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationDto.java b/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationDto.java index ad88e33b8..958d46f6c 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationDto.java @@ -2,8 +2,8 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyCommentDto.java b/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyCommentDto.java index 635843c0b..3db3bbd8c 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyCommentDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/myInfo/dto/MyCommentDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/domain/NormalBoard.java b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/domain/NormalBoard.java index b985f7cd7..77aa0a238 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/domain/NormalBoard.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/domain/NormalBoard.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.List; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDto.java index 4cd2a07a2..b672da2db 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDto.java @@ -3,9 +3,9 @@ import java.time.LocalDateTime; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDto.java index 9fd9470e9..421b22632 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDto.java index 83106850d..b201f290c 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDto.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyTerm.java b/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyTerm.java index 4a2e78b81..e379dbb03 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyTerm.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyTerm.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.policy.domain; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyType.java b/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyType.java index 8b4a7d670..a295e9786 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyType.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/policy/domain/PolicyType.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.policy.domain; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/PolicyTermDto.java b/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/PolicyTermDto.java index fe7b985f7..3fc9e647f 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/PolicyTermDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/PolicyTermDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.policy.dto; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDto.java b/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDto.java index 7c97a62ad..1a03dc5a7 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.policy.dto; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/project/domain/ProjectBoard.java b/resource-server/src/main/java/com/inhabas/api/domain/project/domain/ProjectBoard.java index f8b4afc15..ebd050345 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/project/domain/ProjectBoard.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/project/domain/ProjectBoard.java @@ -5,16 +5,16 @@ import java.util.Collections; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDto.java index 92e58a051..7308cdc1b 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDto.java @@ -3,9 +3,9 @@ import java.time.LocalDateTime; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDto.java index 2bdfa57e1..15ee618f2 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/project/dto/ProjectBoardDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDto.java index 92d1dbf88..8bd9b5d63 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDto.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/questionnaire/domain/Questionnaire.java b/resource-server/src/main/java/com/inhabas/api/domain/questionnaire/domain/Questionnaire.java index 14289ce85..ebad137ff 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/questionnaire/domain/Questionnaire.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/questionnaire/domain/Questionnaire.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.questionnaire.domain; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/Scholarship.java b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/Scholarship.java index d3956cdd1..13168163b 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/Scholarship.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/Scholarship.java @@ -5,14 +5,14 @@ import java.util.Collections; import java.util.List; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/ScholarshipHistory.java b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/ScholarshipHistory.java index e8e2978c6..63a46775d 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/ScholarshipHistory.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/ScholarshipHistory.java @@ -2,18 +2,18 @@ import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.Builder; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDto.java index 0aeb77a9d..03b0b3c1f 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDto.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Past; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Past; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDto.java b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDto.java index f4090d877..3fed7234f 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Past; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Past; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDto.java index 35dc5038a..448761830 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDto.java @@ -3,9 +3,9 @@ import java.time.LocalDateTime; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDto.java b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDto.java index 9d49f0437..f36e82265 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDto.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUp/domain/entity/Answer.java b/resource-server/src/main/java/com/inhabas/api/domain/signUp/domain/entity/Answer.java index 1c15be972..8a9c92ab1 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUp/domain/entity/Answer.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUp/domain/entity/Answer.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.signUp.domain.entity; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/AnswerDto.java b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/AnswerDto.java index 104946cd8..46f7d5c31 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/AnswerDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/AnswerDto.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.signUp.dto; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.Positive; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/ApplicationDetailDto.java b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/ApplicationDetailDto.java index 702bbb4fe..59f12b403 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/ApplicationDetailDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/ApplicationDetailDto.java @@ -3,7 +3,7 @@ import java.time.LocalDateTime; import java.util.List; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import lombok.Builder; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/QuestionAnswerDto.java b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/QuestionAnswerDto.java index 69a5a5cbc..dc5766284 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/QuestionAnswerDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/QuestionAnswerDto.java @@ -1,8 +1,8 @@ package com.inhabas.api.domain.signUp.dto; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/SignUpDto.java b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/SignUpDto.java index 25d43b4dd..bc47332fc 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/SignUpDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUp/dto/SignUpDto.java @@ -1,9 +1,9 @@ package com.inhabas.api.domain.signUp.dto; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Positive; import lombok.Builder; import lombok.Data; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUp/usecase/AnswerServiceImpl.java b/resource-server/src/main/java/com/inhabas/api/domain/signUp/usecase/AnswerServiceImpl.java index 5a17e5aba..ab10596d6 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUp/usecase/AnswerServiceImpl.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUp/usecase/AnswerServiceImpl.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/domain/entity/SignUpSchedule.java b/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/domain/entity/SignUpSchedule.java index fddf7b9c7..44a346a0a 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/domain/entity/SignUpSchedule.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/domain/entity/SignUpSchedule.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/dto/SignUpScheduleDto.java b/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/dto/SignUpScheduleDto.java index c194df037..53cc50e32 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/dto/SignUpScheduleDto.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/signUpSchedule/dto/SignUpScheduleDto.java @@ -2,8 +2,8 @@ import java.time.LocalDateTime; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/resource-server/src/main/java/com/inhabas/api/global/dto/PagedPinnedResponseDto.java b/resource-server/src/main/java/com/inhabas/api/global/dto/PagedPinnedResponseDto.java index 30851468f..efa8076f3 100644 --- a/resource-server/src/main/java/com/inhabas/api/global/dto/PagedPinnedResponseDto.java +++ b/resource-server/src/main/java/com/inhabas/api/global/dto/PagedPinnedResponseDto.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Data; diff --git a/resource-server/src/main/java/com/inhabas/api/global/dto/PagedResponseDto.java b/resource-server/src/main/java/com/inhabas/api/global/dto/PagedResponseDto.java index cf74a59d3..c3941df0c 100644 --- a/resource-server/src/main/java/com/inhabas/api/global/dto/PagedResponseDto.java +++ b/resource-server/src/main/java/com/inhabas/api/global/dto/PagedResponseDto.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Data; diff --git a/resource-server/src/main/java/com/inhabas/api/web/BudgetApplicationController.java b/resource-server/src/main/java/com/inhabas/api/web/BudgetApplicationController.java index b68a8ca30..0494274dc 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/BudgetApplicationController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/BudgetApplicationController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/BudgetHistoryController.java b/resource-server/src/main/java/com/inhabas/api/web/BudgetHistoryController.java index a23e4180a..1e9e773a9 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/BudgetHistoryController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/BudgetHistoryController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/ClubActivityController.java b/resource-server/src/main/java/com/inhabas/api/web/ClubActivityController.java index 458b60908..b791e01d7 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/ClubActivityController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/ClubActivityController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/ClubHistoryController.java b/resource-server/src/main/java/com/inhabas/api/web/ClubHistoryController.java index e3ffbacfb..410e27ff4 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/ClubHistoryController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/ClubHistoryController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/CommentController.java b/resource-server/src/main/java/com/inhabas/api/web/CommentController.java index 114acbcf4..53b1ba459 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/CommentController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/CommentController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/ContestBoardController.java b/resource-server/src/main/java/com/inhabas/api/web/ContestBoardController.java index 02ea1d667..7f6674c13 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/ContestBoardController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/ContestBoardController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/ExceptionController.java b/resource-server/src/main/java/com/inhabas/api/web/ExceptionController.java index e4d2ab25f..6115d72a2 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/ExceptionController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/ExceptionController.java @@ -8,7 +8,7 @@ import static com.inhabas.api.auth.domain.error.ErrorCode.SIGNUP_NOT_AVAILABLE; import static org.springframework.http.HttpStatus.*; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/LectureController.java b/resource-server/src/main/java/com/inhabas/api/web/LectureController.java index 749aa9c23..9f736879c 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/LectureController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/LectureController.java @@ -2,8 +2,8 @@ import java.util.Map; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/MyInfoController.java b/resource-server/src/main/java/com/inhabas/api/web/MyInfoController.java index 3c1bad5bd..8b3915947 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/MyInfoController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/MyInfoController.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/NormalBoardController.java b/resource-server/src/main/java/com/inhabas/api/web/NormalBoardController.java index f5b15dbf6..89d3e3bad 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/NormalBoardController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/NormalBoardController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/PolicyTermController.java b/resource-server/src/main/java/com/inhabas/api/web/PolicyTermController.java index 16006691b..e3839133a 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/PolicyTermController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/PolicyTermController.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/ProjectBoardController.java b/resource-server/src/main/java/com/inhabas/api/web/ProjectBoardController.java index 0dc8f88ae..dc330c6e8 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/ProjectBoardController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/ProjectBoardController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/ScholarshipController.java b/resource-server/src/main/java/com/inhabas/api/web/ScholarshipController.java index 1e3768ad7..d51699305 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/ScholarshipController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/ScholarshipController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/resource-server/src/main/java/com/inhabas/api/web/ScholarshipHistoryController.java b/resource-server/src/main/java/com/inhabas/api/web/ScholarshipHistoryController.java index 7207e851f..dcc0d252d 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/ScholarshipHistoryController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/ScholarshipHistoryController.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/SignUpController.java b/resource-server/src/main/java/com/inhabas/api/web/SignUpController.java index a57843b35..4ec50bdae 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/SignUpController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/SignUpController.java @@ -2,7 +2,7 @@ import java.util.*; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/SignUpScheduleController.java b/resource-server/src/main/java/com/inhabas/api/web/SignUpScheduleController.java index 658eb0b2c..3535604ba 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/SignUpScheduleController.java +++ b/resource-server/src/main/java/com/inhabas/api/web/SignUpScheduleController.java @@ -1,6 +1,6 @@ package com.inhabas.api.web; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/main/java/com/inhabas/api/web/interceptor/SignUpControllerInterceptor.java b/resource-server/src/main/java/com/inhabas/api/web/interceptor/SignUpControllerInterceptor.java index 3d7128c12..12a928165 100644 --- a/resource-server/src/main/java/com/inhabas/api/web/interceptor/SignUpControllerInterceptor.java +++ b/resource-server/src/main/java/com/inhabas/api/web/interceptor/SignUpControllerInterceptor.java @@ -1,7 +1,7 @@ package com.inhabas.api.web.interceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDtoTest.java index 2c4b630bc..2953b8edf 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDetailDtoTest.java @@ -4,10 +4,10 @@ import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDtoTest.java index 7b8d97377..05cf35d1b 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubActivityDtoTest.java @@ -4,10 +4,10 @@ import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubHistoryDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubHistoryDtoTest.java index bdca9ec01..6ee5f7f65 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubHistoryDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/ClubHistoryDtoTest.java @@ -5,10 +5,10 @@ import java.time.LocalDateTime; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubActivityDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubActivityDtoTest.java index 468373bf6..f5dde4790 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubActivityDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubActivityDtoTest.java @@ -5,10 +5,10 @@ import java.util.Arrays; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDtoTest.java index 3aa41316c..6391c6eb3 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/club/dto/SaveClubHistoryDtoTest.java @@ -2,10 +2,10 @@ import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.assertj.core.api.Assertions; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/comment/usecase/CommentServiceTest.java b/resource-server/src/test/java/com/inhabas/api/domain/comment/usecase/CommentServiceTest.java index be0b38d9d..6cf3c01d6 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/comment/usecase/CommentServiceTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/comment/usecase/CommentServiceTest.java @@ -9,7 +9,7 @@ import java.util.Optional; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.springframework.test.util.ReflectionTestUtils; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDtoTest.java index 41507db8b..19b0848b4 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/ContestBoardDetailDtoTest.java @@ -6,10 +6,10 @@ import java.util.ArrayList; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import com.inhabas.api.domain.file.dto.FileDownloadDto; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDtoTest.java index 905e9b267..b781d62fd 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/contest/dto/SaveContestBoardDtoTest.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.assertj.core.api.Assertions; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/file/dto/FileDownloadDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/file/dto/FileDownloadDtoTest.java index fbe61dbf0..46e0a7ec2 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/file/dto/FileDownloadDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/file/dto/FileDownloadDtoTest.java @@ -4,10 +4,10 @@ import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceDBTest.java b/resource-server/src/test/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceDBTest.java index 3769bd43f..5e52c9161 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceDBTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/lecture/usecase/LectureStudentServiceDBTest.java @@ -1,6 +1,6 @@ package com.inhabas.api.domain.lecture.usecase; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.springframework.beans.factory.annotation.Autowired; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBoardDtoTest.java index 10ecb41a0..b6929d57e 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBoardDtoTest.java @@ -6,10 +6,10 @@ import java.time.LocalDateTime; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationsTest.java b/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationsTest.java index d55b62549..d66faa1d1 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationsTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyBudgetSupportApplicationsTest.java @@ -5,10 +5,10 @@ import java.time.LocalDateTime; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import com.inhabas.api.auth.domain.oauth2.member.domain.valueObject.RequestStatus; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyCommentDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyCommentDtoTest.java index 309f75c14..0b687b4e3 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyCommentDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/myInfo/dto/MyCommentDtoTest.java @@ -6,10 +6,10 @@ import java.time.LocalDateTime; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDtoTest.java index 8d02ebb52..81d6f4449 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDetailDtoTest.java @@ -7,10 +7,10 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import com.inhabas.api.domain.file.dto.FileDownloadDto; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDtoTest.java index 34a201203..75c9493e1 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/NormalBoardDtoTest.java @@ -5,10 +5,10 @@ import java.time.LocalDateTime; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDtoTest.java index 91dbc3154..7ad27d628 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/normalBoard/dto/SaveNormalBoardDtoTest.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.springframework.web.multipart.MultipartFile; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/PolicyTermDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/PolicyTermDtoTest.java index 0fda6ea32..706907f4a 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/PolicyTermDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/PolicyTermDtoTest.java @@ -4,10 +4,10 @@ import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDtoTest.java index c7c1f9752..97c9074a9 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/policy/dto/SavePolicyTernDtoTest.java @@ -4,10 +4,10 @@ import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDtoTest.java index 67415c46f..7663f6443 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDetailDtoTest.java @@ -7,10 +7,10 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import com.inhabas.api.domain.file.dto.FileDownloadDto; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDtoTest.java index 40bad63f5..baa3fc9bc 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/project/dto/ProjectBoardDtoTest.java @@ -5,10 +5,10 @@ import java.time.LocalDateTime; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDtoTest.java index 9be4561bb..606a1bcf7 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/project/dto/SaveProjectBoardDtoTest.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.springframework.web.multipart.MultipartFile; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDtoTest.java index fcff66428..4491148e4 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipBoardDtoTest.java @@ -5,10 +5,10 @@ import java.time.LocalDateTime; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDtoTest.java index f6fadbd96..21ded8fe6 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/SaveScholarshipHistoryDtoTest.java @@ -4,10 +4,10 @@ import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDtoTest.java index b2db7e477..255b7bcf5 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDetailDtoTest.java @@ -6,10 +6,10 @@ import java.util.ArrayList; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.springframework.test.util.ReflectionTestUtils; diff --git a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDtoTest.java b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDtoTest.java index f75ff733c..0a9ab30c1 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDtoTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/dto/ScholarshipBoardDtoTest.java @@ -5,10 +5,10 @@ import java.time.LocalDateTime; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.springframework.test.util.ReflectionTestUtils; diff --git a/resource-server/src/test/java/com/inhabas/testAnnotataion/CustomSpringBootTest.java b/resource-server/src/test/java/com/inhabas/testAnnotataion/CustomSpringBootTest.java index b913abe5a..e203b8953 100644 --- a/resource-server/src/test/java/com/inhabas/testAnnotataion/CustomSpringBootTest.java +++ b/resource-server/src/test/java/com/inhabas/testAnnotataion/CustomSpringBootTest.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; From d211bd8daa21ac50e1c58cc5b6e7bd1923f40462 Mon Sep 17 00:00:00 2001 From: agree0002 Date: Sat, 15 Nov 2025 22:44:39 +0900 Subject: [PATCH 3/7] =?UTF-8?q?[refactor/#350]=20Thymeleaf=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=ED=8C=A8=ED=82=A4=EC=A7=80=20spring5=20->=20spring?= =?UTF-8?q?6=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/inhabas/api/auth/config/TemplateConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module-auth/src/main/java/com/inhabas/api/auth/config/TemplateConfig.java b/module-auth/src/main/java/com/inhabas/api/auth/config/TemplateConfig.java index e238c1a02..6c64986d8 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/config/TemplateConfig.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/config/TemplateConfig.java @@ -4,8 +4,8 @@ import org.springframework.context.annotation.Configuration; import org.thymeleaf.TemplateEngine; -import org.thymeleaf.spring5.SpringTemplateEngine; -import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; +import org.thymeleaf.spring6.SpringTemplateEngine; +import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver; import org.thymeleaf.templatemode.TemplateMode; @Configuration From 26fe0649dff01779bfcd272c7093d13238626c29 Mon Sep 17 00:00:00 2001 From: agree0002 Date: Sun, 16 Nov 2025 01:18:45 +0900 Subject: [PATCH 4/7] =?UTF-8?q?[refactor/#350]=20WebSecurityConfigurerAdap?= =?UTF-8?q?ter=20=E2=86=92=20SecurityFilterChain=20=EB=A7=88=EC=9D=B4?= =?UTF-8?q?=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/auth/config/AuthSecurityConfig.java | 67 ++--- ...eOAuth2AuthorizationRequestRepository.java | 1 - .../inhabas/api/config/WebSecurityConfig.java | 243 +++++++++--------- 3 files changed, 151 insertions(+), 160 deletions(-) diff --git a/module-auth/src/main/java/com/inhabas/api/auth/config/AuthSecurityConfig.java b/module-auth/src/main/java/com/inhabas/api/auth/config/AuthSecurityConfig.java index 4cb67a490..3a060276e 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/config/AuthSecurityConfig.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/config/AuthSecurityConfig.java @@ -2,13 +2,15 @@ import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.web.cors.CorsUtils; import com.inhabas.api.auth.domain.oauth2.CustomOAuth2UserService; @@ -17,10 +19,11 @@ import com.inhabas.api.auth.domain.oauth2.handler.Oauth2AuthenticationSuccessHandler; @Order(0) // 인증 관련 security filter chain 은 우선순위가 가장 높아야 함. +@Configuration @EnableWebSecurity @RequiredArgsConstructor @Profile({"dev1", "dev2", "local", "prod1", "prod2"}) // 테스트에는 포함시키지 않음. -public class AuthSecurityConfig extends WebSecurityConfigurerAdapter { +public class AuthSecurityConfig { private final CustomOAuth2UserService customOAuth2UserService; private final OAuth2AuthorizedClientService authorizedClientService; @@ -51,40 +54,38 @@ public class AuthSecurityConfig extends WebSecurityConfigurerAdapter { * 회원가입이나, jwt 토큰 발급을 위한 url 로 함부로 접근할 수 없게 하기 위해 jwt 토근이 발급되기 이전까지는 OAuth2 인증 결과를 세션을 통해서 유지함. * 따라서 critical 한 url 에 대해서 OAuth2 인증이 완료된 세션에 한해서만 허용. */ - @Override - protected void configure(HttpSecurity http) throws Exception { + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { - http.requestMatchers() - .antMatchers("/login/**") - .and() + http.securityMatcher("/login/**") // 세션 생성 금지 - .sessionManagement() - .sessionCreationPolicy(SessionCreationPolicy.STATELESS) - .and() - .cors() - .and() - .authorizeRequests() - .requestMatchers(CorsUtils::isPreFlightRequest) - .permitAll() - .anyRequest() - .permitAll() - .and() - .csrf() - .disable() - + .sessionManagement( + session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .cors(cors -> cors.disable()) + .authorizeHttpRequests( + authorize -> + authorize + .requestMatchers(CorsUtils::isPreFlightRequest) + .permitAll() + .anyRequest() + .permitAll()) + .csrf(csrf -> csrf.disable()) // Oauth 로그인 설정 - .oauth2Login() - .authorizedClientService(authorizedClientService) - .authorizationEndpoint() - .baseUri("/login/oauth2/authorization") - .authorizationRequestRepository(httpCookieOAuth2AuthorizationRequestRepository) - .and() + .oauth2Login( + oauth2 -> + oauth2 + .authorizedClientService(authorizedClientService) + .authorizationEndpoint( + authorization -> + authorization + .baseUri("/login/oauth2/authorization") + .authorizationRequestRepository( + httpCookieOAuth2AuthorizationRequestRepository)) + // 사용자 정보를 가져오는 엔드포인트에 대한 설정 + .userInfoEndpoint(userInfo -> userInfo.userService(customOAuth2UserService)) + .failureHandler(oauth2AuthenticationFailureHandler) + .successHandler(oauth2AuthenticationSuccessHandler)); - // 사용자 정보를 가져오는 엔드포인트에 대한 설정 - .userInfoEndpoint() - .userService(customOAuth2UserService) - .and() - .failureHandler(oauth2AuthenticationFailureHandler) - .successHandler(oauth2AuthenticationSuccessHandler); + return http.build(); } } diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepository.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepository.java index 068adb89a..baa981716 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepository.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/cookie/HttpCookieOAuth2AuthorizationRequestRepository.java @@ -52,7 +52,6 @@ public void saveAuthorizationRequest( } @Deprecated - @Override public OAuth2AuthorizationRequest removeAuthorizationRequest(HttpServletRequest request) { return null; } diff --git a/resource-server/src/main/java/com/inhabas/api/config/WebSecurityConfig.java b/resource-server/src/main/java/com/inhabas/api/config/WebSecurityConfig.java index 9bdbee858..6c15863da 100644 --- a/resource-server/src/main/java/com/inhabas/api/config/WebSecurityConfig.java +++ b/resource-server/src/main/java/com/inhabas/api/config/WebSecurityConfig.java @@ -8,19 +8,20 @@ import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; import org.springframework.http.HttpMethod; -import org.springframework.security.access.expression.SecurityExpressionHandler; +import org.springframework.security.access.hierarchicalroles.RoleHierarchy; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.web.FilterInvocation; -import org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.util.matcher.AndRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; @@ -65,12 +66,13 @@ public class WebSecurityConfig { private static final String[] AUTH_WHITELIST_CONTEST_BOARD = {"/contest/count"}; + @Configuration @Order(1) - @EnableGlobalMethodSecurity(prePostEnabled = true, jsr250Enabled = true) + @EnableMethodSecurity(jsr250Enabled = true) @EnableWebSecurity @RequiredArgsConstructor @Profile({"local", "dev1", "dev2", "default_mvc_test", "prod1", "prod2", "integration_test"}) - public static class ApiSecurityForDev extends WebSecurityConfigurerAdapter { + public static class ApiSecurityForDev { private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint; private final JwtAccessDeniedHandler jwtAccessDeniedHandler; @@ -79,126 +81,17 @@ public static class ApiSecurityForDev extends WebSecurityConfigurerAdapter { private final JwtAuthenticationProvider jwtAuthenticationProvider; private final AuthBeansConfig authBeansConfig; - @Override - public void configure(AuthenticationManagerBuilder auth) throws Exception { - auth.authenticationProvider(jwtAuthenticationProvider); - } - - @Override - public void configure(WebSecurity web) throws Exception { - web.ignoring() - .antMatchers(HttpMethod.GET, AUTH_WHITELIST_POLICY) - .antMatchers(HttpMethod.GET, AUTH_WHITELIST_SIGNUP) - .antMatchers(HttpMethod.GET, AUTH_WHITELIST_CLUB) - .antMatchers(HttpMethod.GET, AUTH_WHITELIST_NORMAL_BOARD) - .antMatchers(HttpMethod.GET, AUTH_WHITELIST_PROJECT_BOARD) - .antMatchers(HttpMethod.GET, AUTH_WHITELIST_CONTEST_BOARD) - .antMatchers(AUTH_WHITELIST_SWAGGER) - .antMatchers(AUTH_WHITELIST_STATIC) - .antMatchers(AUTH_WHITELIST_PATH); - } - - @Override - protected void configure(HttpSecurity http) throws Exception { - http - // OAuth 관련 경로 제외 모든 경로 - .requestMatchers() - .antMatchers("/**") - .and() - .anonymous() - .authorities("ROLE_" + ANONYMOUS) - .and() - // HTTP 기본 인증 비활성화 - .httpBasic() - .disable() - // 세션 생성 금지 - .sessionManagement() - .sessionCreationPolicy(SessionCreationPolicy.STATELESS) - .and() - // API 이므로 CORS 활성화, CSRF 비활성화 - .cors() - .and() - .csrf() - .disable() - - // 인증 예외 처리시 jwtAuthenticationEntryPoint 사용 - .exceptionHandling() - .authenticationEntryPoint(jwtAuthenticationEntryPoint) - .accessDeniedHandler(jwtAccessDeniedHandler) - .and() - .authorizeRequests() - // 권한 부여 표현식 - .expressionHandler(expressionHandler()) - // Preflight 방식 - .requestMatchers(CorsUtils::isPreFlightRequest) - .permitAll() - .antMatchers("/myInfo/requests") - .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) - .antMatchers("/myInfo/request/**") - .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) - - // 회원 관리 - .antMatchers("/members/executive") - .hasRole(ANONYMOUS.toString()) - .antMatchers("/members/hof") - .hasRole(DEACTIVATED.toString()) - .antMatchers("/members/approved/role") - .hasRole(SECRETARY.toString()) - .antMatchers("/members/approved/type") - .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) - .antMatchers("/members/**", "/member/**") - .hasAnyRole(SECRETARY.toString(), EXECUTIVES.toString()) - // 회계내역 - .antMatchers( - "/budget/history/**", - "/budget/histories", - "/budget/application/**", - "/budget/applications") - .hasRole(DEACTIVATED.toString()) - // 강의 - .antMatchers("/lecture/**/status") - .hasRole(EXECUTIVES.toString()) - .antMatchers("/lecture/**") - .hasRole(DEACTIVATED.toString()) - - // 회원가입 일정 수정 - .antMatchers(HttpMethod.PUT, "/signUp/schedule") - .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) - - // 회원가입은 ANONYMOUS 권한은 명시적으로 부여받은 상태에서만 가능 - .antMatchers("/signUp/check") - .hasRole(ANONYMOUS.toString()) - .antMatchers("/signUp/**") - .hasRole(SIGNING_UP.toString()) - - // 동아리 연혁 수정 - .antMatchers("/club/history/**") - .hasRole(EXECUTIVES.toString()) - - // 정책 수정 - .antMatchers(HttpMethod.PUT, "/policy/**") - .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) - - // 장학회 연혁 수정 - .antMatchers("/scholarship/history/**") - .hasRole(SECRETARY.toString()) - - // 그 외 - .anyRequest() - .hasRole(ANONYMOUS.toString()); - - http.addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class); - } - @Bean - public SecurityExpressionHandler expressionHandler() { - DefaultWebSecurityExpressionHandler webSecurityExpressionHandler = - new DefaultWebSecurityExpressionHandler(); - webSecurityExpressionHandler.setRoleHierarchy(hierarchy.getHierarchy()); - return webSecurityExpressionHandler; + public AuthenticationManager authenticationManager(HttpSecurity http) throws Exception { + AuthenticationManagerBuilder builder = + http.getSharedObject(AuthenticationManagerBuilder.class); + builder.authenticationProvider(jwtAuthenticationProvider); + return builder.build(); } - public JwtAuthenticationFilter jwtAuthenticationFilter() throws Exception { + @Bean + public JwtAuthenticationFilter jwtAuthenticationFilter( + AuthenticationManager authenticationManager) { final List skipPaths = new ArrayList<>(); for (String path : AUTH_WHITELIST_CLUB_ACTIVITY) { @@ -214,8 +107,106 @@ public JwtAuthenticationFilter jwtAuthenticationFilter() throws Exception { new JwtAuthenticationFilter( requestMatcher, jwtTokenUtil, authBeansConfig.tokenResolver()); - filter.setAuthenticationManager(super.authenticationManager()); + filter.setAuthenticationManager(authenticationManager); return filter; } + + @Bean + @Order(1) + public SecurityFilterChain apiSecurityFilterChain( + HttpSecurity http, JwtAuthenticationFilter jwtAuthenticationFilter) throws Exception { + http.securityMatcher("/**") + .anonymous(anon -> anon.authorities("ROLE_" + ANONYMOUS)) + .httpBasic(AbstractHttpConfigurer::disable) + .sessionManagement( + session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .cors(Customizer.withDefaults()) + .csrf(AbstractHttpConfigurer::disable) + .exceptionHandling( + ex -> + ex.authenticationEntryPoint(jwtAuthenticationEntryPoint) + .accessDeniedHandler(jwtAccessDeniedHandler)) + .authorizeHttpRequests( + authorize -> + authorize + .requestMatchers(CorsUtils::isPreFlightRequest) + .permitAll() + .requestMatchers(HttpMethod.GET, AUTH_WHITELIST_POLICY) + .permitAll() + .requestMatchers(HttpMethod.GET, AUTH_WHITELIST_SIGNUP) + .permitAll() + .requestMatchers(HttpMethod.GET, AUTH_WHITELIST_CLUB) + .permitAll() + .requestMatchers(HttpMethod.GET, AUTH_WHITELIST_NORMAL_BOARD) + .permitAll() + .requestMatchers(HttpMethod.GET, AUTH_WHITELIST_PROJECT_BOARD) + .permitAll() + .requestMatchers(HttpMethod.GET, AUTH_WHITELIST_CONTEST_BOARD) + .permitAll() + .requestMatchers(AUTH_WHITELIST_SWAGGER) + .permitAll() + .requestMatchers(AUTH_WHITELIST_STATIC) + .permitAll() + .requestMatchers(AUTH_WHITELIST_PATH) + .permitAll() + .requestMatchers("/myInfo/requests") + .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) + .requestMatchers("/myInfo/request/**") + .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) + // 회원 관리 + .requestMatchers("/members/executive") + .hasRole(ANONYMOUS.toString()) + .requestMatchers("/members/hof") + .hasRole(DEACTIVATED.toString()) + .requestMatchers("/members/approved/role") + .hasRole(SECRETARY.toString()) + .requestMatchers("/members/approved/type") + .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) + .requestMatchers("/members/**", "/member/**") + .hasAnyRole(SECRETARY.toString(), EXECUTIVES.toString()) + // 회계내역 + .requestMatchers( + "/budget/history/**", + "/budget/histories", + "/budget/application/**", + "/budget/applications") + .hasRole(DEACTIVATED.toString()) + // 강의 + .requestMatchers( + "/lecture/*/status", + "/lecture/*/students/status", + "/lecture/*/student/*/status") + .hasRole(EXECUTIVES.toString()) + .requestMatchers("/lecture/**") + .hasRole(DEACTIVATED.toString()) + // 회원가입 일정 수정 + .requestMatchers(HttpMethod.PUT, "/signUp/schedule") + .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) + // 회원가입은 ANONYMOUS 권한은 명시적으로 부여받은 상태에서만 가능 + .requestMatchers("/signUp/check") + .hasRole(ANONYMOUS.toString()) + .requestMatchers("/signUp/**") + .hasRole(SIGNING_UP.toString()) + // 동아리 연혁 수정 + .requestMatchers("/club/history/**") + .hasRole(EXECUTIVES.toString()) + // 정책 수정 + .requestMatchers(HttpMethod.PUT, "/policy/**") + .hasAnyRole(CHIEF.toString(), VICE_CHIEF.toString()) + // 장학회 연혁 수정 + .requestMatchers("/scholarship/history/**") + .hasRole(SECRETARY.toString()) + // 그 외 + .anyRequest() + .hasRole(ANONYMOUS.toString())); + + http.addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class); + return http.build(); + } + + @Bean + public RoleHierarchy roleHierarchy() { + return hierarchy.getHierarchy(); + } } } From d3bcb727772fc058061278934202f4ba3203fa4c Mon Sep 17 00:00:00 2001 From: agree0002 Date: Sun, 16 Nov 2025 23:27:07 +0900 Subject: [PATCH 5/7] =?UTF-8?q?[chore/#350]=20=EC=9D=98=EC=A1=B4=EC=84=B1?= =?UTF-8?q?=20=EB=B2=84=EC=A0=84=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 21 ++++++++++++++----- .../com/inhabas/api/config/SwaggerConfig.java | 2 +- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index cbf4c6814..c80b50dbb 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,11 @@ plugins { id 'com.diffplug.spotless' version '6.23.3' } +ext { + set('springCloudVersion', "2025.0.0") + set('querydslVersion', "5.1.0") +} + spotless { java { // 모든 Java 소스 파일에 포맷팅 규칙 적용 @@ -64,26 +69,32 @@ subprojects { } } + dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}" + } + } + dependencies { annotationProcessor( 'org.projectlombok:lombok', 'org.springframework.boot:spring-boot-configuration-processor', 'jakarta.persistence:jakarta.persistence-api', 'jakarta.annotation:jakarta.annotation-api', - "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta" + "com.querydsl:querydsl-apt:${querydslVersion}:jakarta" ) implementation ( 'org.springframework.boot:spring-boot-starter-web', 'org.springframework.boot:spring-boot-starter-validation', - 'org.springdoc:springdoc-openapi-ui:1.7.0', + 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0', 'com.google.code.findbugs:jsr305:3.0.2', 'io.awspring.cloud:spring-cloud-starter-aws:2.4.4', // cloud config - 'org.springframework.cloud:spring-cloud-starter-config:3.1.8', + 'org.springframework.cloud:spring-cloud-starter-config', 'org.springframework.boot:spring-boot-starter-actuator', - 'org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.8', + 'org.springframework.cloud:spring-cloud-starter-bootstrap', // mail 'org.springframework.boot:spring-boot-starter-mail', @@ -117,7 +128,7 @@ project(':module-jpa') { dependencies { api ( 'org.springframework.boot:spring-boot-starter-data-jpa', - "com.querydsl:querydsl-jpa:${dependencyManagement.importedProperties['querydsl.version']}:jakarta", // query dsl + "com.querydsl:querydsl-jpa:${querydslVersion}:jakarta", 'com.jcraft:jsch:0.1.55', // 로컬 개발용 db ssh tunneling, https://mavenlibs.com/maven/dependency/com.jcraft/jsch // 'org.mariadb.jdbc:mariadb-java-client', 'com.mysql:mysql-connector-j', diff --git a/resource-server/src/main/java/com/inhabas/api/config/SwaggerConfig.java b/resource-server/src/main/java/com/inhabas/api/config/SwaggerConfig.java index 664f68786..b6d8dd2ce 100644 --- a/resource-server/src/main/java/com/inhabas/api/config/SwaggerConfig.java +++ b/resource-server/src/main/java/com/inhabas/api/config/SwaggerConfig.java @@ -11,7 +11,7 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; import org.apache.http.HttpHeaders; -import org.springdoc.core.GroupedOpenApi; +import org.springdoc.core.models.GroupedOpenApi; @Configuration public class SwaggerConfig { From 42485b74884c095ed72d7f860fa999f66ae0dc2a Mon Sep 17 00:00:00 2001 From: agree0002 Date: Sun, 16 Nov 2025 23:28:23 +0900 Subject: [PATCH 6/7] =?UTF-8?q?[refactor/#350]=20Hibernate=206=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8=EC=97=90=20=EB=94=B0=EB=A5=B8=20Que?= =?UTF-8?q?rydsl=20=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menu/repository/MenuRepositoryImpl.java | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/repository/MenuRepositoryImpl.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/repository/MenuRepositoryImpl.java index d66d02255..9e538b0c9 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/repository/MenuRepositoryImpl.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/repository/MenuRepositoryImpl.java @@ -1,20 +1,22 @@ package com.inhabas.api.domain.menu.repository; import static com.inhabas.api.domain.menu.domain.QMenu.menu; -import static com.querydsl.core.group.GroupBy.list; +import static com.inhabas.api.domain.menu.domain.QMenuGroup.menuGroup; +import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import com.inhabas.api.domain.menu.domain.Menu; +import com.inhabas.api.domain.menu.domain.MenuGroup; import com.inhabas.api.domain.menu.domain.valueObject.MenuId; import com.inhabas.api.domain.menu.dto.MenuDto; import com.inhabas.api.domain.menu.dto.MenuGroupDto; -import com.querydsl.core.group.GroupBy; -import com.querydsl.core.types.Projections; import com.querydsl.jpa.impl.JPAQueryFactory; @RequiredArgsConstructor @@ -23,23 +25,24 @@ public class MenuRepositoryImpl implements MenuRepositoryCustom { private final JPAQueryFactory jpaQueryFactory; public List findAllMenuByMenuGroup() { - return jpaQueryFactory - .from(menu) - .orderBy(menu.menuGroup.id.asc()) - .orderBy(menu.priority.asc()) - .transform( - GroupBy.groupBy(menu.menuGroup) - .as( - list( - Projections.constructor( - MenuDto.class, - menu.id, - menu.priority, - menu.name.value, - menu.type, // enum type - menu.description.value)))) - .entrySet() - .stream() + List menus = + jpaQueryFactory + .selectFrom(menu) + .leftJoin(menu.menuGroup, menuGroup) + .fetchJoin() + .orderBy(menu.menuGroup.id.asc(), menu.priority.asc()) + .fetch(); + + // 메뉴 그룹별로 그룹화 + Map> groupedMenus = new LinkedHashMap<>(); + for (Menu m : menus) { + MenuGroup group = m.getMenuGroup(); + groupedMenus.putIfAbsent(group, new ArrayList<>()); + groupedMenus.get(group).add(MenuDto.convert(m)); + } + + // MenuGroupDto로 변환 + return groupedMenus.entrySet().stream() .map( entry -> new MenuGroupDto( From 707ada4a00654a24a170aa69323eb1f5d42c167b Mon Sep 17 00:00:00 2001 From: agree0002 Date: Sun, 16 Nov 2025 23:32:41 +0900 Subject: [PATCH 7/7] =?UTF-8?q?[test/#350]=20Hibernate=206=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/oauth2/member/domain/entity/Member.java | 2 +- .../repository/QuestionnaireRepositoryTest.java | 10 +++++----- .../repository/ScholarshipHistoryRepositoryTest.java | 8 ++++---- .../api/domain/signUp/SignUpIntegrationTest.java | 10 +++++----- .../domain/signUp/repository/AnswerRepositoryTest.java | 2 +- .../inhabas/api/web/ContestBoardControllerTest.java | 2 +- .../java/com/inhabas/api/web/MenuControllerTest.java | 4 ++-- .../inhabas/testAnnotataion/NoSecureWebMvcTest.java | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/Member.java b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/Member.java index 14cca38eb..164a92473 100644 --- a/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/Member.java +++ b/module-auth/src/main/java/com/inhabas/api/auth/domain/oauth2/member/domain/entity/Member.java @@ -26,7 +26,7 @@ uniqueConstraints = { @UniqueConstraint( name = "UNIQUE_PROVIDER_UID", - columnNames = {"provider", "uid"}) + columnNames = {"provider", "UID"}) }) @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) diff --git a/resource-server/src/test/java/com/inhabas/api/domain/questionnaire/repository/QuestionnaireRepositoryTest.java b/resource-server/src/test/java/com/inhabas/api/domain/questionnaire/repository/QuestionnaireRepositoryTest.java index 578531a8a..535771f7e 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/questionnaire/repository/QuestionnaireRepositoryTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/questionnaire/repository/QuestionnaireRepositoryTest.java @@ -27,11 +27,11 @@ public void countByIdIn() { ArrayList questionnaireInDatabase = new ArrayList<>() { { - add(new Questionnaire(1L, "지원동기 및 목표를 기술해주세요.")); - add(new Questionnaire(2L, "프로그래밍 관련 언어를 다루어 본 적이 있다면 적어주세요.")); - add(new Questionnaire(3L, "빅데이터 관련 활동 혹은 공모전 관련 경험이 있다면 적어주세요.")); - add(new Questionnaire(4L, "추후 희망하는 진로가 무엇이며, 동아리 활동이 진로에 어떠한 영향을 줄 것이라고 생각하나요?")); - add(new Questionnaire(5L, "어떤 경로로 IBAS를 알게 되셨나요?")); + add(new Questionnaire(null, "지원동기 및 목표를 기술해주세요.")); + add(new Questionnaire(null, "프로그래밍 관련 언어를 다루어 본 적이 있다면 적어주세요.")); + add(new Questionnaire(null, "빅데이터 관련 활동 혹은 공모전 관련 경험이 있다면 적어주세요.")); + add(new Questionnaire(null, "추후 희망하는 진로가 무엇이며, 동아리 활동이 진로에 어떠한 영향을 줄 것이라고 생각하나요?")); + add(new Questionnaire(null, "어떤 경로로 IBAS를 알게 되셨나요?")); } }; questionnaireRepository.saveAll(questionnaireInDatabase); diff --git a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/repository/ScholarshipHistoryRepositoryTest.java b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/repository/ScholarshipHistoryRepositoryTest.java index 936c3be2b..1c1a4168d 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/scholarship/repository/ScholarshipHistoryRepositoryTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/scholarship/repository/ScholarshipHistoryRepositoryTest.java @@ -5,7 +5,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; -import org.springframework.test.util.ReflectionTestUtils; import com.inhabas.api.auth.domain.oauth2.member.domain.entity.Member; import com.inhabas.api.auth.domain.oauth2.member.repository.MemberRepository; @@ -31,16 +30,17 @@ void getYearlyData() { Member writer = memberRepository.save(MemberTest.chiefMember()); ScholarshipHistory scholarshipHistory = new ScholarshipHistory(writer, "title", LocalDateTime.now()); - ReflectionTestUtils.setField(scholarshipHistory, "id", 1L); ScholarshipHistory savedScholarshipHistory = scholarshipHistoryRepository.save(scholarshipHistory); Data data = - new Data(1L, savedScholarshipHistory.getTitle(), savedScholarshipHistory.getDateHistory()); + new Data( + savedScholarshipHistory.getId(), + savedScholarshipHistory.getTitle(), + savedScholarshipHistory.getDateHistory()); List savedData = List.of(new YearlyData(savedScholarshipHistory.getDateHistory().getYear(), List.of(data))); // when - scholarshipHistoryRepository.save(scholarshipHistory); List yearlyData = scholarshipHistoryRepository.getYearlyData(); // then diff --git a/resource-server/src/test/java/com/inhabas/api/domain/signUp/SignUpIntegrationTest.java b/resource-server/src/test/java/com/inhabas/api/domain/signUp/SignUpIntegrationTest.java index 74af3571a..fc32492d1 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/signUp/SignUpIntegrationTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/signUp/SignUpIntegrationTest.java @@ -348,11 +348,11 @@ public static RequestPostProcessor accessToken(String accessToken) { private void 면접질문_설정() { questionnaireRepository.saveAll( Arrays.asList( - new Questionnaire(1L, "지원동기 및 목표를 기술해주세요."), - new Questionnaire(2L, "프로그래밍 관련 언어를 다루어 본 적이 있다면 적어주세요."), - new Questionnaire(3L, "빅데이터 관련 활동 혹은 공모전 관련 경험이 있다면 적어주세요."), - new Questionnaire(4L, "추후 희망하는 진로가 무엇이며, 동아리 활동이 진로에 어떠한 영향을 줄 것이라고 생각하나요?"), - new Questionnaire(5L, "어떤 경로로 IBAS를 알게 되셨나요?"))); + new Questionnaire(null, "지원동기 및 목표를 기술해주세요."), + new Questionnaire(null, "프로그래밍 관련 언어를 다루어 본 적이 있다면 적어주세요."), + new Questionnaire(null, "빅데이터 관련 활동 혹은 공모전 관련 경험이 있다면 적어주세요."), + new Questionnaire(null, "추후 희망하는 진로가 무엇이며, 동아리 활동이 진로에 어떠한 영향을 줄 것이라고 생각하나요?"), + new Questionnaire(null, "어떤 경로로 IBAS를 알게 되셨나요?"))); } private void 전공정보_설정() { diff --git a/resource-server/src/test/java/com/inhabas/api/domain/signUp/repository/AnswerRepositoryTest.java b/resource-server/src/test/java/com/inhabas/api/domain/signUp/repository/AnswerRepositoryTest.java index 5080e5eef..cafe1d452 100644 --- a/resource-server/src/test/java/com/inhabas/api/domain/signUp/repository/AnswerRepositoryTest.java +++ b/resource-server/src/test/java/com/inhabas/api/domain/signUp/repository/AnswerRepositoryTest.java @@ -33,7 +33,7 @@ class AnswerRepositoryTest { void findByMember_Id() { // given Member member = memberRepository.save(MemberTest.signingUpMember1()); - Questionnaire questionnaire = new Questionnaire(1L, "hello"); + Questionnaire questionnaire = new Questionnaire(null, "hello"); questionnaireRepository.save(questionnaire); String content = "Ok... bye"; Answer answer = new Answer(member, questionnaire, content); diff --git a/resource-server/src/test/java/com/inhabas/api/web/ContestBoardControllerTest.java b/resource-server/src/test/java/com/inhabas/api/web/ContestBoardControllerTest.java index 1721c9fb7..24afefe4c 100644 --- a/resource-server/src/test/java/com/inhabas/api/web/ContestBoardControllerTest.java +++ b/resource-server/src/test/java/com/inhabas/api/web/ContestBoardControllerTest.java @@ -316,7 +316,7 @@ void updateBoard_Invalid_Input() throws Exception { // when String response = mvc.perform( - post("/contest/contest/") + post("/contest/contest/1") .contentType(MediaType.APPLICATION_JSON) .content(jsonOf(saveContestBoardDto))) .andExpect(status().isBadRequest()) diff --git a/resource-server/src/test/java/com/inhabas/api/web/MenuControllerTest.java b/resource-server/src/test/java/com/inhabas/api/web/MenuControllerTest.java index c2e4fb67f..f61d8134d 100644 --- a/resource-server/src/test/java/com/inhabas/api/web/MenuControllerTest.java +++ b/resource-server/src/test/java/com/inhabas/api/web/MenuControllerTest.java @@ -49,7 +49,7 @@ public void getTotalMenuInfoTest() throws Exception { .andExpect( content() .string( - "[{\"id\":1,\"groupName\":\"IBAS\",\"menuList\":[{\"menuId\":6,\"priority\":1,\"name\":\"ë\u008F\u0099ì\u0095\u0084리 ì\u0086\u008Cê°\u009C\",\"type\":\"INTRODUCE\",\"description\":\"\"}]}]")) + "[{\"id\":1,\"groupName\":\"IBAS\",\"menuList\":[{\"menuId\":6,\"priority\":1,\"name\":\"동아리 소개\",\"type\":\"INTRODUCE\",\"description\":\"\"}]}]")) .andReturn(); then(menuService).should(times(1)).getAllMenuInfo(); @@ -66,7 +66,7 @@ public void getMenuInfoByIdTest() throws Exception { .andExpect( content() .string( - "{\"menuId\":6,\"priority\":1,\"name\":\"ê³µì§\u0080ì\u0082¬í\u0095\u00AD\",\"type\":\"LIST\",\"description\":\"\"}")) + "{\"menuId\":6,\"priority\":1,\"name\":\"공지사항\",\"type\":\"LIST\",\"description\":\"\"}")) .andExpect(status().isOk()) .andReturn(); diff --git a/resource-server/src/test/java/com/inhabas/testAnnotataion/NoSecureWebMvcTest.java b/resource-server/src/test/java/com/inhabas/testAnnotataion/NoSecureWebMvcTest.java index 34b43e623..6c51e88d1 100644 --- a/resource-server/src/test/java/com/inhabas/testAnnotataion/NoSecureWebMvcTest.java +++ b/resource-server/src/test/java/com/inhabas/testAnnotataion/NoSecureWebMvcTest.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration; +import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientWebSecurityAutoConfiguration; import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.context.annotation.Import; @@ -16,7 +16,7 @@ /** * WebMvcTest(excludeAutoConfiguration = {SecurityAutoConfiguration.class, - * OAuth2ClientAutoConfiguration.class}) , default security filter 를 사용하지 않음. 테스트 설정 파일에서 + * OAuth2ClientWebSecurityAutoConfiguration.class}) , default security filter 를 사용하지 않음. 테스트 설정 파일에서 * OAuth2Client 정보를 읽어들이지 않음. * * @see DefaultWebMvcTest @@ -27,7 +27,7 @@ @WebMvcTest( excludeAutoConfiguration = { SecurityAutoConfiguration.class, - OAuth2ClientAutoConfiguration.class + OAuth2ClientWebSecurityAutoConfiguration.class }) // disable default spring-security configuration @Import(InterceptorConfigMockBean.class) public @interface NoSecureWebMvcTest {