T-35: add proxy

Author: whiskels

pom.xml

@@ -15,18 +15,18 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- Spring -->
-        <spring-aspects.version>6.0.2</spring-aspects.version>
+        <spring-aspects.version>6.0.9</spring-aspects.version>
 
         <!-- TelegramBots Spring Boot Starter -->
         <telegrambots-spring.version>0.26</telegrambots-spring.version>
 
         <!-- Slack API -->
-        <slack-api.version>1.27.1</slack-api.version>
+        <slack-api.version>1.28.0</slack-api.version>
 
         <!-- Google API -->
-        <google-api-client.version>2.0.1</google-api-client.version>
+        <google-api-client.version>2.2.0</google-api-client.version>
         <google-oauth-client-jetty.version>1.34.1</google-oauth-client-jetty.version>
-        <google-sheets.version>v4-rev20220927-2.0.0</google-sheets.version>
+        <google-sheets.version>v4-rev20230227-2.0.0</google-sheets.version>
 
         <jackson-json.version>2.14.0</jackson-json.version>
     </properties>
@@ -49,6 +49,11 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-okhttp</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -64,7 +69,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
         </dependency>
 
         <!-- Google Api -->

src/main/java/com/whiskels/notifier/App.java

@@ -1,14 +1,22 @@
 package com.whiskels.notifier;
 
+import com.whiskels.notifier.slack.SlackConfig;
+import com.whiskels.notifier.telegram.TelegramConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Profile;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @Profile("!test")
 @SpringBootApplication
+@ComponentScan(basePackages = "com.whiskels.notifier",
+        excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = {"com.whiskels.notifier.telegram.*", "com.whiskels.notifier.slack.*"}))
+@Import({TelegramConfig.class, SlackConfig.class})
 @EnableScheduling
 @EnableConfigurationProperties
 @EnableFeignClients

src/main/java/com/whiskels/notifier/common/audit/AuditListener.java

