Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] 불필요한 import 제거 등 코드 정리 (#155) #156

Merged
merged 3 commits into from
Aug 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
package hyundai.softeer.orange.admin.controller;

import hyundai.softeer.orange.admin.dto.AdminSignInRequest;
import hyundai.softeer.orange.admin.dto.AdminSignupRequest;
import hyundai.softeer.orange.admin.service.AdminAuthService;
import hyundai.softeer.orange.common.ErrorResponse;
import hyundai.softeer.orange.common.dto.TokenDto;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import hyundai.softeer.orange.admin.dto.AdminSignInRequest;
import hyundai.softeer.orange.admin.service.AdminAuthService;
import hyundai.softeer.orange.common.ErrorResponse;
import hyundai.softeer.orange.common.dto.TokenDto;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

@Tag(name = "admin auth", description = "어드민 인증에 사용되는 api")
@RequestMapping("/api/v1/admin/auth")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package hyundai.softeer.orange.common;

import com.fasterxml.jackson.databind.exc.InvalidFormatException;
import hyundai.softeer.orange.admin.exception.AdminException;
import hyundai.softeer.orange.comment.exception.CommentException;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/hyundai/softeer/orange/config/WebConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import hyundai.softeer.orange.core.auth.AuthInterceptor;
import hyundai.softeer.orange.eventuser.component.EventUserArgumentResolver;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;

import java.time.Instant;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.concurrent.TimeUnit;

@Component
public class EventKeyGenerator {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import hyundai.softeer.orange.event.common.entity.EventMetadata;
import jakarta.persistence.*;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package hyundai.softeer.orange.event.dto;

import lombok.Getter;

/**
* 관리자가 이벤트 댓글 검색 시 자동완성 영역에 제공되는 데이터
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package hyundai.softeer.orange.event.dto.draw;

import hyundai.softeer.orange.event.dto.group.EventEditGroup;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package hyundai.softeer.orange.event.dto.draw;

import hyundai.softeer.orange.event.draw.enums.DrawEventAction;
import hyundai.softeer.orange.event.dto.group.EventEditGroup;

import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Positive;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

import java.util.Collection;
import java.util.List;

public interface CustomEventUserRepository {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package hyundai.softeer.orange.core.jwt;

import hyundai.softeer.orange.admin.entity.Admin;
import hyundai.softeer.orange.core.jwt.JWTManager;
import io.jsonwebtoken.JwtException;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand Down
4 changes: 1 addition & 3 deletions src/test/java/hyundai/softeer/orange/core/jwt/JwtTest.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package hyundai.softeer.orange.core.jwt;

import hyundai.softeer.orange.admin.entity.Admin;
import hyundai.softeer.orange.core.jwt.JWTManager;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.jackson.io.JacksonDeserializer;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;

import javax.crypto.SecretKey;
Expand All @@ -14,7 +12,7 @@

import static org.assertj.core.api.Assertions.assertThat;

public class JwtTest {
class JwtTest {
// generated by web
private static final String KEY = "RS1Asd5x0Z0EpKdDmevsc1tJSIZoGNvuxLqL+I35qCM=";
@Test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package hyundai.softeer.orange.core.security;

import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
package hyundai.softeer.orange.core.security;

import hyundai.softeer.orange.core.security.RandomStrGenerator;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;

class RandomStrGeneratorTest {
@DisplayName("generate는 지정된 길이의 랜덤 문자열을 생성한다.")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
package hyundai.softeer.orange.event.common.component.query;

import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

import java.util.Map;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;

class EventSearchQueryParserTest {
@DisplayName("query parser이 정상적으로 동작하는지 검사")
@Test
public void testParser() {
void testParser() {
// 1. key:value,key:value,key 형식으로 표현됨
// 2. :으로 구분되는 부분은 1개 또는 2개여야 함.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package hyundai.softeer.orange.event.component;

import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class AccSumBasedWinnerPickerTest {

@DisplayName("정상적으로 N개의 서로 다른 아이템을 뽑는지 검사")
@Test
public void test_pickMany() {
void test_pickMany() {
AccSumBasedWinnerPicker picker = new AccSumBasedWinnerPicker();
List<PickTarget> pickTargets = new ArrayList<>();

Expand All @@ -38,7 +38,7 @@ public void test_pickMany() {

@DisplayName("정상적으로 N개의 서로 다른 아이템을 뽑는지 검사")
@Test
public void test_pickManyUsingSet() {
void test_pickManyUsingSet() {
AccSumBasedWinnerPicker picker = new AccSumBasedWinnerPicker();
List<PickTarget> pickTargets = new ArrayList<>();

Expand All @@ -60,7 +60,7 @@ public void test_pickManyUsingSet() {

@DisplayName("binary search가 제대로 동작하는지 테스트")
@Test
public void test_binarySearch() {
void test_binarySearch() {
AccSumBasedWinnerPicker picker = new AccSumBasedWinnerPicker();
AccSumBasedWinnerPicker.RandomItem[] items = new AccSumBasedWinnerPicker.RandomItem[5];

Expand Down Expand Up @@ -89,7 +89,7 @@ public void test_binarySearch() {

@DisplayName("정상적으로 누적합을 만드는지 검사")
@Test
public void test_getAccumulatedItems() {
void test_getAccumulatedItems() {

List<PickTarget> pickTargets = new ArrayList<>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@
import hyundai.softeer.orange.event.draw.entity.DrawEventScorePolicy;
import hyundai.softeer.orange.event.draw.enums.DrawEventAction;
import hyundai.softeer.orange.event.draw.repository.EventParticipationInfoRepository;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.HashMap;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;

import java.time.Instant;
import java.time.LocalDateTime;

import static org.mockito.Mockito.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ void clearDatabase(){
List<String> tableNameList = jdbcTemplate.queryForList("SHOW TABLES", String.class); // 모든 테이블 이름을 가져온다.
for(String tableName : tableNameList) {
jdbcTemplate.execute("TRUNCATE TABLE " + tableName); // 모든 테이블의 데이터를 삭제한다.
jdbcTemplate.execute("ALTER TABLE " + tableName + " AUTO_INCREMENT = 1"); // AUTO_INCREMENT 초기화
}
jdbcTemplate.execute("SET FOREIGN_KEY_CHECKS = 1");
}
Expand Down
Loading