Small update for changes in jenax

Scaseco · Oct 4, 2023 · ef5c809 · ef5c809
1 parent a431483
commit ef5c809
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/...cete3-app-vaadin/src/main/java/org/aksw/jena_sparql_api/metamodel/ResourceTraversals.java b/...cete3-app-vaadin/src/main/java/org/aksw/jena_sparql_api/metamodel/ResourceTraversals.java
@@ -47,7 +47,6 @@
 import org.aksw.jenax.arq.util.syntax.QueryUtils;
 import org.aksw.jenax.path.core.PathNode;
 import org.aksw.jenax.path.core.PathOpsNode;
-import org.aksw.jenax.path.core.PathOpsPE;
 import org.aksw.jenax.path.core.PathPE;
 import org.aksw.jenax.path.relgen.RelationGeneratorSimple;
 import org.aksw.jenax.reprogen.core.JenaPluginUtils;
@@ -201,7 +200,7 @@ public static void mainRelationGen(String[] args) {
 
 
 
- PathNode path = PathOpsNode.newAbsolutePath();
+ PathNode path = PathNode.newAbsolutePath();
  PathNode tgt = path.resolve(RDF.first).resolve(RDF.rest).resolve(RDFS.label).resolve(RDF.type).resolve(OWL.hasValue);
 
  XRelationTree tree = new XRelationTree();
@@ -243,7 +242,7 @@ public String visitB(XAliasNode b) {
 
 
 
- PathPE exprs = PathOpsPE.newAbsolutePath()
+ PathPE exprs = PathPE.newAbsolutePath()
  .resolve(rootShape)
  .resolveSegment("<urn:fwd>")
  .resolve(DCAT.dataset)
@@ -324,7 +323,7 @@ static class XRelationTree
 
  @Override
  public XRelationNode mkRoot() {
- return new XRelationNode(PathOpsNode.newAbsolutePath(), this, null, RelationUtils.SPO);
+ return new XRelationNode(PathNode.newAbsolutePath(), this, null, RelationUtils.SPO);
  }
 
  @Override
@@ -406,7 +405,7 @@ public static void mainShacl(String[] args) {
  System.out.println( Paths.get("/tmp").relativize(Paths.get("/tmp/foo")) );
  System.out.println( Paths.get("/tmp/foo").relativize(Paths.get("/tmp")) );
 
- PathNode r = PathOpsNode.get().newRoot();
+ PathNode r = PathNode.newAbsolutePath();
 
  PathNode path = r.resolve(RDF.type).resolve(RDF.first).resolve(NodeValue.makeInteger(1).asNode());
 
@@ -461,7 +460,7 @@ public static void mainShacl(String[] args) {
 
 
  Trav3Provider<Node, Set<RDFNode>, Set<RDFNode>, Set<RDFNode>, Set<RDFNode>> myProvider = createSimpleShaclTraverser3(sourceNode);
- dfs(myProvider.newRoot(PathOpsNode.get().newRoot()), 0, 9);
+ dfs(myProvider.newRoot(PathNode.newAbsolutePath()), 0, 9);
 
  }
 

diff --git a/...rc/main/java/org/aksw/jena_sparql_api/schema/traversal/sparql/TravProviderTripleImpl.java b/...rc/main/java/org/aksw/jena_sparql_api/schema/traversal/sparql/TravProviderTripleImpl.java
@@ -9,6 +9,7 @@
 import org.aksw.jena_sparql_api.schema.traversal.sparql.TravTripleViews.TravTripleStateComputer;
 import org.aksw.jena_sparql_api.schema.traversal.sparql.TravTripleViews.TravTripleStateComputerAlwaysNull;
 import org.aksw.jena_sparql_api.schema.traversal.sparql.TravTripleViews.TravValues;
+import org.aksw.jenax.path.core.PathNode;
 import org.aksw.jenax.path.core.PathOpsNode;
 import org.apache.jena.graph.Node;
 
@@ -45,7 +46,7 @@ public static <S> TravProviderTriple<S> create(Supplier<S> rootStateSupp, TravTr
 
  @Override
  public TravValues<S> root() {
- Path<Node> rootPath = PathOpsNode.get().newRoot();
+ Path<Node> rootPath = PathNode.newAbsolutePath();
  S rootState = rootStateSupp.get();
  return new TravValues<>(this, rootPath, null, rootState);
  }

diff --git a/.../facete3-app-vaadin/src/main/java/org/aksw/vaadin/datashape/form/TestObservableGraph.java b/.../facete3-app-vaadin/src/main/java/org/aksw/vaadin/datashape/form/TestObservableGraph.java
@@ -9,7 +9,7 @@
 import org.aksw.jena_sparql_api.collection.observable.ObservableSetFromGraph;
 import org.aksw.jena_sparql_api.collection.observable.ObservableSubGraph;
 import org.aksw.jena_sparql_api.collection.observable.SetOfNodesFromGraph;
-import org.aksw.jena_sparql_api.relation.TripleConstraintImpl;
+import org.aksw.jenax.arq.util.triple.TripleConstraintImpl;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
 import org.apache.jena.graph.Triple;