@@ -14,7 +14,7 @@
 class AuditListener {
     private Clock clock;
 
-    @Autowired
+    @Autowired //JPA spec requires @PrePersist classes to have no-args constructor
     public void setClock(Clock clock) {
         this.clock = clock;
     }

src/main/java/com/whiskels/notifier/common/datetime/ClockConfiguration.java

@@ -15,7 +15,7 @@ class ClockConfiguration {
     private String timeZone;
 
     @Bean
-    public Clock defaultClock() {
+    Clock defaultClock() {
         return Clock.system(ZoneId.of(timeZone));
     }
 }

src/main/java/com/whiskels/notifier/external/google/customer/_CustomerBirthdayInfoBeanConfig.java

@@ -20,7 +20,7 @@ class _CustomerBirthdayInfoBeanConfig {
     static final String PROPERTIES_PREFIX = "external.google.customer.birthday";
 
     @Bean
-    public Loader<CustomerBirthdayInfo> customerBirthdayInfoLoader(
+    Loader<CustomerBirthdayInfo> customerBirthdayInfoLoader(
             Clock clock,
             GoogleSheetsReader spreadsheetLoader,
             CustomerBirthdaySpreadsheetProperties properties
@@ -29,7 +29,7 @@ public Loader<CustomerBirthdayInfo> customerBirthdayInfoLoader(
     }
 
     @Bean
-    public ReportSupplier<CustomerBirthdayInfoDto> customerBirthdayInfoDtoSupplier(Clock clock, Loader<CustomerBirthdayInfo> loader) {
+    ReportSupplier<CustomerBirthdayInfoDto> customerBirthdayInfoDtoSupplier(Clock clock, Loader<CustomerBirthdayInfo> loader) {
         ReportSupplier<CustomerBirthdayInfo> reportSupplier = new MemoizingReportSupplier<>(loader, clock);
         return () -> reportSupplier.get().remap(CustomerBirthdayInfoDto::from);
     }

src/main/java/com/whiskels/notifier/external/json/currency/_CurrencyRateBeanConfig.java

@@ -16,8 +16,8 @@
 @Configuration
 class _CurrencyRateBeanConfig {
     @Bean
-    public Loader<CurrencyRate> currencyRateLoader(CurrencyRateFeignClient currencyRateClient) {
-        return new Loader<CurrencyRate>() {
+    Loader<CurrencyRate> currencyRateLoader(CurrencyRateFeignClient currencyRateClient) {
+        return new Loader<>() {
             @Override
             @Audit(loader = CURRENCY_RATE)
             public List<CurrencyRate> load() {
@@ -27,7 +27,7 @@ public List<CurrencyRate> load() {
     }
 
     @Bean
-    public ReportSupplier<CurrencyRate> currencyRateSupplier(Clock clock, Loader<CurrencyRate> loader) {
+    ReportSupplier<CurrencyRate> currencyRateSupplier(Clock clock, Loader<CurrencyRate> loader) {
         return new MemoizingReportSupplier<>(loader, clock);
     }
 }

src/main/java/com/whiskels/notifier/external/json/debt/DebtFeignClient.java

@@ -1,5 +1,6 @@
 package com.whiskels.notifier.external.json.debt;
 
+import com.whiskels.notifier.external.proxy.FeignProxyConfig;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -8,7 +9,7 @@
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 
 
-@FeignClient(name = "debtClient", url = "${" + DEBT_URL + "}")
+@FeignClient(name = "debtClient", url = "${" + DEBT_URL + "}", configuration = FeignProxyConfig.class)
 @ConditionalOnProperty(DEBT_URL)
 interface DebtFeignClient {
     @RequestMapping(method = GET)

src/main/java/com/whiskels/notifier/external/json/debt/DebtLoader.java

@@ -17,9 +17,10 @@
 
 @RequiredArgsConstructor
 class DebtLoader implements Loader<Debt> {
+    private static final int MIN_RUB_VALUE = 500;
+
     private final ReportSupplier<CurrencyRate> rateReportSupplier;
     private final DebtFeignClient debtClient;
-    private static final int MIN_RUB_VALUE = 500;
 
     @Override
     @Audit(loader = DEBT)

src/main/java/com/whiskels/notifier/external/json/debt/_DebtConfig.java

@@ -18,13 +18,13 @@ class _DebtConfig {
     static final String DEBT_URL = "external.customer.debt.url";
 
     @Bean
-    public Loader<Debt> debtLoader(ReportSupplier<CurrencyRate> currencyRateReportSupplier,
+    Loader<Debt> debtLoader(ReportSupplier<CurrencyRate> currencyRateReportSupplier,
                                    DebtFeignClient debtClient) {
         return new DebtLoader(currencyRateReportSupplier, debtClient);
     }
 
     @Bean
-    public ReportSupplier<DebtDto> debtDtoSupplier(Clock clock, Loader<Debt> loader) {
+    ReportSupplier<DebtDto> debtDtoSupplier(Clock clock, Loader<Debt> loader) {
         ReportSupplier<Debt> reportSupplier = new MemoizingReportSupplier<>(loader, clock);
         return () -> reportSupplier.get().remap(DebtDto::from);
     }

src/main/java/com/whiskels/notifier/external/json/employee/EmployeeFeignClient.java

@@ -1,5 +1,6 @@
 package com.whiskels.notifier.external.json.employee;
 
+import com.whiskels.notifier.external.proxy.FeignProxyConfig;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -10,7 +11,7 @@
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 
 
-@FeignClient(name = "employeeClient", url = "${" + EMPLOYEE_URL + "}")
+@FeignClient(name = "employeeClient", url = "${" + EMPLOYEE_URL + "}", configuration = FeignProxyConfig.class)
 @ConditionalOnProperty(EMPLOYEE_URL)
 interface EmployeeFeignClient {
     @RequestMapping(method = GET)