jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370593 )
Change subject: Uppercase item ids received from services. ...................................................................... Uppercase item ids received from services. Bug: T172642 Change-Id: I017d88425f734ffcdc45b565867ca70b142e88d2 --- M blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java M blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplateUnitTest.java 2 files changed, 8 insertions(+), 2 deletions(-) Approvals: Smalyshev: Looks good to me, approved jenkins-bot: Verified Gehel: Looks good to me, but someone else must approve diff --git a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java index 89711d5..147247d 100644 --- a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java +++ b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; @@ -372,7 +373,7 @@ case URI: return new URIImpl(value); case ITEM: - return new URIImpl(WikibaseUris.getURISystem().entity() + value); + return new URIImpl(WikibaseUris.getURISystem().entity() + value.toUpperCase(Locale.ROOT)); default: throw new IllegalArgumentException("Can not produce URI for non-URI type " + type); } diff --git a/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplateUnitTest.java b/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplateUnitTest.java index 9abc865..8898ada 100644 --- a/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplateUnitTest.java +++ b/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplateUnitTest.java @@ -22,6 +22,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.endsWith; import static org.wikidata.query.rdf.blazegraph.mwapi.MWApiServiceFactory.paramNameToURI; public class ApiTemplateUnitTest extends AbstractRandomizedBlazegraphTestBase { @@ -144,12 +145,16 @@ assertThat(var.getPath(), equalTo("@somedata")); assertTrue(var.isURI()); assertThat(var.getURI("http://test.com/"), instanceOf(URI.class)); - // User-defined variable + // URI keeps the case + assertThat(var.getURI("http://test.com/test").toString(), endsWith("test")); + // User-defined variable which is an item var = outputs.get(2); assertThat(var.getName(), equalTo("var3")); assertThat(var.getPath(), equalTo("item/@wikibase_id")); assertTrue(var.isURI()); assertThat(var.getURI("test"), instanceOf(URI.class)); + // T172642: Item URIs will be uppercased + assertThat(var.getURI("test").toString(), endsWith("TEST")); } @Test(expected = NullPointerException.class) -- To view, visit https://gerrit.wikimedia.org/r/370593 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I017d88425f734ffcdc45b565867ca70b142e88d2 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Smalyshev <smalys...@wikimedia.org> Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org> Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits