9272/change AzureBlobClientFactory

Author: SashaPog

service/src/main/java/greencity/service/AzureBlobClientFactory.java

@@ -3,19 +3,18 @@
 import com.azure.storage.blob.BlobContainerClient;
 import com.azure.storage.blob.BlobServiceClient;
 import com.azure.storage.blob.BlobServiceClientBuilder;
-import org.springframework.beans.factory.annotation.Value;
+import greencity.properties.AzureProperties;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
 @Component
+@RequiredArgsConstructor
 public class AzureBlobClientFactory {
-    @Value("${azure.connection.string}")
-    private String connectionString;
-    @Value("${azure.container.name}")
-    private String containerName;
+    private final AzureProperties azureProperties;
 
     public BlobContainerClient getContainerClient() {
         BlobServiceClient serviceClient = new BlobServiceClientBuilder()
-            .connectionString(connectionString).buildClient();
-        return serviceClient.getBlobContainerClient(containerName);
+            .connectionString(azureProperties.getAzureConnectionString()).buildClient();
+        return serviceClient.getBlobContainerClient(azureProperties.getAzureContainerName());
     }
 }

service/src/test/java/greencity/service/AzureBlobClientFactoryTest.java

@@ -1,20 +1,25 @@
 package greencity.service;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import greencity.properties.AzureProperties;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import static org.mockito.Mockito.when;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.test.util.ReflectionTestUtils;
 
 @ExtendWith(MockitoExtension.class)
 class AzureBlobClientFactoryTest {
+    @Mock
+    private AzureProperties azureProperties;
+
     @Test
     void getContainerClient_doesNotThrow() {
-        AzureBlobClientFactory factory = new AzureBlobClientFactory();
+        AzureBlobClientFactory factory = new AzureBlobClientFactory(azureProperties);
 
-        ReflectionTestUtils.setField(factory, "connectionString",
+        when(azureProperties.getAzureConnectionString()).thenReturn(
             "DefaultEndpointsProtocol=https;AccountName=fake;AccountKey=fakeKey;EndpointSuffix=core.windows.net");
-        ReflectionTestUtils.setField(factory, "containerName", "test-container");
+        when(azureProperties.getAzureContainerName()).thenReturn("test-container");
 
         assertDoesNotThrow(factory::getContainerClient);
     }