Minor API clean up

TopQuadrant · Nov 25, 2019 · a5252a7 · a5252a7
1 parent 4a8171f
commit a5252a7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/main/java/org/topbraid/shacl/model/SHResult.java b/src/main/java/org/topbraid/shacl/model/SHResult.java
@@ -25,6 +25,12 @@ public interface SHResult extends SHResource {
 
 
 	RDFNode getFocusNode();
+
+
+	Resource getPath();
+
+
+	Resource getSeverity();
 
 
 	Resource getSourceConstraint();
@@ -36,11 +42,5 @@ public interface SHResult extends SHResource {
 	Resource getSourceShape();
 
 
-	Resource getPath();
-
-
 	RDFNode getValue();
-
-
-	Resource getResultSeverity();
 }
diff --git a/src/main/java/org/topbraid/shacl/model/impl/SHResultImpl.java b/src/main/java/org/topbraid/shacl/model/impl/SHResultImpl.java
@@ -50,30 +50,31 @@ public Resource getPath() {
 
 
 	@Override
-	public RDFNode getValue() {
-		return JenaUtil.getProperty(this, SH.value);
+	public Resource getSeverity() {
+		return getPropertyResourceValue(SH.resultSeverity);
 	}
 
 
 	@Override
 	public Resource getSourceConstraint() {
-		return JenaUtil.getResourceProperty(this, SH.sourceConstraint);
+		return getPropertyResourceValue(SH.sourceConstraint);
 	}
 
 
 	@Override
 	public Resource getSourceConstraintComponent() {
-		return JenaUtil.getResourceProperty(this, SH.sourceConstraintComponent);
+		return getPropertyResourceValue(SH.sourceConstraintComponent);
 	}
 
 
 	@Override
 	public Resource getSourceShape() {
-		return JenaUtil.getResourceProperty(this, SH.sourceShape);
+		return getPropertyResourceValue(SH.sourceShape);
 	}
+
 
 	@Override
-	public Resource getResultSeverity() {
-		return JenaUtil.getResourceProperty(this, SH.resultSeverity);
+	public RDFNode getValue() {
+		return JenaUtil.getProperty(this, SH.value);
 	}
-}
+}