Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.powsybl.commons.report.ReportNodeDeserializer;
import com.powsybl.commons.report.ReportNodeJsonModule;
import com.powsybl.openreac.parameters.input.json.OpenReactJsonModule;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.converter.HttpMessageConverter;
Expand All @@ -27,8 +28,8 @@
public class RestTemplateConfig {

@Bean
public RestTemplate restTemplate() {
final RestTemplate restTemplate = new RestTemplate();
public RestTemplate restTemplate(RestTemplateBuilder builder) {
final RestTemplate restTemplate = builder.build();

//find and replace Jackson message converter with our own
for (int i = 0; i < restTemplate.getMessageConverters().size(); i++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,19 @@ public class NetworkModificationService {

private String networkModificationServerBaseUri;

private final RestTemplate restTemplate = new RestTemplate();
private final RestTemplate restTemplate;

private final ObjectMapper objectMapper;

private final UuidGeneratorService uuidGeneratorService;

NetworkModificationService(@Value("${gridsuite.services.network-modification-server.base-uri:http://network-modification-server/}") String networkModificationServerBaseUri,
ObjectMapper objectMapper, UuidGeneratorService uuidGeneratorService) {
ObjectMapper objectMapper, UuidGeneratorService uuidGeneratorService,
RestTemplate restTemplate) {
this.networkModificationServerBaseUri = networkModificationServerBaseUri;
this.objectMapper = objectMapper;
this.uuidGeneratorService = uuidGeneratorService;
this.restTemplate = restTemplate;
}

public void setNetworkModificationServerBaseUri(String networkModificationServerBaseUri) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,18 @@ public class FilterService implements FilterLoader {

private static String filterServerBaseUri;

private final RestTemplate restTemplate = new RestTemplate();
private final RestTemplate restTemplate;

private final NetworkStoreService networkStoreService;

public static final String FILTERS_NOT_FOUND = "Filters not found";

public FilterService(NetworkStoreService networkStoreService,
@Value("${gridsuite.services.filter-server.base-uri:http://filter-server/}") String filterServerBaseUri) {
@Value("${gridsuite.services.filter-server.base-uri:http://filter-server/}") String filterServerBaseUri,
RestTemplate restTemplate) {
this.networkStoreService = networkStoreService;
setFilterServerBaseUri(filterServerBaseUri);
this.restTemplate = restTemplate;
}

public static void setFilterServerBaseUri(String filterServerBaseUri) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class FilterServiceTest {

@BeforeEach
void setUp() {
filterService = spy(new FilterService(Mockito.mock(NetworkStoreService.class), "http://filter-server/"));
filterService = spy(new FilterService(Mockito.mock(NetworkStoreService.class), "http://filter-server/", null));
}

@Test
Expand Down