Skip to content

Commit

Permalink
Fixes issue with the SPARQL based RDF export
Browse files Browse the repository at this point in the history 
- Fixed issue with the payload of the request for the SPARQL based RDF
export. The problem was that the payload was not encoded, which caused
execution of an malformed query in most of the cases.
- Java 11 is back.
- Updated the version of the ``jackson-databind`` as it was detected as
security vulnerable from the dependency checker.
- Prepared for quick 1.6.0 release.
  • Loading branch information
@tonyKunchev
tonyKunchev committed Mar 31, 2022
1 parent 523d682 commit bcbd820
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 36 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,20 @@

## Version 1.6

### New
### New

- Move the project to Java 11. Initially it was on 11, but after a while it was downgraded to 8, because of internal projects that were still developed on 8. Now we can
proceed with the initial plan.

### Changes

- Updated the version of the ``jackson-databind`` library to the latest. The previous is detected as vulnerable by the security scans.

### Bug fixes

- Fixed a major bug in the `SparqlBasedRdfExportCommand`. The problem was that the payload for the request (the actual SPARQL query) was not encoded, which in
different cases caused an execution of malformed query.


## Version 1.5

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>com.ontotext</groupId>
<artifactId>ontorefine-client</artifactId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>

<name>${project.groupId}:${project.artifactId}</name>
<description>An OntoRefine Client Library</description>
Expand Down Expand Up @@ -44,8 +44,8 @@
</distributionManagement>

<properties>
<java.version>8</java.version>
<project.java.version>8</project.java.version>
<java.version>11</java.version>
<project.java.version>11</project.java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<cvss.threshold>6.9</cvss.threshold>
Expand All @@ -67,7 +67,7 @@
<httpcomponents.version>4.5.13</httpcomponents.version>
<commons.lang3.version>3.12.0</commons.lang3.version>
<commons.io.version>2.10.0</commons.io.version>
<jackson.databind.version>2.12.4</jackson.databind.version>
<jackson.databind.version>2.13.2.2</jackson.databind.version>
<rdf4j.version>3.7.2</rdf4j.version>

<junit.jupiter.version>5.8.1</junit.jupiter.version>
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/ontotext/refine/client/command/rdf/SparqlBasedExportRdfCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.ontotext.refine.client.command.RefineCommand;
import com.ontotext.refine.client.exceptions.RefineException;
import java.io.IOException;
import java.net.URLEncoder;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
Expand Down Expand Up @@ -106,7 +107,8 @@ private HttpEntity buildEntity() throws IOException {
*/
private String buildRequestContent() {
String fixedQuery = query.replaceFirst(projectPlaceholder, project);
return StringUtils.prependIfMissing(fixedQuery, "query=");
String encodedQuery = URLEncoder.encode(fixedQuery, UTF_8);
return StringUtils.prependIfMissing(encodedQuery, "query=");
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/ontotext/refine/client/SecuredExportIntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void exportRdfUsingSparql() throws Exception {
new ByteArrayInputStream(exportRdfResponse.getResult().getBytes()),
RDFFormat.TURTLE);

assertTrue("The expected result different then the acual one.", areEqual);
assertTrue("The expected result is different then the acual one.", areEqual);

DeleteProjectResponse deleteResponse = deleteProject(projectId);
assertEquals(ResponseCode.OK, deleteResponse.getCode());
Expand Down
58 changes: 29 additions & 29 deletions .../integration/expected/scenario_1_reduced_netherlands_restaurants_exportRdfUsingSparql.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<https://data/amsterdam/nl/resource/geometry/669d7d82-8962-4e88-b2e1-7b8706633aa0>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.9003230 52.3775440)"^^geo:wktLiteral .

_:node1 amsterdam:address "Stationsplein 10" .

Expand All @@ -42,7 +42,7 @@ _:node2 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/8d9eb314-4433-477e-84b7-35a3552b6fbe>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.9108380 52.3703240)"^^geo:wktLiteral .

_:node3 amsterdam:address "Rapenburgerplein 6 HS" .

Expand All @@ -60,7 +60,7 @@ _:node4 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/ca0e88a6-5cd2-4dc0-8d6a-4273f84721bd>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8819140 52.3652890)"^^geo:wktLiteral .

