From 79a24c47669725b84d04b037ac8b707fd6b598bb Mon Sep 17 00:00:00 2001 From: Jeroen De Dauw Date: Tue, 6 Jan 2026 18:41:05 +0100 Subject: [PATCH] Fix property mappings to use entity prefix instead of direct claim prefix --- src/Presentation/RDF/MappingRdfBuilder.php | 4 ++-- .../RDF/PropertyMappingPrefixBuilder.php | 20 ------------------ src/WikibaseRdfExtension.php | 7 ------- .../RDF/PropertyMappingPrefixBuilderTest.php | 21 ------------------- 4 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 src/Presentation/RDF/PropertyMappingPrefixBuilder.php delete mode 100644 tests/Presentation/RDF/PropertyMappingPrefixBuilderTest.php diff --git a/src/Presentation/RDF/MappingRdfBuilder.php b/src/Presentation/RDF/MappingRdfBuilder.php index 8fbc8d4..bb48fa7 100644 --- a/src/Presentation/RDF/MappingRdfBuilder.php +++ b/src/Presentation/RDF/MappingRdfBuilder.php @@ -17,7 +17,7 @@ class MappingRdfBuilder implements EntityRdfBuilder { public function __construct( private RdfWriter $writer, private MappingRepository $repository, - private PropertyMappingPrefixBuilder $propertyMappingPrefixBuilder + private string $rdfNodeNamespacePrefix ) { } @@ -85,7 +85,7 @@ private function addItemMapping( Mapping $mapping ): void { private function addPropertyMapping( Mapping $mapping, EntityId $entityId ): void { $this->writer - ->about( $this->propertyMappingPrefixBuilder->getPrefix(), $entityId->getSerialization() ) + ->about( $this->rdfNodeNamespacePrefix, $entityId->getSerialization() ) ->a( 'owl', 'ObjectProperty' ) ->say( $mapping->getPredicateBase(), $mapping->getPredicateLocal() ) ->is( $mapping->object ); diff --git a/src/Presentation/RDF/PropertyMappingPrefixBuilder.php b/src/Presentation/RDF/PropertyMappingPrefixBuilder.php deleted file mode 100644 index a27fdb4..0000000 --- a/src/Presentation/RDF/PropertyMappingPrefixBuilder.php +++ /dev/null @@ -1,20 +0,0 @@ -rdfNodeNamespacePrefix . RdfVocabulary::NSP_DIRECT_CLAIM; - } - -} diff --git a/src/WikibaseRdfExtension.php b/src/WikibaseRdfExtension.php index 036275d..41ca7b3 100644 --- a/src/WikibaseRdfExtension.php +++ b/src/WikibaseRdfExtension.php @@ -32,7 +32,6 @@ use ProfessionalWiki\WikibaseRDF\Presentation\RDF\MappingRdfBuilder; use ProfessionalWiki\WikibaseRDF\EntryPoints\Rest\GetMappingsApi; use ProfessionalWiki\WikibaseRDF\EntryPoints\Rest\SaveMappingsApi; -use ProfessionalWiki\WikibaseRDF\Presentation\RDF\PropertyMappingPrefixBuilder; use ProfessionalWiki\WikibaseRDF\Presentation\RestSaveMappingsPresenter; use ProfessionalWiki\WikibaseRDF\Presentation\HtmlMappingsPresenter; use ValueValidators\ValueValidator; @@ -91,12 +90,6 @@ public function newMappingRdfBuilder( RdfWriter $writer ): MappingRdfBuilder { return new MappingRdfBuilder( $writer, $this->newMappingRepository( RequestContext::getMain()->getUser() ), - $this->newPropertyMappingPrefixBuilder() - ); - } - - private function newPropertyMappingPrefixBuilder(): PropertyMappingPrefixBuilder { - return new PropertyMappingPrefixBuilder( WikibaseRepo::getLocalEntitySource()->getRdfNodeNamespacePrefix() ); } diff --git a/tests/Presentation/RDF/PropertyMappingPrefixBuilderTest.php b/tests/Presentation/RDF/PropertyMappingPrefixBuilderTest.php deleted file mode 100644 index c2df6e1..0000000 --- a/tests/Presentation/RDF/PropertyMappingPrefixBuilderTest.php +++ /dev/null @@ -1,21 +0,0 @@ -assertSame( 'wdt', $builder->getPrefix() ); - } - -}