Dev

docker-compose.yaml

@@ -67,8 +67,9 @@ services:
       POSTGRES_HOST: db
       STORAGE_SERVICE_URL: http://storage:8081
       SPRING_PROFILES_ACTIVE: docker
-      SPRING_APPLICATION_JSON: '{"yandex":{"api-key":"AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q","folder-id":"b1gokpdbm6qfpsou8pcd","search-url":"https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"}}'
-
+      YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
+      YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
+      YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
     depends_on:
       - db
     ports:

src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java

@@ -19,7 +19,6 @@ public class ImageFoundRequestHandler implements RequestHandler {
 
     private final ObjectMapper objectMapper;
 
-    @Autowired
     private final YandexSearchService yandexSearchService;
 
     @Override

src/main/java/ru/soune/nocopy/service/YandexSearchService.java

@@ -40,6 +40,7 @@ public class YandexSearchService {
 
     @Value("${yandex.search-url}")
     private String searchUrl;
+
     @PostConstruct
     public void init() {
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

src/main/resources/application.yaml

@@ -40,11 +40,6 @@ security:
     allowed-headers: "*"
     allow-credentials: true
 
-yandex:
-  api-key: ${yandex.api-key}
-  folder-id: ${yandex.folder-id}
-  search-url: ${yandex.search-url}
-
 server:
   port: ${SERVER_PORT:8080}
 
@@ -56,4 +51,9 @@ logging:
   file:
     name: logs/application.log
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+
+yandex:
+    api-key: ${YANDEX_API_KEY}
+    folder-id: ${YANDEX_FOLDER_ID}
+    search-url: ${YANDEX_SEARCH_URL}