INTERNAL: upgrade spring 3 version

Author: cheesecrust

build.gradle

@@ -1,170 +1,84 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
-buildscript {
-    ext {
-        springBootVer = '2.4.5'
-        querydslVer = '4.4.0'
-        querydslPluginVer = '1.0.10'
-        springDependencyMgmtVer = '1.0.11'
-        springLoadedVer = '1.2.8'
-        // nodePluginVer 제거됨
-    }
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVer}"
-        classpath "io.spring.gradle:dependency-management-plugin:${springDependencyMgmtVer}.RELEASE"
-        classpath "org.springframework:springloaded:${springLoadedVer}.RELEASE"
-        // node-gradle 플러그인 classpath 제거됨
-    }
-}
-
 plugins {
     id 'java'
-    id 'idea'
-    id 'org.springframework.boot' version "${springBootVer}"
+    id 'org.springframework.boot' version '3.4.5'
+    id 'io.spring.dependency-management' version '1.1.7'
+    id 'jacoco'
 }
 
-apply plugin: 'io.spring.dependency-management'
-apply plugin: 'eclipse'
+group = 'com.ssafy'
+version = '0.0.1-SNAPSHOT'
 
-repositories {
-    mavenCentral()
-    maven { url 'https://repo.spring.io/snapshot' }
-    maven { url 'https://repo.spring.io/milestone' }
-    maven { url "https://repo.spring.io/libs-release" }
-    maven { url "https://repo.maven.apache.org/maven2" }
-    maven { url "https://build.shibboleth.net/nexus/content/repositories/releases" }
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
 }
 
-group 'com.ssafy'
-version '1.0-SNAPSHOT'
-sourceCompatibility = '1.8'
-
 configurations {
-    providedRuntime
+    compileOnly {
+        extendsFrom annotationProcessor
+    }
 }
 
