From ccdb57fa3932785811faf9dd42d5998e4f1ea14b Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 8 Dec 2022 10:37:23 +0300 Subject: Spring beans should not be public --- src/main/java/com/juick/config/ActivityPubConfig.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/main/java/com/juick/config/ActivityPubConfig.java') diff --git a/src/main/java/com/juick/config/ActivityPubConfig.java b/src/main/java/com/juick/config/ActivityPubConfig.java index fb204aaa..c93c035b 100644 --- a/src/main/java/com/juick/config/ActivityPubConfig.java +++ b/src/main/java/com/juick/config/ActivityPubConfig.java @@ -30,6 +30,7 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert import org.springframework.web.client.RestTemplate; import javax.inject.Inject; + import java.nio.charset.StandardCharsets; @Configuration @@ -38,26 +39,31 @@ public class ActivityPubConfig { ActivityPubClientErrorHandler activityPubClientErrorHandler; @Inject ObjectMapper jsonMapper; + @Bean - public MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter() { + MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter() { MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); converter.setObjectMapper(jsonMapper); return converter; } + @Bean - public ActivityPubManager activityPubManager() { + ActivityPubManager activityPubManager() { return new ActivityPubManager(); } + @Inject CloseableHttpClient httpClient; + @Bean - public HttpComponentsClientHttpRequestFactory clientHttpRequestFactory() { + HttpComponentsClientHttpRequestFactory clientHttpRequestFactory() { HttpComponentsClientHttpRequestFactory clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory(); clientHttpRequestFactory.setHttpClient(httpClient); return clientHttpRequestFactory; } + @Bean - public RestTemplate apClient() { + RestTemplate apClient() { RestTemplate restTemplate = new RestTemplate(clientHttpRequestFactory()); restTemplate.getMessageConverters().add(0, mappingJacksonHttpMessageConverter()); restTemplate.getMessageConverters().add(0, new StringHttpMessageConverter(StandardCharsets.UTF_8)); @@ -65,4 +71,4 @@ public class ActivityPubConfig { restTemplate.getInterceptors().add(new ActivityPubRequestInterceptor()); return restTemplate; } -} \ No newline at end of file +} -- cgit v1.2.3