Skip to content

@Configurable ->@Configuration 수정 #13

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.

Sign up for GitHub

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

Merged
LgE02 merged 1 commit into from
Mar 3, 2025
Merged

@Configurable ->@Configuration 수정 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/main/java/com/example/aws/S3Manager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
@Component
@RequiredArgsConstructor
public class S3Manager {

private final AmazonS3 amazonS3;
private final AmazonConfig awsConfig;
private final UuidRepository uuidRepository;
Expand All @@ -30,10 +31,10 @@ public String uploadFile(String keyName, MultipartFile file){
log.error("error at AmazonS3Manager uploadFile : {}", (Object) e.getStackTrace());
}

return amazonS3.getUrl(awsConfig.getBucket(), keyName).toString();}
return amazonS3.getUrl(awsConfig.getBucket(), keyName).toString();
}

public String generateReviewKeyName(Uuid uuid) {

return awsConfig.getReviewPath() + '/' + uuid.getUuid();
return awsConfig.getReviewPath() + "/" + uuid.getUuid();
}
}
27 changes: 12 additions & 15 deletions src/main/java/com/example/config/AmazonConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,18 @@
import org.springframework.beans.factory.annotation.Configurable;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@Configurable
@Configuration
@Getter
public class AmazonConfig {

private AWSCredentials awsCredentials;

@Value("${cloud.aws.credentials.access-key}")
@Value("${cloud.aws.credentials.accessKey}")
private String accessKey;

@Value("${cloud.aws.credentials.secret-key}")
@Value("${cloud.aws.credentials.secretKey}")
private String secretKey;

@Value("${cloud.aws.region.static}")
Expand All @@ -34,21 +35,17 @@ public class AmazonConfig {
private String reviewPath;

@PostConstruct
public void init() {
this.awsCredentials = new BasicAWSCredentials(accessKey, secretKey);
}
public void init() { this.awsCredentials = new BasicAWSCredentials(accessKey, secretKey); }

@Bean
public AmazonS3 amazonS3() {
AWSCredentials awsCredentials = new BasicAWSCredentials(accessKey, secretKey);
return AmazonS3ClientBuilder.standard()
.withRegion(region)
.withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
.build();
AWSCredentials awsCredentials = new BasicAWSCredentials(accessKey, secretKey);
return AmazonS3ClientBuilder.standard()
.withRegion(region)
.withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
.build();
}

@Bean
public AWSCredentialsProvider awsCredentialsProvider() {
return new AWSStaticCredentialsProvider(awsCredentials);
}
}
public AWSCredentialsProvider awsCredentialsProvider() { return new AWSStaticCredentialsProvider(awsCredentials); }
}
7 changes: 0 additions & 7 deletions src/main/java/com/example/repository/ReviewImageRepository.java
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/main/java/com/example/service/store/StoreCommandServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,8 @@
package com.example.service.store;

import com.example.aws.S3Manager;
import com.example.converter.ReviewConverter;
import com.example.domain.Review;
import com.example.domain.Uuid;
import com.example.repository.ReviewImageRepository;
import com.example.repository.ReviewRepository;
import com.example.repository.StoreRepository;
import com.example.repository.UuidRepository;
import com.example.service.member.MemberQueryService;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

import java.util.UUID;

@Service
@RequiredArgsConstructor
Expand Down