Skip to content

Commit 6587b09

Browse files
dennisvangdennisvang
authored
Clean up vocabulary classes for v1.17.x (#717)
* remove unused WebAccessControl vocabulary * rename vocabulary.Sio to SIO and use util.ValueFactoryHelper.i for consistency * remove unused terms from DATACITE vocabulary and refactor for consistency * remove unused terms from R3D vocabulary and refactor for consistency * remove unused terms from FDP vocabulary and refactor for consistency
1 parent 255af5e commit 6587b09

File tree

6 files changed

+33
-538
lines changed

6 files changed

+33
-538
lines changed

‎src/main/java/nl/dtls/fairdatapoint/entity/metadata/MetadataSetter.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import nl.dtls.fairdatapoint.vocabulary.DCAT3;
2626
import nl.dtls.fairdatapoint.vocabulary.FDP;
27-
import nl.dtls.fairdatapoint.vocabulary.Sio;
27+
import nl.dtls.fairdatapoint.vocabulary.SIO;
2828
import org.eclipse.rdf4j.model.IRI;
2929
import org.eclipse.rdf4j.model.Literal;
3030
import org.eclipse.rdf4j.model.Model;
@@ -122,12 +122,12 @@ public static void setPublisher(Model metadata, IRI uri, Agent publisher) {
122122
}
123123

124124
public static void setMetrics(Model metadata, IRI uri, List<Metric> metrics) {
125-
metadata.remove(null, Sio.IS_ABOUT, null);
126-
metadata.remove(null, Sio.REFERS_TO, null);
125+
metadata.remove(null, SIO.IS_ABOUT, null);
126+
metadata.remove(null, SIO.REFERS_TO, null);
127127
metrics.forEach(metric -> {
128-
metadata.add(uri, Sio.REFERS_TO, metric.getUri());
129-
metadata.add(metric.getUri(), Sio.IS_ABOUT, metric.getMetricType());
130-
metadata.add(metric.getUri(), Sio.REFERS_TO, metric.getValue());
128+
metadata.add(uri, SIO.REFERS_TO, metric.getUri());
129+
metadata.add(metric.getUri(), SIO.IS_ABOUT, metric.getMetricType());
130+
metadata.add(metric.getUri(), SIO.REFERS_TO, metric.getValue());
131131
});
132132
}
133133

‎src/main/java/nl/dtls/fairdatapoint/vocabulary/DATACITE.java

Lines changed: 4 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -23,136 +23,11 @@
2323
package nl.dtls.fairdatapoint.vocabulary;
2424

2525
import org.eclipse.rdf4j.model.IRI;
26-
import org.eclipse.rdf4j.model.ValueFactory;
27-
import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
2826

29-
public final class DATACITE {
30-
public static final String NAMESPACE = "";
31-
public static final String PREFIX = "datacite";
32-
33-
/** <tt>http://purl.org/spar/datacite/AlternateResourceIdentifier</tt> */
34-
public static final IRI ALTERNATERESOURCEIDENTIFIER;
35-
36-
/** <tt>http://purl.org/co/List</tt> */
37-
public static final IRI LIST;
38-
39-
/** <tt>http://purl.org/spar/datacite/PrimaryResourceIdentifier</tt> */
40-
public static final IRI PRIMARYRESOURCEIDENTIFIER;
41-
42-
/** <tt>http://www.essepuntato.it/2010/06/literalreification/Literal</tt> */
43-
public static final IRI LITERAL;
44-
45-
/** <tt>http://purl.org/spar/datacite/FunderIdentifier</tt> */
46-
public static final IRI FUNDERIDENTIFIER;
47-
48-
/** <tt>http://purl.org/spar/datacite/MetadataScheme</tt> */
49-
public static final IRI METADATASCHEME;
50-
51-
/** <tt>http://purl.org/spar/datacite/OrganizationIdentifier</tt> */
52-
public static final IRI ORGANIZATIONIDENTIFIER;
53-
54-
/** <tt>http://purl.org/spar/datacite/PersonalIdentifier</tt> */
55-
public static final IRI PERSONALIDENTIFIER;
56-
57-
/** <tt>http://www.w3.org/2004/02/skos/core#Concept</tt> */
58-
public static final IRI CONCEPT;
59-
60-
/** <tt>http://purl.org/spar/datacite/FunderIdentifierScheme</tt> */
61-
public static final IRI FUNDERIDENTIFIERSCHEME;
62-
63-
/** <tt>http://purl.org/spar/datacite/Identifier</tt> */
64-
public static final IRI IDENTIFIER;
65-
66-
/** <tt>http://purl.org/spar/datacite/OrganizationIdentifierScheme</tt> */
67-
public static final IRI ORGANIZATIONIDENTIFIERSCHEME;
68-
69-
/** <tt>http://purl.org/spar/datacite/AgentIdentifier</tt> */
70-
public static final IRI AGENTIDENTIFIER;
71-
72-
/** <tt>http://purl.org/spar/datacite/DescriptionType</tt> */
73-
public static final IRI DESCRIPTIONTYPE;
74-
75-
/** <tt>http://purl.org/spar/datacite/AgentIdentifierScheme</tt> */
76-
public static final IRI AGENTIDENTIFIERSCHEME;
77-
78-
/** <tt>http://purl.org/spar/datacite/IdentifierScheme</tt> */
79-
public static final IRI IDENTIFIERSCHEME;
27+
import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
8028

81-
/** <tt>http://purl.org/spar/datacite/ResourceIdentifier</tt> */
82-
public static final IRI RESOURCEIDENTIFIER;
83-
84-
/** <tt>http://purl.org/spar/datacite/PersonalIdentifierScheme</tt> */
85-
public static final IRI PERSONALIDENTIFIERSCHEME;
86-
87-
/** <tt>http://purl.org/spar/datacite/ResourceIdentifierScheme</tt> */
88-
public static final IRI RESOURCEIDENTIFIERSCHEME;
89-
90-
/** <tt>http://purl.org/spar/datacite/hasCreatorList</tt> */
91-
public static final IRI HASCREATORLIST;
92-
93-
/** <tt>http://purl.org/spar/datacite/hasGeneralResourceType</tt> */
94-
public static final IRI HASGENERALRESOURCETYPE;
95-
96-
/** <tt>http://purl.org/spar/datacite/usesMetadataScheme</tt> */
97-
public static final IRI USESMETADATASCHEME;
98-
99-
/** <tt>http://purl.org/spar/fabio/hasURL</tt> */
100-
public static final IRI HASURL;
101-
102-
/** <tt>http://www.w3.org/2002/07/owl#topObjectProperty</tt> */
103-
public static final IRI TOPOBJECTPROPERTY;
104-
105-
/** <tt>http://purl.org/spar/datacite/hasDescription</tt> */
106-
public static final IRI HASDESCRIPTION;
107-
108-
/** <tt>http://purl.org/spar/datacite/hasDescriptionType</tt> */
109-
public static final IRI HASDESCRIPTIONTYPE;
110-
111-
/** <tt>http://purl.org/dc/terms/type</tt> */
112-
public static final IRI TYPE;
113-
114-
/** <tt>http://purl.org/spar/datacite/hasIdentifier</tt> */
115-
public static final IRI HASIDENTIFIER;
116-
117-
/** <tt>http://purl.org/spar/datacite/usesIdentifierScheme</tt> */
118-
public static final IRI USESIDENTIFIERSCHEME;
119-
120-
static {
121-
final ValueFactory factory = SimpleValueFactory.getInstance();
122-
123-
ALTERNATERESOURCEIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/AlternateResourceIdentifier");
124-
LIST = factory.createIRI("http://purl.org/co/List");
125-
PRIMARYRESOURCEIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/PrimaryResourceIdentifier");
126-
LITERAL = factory.createIRI("http://www.essepuntato.it/2010/06/literalreification/Literal");
127-
FUNDERIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/FunderIdentifier");
128-
METADATASCHEME = factory.createIRI("http://purl.org/spar/datacite/MetadataScheme");
129-
ORGANIZATIONIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/OrganizationIdentifier");
130-
PERSONALIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/PersonalIdentifier");
131-
CONCEPT = factory.createIRI("http://www.w3.org/2004/02/skos/core#Concept");
132-
FUNDERIDENTIFIERSCHEME = factory.createIRI("http://purl.org/spar/datacite/FunderIdentifierScheme");
133-
IDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/Identifier");
134-
ORGANIZATIONIDENTIFIERSCHEME = factory.createIRI("http://purl.org/spar/datacite/OrganizationIdentifierScheme");
135-
AGENTIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/AgentIdentifier");
136-
DESCRIPTIONTYPE = factory.createIRI("http://purl.org/spar/datacite/DescriptionType");
137-
AGENTIDENTIFIERSCHEME = factory.createIRI("http://purl.org/spar/datacite/AgentIdentifierScheme");
138-
IDENTIFIERSCHEME = factory.createIRI("http://purl.org/spar/datacite/IdentifierScheme");
139-
RESOURCEIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/ResourceIdentifier");
140-
PERSONALIDENTIFIERSCHEME = factory.createIRI("http://purl.org/spar/datacite/PersonalIdentifierScheme");
141-
RESOURCEIDENTIFIERSCHEME = factory.createIRI("http://purl.org/spar/datacite/ResourceIdentifierScheme");
142-
HASCREATORLIST = factory.createIRI("http://purl.org/spar/datacite/hasCreatorList");
143-
HASGENERALRESOURCETYPE = factory.createIRI("http://purl.org/spar/datacite/hasGeneralResourceType");
144-
USESMETADATASCHEME = factory.createIRI("http://purl.org/spar/datacite/usesMetadataScheme");
145-
HASURL = factory.createIRI("http://purl.org/spar/fabio/hasURL");
146-
TOPOBJECTPROPERTY = factory.createIRI("http://www.w3.org/2002/07/owl#topObjectProperty");
147-
HASDESCRIPTION = factory.createIRI("http://purl.org/spar/datacite/hasDescription");
148-
HASDESCRIPTIONTYPE = factory.createIRI("http://purl.org/spar/datacite/hasDescriptionType");
149-
TYPE = factory.createIRI("http://purl.org/dc/terms/type");
150-
HASIDENTIFIER = factory.createIRI("http://purl.org/spar/datacite/hasIdentifier");
151-
USESIDENTIFIERSCHEME = factory.createIRI("http://purl.org/spar/datacite/usesIdentifierScheme");
152-
153-
}
29+
public final class DATACITE {
30+
public static final String NAMESPACE = "http://purl.org/spar/datacite/";
15431

155-
/** Utility class; private constructor to prevent instance being created. */
156-
private DATACITE() {
157-
}
32+
public static final IRI IDENTIFIER = i(NAMESPACE + "Identifier");
15833
}

‎src/main/java/nl/dtls/fairdatapoint/vocabulary/FDP.java

Lines changed: 10 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -23,80 +23,19 @@
2323
package nl.dtls.fairdatapoint.vocabulary;
2424

2525
import org.eclipse.rdf4j.model.IRI;
26-
import org.eclipse.rdf4j.model.ValueFactory;
27-
import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
2826

29-
public final class FDP {
30-
public static final String NAMESPACE = "https://w3id.org/fdp/fdp-o#";
31-
public static final String PREFIX = "fdp";
32-
33-
/** <tt>https://w3id.org/fdp/fdp-o#DeprecatedClasses</tt> */
34-
public static final IRI DEPRECATEDCLASSES;
35-
36-
/** <tt>https://w3id.org/fdp/fdp-o#FAIRDataPoint</tt> */
37-
public static final IRI FAIRDATAPOINT;
38-
39-
/** <tt>https://w3id.org/fdp/fdp-o#Metadata</tt> */
40-
public static final IRI METADATA;
41-
42-
/** <tt>https://w3id.org/fdp/fdp-o#MetadataService</tt> */
43-
public static final IRI METADATASERVICE;
44-
45-
/** <tt>https://w3id.org/fdp/fdp-o#deprecatedObjectProperties</tt> */
46-
public static final IRI DEPRECATEDOBJECTPROPERTIES;
47-
48-
/** <tt>https://w3id.org/fdp/fdp-o#fdpIdentifier</tt> */
49-
public static final IRI FDPIDENTIFIER;
50-
51-
/** <tt>https://w3id.org/fdp/fdp-o#metadataCatalog</tt> */
52-
public static final IRI METADATACATALOG;
53-
54-
/** <tt>https://w3id.org/fdp/fdp-o#metadataIdentifier</tt> */
55-
public static final IRI METADATAIDENTIFIER;
27+
import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
5628

57-
/** <tt>https://w3id.org/fdp/fdp-o#servesMetadata</tt> */
58-
public static final IRI SERVESMETADATA;
59-
60-
/** <tt>https://w3id.org/fdp/fdp-o#fdpEndDate</tt> */
61-
public static final IRI FDPENDDATE;
62-
63-
/** <tt>https://w3id.org/fdp/fdp-o#fdpSoftwareVersion</tt> */
64-
public static final IRI FDPSOFTWAREVERSION;
65-
66-
/** <tt>https://w3id.org/fdp/fdp-o#fdpStartDate</tt> */
67-
public static final IRI FDPSTARTDATE;
68-
69-
/** <tt>https://w3id.org/fdp/fdp-o#fdpUILanguage</tt> */
70-
public static final IRI FDPUILANGUAGE;
71-
72-
/** <tt>https://w3id.org/fdp/fdp-o#metadataIssued</tt> */
73-
public static final IRI METADATAISSUED;
74-
75-
/** <tt>https://w3id.org/fdp/fdp-o#metadataModified</tt> */
76-
public static final IRI METADATAMODIFIED;
77-
78-
static {
79-
final ValueFactory factory = SimpleValueFactory.getInstance();
29+
public final class FDP {
8030

81-
DEPRECATEDCLASSES = factory.createIRI("https://w3id.org/fdp/fdp-o#DeprecatedClasses");
82-
FAIRDATAPOINT = factory.createIRI("https://w3id.org/fdp/fdp-o#FAIRDataPoint");
83-
METADATA = factory.createIRI("https://w3id.org/fdp/fdp-o#Metadata");
84-
METADATASERVICE = factory.createIRI("https://w3id.org/fdp/fdp-o#MetadataService");
85-
DEPRECATEDOBJECTPROPERTIES = factory.createIRI("https://w3id.org/fdp/fdp-o#deprecatedObjectProperties");
86-
FDPIDENTIFIER = factory.createIRI("https://w3id.org/fdp/fdp-o#fdpIdentifier");
87-
METADATACATALOG = factory.createIRI("https://w3id.org/fdp/fdp-o#metadataCatalog");
88-
METADATAIDENTIFIER = factory.createIRI("https://w3id.org/fdp/fdp-o#metadataIdentifier");
89-
SERVESMETADATA = factory.createIRI("https://w3id.org/fdp/fdp-o#servesMetadata");
90-
FDPENDDATE = factory.createIRI("https://w3id.org/fdp/fdp-o#fdpEndDate");
91-
FDPSOFTWAREVERSION = factory.createIRI("https://w3id.org/fdp/fdp-o#fdpSoftwareVersion");
92-
FDPSTARTDATE = factory.createIRI("https://w3id.org/fdp/fdp-o#fdpStartDate");
93-
FDPUILANGUAGE = factory.createIRI("https://w3id.org/fdp/fdp-o#fdpUILanguage");
94-
METADATAISSUED = factory.createIRI("https://w3id.org/fdp/fdp-o#metadataIssued");
95-
METADATAMODIFIED = factory.createIRI("https://w3id.org/fdp/fdp-o#metadataModified");
31+
public static final String NAMESPACE = "https://w3id.org/fdp/fdp-o#";
9632

97-
}
33+
public static final IRI FAIRDATAPOINT = i(NAMESPACE + "FAIRDataPoint");
34+
public static final IRI FDPSOFTWAREVERSION = i(NAMESPACE + "fdpSoftwareVersion");
35+
public static final IRI METADATACATALOG = i(NAMESPACE + "metadataCatalog");
36+
public static final IRI METADATAIDENTIFIER = i(NAMESPACE + "metadataIdentifier");
37+
public static final IRI METADATAISSUED = i(NAMESPACE + "metadataIssued");
38+
public static final IRI METADATAMODIFIED = i(NAMESPACE + "metadataModified");
39+
public static final IRI METADATASERVICE = i(NAMESPACE + "MetadataService");
9840

99-
/** Utility class; private constructor to prevent instance being created. */
100-
private FDP() {
101-
}
10241
}

0 commit comments

Comments
 (0)