Skip to content

Commit

Permalink
Updates to jenax refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aklakan
Aklakan committed Oct 7, 2023
1 parent ef5c809 commit 4ada875
Show file tree
Hide file tree
Showing 17 changed files with 34 additions and 34 deletions.
10 changes: 5 additions & 5 deletions ...p-parent/facete3-app-terminal/src/main/java/org/aksw/facete3/cli/main/MainCliFacete3.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@
import org.aksw.jena_sparql_api.data_query.util.KeywordSearchUtils;
import org.aksw.jena_sparql_api.pathlet.Path;
import org.aksw.jena_sparql_api.rdf.collections.ResourceUtils;
import org.aksw.jenax.arq.connection.RDFConnectionModular;
import org.aksw.jenax.arq.connection.core.QueryExecutionFactoryOverSparqlQueryConnection;
import org.aksw.jenax.arq.connection.core.RDFConnectionUtils;
import org.aksw.jenax.arq.connection.core.SparqlQueryConnectionJsa;
import org.aksw.jenax.arq.util.exception.HttpExceptionUtils;
import org.aksw.jenax.arq.util.syntax.QueryUtils;
import org.aksw.jenax.arq.util.var.Vars;
import org.aksw.jenax.connection.datasource.RdfDataSource;
import org.aksw.jenax.dataaccess.LabelUtils;
import org.aksw.jenax.dataaccess.sparql.connection.common.RDFConnectionModular;
import org.aksw.jenax.dataaccess.sparql.connection.common.RDFConnectionUtils;
import org.aksw.jenax.dataaccess.sparql.connection.query.SparqlQueryConnectionJsa;
import org.aksw.jenax.dataaccess.sparql.datasource.RdfDataSource;
import org.aksw.jenax.dataaccess.sparql.factory.execution.query.QueryExecutionFactoryOverSparqlQueryConnection;
import org.aksw.jenax.sparql.path.SimplePath;
import org.aksw.jenax.sparql.query.rx.RDFDataMgrEx;
import org.aksw.jenax.sparql.query.rx.SparqlRx;
Expand Down
12 changes: 6 additions & 6 deletions ...p-parent/facete3-app-vaadin/src/main/java/org/aksw/facete3/app/vaadin/ConfigEndpoint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
import org.aksw.jena_sparql_api.conjure.dataset.engine.OpExecutorDefault;
import org.aksw.jena_sparql_api.conjure.dataset.engine.TaskContext;
import org.aksw.jena_sparql_api.http.repository.impl.HttpResourceRepositoryFromFileSystemImpl;
import org.aksw.jenax.arq.connection.core.QueryExecutionFactory;
import org.aksw.jenax.arq.connection.core.RDFConnectionUtils;
import org.aksw.jenax.arq.datasource.RdfDataEngines;
import org.aksw.jenax.arq.datasource.RdfDataSourceWithBnodeRewrite;
import org.aksw.jenax.arq.datasource.RdfDataSourceWithLocalCache;
import org.aksw.jenax.arq.util.syntax.QueryUtils;
import org.aksw.jenax.connection.datasource.RdfDataSource;
import org.aksw.jenax.dataaccess.LabelUtils;
import org.aksw.jenax.dataaccess.sparql.connection.common.RDFConnectionUtils;
import org.aksw.jenax.dataaccess.sparql.datasource.RdfDataSource;
import org.aksw.jenax.dataaccess.sparql.factory.dataengine.RdfDataEngines;
import org.aksw.jenax.dataaccess.sparql.factory.execution.query.QueryExecutionFactory;
import org.aksw.jenax.dataaccess.sparql.polyfill.datasource.RdfDataSourceWithBnodeRewrite;
import org.aksw.jenax.dataaccess.sparql.polyfill.datasource.RdfDataSourceWithLocalCache;
import org.aksw.jenax.vaadin.label.VaadinRdfLabelMgr;
import org.aksw.jenax.vaadin.label.VaadinRdfLabelMgrImpl;
import org.apache.jena.query.QueryExecution;
Expand Down
2 changes: 1 addition & 1 deletion ...acete3-app-vaadin/src/main/java/org/aksw/facete3/app/vaadin/ConfigFacetedBrowserView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import org.aksw.jena_sparql_api.vaadin.data.provider.DataProviderNodeQuery;
import org.aksw.jena_sparql_api.vaadin.data.provider.DataRetriever;
import org.aksw.jenax.arq.aggregation.BestLiteralConfig;
import org.aksw.jenax.connection.datasource.RdfDataSource;
import org.aksw.jenax.dataaccess.LabelUtils;
import org.aksw.jenax.dataaccess.sparql.datasource.RdfDataSource;
import org.aksw.jenax.vaadin.component.grid.shacl.VaadinShaclGridUtils;
import org.aksw.jenax.vaadin.label.VaadinRdfLabelMgr;
import org.apache.jena.graph.Node;
Expand Down
4 changes: 2 additions & 2 deletions ...facete3-app-vaadin/src/main/java/org/aksw/facete3/app/vaadin/ConfigSearchProviderNli.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
import org.aksw.jena_sparql_api.algebra.transform.TransformFactorizeTableColumnsToExtend;
import org.aksw.jena_sparql_api.algebra.utils.VirtualPartitionedQuery;
import org.aksw.jena_sparql_api.concepts.TernaryRelationImpl;
import org.aksw.jena_sparql_api.core.QueryTransform;
import org.aksw.jena_sparql_api.rdf.collections.ResourceUtils;
import org.aksw.jenax.arq.connection.core.RDFConnectionBuilder;
import org.aksw.jenax.arq.util.query.QueryTransform;
import org.aksw.jenax.arq.util.syntax.ElementUtils;
import org.aksw.jenax.arq.util.syntax.QueryUtils;
import org.aksw.jenax.arq.util.var.Vars;
import org.aksw.jenax.dataaccess.sparql.connection.common.RDFConnectionBuilder;
import org.aksw.jenax.sparql.relation.api.TernaryRelation;
import com.google.common.collect.Lists;
import org.apache.jena.graph.Triple;
Expand Down
2 changes: 1 addition & 1 deletion ...p-parent/facete3-app-vaadin/src/main/java/org/aksw/facete3/app/vaadin/Facete3Wrapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.aksw.jena_sparql_api.conjure.dataref.rdf.api.RdfDataRefSparqlEndpoint;
import org.aksw.jena_sparql_api.entity.graph.metamodel.MainPlaygroundResourceMetamodel;
import org.aksw.jenax.arq.util.var.Vars;
import org.aksw.jenax.connection.datasource.RdfDataSource;
import org.aksw.jenax.dataaccess.sparql.datasource.RdfDataSource;
import org.aksw.jenax.model.entityinfo.plugin.JenaPluginEntityInfo;
import org.aksw.jenax.path.core.FacetPath;
import org.aksw.jenax.path.datatype.RDFDatatypePPath;
Expand Down
8 changes: 4 additions & 4 deletions ...nt/facete3-app-vaadin/src/main/java/org/aksw/facete3/app/vaadin/RDFConnectionBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
import org.aksw.jena_sparql_api.algebra.expr.transform.ExprTransformVirtualBnodeUris;
import org.aksw.jena_sparql_api.cache.staging.CacheBackendMem;
import org.aksw.jena_sparql_api.core.FluentQueryExecutionFactory;
import org.aksw.jenax.arq.connection.RDFConnectionModular;
import org.aksw.jenax.arq.connection.core.QueryExecutionFactoryOverSparqlQueryConnection;
import org.aksw.jenax.arq.connection.core.RDFConnectionUtils;
import org.aksw.jenax.arq.connection.core.SparqlQueryConnectionJsa;
import org.aksw.jenax.dataaccess.sparql.connection.common.RDFConnectionModular;
import org.aksw.jenax.dataaccess.sparql.connection.common.RDFConnectionUtils;
import org.aksw.jenax.dataaccess.sparql.connection.query.SparqlQueryConnectionJsa;
import org.aksw.jenax.dataaccess.sparql.factory.execution.query.QueryExecutionFactoryOverSparqlQueryConnection;
import org.aksw.jenax.stmt.core.SparqlStmtMgr;
import org.apache.jena.query.Dataset;
import org.apache.jena.query.DatasetFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...adin/src/main/java/org/aksw/facete3/app/vaadin/SearchSensitiveRDFConnectionTransform.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.aksw.facete3.app.vaadin;