_:node5 amsterdam:address "Korte Leidsedwarsstraat 15" .

Expand All @@ -79,7 +79,7 @@ _:node6 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/adcd917e-a472-4aed-aace-999c95e97006>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8979420 52.3644210)"^^geo:wktLiteral .

_:node7 amsterdam:address "Utrechtsestraat 32" .

Expand All @@ -98,7 +98,7 @@ _:node8 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/8c83496c-0b8b-41f2-987c-21ddb78b2978>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8890150 52.3723020)"^^geo:wktLiteral .

_:node9 amsterdam:address "Paleisstraat 16" .

Expand All @@ -117,7 +117,7 @@ _:node10 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/56b1dd7d-4ac3-4e24-826e-cb8b55617f42>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.9054970 52.3600380)"^^geo:wktLiteral .

_:node11 amsterdam:address "Professor Tulpplein 1" .

Expand All @@ -135,7 +135,7 @@ _:node12 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/2760a2d8-0404-45df-aa6e-fd88c602d5b9>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8904390 52.3736470)"^^geo:wktLiteral .

_:node13 amsterdam:address "Nieuwezijds Voorburgwal 182" .

Expand All @@ -154,7 +154,7 @@ _:node14 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/17d5d8e4-80c9-459a-8dd2-c59a1eb87618>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8925680 52.3736560)"^^geo:wktLiteral .

_:node15 amsterdam:address "Nieuwendijk 224" .

Expand All @@ -173,7 +173,7 @@ _:node16 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/6c176a7d-04ba-4b4f-83dd-eab89961f971>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8251040 52.3417330)"^^geo:wktLiteral .

_:node17 amsterdam:address "John M. Keynesplein 2" .

Expand All @@ -192,7 +192,7 @@ _:node18 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/9792d7d2-6aa9-4317-b9ff-71d673084e61>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8816340 52.3782390)"^^geo:wktLiteral .

_:node19 amsterdam:address "Westerstraat 186" .

Expand All @@ -211,7 +211,7 @@ _:node20 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/586d2ccd-de3d-4354-86d2-3b37a2820d39>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8938650 52.3732480)"^^geo:wktLiteral .

_:node21 amsterdam:address "Dam 1" .

Expand All @@ -230,7 +230,7 @@ _:node22 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/81fc539d-4d17-4ffe-8e6c-e87de32ace78>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8995560 52.3765520)"^^geo:wktLiteral .

_:node23 amsterdam:address "Prins Hendrikkade 52-57" .

Expand All @@ -249,7 +249,7 @@ _:node24 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/43ad34d9-3571-4721-9382-ffe860fe8755>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8964230 52.3656790)"^^geo:wktLiteral .

_:node25 amsterdam:address "Rembrandtplein 42" .

Expand All @@ -268,7 +268,7 @@ _:node26 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/07eeee9b-9d1d-40a3-afe3-2119982dda85>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8118490 52.4718770)"^^geo:wktLiteral .

_:node27 amsterdam:address "Lagedijk 32-34" .

Expand All @@ -286,7 +286,7 @@ _:node28 amsterdam:city "ZAANDIJK" .

<https://data/amsterdam/nl/resource/geometry/e526f228-83f7-4a81-9cda-0d137d1ef2db>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8956800 52.3780830)"^^geo:wktLiteral .

_:node29 amsterdam:address "Nieuwendijk 40" .

Expand All @@ -305,7 +305,7 @@ _:node30 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/40c53f2a-cc32-4007-9e86-dd15b7cd1df7>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8840520 52.3637490)"^^geo:wktLiteral .

