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

[REFACTOR] papago RestTemplate Connection Pool 구현 #70

Merged
merged 1 commit into from
Oct 23, 2023
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
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ dependencies {
implementation 'io.github.openfeign:feign-httpclient:12.4'
implementation 'io.github.openfeign:feign-core:12.4'

// https://mvnrepository.com/artifact/org.apache.httpcomponents.client5/httpclient5
implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.1'


// Amazon AWS Java SDK s3 And File
implementation 'commons-io:commons-io:2.13.0'
implementation('com.amazonaws:aws-java-sdk-s3:1.12.530') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.*;
import org.springframework.stereotype.Service;
import org.springframework.util.LinkedMultiValueMap;
Expand All @@ -25,15 +26,19 @@ public class TranslateService {
private final PapagoProperties papagoProperties;
private final ObjectMapper objectMapper;

@Qualifier("papagoTextTranslateTemplate")
private final RestTemplate textRestTemplate;

@Qualifier("papagoHtmlTranslateTemplate")
private final RestTemplate htmlRestTemplate;

/**
* @param source : 번역의 대상이 될 원래의 언어 종류
* @param target : 번역 후 결과물로 나올 언어 종류
* @param html : 번역의 대상이 되는 html
* @return : html 형식의 번역이 된 String
*/
public String naverPapagoHtmlTranslate(LanguageType source, LanguageType target, String html) {
RestTemplate restTemplate = new RestTemplate();

MultiValueMap<String, String> papagoRequestBody = new LinkedMultiValueMap<>();
papagoRequestBody.add("source", source.getLanguageCode());
papagoRequestBody.add("target", target.getLanguageCode());
Expand All @@ -46,7 +51,7 @@ public String naverPapagoHtmlTranslate(LanguageType source, LanguageType target,
HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(papagoRequestBody, papagoRequestHeaders);

ResponseEntity<String> response =
restTemplate.postForEntity(URI.create(papagoProperties.getHtmlRequestUrl()), request, String.class);
htmlRestTemplate.postForEntity(URI.create(papagoProperties.getHtmlRequestUrl()), request, String.class);
if (response.getStatusCode().equals(HttpStatus.OK)) {
log.info("result >>> {}", response.getBody());
return response.getBody();
Expand All @@ -55,7 +60,6 @@ public String naverPapagoHtmlTranslate(LanguageType source, LanguageType target,
}

public String naverPapagoTextTranslate(LanguageType source, LanguageType target, String content) {
RestTemplate restTemplate = new RestTemplate();
HttpHeaders papagoRequestHeaders = new HttpHeaders();
papagoRequestHeaders.setContentType(MediaType.APPLICATION_JSON);
papagoProperties.getHeader().forEach(papagoRequestHeaders::set);
Expand All @@ -69,7 +73,7 @@ public String naverPapagoTextTranslate(LanguageType source, LanguageType target,
HttpEntity request = new HttpEntity<>(papagoRequestBody, papagoRequestHeaders);

ResponseEntity<PapagoTextResponse> response =
restTemplate.postForEntity(URI.create(papagoProperties.getTextRequestUrl()), request, PapagoTextResponse.class);
textRestTemplate.postForEntity(URI.create(papagoProperties.getTextRequestUrl()), request, PapagoTextResponse.class);

if (response.getStatusCode().equals(HttpStatus.OK)) {
log.info("result >>> {}", response.getBody().getMessage().getResult().toString());
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package HookKiller.server.common.util;

import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.web.client.RestTemplate;

import java.time.Duration;

@Configuration
public class HtmlTranslateRestTemplate {

@Bean
@Qualifier("papagoHtmlTranslateTemplate")
public RestTemplate htmlTranslate() {
HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory();
factory.setHttpClient(this.httpClient());

RestTemplate restTemplate = new RestTemplateBuilder()
.setConnectTimeout(Duration.ofSeconds(5))
.setReadTimeout(Duration.ofSeconds(20))
.build();

restTemplate.setRequestFactory(factory);

return restTemplate;
}

private CloseableHttpClient httpClient() {
return HttpClientBuilder
.create()
.setConnectionManager(this.papagoHtmlHttpClient())
.build();
}
private PoolingHttpClientConnectionManager papagoHtmlHttpClient() {
return PoolingHttpClientConnectionManagerBuilder.create()
.setMaxConnTotal(50)
.setMaxConnPerRoute(5)
.build();
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package HookKiller.server.common.util;

import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.web.client.RestTemplate;

import java.time.Duration;


@Configuration
public class TextTranslateRestTemplate {

@Bean
@Primary
@Qualifier("papagoTextTranslateTemplate")
public RestTemplate textTranslate() {
HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory();
factory.setHttpClient(this.httpClient());

RestTemplate restTemplate = new RestTemplateBuilder()
.setConnectTimeout(Duration.ofSeconds(5))
.setReadTimeout(Duration.ofSeconds(5))
.build();

restTemplate.setRequestFactory(factory);

return restTemplate;
}

private CloseableHttpClient httpClient() {
return HttpClientBuilder
.create()
.setConnectionManager(this.papagoTextHttpClient())
.build();
}
private PoolingHttpClientConnectionManager papagoTextHttpClient() {
return PoolingHttpClientConnectionManagerBuilder.create()
.setMaxConnTotal(20)
.setMaxConnPerRoute(5)
.build();
}

}
Loading