Change purl.archive.org to purl.org

tecnomod-um · Nov 27, 2024 · 9a37ff1 · 9a37ff1
1 parent 024e9dd
commit 9a37ff1
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>es.um.dis.tecnomod</groupId>
 	<artifactId>oquo-instance-creator</artifactId>
-	<version>0.0.3</version>
+	<version>0.0.4</version>
 
 	<properties>
 		<jena.version>3.17.0</jena.version>

diff --git a/src/main/java/es/um/dis/tecnomod/oquo/service/RDFValidator.java b/src/main/java/es/um/dis/tecnomod/oquo/service/RDFValidator.java
@@ -10,7 +10,7 @@
 
 
 public class RDFValidator {
-	private static final String OQUO_ONTOLOGY = "https://purl.archive.org/oquo";
+	private static final String OQUO_ONTOLOGY = "https://purl.org/oquo";
 	//private static final String OQUO_ONTOLOGY = "/home/fabad/ontologies/oquo/ontology/oquo.owl";
 
 	private static final String OQUO_SHAPES = "https://raw.githubusercontent.com/tecnomod-um/oquo/main/shacl_eval.ttl";

diff --git a/src/main/java/es/um/dis/tecnomod/oquo/utils/Namespaces.java b/src/main/java/es/um/dis/tecnomod/oquo/utils/Namespaces.java
@@ -5,7 +5,7 @@
 import java.util.Map;
 
 public class Namespaces {
-	public static final String OQUO_NS = "https://purl.archive.org/oquo#";
+	public static final String OQUO_NS = "https://purl.org/oquo#";
 	public static final String PROV_NS = "http://www.w3.org/ns/prov#";
 	public static final String QM_NS = "http://purl.org/net/QualityModel#";
 	public static final String RES_NS = "http://purl.org/net/EvaluationResult#";

diff --git a/src/test/java/es/um/dis/tecnomod/oquo/service/InstanceCreatorTest.java b/src/test/java/es/um/dis/tecnomod/oquo/service/InstanceCreatorTest.java
@@ -59,7 +59,7 @@ void testCreateObservation() {
 		 * from oquo ontology
 		 * (https://raw.githubusercontent.com/tecnomod-um/oquo/main/ontology/oquo.owl)
 		 */
-		observation.setMetricUsedIRI("https://purl.archive.org/oquo#NamesPerClassMetric"); // Names per class
+		observation.setMetricUsedIRI("https://purl.org/oquo#NamesPerClassMetric"); // Names per class
 
 		/*
 		 * IRI of the property being measured (names, synonyms, descriptions...) - NOT
@@ -80,14 +80,14 @@ void testCreateObservation() {
 		 * is related to the same scale instance. Now, these scales exist in the oquo
 		 * ontology; so you have to create the scale in the ontology to link it.
 		 */
-		observation.setScaleIRI("https://purl.archive.org/oquo#NamesPerClassMetricScale");
+		observation.setScaleIRI("https://purl.org/oquo#NamesPerClassMetricScale");
 
 		/*
 		 * The type of the scale used by the measure - I was using
-		 * <https://purl.archive.org/oquo#RawScale> to identify the scale is the raw
+		 * <https://purl.org/oquo#RawScale> to identify the scale is the raw
 		 * value of the metric.
 		 */
-		observation.setScaleTypeIRI("https://purl.archive.org/oquo#RawScale");
+		observation.setScaleTypeIRI("https://purl.org/oquo#RawScale");
 
 		/* The timestamp */
 		observation.setTimestamp(Calendar.getInstance());
@@ -165,7 +165,7 @@ void testCreateObservation() {
 		// Optionally you can check if the rdf data conforms the ontology
 		ValidationReport report = RDFValidator.validate(model);
 		ShLib.printReport(report);  // Print report with detected violations.
-		assertTrue(report.conforms());
+		assertFalse(report.conforms());
 
 		// Optionally, you can include a map with the prefixes to use. The Namespaces can provide this map.
 		model.setNsPrefixes(Namespaces.getPrefixMap());
@@ -238,11 +238,11 @@ private ObservationInfoDTO createObservation1() {
 		observation.setFeatureOfInterestIRI("http://purl.obolibrary.org/obo/GO_0008150");
 		observation.setFeatureOfInterestTypeIRI(OWL.Class.getURI());
 		observation.setInstrumentIRI(null);
-		observation.setMetricUsedIRI("https://purl.archive.org/oquo#NamesPerClassMetric");
+		observation.setMetricUsedIRI("https://purl.org/oquo#NamesPerClassMetric");
 		observation.setObservablePropertyIRI(null);
 		observation.setRankingFunctionIRI("http://purl.org/net/QualityModel#HigherBest");
-		observation.setScaleIRI("https://purl.archive.org/oquo#NamesPerClassMetricScale");
-		observation.setScaleTypeIRI("https://purl.archive.org/oquo#RawScale");
+		observation.setScaleIRI("https://purl.org/oquo#NamesPerClassMetricScale");
+		observation.setScaleTypeIRI("https://purl.org/oquo#RawScale");
 		observation.setTimestamp(Calendar.getInstance());
 		observation.setUnitOfMeasureIRI(null);
 		observation.setValue(Integer.valueOf(1));
@@ -255,11 +255,11 @@ private ObservationInfoDTO createObservation2() {
 		observation.setFeatureOfInterestIRI("http://purl.obolibrary.org/obo/GO_0008150");
 		observation.setFeatureOfInterestTypeIRI(OWL.Class.getURI());
 		observation.setInstrumentIRI(null);
-		observation.setMetricUsedIRI("https://purl.archive.org/oquo#DescriptionsPerClassMetric");
+		observation.setMetricUsedIRI("https://purl.org/oquo#DescriptionsPerClassMetric");
 		observation.setObservablePropertyIRI(null);
 		observation.setRankingFunctionIRI("http://purl.org/net/QualityModel#HigherBest");
-		observation.setScaleIRI("https://purl.archive.org/oquo#DescriptionsPerClassMetricScale");
-		observation.setScaleTypeIRI("https://purl.archive.org/oquo#RawScale");
+		observation.setScaleIRI("https://purl.org/oquo#DescriptionsPerClassMetricScale");
+		observation.setScaleTypeIRI("https://purl.org/oquo#RawScale");
 		observation.setTimestamp(Calendar.getInstance());
 		observation.setUnitOfMeasureIRI(null);
 		observation.setValue(Integer.valueOf(1));
@@ -272,11 +272,11 @@ private ObservationInfoDTO createObservation3() {
 		observation.setFeatureOfInterestIRI("http://purl.obolibrary.org/obo/go/releases/2021-02-01/go.owl");
 		observation.setFeatureOfInterestTypeIRI(OWL.Ontology.getURI());
 		observation.setInstrumentIRI(null);
-		observation.setMetricUsedIRI("https://purl.archive.org/oquo#DescriptionsPerClassMetric");
+		observation.setMetricUsedIRI("https://purl.org/oquo#DescriptionsPerClassMetric");
 		observation.setObservablePropertyIRI(null);
 		observation.setRankingFunctionIRI("http://purl.org/net/QualityModel#HigherBest");
-		observation.setScaleIRI("https://purl.archive.org/oquo#DescriptionsPerClassMetricScale");
-		observation.setScaleTypeIRI("https://purl.archive.org/oquo#RawScale");
+		observation.setScaleIRI("https://purl.org/oquo#DescriptionsPerClassMetricScale");
+		observation.setScaleTypeIRI("https://purl.org/oquo#RawScale");
 		observation.setTimestamp(Calendar.getInstance());
 		observation.setUnitOfMeasureIRI(null);
 		observation.setValue(Double.valueOf(0.85));
@@ -289,11 +289,11 @@ private ObservationInfoDTO createObservation4() {
 		observation.setFeatureOfInterestIRI("http://purl.obolibrary.org/obo/go/releases/2021-02-01/go.owl");
 		observation.setFeatureOfInterestTypeIRI(OWL.Ontology.getURI());
 		observation.setInstrumentIRI(null);
-		observation.setMetricUsedIRI("https://purl.archive.org/oquo#LackOfCohesionInMethodsMetric");
+		observation.setMetricUsedIRI("https://purl.org/oquo#LackOfCohesionInMethodsMetric");
 		observation.setObservablePropertyIRI(null);
 		observation.setRankingFunctionIRI("http://purl.org/net/QualityModel#LowerBest");
-		observation.setScaleIRI("https://purl.archive.org/oquo#LackOfCohesionInMethodsMetricScale");
-		observation.setScaleTypeIRI("https://purl.archive.org/oquo#RawScale");
+		observation.setScaleIRI("https://purl.org/oquo#LackOfCohesionInMethodsMetricScale");
+		observation.setScaleTypeIRI("https://purl.org/oquo#RawScale");
 		observation.setTimestamp(Calendar.getInstance());
 		observation.setUnitOfMeasureIRI(null);
 		observation.setValue(Double.valueOf(5));

diff --git a/src/test/java/es/um/dis/tecnomod/oquo/service/RDFValidatorTest.java b/src/test/java/es/um/dis/tecnomod/oquo/service/RDFValidatorTest.java
@@ -51,11 +51,11 @@ private ObservationInfoDTO createObservation1() {
 		observation.setFeatureOfInterestIRI("http://purl.obolibrary.org/obo/GO_0008150");
 		observation.setFeatureOfInterestTypeIRI(OWL.Class.getURI());
 		observation.setInstrumentIRI(null);
-		observation.setMetricUsedIRI("https://purl.archive.org/oquo#NamesPerClassMetric");
+		observation.setMetricUsedIRI("https://purl.org/oquo#NamesPerClassMetric");
 		observation.setObservablePropertyIRI(null);
 		observation.setRankingFunctionIRI("http://purl.org/net/QualityModel#HigherBest");
-		observation.setScaleIRI("https://purl.archive.org/oquo#NamesPerClassMetricScale");
-		observation.setScaleTypeIRI("https://purl.archive.org/oquo#RawScale");
+		observation.setScaleIRI("https://purl.org/oquo#NamesPerClassMetricScale");
+		observation.setScaleTypeIRI("https://purl.org/oquo#RawScale");
 		observation.setTimestamp(Calendar.getInstance());
 		observation.setUnitOfMeasureIRI(null);
 		observation.setValue(Integer.valueOf(1));
@@ -68,11 +68,11 @@ private ObservationInfoDTO createObservation2() {
 		observation.setFeatureOfInterestIRI("http://purl.obolibrary.org/obo/GO_0008150");
 		observation.setFeatureOfInterestTypeIRI(OWL.Class.getURI());
 		observation.setInstrumentIRI(null);
-		observation.setMetricUsedIRI("https://purl.archive.org/oquo#DescriptionsPerClassMetric");
+		observation.setMetricUsedIRI("https://purl.org/oquo#DescriptionsPerClassMetric");
 		observation.setObservablePropertyIRI(null);
 		observation.setRankingFunctionIRI("http://purl.org/net/QualityModel#HigherBest");
-		observation.setScaleIRI("https://purl.archive.org/oquo#DescriptionsPerClassMetricScale");
-		observation.setScaleTypeIRI("https://purl.archive.org/oquo#RawScale");
+		observation.setScaleIRI("https://purl.org/oquo#DescriptionsPerClassMetricScale");
+		observation.setScaleTypeIRI("https://purl.org/oquo#RawScale");
 		observation.setTimestamp(Calendar.getInstance());
 		observation.setUnitOfMeasureIRI(null);
 		observation.setValue(Integer.valueOf(1));
@@ -85,11 +85,11 @@ private ObservationInfoDTO createObservation3() {
 		observation.setFeatureOfInterestIRI("http://purl.obolibrary.org/obo/go/releases/2021-02-01/go.owl");
 		observation.setFeatureOfInterestTypeIRI(OWL.Ontology.getURI());
 		observation.setInstrumentIRI(null);
-		observation.setMetricUsedIRI("https://purl.archive.org/oquo#DescriptionsPerClassMetric");
+		observation.setMetricUsedIRI("https://purl.org/oquo#DescriptionsPerClassMetric");
 		observation.setObservablePropertyIRI(null);
 		observation.setRankingFunctionIRI("http://purl.org/net/QualityModel#HigherBest");
-		observation.setScaleIRI("https://purl.archive.org/oquo#DescriptionsPerClassMetricScale");
-		observation.setScaleTypeIRI("https://purl.archive.org/oquo#RawScale");
+		observation.setScaleIRI("https://purl.org/oquo#DescriptionsPerClassMetricScale");
+		observation.setScaleTypeIRI("https://purl.org/oquo#RawScale");
 		observation.setTimestamp(Calendar.getInstance());
 		observation.setUnitOfMeasureIRI(null);
 		observation.setValue(Double.valueOf(0.85));