Skip to content

Clean up vocabulary classes for v1.17.x #717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 5, 2025
Merged

Clean up vocabulary classes for v1.17.x #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e92169
remove unused WebAccessControl vocabulary
dennisvang Jun 5, 2025
ea3531e
rename vocabulary.Sio to SIO
dennisvang Jun 5, 2025
ae65862
remove unused terms from DATACITE vocabulary
dennisvang Jun 5, 2025
c16f745
remove unused terms from R3D vocabulary
dennisvang Jun 5, 2025
ead6098
remove unused terms from FDP vocabulary
dennisvang Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataSetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -122,12 +122,12 @@ public static void setPublisher(Model metadata, IRI uri, Agent publisher) {
}

public static void setMetrics(Model metadata, IRI uri, List<Metric> 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());
});
}

Expand Down
133 changes: 4 additions & 129 deletions src/main/java/nl/dtls/fairdatapoint/vocabulary/DATACITE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/** <tt>http://purl.org/spar/datacite/AlternateResourceIdentifier</tt> */
public static final IRI ALTERNATERESOURCEIDENTIFIER;

/** <tt>http://purl.org/co/List</tt> */
public static final IRI LIST;

/** <tt>http://purl.org/spar/datacite/PrimaryResourceIdentifier</tt> */
public static final IRI PRIMARYRESOURCEIDENTIFIER;

/** <tt>http://www.essepuntato.it/2010/06/literalreification/Literal</tt> */
public static final IRI LITERAL;

/** <tt>http://purl.org/spar/datacite/FunderIdentifier</tt> */
public static final IRI FUNDERIDENTIFIER;

/** <tt>http://purl.org/spar/datacite/MetadataScheme</tt> */
public static final IRI METADATASCHEME;

/** <tt>http://purl.org/spar/datacite/OrganizationIdentifier</tt> */
public static final IRI ORGANIZATIONIDENTIFIER;

/** <tt>http://purl.org/spar/datacite/PersonalIdentifier</tt> */
public static final IRI PERSONALIDENTIFIER;

/** <tt>http://www.w3.org/2004/02/skos/core#Concept</tt> */
public static final IRI CONCEPT;

/** <tt>http://purl.org/spar/datacite/FunderIdentifierScheme</tt> */
public static final IRI FUNDERIDENTIFIERSCHEME;

/** <tt>http://purl.org/spar/datacite/Identifier</tt> */
public static final IRI IDENTIFIER;

/** <tt>http://purl.org/spar/datacite/OrganizationIdentifierScheme</tt> */
public static final IRI ORGANIZATIONIDENTIFIERSCHEME;

/** <tt>http://purl.org/spar/datacite/AgentIdentifier</tt> */
public static final IRI AGENTIDENTIFIER;

/** <tt>http://purl.org/spar/datacite/DescriptionType</tt> */
public static final IRI DESCRIPTIONTYPE;

/** <tt>http://purl.org/spar/datacite/AgentIdentifierScheme</tt> */
public static final IRI AGENTIDENTIFIERSCHEME;

/** <tt>http://purl.org/spar/datacite/IdentifierScheme</tt> */
public static final IRI IDENTIFIERSCHEME;
import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;

/** <tt>http://purl.org/spar/datacite/ResourceIdentifier</tt> */
public static final IRI RESOURCEIDENTIFIER;

/** <tt>http://purl.org/spar/datacite/PersonalIdentifierScheme</tt> */
public static final IRI PERSONALIDENTIFIERSCHEME;

/** <tt>http://purl.org/spar/datacite/ResourceIdentifierScheme</tt> */
public static final IRI RESOURCEIDENTIFIERSCHEME;

/** <tt>http://purl.org/spar/datacite/hasCreatorList</tt> */
public static final IRI HASCREATORLIST;

/** <tt>http://purl.org/spar/datacite/hasGeneralResourceType</tt> */
public static final IRI HASGENERALRESOURCETYPE;

/** <tt>http://purl.org/spar/datacite/usesMetadataScheme</tt> */
public static final IRI USESMETADATASCHEME;

/** <tt>http://purl.org/spar/fabio/hasURL</tt> */
public static final IRI HASURL;

/** <tt>http://www.w3.org/2002/07/owl#topObjectProperty</tt> */
public static final IRI TOPOBJECTPROPERTY;

/** <tt>http://purl.org/spar/datacite/hasDescription</tt> */
public static final IRI HASDESCRIPTION;

/** <tt>http://purl.org/spar/datacite/hasDescriptionType</tt> */
public static final IRI HASDESCRIPTIONTYPE;

/** <tt>http://purl.org/dc/terms/type</tt> */
public static final IRI TYPE;

/** <tt>http://purl.org/spar/datacite/hasIdentifier</tt> */
public static final IRI HASIDENTIFIER;

/** <tt>http://purl.org/spar/datacite/usesIdentifierScheme</tt> */
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");
}
81 changes: 10 additions & 71 deletions src/main/java/nl/dtls/fairdatapoint/vocabulary/FDP.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/** <tt>https://w3id.org/fdp/fdp-o#DeprecatedClasses</tt> */
public static final IRI DEPRECATEDCLASSES;

/** <tt>https://w3id.org/fdp/fdp-o#FAIRDataPoint</tt> */
public static final IRI FAIRDATAPOINT;

/** <tt>https://w3id.org/fdp/fdp-o#Metadata</tt> */
public static final IRI METADATA;

/** <tt>https://w3id.org/fdp/fdp-o#MetadataService</tt> */
public static final IRI METADATASERVICE;

/** <tt>https://w3id.org/fdp/fdp-o#deprecatedObjectProperties</tt> */
public static final IRI DEPRECATEDOBJECTPROPERTIES;

/** <tt>https://w3id.org/fdp/fdp-o#fdpIdentifier</tt> */
public static final IRI FDPIDENTIFIER;

/** <tt>https://w3id.org/fdp/fdp-o#metadataCatalog</tt> */
public static final IRI METADATACATALOG;

/** <tt>https://w3id.org/fdp/fdp-o#metadataIdentifier</tt> */
public static final IRI METADATAIDENTIFIER;
import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;

/** <tt>https://w3id.org/fdp/fdp-o#servesMetadata</tt> */
public static final IRI SERVESMETADATA;

/** <tt>https://w3id.org/fdp/fdp-o#fdpEndDate</tt> */
public static final IRI FDPENDDATE;

/** <tt>https://w3id.org/fdp/fdp-o#fdpSoftwareVersion</tt> */
public static final IRI FDPSOFTWAREVERSION;

/** <tt>https://w3id.org/fdp/fdp-o#fdpStartDate</tt> */
public static final IRI FDPSTARTDATE;

/** <tt>https://w3id.org/fdp/fdp-o#fdpUILanguage</tt> */
public static final IRI FDPUILANGUAGE;

/** <tt>https://w3id.org/fdp/fdp-o#metadataIssued</tt> */
public static final IRI METADATAISSUED;

/** <tt>https://w3id.org/fdp/fdp-o#metadataModified</tt> */
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() {
}
}
Loading
Loading