import org.aksw.facete3.app.shared.concept.RDFNodeSpec;
import org.aksw.jenax.arq.connection.core.RDFConnectionTransform;
import org.aksw.jenax.dataaccess.sparql.connection.common.RDFConnectionTransform;

public interface SearchSensitiveRDFConnectionTransform {
RDFConnectionTransform create(RDFNodeSpec rdfNodeSpec);
Expand Down
4 changes: 2 additions & 2 deletions ...vaadin/src/main/java/org/aksw/facete3/app/vaadin/components/DatasetSelectorComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
import org.aksw.jena_sparql_api.schema.ResourceCache;
import org.aksw.jena_sparql_api.schema.ResourceExplorer;
import org.aksw.jena_sparql_api.schema.ShapedNode;
import org.aksw.jenax.arq.connection.core.QueryExecutionFactory;
import org.aksw.jenax.arq.util.triple.ModelUtils;
import org.aksw.jenax.connection.query.QueryExecutionFactoryDataset;
import org.aksw.jenax.dataaccess.LabelUtils;
import org.aksw.jenax.dataaccess.sparql.factory.execution.query.QueryExecutionFactory;
import org.aksw.jenax.dataaccess.sparql.factory.execution.query.QueryExecutionFactoryDataset;
import org.aksw.vaadin.common.component.managed.ManagedComponentSimple;
import org.aksw.vaadin.common.component.tab.TabSheet;
import org.aksw.vaadin.component.rdf_term_editor.RdfTermEditor;
Expand Down
4 changes: 2 additions & 2 deletions ...3-app-vaadin/src/main/java/org/aksw/facete3/app/vaadin/components/FacetedBrowserView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
import org.aksw.jena_sparql_api.vaadin.util.VaadinStyleUtils;
import org.aksw.jenax.analytics.core.RootedQuery;
import org.aksw.jenax.arq.aggregation.BestLiteralConfig;
import org.aksw.jenax.arq.connection.core.RDFConnectionTransform;
import org.aksw.jenax.arq.datashape.viewselector.ViewTemplate;
import org.aksw.jenax.arq.datashape.viewselector.ViewTemplateImpl;
import org.aksw.jenax.arq.util.syntax.ElementUtils;
import org.aksw.jenax.arq.util.var.Vars;
import org.aksw.jenax.connection.datasource.RdfDataSource;
import org.aksw.jenax.dataaccess.LabelUtils;
import org.aksw.jenax.dataaccess.sparql.connection.common.RDFConnectionTransform;
import org.aksw.jenax.dataaccess.sparql.datasource.RdfDataSource;
import org.aksw.jenax.path.core.FacetPath;
import org.aksw.jenax.path.core.FacetStep;
import org.aksw.jenax.sparql.relation.api.UnaryRelation;
Expand Down
2 changes: 1 addition & 1 deletion ...acete3-app-vaadin/src/main/java/org/aksw/facete3/app/vaadin/components/ItemComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import org.aksw.jena_sparql_api.vaadin.data.provider.DataProviderNodeQuery;
import org.aksw.jena_sparql_api.vaadin.data.provider.DataProviderSparqlBinding;
import org.aksw.jena_sparql_api.vaadin.data.provider.DataRetriever;
import org.aksw.jenax.connection.datasource.RdfDataSource;
import org.aksw.jenax.dataaccess.sparql.datasource.RdfDataSource;
import org.aksw.jenax.model.shacl.util.ShTemplateRegistry;
import org.aksw.jenax.path.core.FacetPath;
import org.aksw.jenax.sparql.query.rx.RDFDataMgrEx;
Expand Down
4 changes: 2 additions & 2 deletions ...pp-vaadin/src/main/java/org/aksw/facete3/app/vaadin/components/ResourceViewComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
import org.aksw.jena_sparql_api.vaadin.data.provider.DataProviderSparqlBase;
import org.aksw.jena_sparql_api.vaadin.data.provider.DataProviderSparqlBinding;
import org.aksw.jena_sparql_api.vaadin.util.VaadinSparqlUtils;
import org.aksw.jenax.arq.connection.core.QueryExecutionFactories;
import org.aksw.jenax.arq.util.var.Vars;
import org.aksw.jenax.connection.query.QueryExecutionFactoryQuery;
import org.aksw.jenax.dataaccess.LabelUtils;
import org.aksw.jenax.dataaccess.sparql.factory.execution.query.QueryExecutionFactories;
import org.aksw.jenax.dataaccess.sparql.factory.execution.query.QueryExecutionFactoryQuery;
import org.aksw.jenax.sparql.relation.api.Relation;
import org.aksw.jenax.vaadin.label.LabelService;
import org.aksw.jenax.vaadin.label.VaadinLabelMgr;
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/org/aksw/facete3/app/vaadin/components/sparql/wizard/SparqlConnectionWizard.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import org.aksw.jena_sparql_api.conjure.dataset.algebra.Op;
import org.aksw.jena_sparql_api.conjure.dataset.algebra.OpDataRefResource;
import org.aksw.jena_sparql_api.vaadin.util.VaadinSparqlUtils;
import org.aksw.jenax.arq.connection.core.QueryExecutionFactories;
import org.aksw.jenax.connection.query.QueryExecutionFactoryQuery;
import org.aksw.jenax.dataaccess.sparql.factory.execution.query.QueryExecutionFactories;
import org.aksw.jenax.dataaccess.sparql.factory.execution.query.QueryExecutionFactoryQuery;
import org.aksw.vaadin.common.provider.util.DataProviderUtils;
import org.apache.jena.graph.Node;
import org.apache.jena.query.Query;
Expand Down
2 changes: 1 addition & 1 deletion ...acete3-app-vaadin/src/main/java/org/aksw/facete3/app/vaadin/config/ConfigViewManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.aksw.facete3.app.vaadin.plugin.view.ViewManagerImpl;
import org.aksw.facete3.app.vaadin.qualifier.FullView;
import org.aksw.facete3.app.vaadin.qualifier.SnippetView;
import org.aksw.jenax.connection.datasource.RdfDataSource;
import org.aksw.jenax.dataaccess.sparql.datasource.RdfDataSource;
import org.springframework.context.annotation.Bean;

public class ConfigViewManager
Expand Down
2 changes: 1 addition & 1 deletion ...te3-app-vaadin/src/main/java/org/aksw/facete3/app/vaadin/plugin/view/ViewManagerImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import org.aksw.jenax.arq.datashape.viewselector.EntityClassifier;
import org.aksw.jenax.arq.datashape.viewselector.ViewTemplate;
import org.aksw.jenax.arq.util.var.Vars;
import org.aksw.jenax.connection.query.QueryExecutionFactoryQuery;
import org.aksw.jenax.dataaccess.rx.ListServiceEntityQuery;
import org.aksw.jenax.dataaccess.sparql.factory.execution.query.QueryExecutionFactoryQuery;
import org.aksw.jenax.sparql.relation.api.UnaryRelation;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
Expand Down
2 changes: 1 addition & 1 deletion ...cete3-fsbg-core/src/main/java/org/aksw/jena_sparql_api/changeset/util/ChangeSetUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
import org.aksw.jena_sparql_api.concepts.Concept;
import org.aksw.jena_sparql_api.core.FluentQueryExecutionFactory;
import org.aksw.jena_sparql_api.core.utils.ServiceUtils;
import org.aksw.jenax.arq.connection.core.SparqlQueryConnectionJsa;
import org.aksw.jenax.arq.util.syntax.ElementUtils;
import org.aksw.jenax.arq.util.triple.DeltaWithFixedIterator;
import org.aksw.jenax.arq.util.var.Vars;
import org.aksw.jenax.dataaccess.sparql.connection.query.SparqlQueryConnectionJsa;
import org.aksw.jenax.sparql.relation.api.UnaryRelation;
import com.google.common.collect.Sets;
import org.apache.jena.graph.Graph;
Expand Down
2 changes: 1 addition & 1 deletion ...re/src/main/java/org/hobbit/benchmark/faceted_browsing/v2/main/MainFacetedBenchmark2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.aksw.jena_sparql_api.data_query.impl.PathAccessorSPath;
import org.aksw.jena_sparql_api.data_query.util.KeywordSearchUtils;
import org.aksw.jena_sparql_api.sparql_path.core.algorithm.ConceptPathFinder;
import org.aksw.jenax.arq.connection.core.QueryExecutionFactoryOverSparqlQueryConnection;
import org.aksw.jenax.dataaccess.sparql.factory.execution.query.QueryExecutionFactoryOverSparqlQueryConnection;
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...bg-core/src/main/java/org/hobbit/benchmark/faceted_browsing/v2/vocab/ConceptAnalyser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.aksw.jena_sparql_api.shape.ResourceShapeBuilder;
import org.aksw.jenax.arq.util.syntax.ElementUtils;
import org.aksw.jenax.arq.util.var.Vars;
import org.aksw.jenax.connection.datasource.RdfDataSource;
import org.aksw.jenax.dataaccess.sparql.datasource.RdfDataSource;
import org.aksw.jenax.sparql.relation.api.Relation;
import org.aksw.jenax.sparql.relation.api.UnaryRelation;
import org.apache.jena.graph.Node;
Expand Down

0 comments on commit 4ada875

Please sign in to comment.