Skip to content

Commit c23ea14

Browse files
fix examples urls
1 parent 300b379 commit c23ea14

File tree

4 files changed

+29
-14
lines changed

4 files changed

+29
-14
lines changed

.idea/dataSources.xml

+18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/frontend/app/status/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export default function Status() {
6161
<APIExampleCheckResult url={'/artefacts'}/>
6262
<APIExampleCheckResult url={'/search?query=concept'}/>
6363
<APIExampleCheckResult url={'/artefacts/NCBITAXON'}/>
64-
<APIExampleCheckResult url={'/artefacts/NCBITAXON/terms?uri=http://purl.obolibrary.org/obo/NCBITaxon_2'}/>
64+
<APIExampleCheckResult url={'/artefacts/NCBITAXON/resources/classes/http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FNCBITaxon_2'}/>
6565
</div>
6666
</>
6767
);

src/main/java/org/semantics/apigateway/service/StatusService.java

+6-9
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@
1414
import org.springframework.web.context.request.ServletRequestAttributes;
1515
import org.springframework.web.reactive.function.client.WebClient;
1616
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
17-
import org.springframework.web.util.UriComponentsBuilder;
1817
import org.yaml.snakeyaml.Yaml;
1918

2019
import java.io.IOException;
2120
import java.io.InputStream;
22-
import java.net.URLDecoder;
23-
import java.nio.charset.StandardCharsets;
2421
import java.util.*;
2522

2623
@Getter
@@ -56,7 +53,6 @@ public String getBaseUrl(HttpServletRequest request) {
5653

5754
public Map<?, ?> getResultFromUrlReactive(String url) {
5855
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
59-
6056
return webClient.get()
6157
.uri(getBaseUrl(request) + url)
6258
.retrieve()
@@ -90,12 +86,13 @@ private void loadExamplesFromYaml() {
9086
}
9187

9288
public Map<String, Object> checkEndpoint(String endpoint) {
93-
endpoint = URLDecoder.decode(endpoint, StandardCharsets.UTF_8);
94-
String url = UriComponentsBuilder.fromUriString(endpoint)
95-
.queryParam("showResponseConfiguration", "true")
96-
.toUriString();
89+
if(endpoint.contains("?")){
90+
endpoint += "&showResponseConfiguration=true";
91+
} else {
92+
endpoint += "?showResponseConfiguration=true";
93+
}
9794

98-
return calculateGlobalStats(url);
95+
return calculateGlobalStats(endpoint);
9996
}
10097

10198
private Map<String, Object> calculateGlobalStats(String exampleUrl) {

src/main/resources/examples.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
data:
2-
"NCIT_C2984 term (OLS)": "/artefacts/ncit/terms?uri=http://purl.obolibrary.org/obo/NCIT_C2984&showResponseConfiguration=true"
3-
"AGROVOC/c_330834 term (OntoPortal, SKOSMOS)": "/artefacts/AGROVOC/terms?uri=http://aims.fao.org/aos/agrovoc/c_330834&showResponseConfiguration=true"
4-
"NCBITaxon_131567 term from BCO (OntoPortal, ols, ols2)": "/artefacts/bco/terms?uri=http://purl.obolibrary.org/obo/NCBITaxon_131567&showResponseConfiguration=true"
5-
"NCBITaxon_2 term from NCBITaxon (OntoPortal, ols2)": "/artefacts/ncbitaxon/terms?uri=http://purl.obolibrary.org/obo/NCBITaxon_2&showResponseConfiguration=true"
2+
"NCIT_C2984 term (OLS)": "/artefacts/ncit/resources/classes/http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FNCIT_C2984?showResponseConfiguration=true"
3+
"AGROVOC/c_330834 term (OntoPortal, SKOSMOS)": "/artefacts/AGROVOC/resources/classes/http%3A%2F%2Faims.fao.org%2Faos%2Fagrovoc%2Fc_330834?showResponseConfiguration=true"
4+
"NCBITaxon_131567 term from BCO (OntoPortal, ols, ols2)": "/artefacts/bco/resources/classes/http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FNCBITaxon_131567?showResponseConfiguration=true"
5+
"NCBITaxon_2 term from NCBITaxon (OntoPortal, ols2)": "/artefacts/ncbitaxon/resources/classes/http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FNCBITaxon_2?showResponseConfiguration=true"
66

77
metadata:
88
"Artefacts from OLS v1": "/artefacts?database=OLS&showResponseConfiguration=true"

0 commit comments

Comments
 (0)