_:node31 amsterdam:address "Korte Leidsedwarsstraat 95" .

Expand All @@ -324,7 +324,7 @@ _:node32 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/a9e3ddff-6863-427f-a049-f243974d8586>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.9128770 52.3496410)"^^geo:wktLiteral .

_:node33 amsterdam:address "Weesperzijde 135" .

Expand All @@ -343,7 +343,7 @@ _:node34 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/a6e96853-6403-49fa-9d0e-39eeff555a56>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8900800 52.3731270)"^^geo:wktLiteral .

_:node35 amsterdam:address "Dam 3-7" .

Expand All @@ -362,7 +362,7 @@ _:node36 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/e1b97cca-b08a-4639-b56b-1c93d4777b48>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8173360 52.3372140)"^^geo:wktLiteral .

_:node37 amsterdam:address "Oude Haagseweg 20" .

Expand All @@ -381,7 +381,7 @@ _:node38 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/eafa02c5-812c-49cb-bf41-3571a507c9b7>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.9416950 52.3130940)"^^geo:wktLiteral .

_:node39 amsterdam:address "Arena boulevard 61-75" .

Expand All @@ -400,7 +400,7 @@ _:node40 amsterdam:city "AMSTERDAM ZUIDOOST" .

<https://data/amsterdam/nl/resource/geometry/2a3ba197-69ab-4be0-931e-1a57f5d14242>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8954940 52.3782540)"^^geo:wktLiteral .

_:node41 amsterdam:address "Nieuwendijk 31" .

Expand All @@ -419,7 +419,7 @@ _:node42 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/215f8ef9-44f2-421b-8f0e-210153e4a25a>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8888240 52.3633790)"^^geo:wktLiteral .

_:node43 amsterdam:address "Kerkstraat 148" .

Expand All @@ -438,7 +438,7 @@ _:node44 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/28e4f3e5-13d9-4655-9032-e644ac310d6c>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8971930 52.3657750)"^^geo:wktLiteral .

_:node45 amsterdam:address "Rembrandtplein 44" .

Expand All @@ -457,7 +457,7 @@ _:node46 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/ba2df677-faad-427a-942f-25fc69869af2>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.9025420 52.3653120)"^^geo:wktLiteral .

_:node47 amsterdam:address "Amstel 51" .

Expand All @@ -476,7 +476,7 @@ _:node48 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/0dc430b8-f08c-47c9-beac-318bf1d0d6e5>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.7927380 52.3420810)"^^geo:wktLiteral .

_:node49 amsterdam:address "Akersluis 8" .

Expand All @@ -495,7 +495,7 @@ _:node50 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/fd2ed47c-627c-40da-95b1-dfdca832be62>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8921870 52.3661890)"^^geo:wktLiteral .

_:node51 amsterdam:address "Reguliersdwarsstraat 38" .

Expand All @@ -514,7 +514,7 @@ _:node52 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/d82a6238-0837-43c7-bf66-851fa1895707>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8986440 52.3632830)"^^geo:wktLiteral .

_:node53 amsterdam:address "Utrechtsestraat 75" .

Expand All @@ -533,7 +533,7 @@ _:node54 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/672b71ac-b3e7-42c8-ad73-39f54fab6957>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8833480 52.3527450)"^^geo:wktLiteral .

_:node55 amsterdam:address "Roelof Hartstraat 1" .

Expand All @@ -552,7 +552,7 @@ _:node56 amsterdam:city "AMSTERDAM" .

<https://data/amsterdam/nl/resource/geometry/e27ade8b-ec67-4e34-8b71-d61cc17bb2aa>
a sf:Point;
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT ("^^geo:wktLiteral .
geo:asWKT "<http://www.opengis.net/def/crs/OGC/1.3/CRS84> POINT (4.8784460 52.3579310)"^^geo:wktLiteral .

_:node57 amsterdam:address "Van Baerlestraat 52" .

Expand Down

0 comments on commit bcbd820

Please sign in to comment.