-def buildTime() {
-    def date = new Date()
-    def formattedDate = date.format('yyyyMMdd_HHmm')
-    return formattedDate
+repositories {
+    mavenCentral()
 }
 
-project.ext.set("build.date", buildTime())
-
-processResources {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    with copySpec {
-        from "src/main/resources"
-        include "**/application*.yml"
-        include "**/application*.yaml"
-        include "**/application*.properties"
-        project.properties.findAll().each {
-            prop ->
-                if (prop.value != null) {
-                    filter(ReplaceTokens, tokens: [ (prop.key): String.valueOf(prop.value)])
-                    filter(ReplaceTokens, tokens: [ ('project.' + prop.key): String.valueOf(prop.value)])
-                    filter(ReplaceTokens, tokens: [ ('project.ext.' + prop.key): String.valueOf(prop.value)])
-                }
-        }
-    }
+dependencies {
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'  // JPA 추가
+    implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.4'
+
+    // QueryDSL - Spring Boot 3.x 호환 버전
+    implementation 'com.querydsl:querydsl-jpa:5.1.0:jakarta'
+    annotationProcessor 'com.querydsl:querydsl-apt:5.1.0:jakarta'
+    annotationProcessor 'jakarta.annotation:jakarta.annotation-api'
+    annotationProcessor 'jakarta.persistence:jakarta.persistence-api'
+
+    // AWS
+    implementation 'software.amazon.awssdk:s3:2.20.123'
+    implementation 'software.amazon.awssdk:ec2:2.20.123'
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+    implementation 'com.amazonaws:aws-java-sdk-s3:1.12.395'
+
+    // 기타
+    implementation 'org.springframework.boot:spring-boot-starter-webflux'
+    implementation 'org.apache.pdfbox:pdfbox:2.0.27'
+
+    compileOnly 'org.projectlombok:lombok'
+    developmentOnly 'org.springframework.boot:spring-boot-devtools'
+    runtimeOnly 'com.mysql:mysql-connector-j'
+    annotationProcessor 'org.projectlombok:lombok'
+
+    // 테스트
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:3.0.4'
+    testImplementation 'org.springframework.security:spring-security-test'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+    // 검증 및 JWT
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 }
 
-// QueryDSL 관련 설정 (주석 처리된 IntelliJ 전용 부분은 유지하지 않음)
-
-/*
-def querydslDir = 'src/main/generated'
-querydsl {
-    library = "com.querydsl:querydsl-apt"
-    jpa = true
-    querydslSourcesDir = querydslDir
-}
+// QueryDSL 설정
+def querydslDir = "src/main/generated"
 
 sourceSets {
-    main {
-        java {
-            srcDirs = ['src/main/java', querydslDir]
-        }
-    }
+    main.java.srcDirs += [querydslDir]
 }
 
-compileQuerydsl {
-    options.annotationProcessorPath = configurations.querydsl
+tasks.withType(JavaCompile) {
+    options.getGeneratedSourceOutputDirectory().set(file(querydslDir))
 }
 
-configurations {
-    querydsl.extendsFrom compileClasspath
+clean.doLast {
+    delete file(querydslDir)
 }
-*/
 
-dependencies {
-    implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("org.springframework.boot:spring-boot-starter-websocket")
-    implementation("org.springframework.boot:spring-boot-starter-security")
-    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-    implementation("org.springframework.boot:spring-boot-starter-actuator")
-    implementation("org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE")
-    testImplementation("org.springframework.security:spring-security-test")
-    annotationProcessor("org.springframework.boot:spring-boot-starter-data-jpa")
-    runtimeOnly("mysql:mysql-connector-java")
-    developmentOnly("org.springframework.boot:spring-boot-devtools")
-    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
-
-    implementation('commons-io:commons-io:2.6')
-    implementation("org.apache.commons:commons-collections4:4.4")
-    implementation("org.apache.commons:commons-lang3:3.9")
-
-    implementation("com.querydsl:querydsl-jpa:${querydslVer}")
-    implementation("com.querydsl:querydsl-apt:${querydslVer}")
-
-    implementation("org.springframework.boot:spring-boot-starter-mustache")
-    implementation('org.webjars.bower:jquery:3.3.1')
-    implementation('org.webjars:sockjs-client:1.1.2')
-    implementation('org.webjars:stomp-websocket:2.3.3-1')
-    implementation('org.webjars:webjars-locator:0.30')
-    implementation('org.webjars.bower:webrtc-adapter:7.4.0')
-    implementation('org.kurento:kurento-client:6.16.0')
-    implementation('org.kurento:kurento-utils-js:6.15.0')
-
-    annotationProcessor("com.querydsl:querydsl-apt:${querydslVer}:jpa")
-
-    implementation("com.squareup.retrofit2:retrofit:2.7.1")
-    implementation("com.squareup.retrofit2:converter-jackson:2.7.1")
-    implementation("com.squareup.okhttp3:logging-interceptor:3.9.0")
-
-    implementation("com.google.guava:guava:29.0-jre")
-    annotationProcessor("com.google.guava:guava:29.0-jre")
-
-    testImplementation("com.jayway.jsonpath:json-path:2.4.0")
-
-    implementation("com.auth0:java-jwt:3.10.3")
-
-    implementation("io.springfox:springfox-swagger2:3.0.0")
-    implementation("io.springfox:springfox-swagger-ui:3.0.0")
-    implementation("io.springfox:springfox-data-rest:3.0.0")
-    implementation("io.springfox:springfox-bean-validators:3.0.0")
-    implementation("io.springfox:springfox-boot-starter:3.0.0")
-
-    implementation("javax.annotation:javax.annotation-api:1.2")
-
-    implementation("org.projectlombok:lombok:1.18.20")
-    annotationProcessor("org.projectlombok:lombok:1.18.20")
-
-    testImplementation('org.springframework.boot:spring-boot-starter-test')
-}
-
-test {
+tasks.named('test') {
     useJUnitPlatform()
-}
-
-// JAR 설정 (중요!)
-jar {
-    enabled = false
-}
-
-bootJar {
-    enabled = true
-    archiveFileName = "${project.name}-${project.version}.jar"
-}
+}

src/main/generated/com/ssafy/db/entity/QBaseEntity.java

@@ -5,27 +5,22 @@
 import com.querydsl.core.types.dsl.*;
 
 import com.querydsl.core.types.PathMetadata;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.querydsl.core.types.Path;
 
 
 /**
  * QUser is a Querydsl query type for User
  */
-@Generated("com.querydsl.codegen.EntitySerializer")
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
 public class QUser extends EntityPathBase<User> {
 
     private static final long serialVersionUID = 846542477L;
 
     public static final QUser user = new QUser("user");
 
-    public final QBaseEntity _super = new QBaseEntity(this);
-
     public final StringPath department = createString("department");
 
-    //inherited
-    public final NumberPath<Long> id = _super.id;
-
     public final StringPath name = createString("name");
 
     public final StringPath password = createString("password");

src/main/generated/com/ssafy/db/entity/QUser.java

@@ -2,29 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.filter.CharacterEncodingFilter;
-
-import java.nio.charset.StandardCharsets;
 
 @SpringBootApplication
 public class GroupCallApplication {
 	public static void main(String[] args) {
         SpringApplication.run(GroupCallApplication.class, args);
     }
-
-    @Bean
-    public HttpMessageConverter<String> responseBodyConverter() {
-        return new StringHttpMessageConverter(StandardCharsets.UTF_8);
-    }
-
-    @Bean
-    public CharacterEncodingFilter characterEncodingFilter() {
-        CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter();
-        characterEncodingFilter.setEncoding("UTF-8");
-        characterEncodingFilter.setForceEncoding(true);
-        return characterEncodingFilter;
-    }
 }

src/main/java/com/ssafy/GroupCallApplication.java

@@ -11,48 +11,20 @@
 import com.ssafy.api.request.UserLoginPostReq;
 import com.ssafy.api.response.UserLoginPostRes;
 import com.ssafy.api.service.UserService;
-import com.ssafy.common.model.response.BaseResponseBody;
-import com.ssafy.common.util.JwtTokenUtil;
 import com.ssafy.db.entity.User;
-import com.ssafy.db.repository.UserRepositorySupport;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.ApiResponse;
 
 /**
  * 인증 관련 API 요청 처리를 위한 컨트롤러 정의.
  */
-@Api(value = "인증 API", tags = {"Auth."})
 @RestController
 @RequestMapping("/api/v1/auth")
 public class AuthController {
-	@Autowired
-	UserService userService;
-	
-	@Autowired
-	PasswordEncoder passwordEncoder;
 
 	@PostMapping("/login")
-	@ApiOperation(value = "로그인", notes = "<strong>아이디와 패스워드</strong>를 통해 로그인 한다.") 
-    @ApiResponses({
-        @ApiResponse(code = 200, message = "성공", response = UserLoginPostRes.class),
-        @ApiResponse(code = 401, message = "인증 실패", response = BaseResponseBody.class),
-        @ApiResponse(code = 404, message = "사용자 없음", response = BaseResponseBody.class),
-        @ApiResponse(code = 500, message = "서버 오류", response = BaseResponseBody.class)
-    })
-	public ResponseEntity<UserLoginPostRes> login(@RequestBody @ApiParam(value="로그인 정보", required = true) UserLoginPostReq loginInfo) {
+	public ResponseEntity<UserLoginPostRes> login(@RequestBody UserLoginPostReq loginInfo) {
 		String userId = loginInfo.getId();
 		String password = loginInfo.getPassword();
-		
-		User user = userService.getUserByUserId(userId);
 		// 로그인 요청한 유저로부터 입력된 패스워드 와 디비에 저장된 유저의 암호화된 패스워드가 같은지 확인.(유효한 패스워드인지 여부 확인)
-		if(passwordEncoder.matches(password, user.getPassword())) {
-			// 유효한 패스워드가 맞는 경우, 로그인 성공으로 응답.(액세스 토큰을 포함하여 응답값 전달)
-			return ResponseEntity.ok(UserLoginPostRes.of(200, "Success", JwtTokenUtil.getToken(userId)));
-		}
 		// 유효하지 않는 패스워드인 경우, 로그인 실패로 응답.
 		return ResponseEntity.status(401).body(UserLoginPostRes.of(401, "Invalid Password", null));
 	}