Skip to content
Merged
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 @@ -3,9 +3,9 @@
import java.net.URI;
import java.time.temporal.Temporal;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;

import io.github.belgif.rest.problem.config.ProblemConfig;
Expand Down Expand Up @@ -61,7 +61,7 @@ public class InputValidationIssues {

public static final String DETAIL_JSON_SYNTAX_ERROR = "JSON syntax error";

private static final Map<URI, URI> BELGIF_ISSUE_TYPE_HREFS = new HashMap<>();
private static final Map<URI, URI> BELGIF_ISSUE_TYPE_HREFS = new ConcurrentHashMap<>();

private InputValidationIssues() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,19 @@

import static org.assertj.core.api.Assertions.*;

import java.lang.reflect.Field;
import java.net.URI;
import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.time.OffsetTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.stream.Stream;

import org.junit.jupiter.api.AfterEach;
Expand Down Expand Up @@ -765,6 +771,30 @@ void equalExpected(boolean extIssueTypes, boolean extInputsArray) {
.allMatch(this::isEmpty);
}

@Test
@SuppressWarnings("unchecked")
void getHrefConcurrently() throws Exception {
Field field = InputValidationIssues.class.getDeclaredField("BELGIF_ISSUE_TYPE_HREFS");
field.setAccessible(true);
((Map<URI, URI>) field.get(null)).clear();
int threads = 16;
ExecutorService executorService = Executors.newFixedThreadPool(threads);
List<Future<Void>> results = new ArrayList<>(threads);
for (int i = 0; i < threads; i++) {
results.add(executorService.submit(() -> {
assertThat(InputValidationIssues.schemaViolation(InEnum.BODY, "name", "value", "detail").getHref())
.hasToString("https://www.belgif.be/specification/rest/api-guide/issues/schemaViolation.html");
assertThat(InputValidationIssues.invalidInput(InEnum.BODY, "name", "value", "detail").getHref())
.hasToString("https://www.belgif.be/specification/rest/api-guide/issues/invalidInput.html");
return null;
}));
}
executorService.shutdown();
for (Future<Void> future : results) {
future.get();
}
}

public boolean isEmpty(Object value) {
return value == null || Integer.valueOf(0).equals(value) || Collections.emptyList().equals(value)
|| Collections.emptyMap().equals(value);
Expand Down
6 changes: 6 additions & 0 deletions src/main/asciidoc/release-notes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@

// tag::recent-versions[]

== Version 0.21

*belgif-rest-problem:*

* Fix concurrency issue in InputValidationIssues.BELGIF_ISSUE_TYPE_HREFS cache

== Version 0.20

*belgif-rest-problem:*
Expand Down