From 1e92169f0d1b467b7222feda0c59e038d20ca233 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Thu, 5 Jun 2025 17:47:00 +0200 Subject: [PATCH 1/5] remove unused WebAccessControl vocabulary --- .../vocabulary/WebAccessControl.java | 58 ------------------- 1 file changed, 58 deletions(-) delete mode 100644 src/main/java/nl/dtls/fairdatapoint/vocabulary/WebAccessControl.java diff --git a/src/main/java/nl/dtls/fairdatapoint/vocabulary/WebAccessControl.java b/src/main/java/nl/dtls/fairdatapoint/vocabulary/WebAccessControl.java deleted file mode 100644 index 186253577..000000000 --- a/src/main/java/nl/dtls/fairdatapoint/vocabulary/WebAccessControl.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * The MIT License - * Copyright © 2017 DTL - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package nl.dtls.fairdatapoint.vocabulary; - -import org.eclipse.rdf4j.model.IRI; -import org.eclipse.rdf4j.model.ValueFactory; -import org.eclipse.rdf4j.model.impl.SimpleValueFactory; - -/** - * WebAccessControl vocabulary. - * - * @see WebAccessControl Vocabulary - * @author Rajaram Kaliyaperumal - * @author Kees Burger - * @version 0.1 - * @since 2017-02-22 - */ -public class WebAccessControl { - - public static final ValueFactory VF = SimpleValueFactory.getInstance(); - - public static final String PREFIX = "acl"; - public static final String NAMESPACE = "http://www.w3.org/ns/auth/acl#"; - - public static final IRI AUTHORIZATION = VF.createIRI(NAMESPACE + "Authorization"); - public static final IRI ACCESS_APPEND = VF.createIRI(NAMESPACE + "Append"); - public static final IRI ACCESS_WRITE = VF.createIRI(NAMESPACE + "Write"); - public static final IRI ACCESS_READ = VF.createIRI(NAMESPACE + "Read"); - public static final IRI ACCESS_MODE = VF.createIRI(NAMESPACE + "mode"); - public static final IRI ACCESS_AGENT = VF.createIRI(NAMESPACE + "agent"); - public static final IRI ACCESS_TO = VF.createIRI(NAMESPACE + "accessTo"); - -} From ea3531eba02747ea4deb203fe108e8cef4e06733 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Thu, 5 Jun 2025 17:48:09 +0200 Subject: [PATCH 2/5] rename vocabulary.Sio to SIO and use util.ValueFactoryHelper.i for consistency --- .../entity/metadata/MetadataSetter.java | 12 ++++++------ .../fairdatapoint/vocabulary/{Sio.java => SIO.java} | 13 ++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) rename src/main/java/nl/dtls/fairdatapoint/vocabulary/{Sio.java => SIO.java} (81%) diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataSetter.java b/src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataSetter.java index 9795efbd4..630da2880 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataSetter.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataSetter.java @@ -24,7 +24,7 @@ import nl.dtls.fairdatapoint.vocabulary.DCAT3; import nl.dtls.fairdatapoint.vocabulary.FDP; -import nl.dtls.fairdatapoint.vocabulary.Sio; +import nl.dtls.fairdatapoint.vocabulary.SIO; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Literal; import org.eclipse.rdf4j.model.Model; @@ -122,12 +122,12 @@ public static void setPublisher(Model metadata, IRI uri, Agent publisher) { } public static void setMetrics(Model metadata, IRI uri, List metrics) { - metadata.remove(null, Sio.IS_ABOUT, null); - metadata.remove(null, Sio.REFERS_TO, null); + metadata.remove(null, SIO.IS_ABOUT, null); + metadata.remove(null, SIO.REFERS_TO, null); metrics.forEach(metric -> { - metadata.add(uri, Sio.REFERS_TO, metric.getUri()); - metadata.add(metric.getUri(), Sio.IS_ABOUT, metric.getMetricType()); - metadata.add(metric.getUri(), Sio.REFERS_TO, metric.getValue()); + metadata.add(uri, SIO.REFERS_TO, metric.getUri()); + metadata.add(metric.getUri(), SIO.IS_ABOUT, metric.getMetricType()); + metadata.add(metric.getUri(), SIO.REFERS_TO, metric.getValue()); }); } diff --git a/src/main/java/nl/dtls/fairdatapoint/vocabulary/Sio.java b/src/main/java/nl/dtls/fairdatapoint/vocabulary/SIO.java similarity index 81% rename from src/main/java/nl/dtls/fairdatapoint/vocabulary/Sio.java rename to src/main/java/nl/dtls/fairdatapoint/vocabulary/SIO.java index df1493856..7e57d0d19 100644 --- a/src/main/java/nl/dtls/fairdatapoint/vocabulary/Sio.java +++ b/src/main/java/nl/dtls/fairdatapoint/vocabulary/SIO.java @@ -28,8 +28,8 @@ package nl.dtls.fairdatapoint.vocabulary; import org.eclipse.rdf4j.model.IRI; -import org.eclipse.rdf4j.model.ValueFactory; -import org.eclipse.rdf4j.model.impl.SimpleValueFactory; + +import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i; /** * Semanticscience Integrated Ontology @@ -40,12 +40,11 @@ * @version 0.1 * @since 2018-01-17 */ -public class Sio { +public class SIO { - public static final ValueFactory VF = SimpleValueFactory.getInstance(); - public static final String PREFIX = "sio"; public static final String NAMESPACE = "http://semanticscience.org/resource/"; - public static final IRI REFERS_TO = VF.createIRI(NAMESPACE + "SIO_000628"); - public static final IRI IS_ABOUT = VF.createIRI(NAMESPACE + "SIO_000332"); + + public static final IRI IS_ABOUT = i(NAMESPACE + "SIO_000332"); + public static final IRI REFERS_TO = i(NAMESPACE + "SIO_000628"); } From ae65862327e9e919da36be7f8a8eab60f2237eff Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Thu, 5 Jun 2025 17:49:48 +0200 Subject: [PATCH 3/5] remove unused terms from DATACITE vocabulary and refactor for consistency --- .../fairdatapoint/vocabulary/DATACITE.java | 133 +----------------- 1 file changed, 4 insertions(+), 129 deletions(-) diff --git a/src/main/java/nl/dtls/fairdatapoint/vocabulary/DATACITE.java b/src/main/java/nl/dtls/fairdatapoint/vocabulary/DATACITE.java index 219699927..2669b4f31 100644 --- a/src/main/java/nl/dtls/fairdatapoint/vocabulary/DATACITE.java +++ b/src/main/java/nl/dtls/fairdatapoint/vocabulary/DATACITE.java @@ -23,136 +23,11 @@ package nl.dtls.fairdatapoint.vocabulary; import org.eclipse.rdf4j.model.IRI; -import org.eclipse.rdf4j.model.ValueFactory; -import org.eclipse.rdf4j.model.impl.SimpleValueFactory; -public final class DATACITE { - public static final String NAMESPACE = ""; - public static final String PREFIX = "datacite"; - - /** http://purl.org/spar/datacite/AlternateResourceIdentifier */ - public static final IRI ALTERNATERESOURCEIDENTIFIER; - - /** http://purl.org/co/List */ - public static final IRI LIST; - - /** http://purl.org/spar/datacite/PrimaryResourceIdentifier */ - public static final IRI PRIMARYRESOURCEIDENTIFIER; - - /** http://www.essepuntato.it/2010/06/literalreification/Literal */ - public static final IRI LITERAL; - - /** http://purl.org/spar/datacite/FunderIdentifier */ - public static final IRI FUNDERIDENTIFIER; - - /** http://purl.org/spar/datacite/MetadataScheme */ - public static final IRI METADATASCHEME; - - /** http://purl.org/spar/datacite/OrganizationIdentifier */ - public static final IRI ORGANIZATIONIDENTIFIER; - - /** http://purl.org/spar/datacite/PersonalIdentifier */ - public static final IRI PERSONALIDENTIFIER; - - /** http://www.w3.org/2004/02/skos/core#Concept */ - public static final IRI CONCEPT; - - /** http://purl.org/spar/datacite/FunderIdentifierScheme */ - public static final IRI FUNDERIDENTIFIERSCHEME; - - /** http://purl.org/spar/datacite/Identifier */ - public static final IRI IDENTIFIER; - - /** http://purl.org/spar/datacite/OrganizationIdentifierScheme */ - public static final IRI ORGANIZATIONIDENTIFIERSCHEME; - - /** http://purl.org/spar/datacite/AgentIdentifier */ - public static final IRI AGENTIDENTIFIER; - - /** http://purl.org/spar/datacite/DescriptionType */ - public static final IRI DESCRIPTIONTYPE; - - /** http://purl.org/spar/datacite/AgentIdentifierScheme */ - public static final IRI AGENTIDENTIFIERSCHEME; - - /** http://purl.org/spar/datacite/IdentifierScheme */ - public static final IRI IDENTIFIERSCHEME; +import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i; - /** http://purl.org/spar/datacite/ResourceIdentifier */ - public static final IRI RESOURCEIDENTIFIER; - - /** http://purl.org/spar/datacite/PersonalIdentifierScheme */ - public static final IRI PERSONALIDENTIFIERSCHEME; - - /** http://purl.org/spar/datacite/ResourceIdentifierScheme */ - public static final IRI RESOURCEIDENTIFIERSCHEME; - - /** http://purl.org/spar/datacite/hasCreatorList */ - public static final IRI HASCREATORLIST; - - /** http://purl.org/spar/datacite/hasGeneralResourceType */ - public static final IRI HASGENERALRESOURCETYPE; - - /** http://purl.org/spar/datacite/usesMetadataScheme */ - public static final IRI USESMETADATASCHEME; - - /** http://purl.org/spar/fabio/hasURL */ - public static final IRI HASURL; - - /** http://www.w3.org/2002/07/owl#topObjectProperty */ - public static final IRI TOPOBJECTPROPERTY; - - /** http://purl.org/spar/datacite/hasDescription */ - public static final IRI HASDESCRIPTION; - - /** http://purl.org/spar/datacite/hasDescriptionType */ - public static final IRI HASDESCRIPTIONTYPE; - - /** http://purl.org/dc/terms/type */ - public static final IRI TYPE; - - /** http://purl.org/spar/datacite/hasIdentifier */ - public static final IRI HASIDENTIFIER; - - /** http://purl.org/spar/datacite/usesIdentifierScheme */ - public static final IRI USESIDENTIFIERSCHEME; - - static { - final ValueFactory factory = SimpleValueFactory.getInstance(); - - ALTERNATERESOURCEIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/AlternateResourceIdentifier"); - LIST = factory.createIRI("http://purl.org/co/List"); - PRIMARYRESOURCEIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/PrimaryResourceIdentifier"); - LITERAL = factory.createIRI("http://www.essepuntato.it/2010/06/literalreification/Literal"); - FUNDERIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/FunderIdentifier"); - METADATASCHEME = factory.createIRI("http://purl.org/spar/datacite/MetadataScheme"); - ORGANIZATIONIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/OrganizationIdentifier"); - PERSONALIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/PersonalIdentifier"); - CONCEPT = factory.createIRI("http://www.w3.org/2004/02/skos/core#Concept"); - FUNDERIDENTIFIERSCHEME = factory.createIRI("http://purl.org/spar/datacite/FunderIdentifierScheme"); - IDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/Identifier"); - ORGANIZATIONIDENTIFIERSCHEME = factory.createIRI("http://purl.org/spar/datacite/OrganizationIdentifierScheme"); - AGENTIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/AgentIdentifier"); - DESCRIPTIONTYPE = factory.createIRI("http://purl.org/spar/datacite/DescriptionType"); - AGENTIDENTIFIERSCHEME = factory.createIRI("http://purl.org/spar/datacite/AgentIdentifierScheme"); - IDENTIFIERSCHEME = factory.createIRI("http://purl.org/spar/datacite/IdentifierScheme"); - RESOURCEIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/ResourceIdentifier"); - PERSONALIDENTIFIERSCHEME = factory.createIRI("http://purl.org/spar/datacite/PersonalIdentifierScheme"); - RESOURCEIDENTIFIERSCHEME = factory.createIRI("http://purl.org/spar/datacite/ResourceIdentifierScheme"); - HASCREATORLIST = factory.createIRI("http://purl.org/spar/datacite/hasCreatorList"); - HASGENERALRESOURCETYPE = factory.createIRI("http://purl.org/spar/datacite/hasGeneralResourceType"); - USESMETADATASCHEME = factory.createIRI("http://purl.org/spar/datacite/usesMetadataScheme"); - HASURL = factory.createIRI("http://purl.org/spar/fabio/hasURL"); - TOPOBJECTPROPERTY = factory.createIRI("http://www.w3.org/2002/07/owl#topObjectProperty"); - HASDESCRIPTION = factory.createIRI("http://purl.org/spar/datacite/hasDescription"); - HASDESCRIPTIONTYPE = factory.createIRI("http://purl.org/spar/datacite/hasDescriptionType"); - TYPE = factory.createIRI("http://purl.org/dc/terms/type"); - HASIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/hasIdentifier"); - USESIDENTIFIERSCHEME = factory.createIRI("http://purl.org/spar/datacite/usesIdentifierScheme"); - - } +public final class DATACITE { + public static final String NAMESPACE = "http://purl.org/spar/datacite/"; - /** Utility class; private constructor to prevent instance being created. */ - private DATACITE() { - } + public static final IRI IDENTIFIER = i(NAMESPACE + "Identifier"); } From c16f745808e49274536e2aae9271d193bd83adff Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Thu, 5 Jun 2025 17:50:09 +0200 Subject: [PATCH 4/5] remove unused terms from R3D vocabulary and refactor for consistency --- .../nl/dtls/fairdatapoint/vocabulary/R3D.java | 274 +----------------- 1 file changed, 7 insertions(+), 267 deletions(-) diff --git a/src/main/java/nl/dtls/fairdatapoint/vocabulary/R3D.java b/src/main/java/nl/dtls/fairdatapoint/vocabulary/R3D.java index 8b088ec8d..0d33583c7 100644 --- a/src/main/java/nl/dtls/fairdatapoint/vocabulary/R3D.java +++ b/src/main/java/nl/dtls/fairdatapoint/vocabulary/R3D.java @@ -23,276 +23,16 @@ package nl.dtls.fairdatapoint.vocabulary; import org.eclipse.rdf4j.model.IRI; -import org.eclipse.rdf4j.model.ValueFactory; -import org.eclipse.rdf4j.model.impl.SimpleValueFactory; -public final class R3D { - public static final String NAMESPACE = "http://www.re3data.org/schema/3-0#"; - public static final String PREFIX = "r3d"; - - /** http://www.re3data.org/schema/3-0#Repository */ - public static final IRI REPOSITORY; - - /** http://www.re3data.org/schema/3-0#Institution */ - public static final IRI INSTITUTION; - - /** http://www.re3data.org/schema/3-0#Regulation */ - public static final IRI REGULATION; - - /** http://www.re3data.org/schema/3-0#Access */ - public static final IRI ACCESS; - - /** http://www.re3data.org/schema/3-0#License */ - public static final IRI LICENSE; - - /** http://www.re3data.org/schema/3-0#Policy */ - public static final IRI POLICY; - - /** http://www.re3data.org/schema/3-0#Api */ - public static final IRI API; - - /** http://www.re3data.org/schema/3-0#ReferenceDocument */ - public static final IRI REFERENCEDOCUMENT; - - /** http://www.re3data.org/schema/3-0#Responsibility */ - public static final IRI RESPONSIBILITY; - - /** http://www.re3data.org/schema/3-0#PublicationSupport */ - public static final IRI PUBLICATIONSUPPORT; - - /** http://www.re3data.org/schema/3-0#publicationSupport */ - public static final IRI HAS_PUBLICATIONSUPPORT; - - /** http://www.re3data.org/schema/3-0#dataAccess */ - public static final IRI DATAACCESS; - - /** http://www.re3data.org/schema/3-0#dataUpload */ - public static final IRI DATAUPLOAD; - - /** http://www.re3data.org/schema/3-0#databaseAccess */ - public static final IRI DATABASEACCESS; - - /** http://www.re3data.org/schema/3-0#dataLicense */ - public static final IRI DATALICENSE; - - /** http://www.re3data.org/schema/3-0#dataUploadLicense */ - public static final IRI DATAUPLOADLICENSE; - - /** http://www.re3data.org/schema/3-0#databaseLicense */ - public static final IRI DATABASELICENSE; - - /** http://www.re3data.org/schema/3-0#policy */ - public static final IRI HAS_POLICY; - - /** http://www.re3data.org/schema/3-0#api */ - public static final IRI HAS_API; - - /** http://www.re3data.org/schema/3-0#metadataStandard */ - public static final IRI METADATASTANDARD; - - /** http://www.re3data.org/schema/3-0#certificate */ - public static final IRI CERTIFICATE; - - /** http://www.re3data.org/schema/3-0#syndication */ - public static final IRI SYNDICATION; - - /** http://www.re3data.org/schema/3-0#repositoryType */ - public static final IRI REPOSITORYTYPE; - - /** http://www.re3data.org/schema/3-0#providerType */ - public static final IRI PROVIDERTYPE; - - /** http://www.re3data.org/schema/3-0#repositoryLanguage */ - public static final IRI REPOSITORYLANGUAGE; - - /** http://www.re3data.org/schema/3-0#contentType */ - public static final IRI CONTENTTYPE; - - /** http://www.re3data.org/schema/3-0#re3data */ - public static final IRI RE3DATA; - - /** http://www.re3data.org/schema/3-0#subject */ - public static final IRI SUBJECT; - - /** http://www.re3data.org/schema/3-0#doi */ - public static final IRI DOI; - - /** http://www.re3data.org/schema/3-0#repositoryIdentifier */ - public static final IRI REPOSITORYIDENTIFIER; - - /** http://www.re3data.org/schema/3-0#repositoryPost */ - public static final IRI REPOSITORYPOST; - - /** http://www.re3data.org/schema/3-0#institution */ - public static final IRI HAS_INSTITUTION; +import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i; - /** http://www.re3data.org/schema/3-0#dataCatalog */ - public static final IRI DATACATALOG; - - /** http://www.re3data.org/schema/3-0#catalogRepository */ - public static final IRI CATALOGREPOSITORY; - - /** http://www.re3data.org/schema/3-0#inRepository */ - public static final IRI INREPOSITORY; - - /** http://www.re3data.org/schema/3-0#reposits */ - public static final IRI REPOSITS; - - /** http://www.re3data.org/schema/3-0#institutionIdentifier */ - public static final IRI INSTITUTIONIDENTIFIER; - - /** http://www.re3data.org/schema/3-0#responsibility */ - public static final IRI HAS_RESPONSIBILITY; - - /** http://www.re3data.org/schema/3-0#institutionType */ - public static final IRI INSTITUTIONTYPE; - - /** http://www.re3data.org/schema/3-0#responsibilityType */ - public static final IRI RESPONSIBILITYTYPE; - - /** http://www.re3data.org/schema/3-0#country */ - public static final IRI COUNTRY; - - /** http://www.re3data.org/schema/3-0#apiType */ - public static final IRI APITYPE; - - /** http://www.re3data.org/schema/3-0#policyType */ - public static final IRI POLICYTYPE; - - /** http://www.re3data.org/schema/3-0#accessRestriction */ - public static final IRI ACCESSRESTRICTION; - - /** http://www.re3data.org/schema/3-0#accessType */ - public static final IRI ACCESSTYPE; - - /** http://www.re3data.org/schema/3-0#citationReference */ - public static final IRI CITATIONREFERENCE; - - /** http://www.re3data.org/schema/3-0#pidSystem */ - public static final IRI PIDSYSTEM; - - /** http://www.re3data.org/schema/3-0#aidSystem */ - public static final IRI AIDSYSTEM; - - /** http://www.re3data.org/schema/3-0#startDate */ - public static final IRI STARTDATE; - - /** http://www.re3data.org/schema/3-0#entryDate */ - public static final IRI ENTRYDATE; - - /** http://www.re3data.org/schema/3-0#closed */ - public static final IRI CLOSED; - - /** http://www.re3data.org/schema/3-0#offline */ - public static final IRI OFFLINE; - - /** http://www.re3data.org/schema/3-0#metrics */ - public static final IRI METRICS; - - /** http://www.re3data.org/schema/3-0#size */ - public static final IRI SIZE; - - /** http://www.re3data.org/schema/3-0#software */ - public static final IRI SOFTWARE; - - /** http://www.re3data.org/schema/3-0#hasVersioning */ - public static final IRI HASVERSIONING; - - /** http://www.re3data.org/schema/3-0#hasQualityManagement */ - public static final IRI HASQUALITYMANAGEMENT; - - /** http://www.re3data.org/schema/3-0#responsibilityStartDate */ - public static final IRI RESPONSIBILITYSTARTDATE; - - /** http://www.re3data.org/schema/3-0#responsibilityEndDate */ - public static final IRI RESPONSIBILITYENDDATE; - - /** http://www.re3data.org/schema/3-0#apiUrl */ - public static final IRI APIURL; - - /** http://www.re3data.org/schema/3-0#wsdlDocument */ - public static final IRI WSDLDOCUMENT; - - /** http://www.re3data.org/schema/3-0#citeGuidelineUrl */ - public static final IRI CITEGUIDELINEURL; - - /** http://www.re3data.org/schema/3-0#enhancedPubliction */ - public static final IRI ENHANCEDPUBLICTION; - - static { - final ValueFactory factory = SimpleValueFactory.getInstance(); - - REPOSITORY = factory.createIRI("http://www.re3data.org/schema/3-0#Repository"); - INSTITUTION = factory.createIRI("http://www.re3data.org/schema/3-0#Institution"); - REGULATION = factory.createIRI("http://www.re3data.org/schema/3-0#Regulation"); - ACCESS = factory.createIRI("http://www.re3data.org/schema/3-0#Access"); - LICENSE = factory.createIRI("http://www.re3data.org/schema/3-0#License"); - POLICY = factory.createIRI("http://www.re3data.org/schema/3-0#Policy"); - API = factory.createIRI("http://www.re3data.org/schema/3-0#Api"); - REFERENCEDOCUMENT = factory.createIRI("http://www.re3data.org/schema/3-0#ReferenceDocument"); - RESPONSIBILITY = factory.createIRI("http://www.re3data.org/schema/3-0#Responsibility"); - PUBLICATIONSUPPORT = factory.createIRI("http://www.re3data.org/schema/3-0#PublicationSupport"); - HAS_PUBLICATIONSUPPORT = factory.createIRI("http://www.re3data.org/schema/3-0#publicationSupport"); - DATAACCESS = factory.createIRI("http://www.re3data.org/schema/3-0#dataAccess"); - DATAUPLOAD = factory.createIRI("http://www.re3data.org/schema/3-0#dataUpload"); - DATABASEACCESS = factory.createIRI("http://www.re3data.org/schema/3-0#databaseAccess"); - DATALICENSE = factory.createIRI("http://www.re3data.org/schema/3-0#dataLicense"); - DATAUPLOADLICENSE = factory.createIRI("http://www.re3data.org/schema/3-0#dataUploadLicense"); - DATABASELICENSE = factory.createIRI("http://www.re3data.org/schema/3-0#databaseLicense"); - HAS_POLICY = factory.createIRI("http://www.re3data.org/schema/3-0#policy"); - HAS_API = factory.createIRI("http://www.re3data.org/schema/3-0#api"); - METADATASTANDARD = factory.createIRI("http://www.re3data.org/schema/3-0#metadataStandard"); - CERTIFICATE = factory.createIRI("http://www.re3data.org/schema/3-0#certificate"); - SYNDICATION = factory.createIRI("http://www.re3data.org/schema/3-0#syndication"); - REPOSITORYTYPE = factory.createIRI("http://www.re3data.org/schema/3-0#repositoryType"); - PROVIDERTYPE = factory.createIRI("http://www.re3data.org/schema/3-0#providerType"); - REPOSITORYLANGUAGE = factory.createIRI("http://www.re3data.org/schema/3-0#repositoryLanguage"); - CONTENTTYPE = factory.createIRI("http://www.re3data.org/schema/3-0#contentType"); - RE3DATA = factory.createIRI("http://www.re3data.org/schema/3-0#re3data"); - SUBJECT = factory.createIRI("http://www.re3data.org/schema/3-0#subject"); - DOI = factory.createIRI("http://www.re3data.org/schema/3-0#doi"); - } +public final class R3D { - static { - final ValueFactory factory = SimpleValueFactory.getInstance(); + public static final String NAMESPACE = "http://www.re3data.org/schema/3-0#"; - REPOSITORYIDENTIFIER = factory.createIRI("http://www.re3data.org/schema/3-0#repositoryIdentifier"); - REPOSITORYPOST = factory.createIRI("http://www.re3data.org/schema/3-0#repositoryPost"); - HAS_INSTITUTION = factory.createIRI("http://www.re3data.org/schema/3-0#institution"); - DATACATALOG = factory.createIRI("http://www.re3data.org/schema/3-0#dataCatalog"); - CATALOGREPOSITORY = factory.createIRI("http://www.re3data.org/schema/3-0#catalogRepository"); - INREPOSITORY = factory.createIRI("http://www.re3data.org/schema/3-0#inRepository"); - REPOSITS = factory.createIRI("http://www.re3data.org/schema/3-0#reposits"); - INSTITUTIONIDENTIFIER = factory.createIRI("http://www.re3data.org/schema/3-0#institutionIdentifier"); - HAS_RESPONSIBILITY = factory.createIRI("http://www.re3data.org/schema/3-0#responsibility"); - INSTITUTIONTYPE = factory.createIRI("http://www.re3data.org/schema/3-0#institutionType"); - RESPONSIBILITYTYPE = factory.createIRI("http://www.re3data.org/schema/3-0#responsibilityType"); - COUNTRY = factory.createIRI("http://www.re3data.org/schema/3-0#country"); - APITYPE = factory.createIRI("http://www.re3data.org/schema/3-0#apiType"); - POLICYTYPE = factory.createIRI("http://www.re3data.org/schema/3-0#policyType"); - ACCESSRESTRICTION = factory.createIRI("http://www.re3data.org/schema/3-0#accessRestriction"); - ACCESSTYPE = factory.createIRI("http://www.re3data.org/schema/3-0#accessType"); - CITATIONREFERENCE = factory.createIRI("http://www.re3data.org/schema/3-0#citationReference"); - PIDSYSTEM = factory.createIRI("http://www.re3data.org/schema/3-0#pidSystem"); - AIDSYSTEM = factory.createIRI("http://www.re3data.org/schema/3-0#aidSystem"); - STARTDATE = factory.createIRI("http://www.re3data.org/schema/3-0#startDate"); - ENTRYDATE = factory.createIRI("http://www.re3data.org/schema/3-0#entryDate"); - CLOSED = factory.createIRI("http://www.re3data.org/schema/3-0#closed"); - OFFLINE = factory.createIRI("http://www.re3data.org/schema/3-0#offline"); - METRICS = factory.createIRI("http://www.re3data.org/schema/3-0#metrics"); - SIZE = factory.createIRI("http://www.re3data.org/schema/3-0#size"); - SOFTWARE = factory.createIRI("http://www.re3data.org/schema/3-0#software"); - HASVERSIONING = factory.createIRI("http://www.re3data.org/schema/3-0#hasVersioning"); - HASQUALITYMANAGEMENT = factory.createIRI("http://www.re3data.org/schema/3-0#hasQualityManagement"); - RESPONSIBILITYSTARTDATE = factory.createIRI("http://www.re3data.org/schema/3-0#responsibilityStartDate"); - RESPONSIBILITYENDDATE = factory.createIRI("http://www.re3data.org/schema/3-0#responsibilityEndDate"); - APIURL = factory.createIRI("http://www.re3data.org/schema/3-0#apiUrl"); - WSDLDOCUMENT = factory.createIRI("http://www.re3data.org/schema/3-0#wsdlDocument"); - CITEGUIDELINEURL = factory.createIRI("http://www.re3data.org/schema/3-0#citeGuidelineUrl"); - ENHANCEDPUBLICTION = factory.createIRI("http://www.re3data.org/schema/3-0#enhancedPubliction"); - } + public static final IRI COUNTRY = i(NAMESPACE + "country"); + public static final IRI DATACATALOG = i(NAMESPACE + "dataCatalog"); + public static final IRI REPOSITORY = i(NAMESPACE + "Repository"); + public static final IRI REPOSITORYIDENTIFIER = i(NAMESPACE + "repositoryIdentifier"); - /** Utility class; private constructor to prevent instance being created. */ - private R3D() { - } } From ead6098452587203186ba1c295ba1921ece5ec6c Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Thu, 5 Jun 2025 17:50:25 +0200 Subject: [PATCH 5/5] remove unused terms from FDP vocabulary and refactor for consistency --- .../nl/dtls/fairdatapoint/vocabulary/FDP.java | 81 +++---------------- 1 file changed, 10 insertions(+), 71 deletions(-) diff --git a/src/main/java/nl/dtls/fairdatapoint/vocabulary/FDP.java b/src/main/java/nl/dtls/fairdatapoint/vocabulary/FDP.java index 75484e281..e42a837bd 100644 --- a/src/main/java/nl/dtls/fairdatapoint/vocabulary/FDP.java +++ b/src/main/java/nl/dtls/fairdatapoint/vocabulary/FDP.java @@ -23,80 +23,19 @@ package nl.dtls.fairdatapoint.vocabulary; import org.eclipse.rdf4j.model.IRI; -import org.eclipse.rdf4j.model.ValueFactory; -import org.eclipse.rdf4j.model.impl.SimpleValueFactory; -public final class FDP { - public static final String NAMESPACE = "https://w3id.org/fdp/fdp-o#"; - public static final String PREFIX = "fdp"; - - /** https://w3id.org/fdp/fdp-o#DeprecatedClasses */ - public static final IRI DEPRECATEDCLASSES; - - /** https://w3id.org/fdp/fdp-o#FAIRDataPoint */ - public static final IRI FAIRDATAPOINT; - - /** https://w3id.org/fdp/fdp-o#Metadata */ - public static final IRI METADATA; - - /** https://w3id.org/fdp/fdp-o#MetadataService */ - public static final IRI METADATASERVICE; - - /** https://w3id.org/fdp/fdp-o#deprecatedObjectProperties */ - public static final IRI DEPRECATEDOBJECTPROPERTIES; - - /** https://w3id.org/fdp/fdp-o#fdpIdentifier */ - public static final IRI FDPIDENTIFIER; - - /** https://w3id.org/fdp/fdp-o#metadataCatalog */ - public static final IRI METADATACATALOG; - - /** https://w3id.org/fdp/fdp-o#metadataIdentifier */ - public static final IRI METADATAIDENTIFIER; +import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i; - /** https://w3id.org/fdp/fdp-o#servesMetadata */ - public static final IRI SERVESMETADATA; - - /** https://w3id.org/fdp/fdp-o#fdpEndDate */ - public static final IRI FDPENDDATE; - - /** https://w3id.org/fdp/fdp-o#fdpSoftwareVersion */ - public static final IRI FDPSOFTWAREVERSION; - - /** https://w3id.org/fdp/fdp-o#fdpStartDate */ - public static final IRI FDPSTARTDATE; - - /** https://w3id.org/fdp/fdp-o#fdpUILanguage */ - public static final IRI FDPUILANGUAGE; - - /** https://w3id.org/fdp/fdp-o#metadataIssued */ - public static final IRI METADATAISSUED; - - /** https://w3id.org/fdp/fdp-o#metadataModified */ - public static final IRI METADATAMODIFIED; - - static { - final ValueFactory factory = SimpleValueFactory.getInstance(); +public final class FDP { - DEPRECATEDCLASSES = factory.createIRI("https://w3id.org/fdp/fdp-o#DeprecatedClasses"); - FAIRDATAPOINT = factory.createIRI("https://w3id.org/fdp/fdp-o#FAIRDataPoint"); - METADATA = factory.createIRI("https://w3id.org/fdp/fdp-o#Metadata"); - METADATASERVICE = factory.createIRI("https://w3id.org/fdp/fdp-o#MetadataService"); - DEPRECATEDOBJECTPROPERTIES = factory.createIRI("https://w3id.org/fdp/fdp-o#deprecatedObjectProperties"); - FDPIDENTIFIER = factory.createIRI("https://w3id.org/fdp/fdp-o#fdpIdentifier"); - METADATACATALOG = factory.createIRI("https://w3id.org/fdp/fdp-o#metadataCatalog"); - METADATAIDENTIFIER = factory.createIRI("https://w3id.org/fdp/fdp-o#metadataIdentifier"); - SERVESMETADATA = factory.createIRI("https://w3id.org/fdp/fdp-o#servesMetadata"); - FDPENDDATE = factory.createIRI("https://w3id.org/fdp/fdp-o#fdpEndDate"); - FDPSOFTWAREVERSION = factory.createIRI("https://w3id.org/fdp/fdp-o#fdpSoftwareVersion"); - FDPSTARTDATE = factory.createIRI("https://w3id.org/fdp/fdp-o#fdpStartDate"); - FDPUILANGUAGE = factory.createIRI("https://w3id.org/fdp/fdp-o#fdpUILanguage"); - METADATAISSUED = factory.createIRI("https://w3id.org/fdp/fdp-o#metadataIssued"); - METADATAMODIFIED = factory.createIRI("https://w3id.org/fdp/fdp-o#metadataModified"); + public static final String NAMESPACE = "https://w3id.org/fdp/fdp-o#"; - } + public static final IRI FAIRDATAPOINT = i(NAMESPACE + "FAIRDataPoint"); + public static final IRI FDPSOFTWAREVERSION = i(NAMESPACE + "fdpSoftwareVersion"); + public static final IRI METADATACATALOG = i(NAMESPACE + "metadataCatalog"); + public static final IRI METADATAIDENTIFIER = i(NAMESPACE + "metadataIdentifier"); + public static final IRI METADATAISSUED = i(NAMESPACE + "metadataIssued"); + public static final IRI METADATAMODIFIED = i(NAMESPACE + "metadataModified"); + public static final IRI METADATASERVICE = i(NAMESPACE + "MetadataService"); - /** Utility class; private constructor to prevent instance being created. */ - private FDP() { - } }