From b4449bcb3333b44d68e84612ed93a06b2b3e6708 Mon Sep 17 00:00:00 2001 From: "AD\\aabdoun" Date: Wed, 10 Dec 2025 13:54:07 +0100 Subject: [PATCH 1/2] Copy Kgram codebase into next package --- .../java/fr/inria/corese/core/Context.java | 6 +- .../java/fr/inria/corese/core/DataStore.java | 2 +- .../fr/inria/corese/core/EdgeFactory.java | 4 +- .../fr/inria/corese/core/EventHandler.java | 2 +- .../fr/inria/corese/core/EventLogger.java | 4 +- .../fr/inria/corese/core/EventManager.java | 2 +- src/main/java/fr/inria/corese/core/Graph.java | 14 ++-- .../fr/inria/corese/core/GraphCompare.java | 4 +- .../fr/inria/corese/core/GraphDistance.java | 2 +- .../fr/inria/corese/core/GraphObject.java | 2 +- .../java/fr/inria/corese/core/GraphStore.java | 2 +- src/main/java/fr/inria/corese/core/Index.java | 4 +- .../java/fr/inria/corese/core/NodeGraph.java | 2 +- .../fr/inria/corese/core/NodeGraphIndex.java | 8 +-- .../java/fr/inria/corese/core/NodeImpl.java | 8 +-- .../fr/inria/corese/core/NodeIterator.java | 4 +- .../java/fr/inria/corese/core/Workflow.java | 4 +- .../fr/inria/corese/core/api/DataBroker.java | 6 +- .../corese/core/api/DataBrokerConstruct.java | 6 +- .../java/fr/inria/corese/core/api/Engine.java | 4 +- .../inria/corese/core/api/GraphListener.java | 6 +- .../java/fr/inria/corese/core/api/IGraph.java | 4 +- .../corese/core/api/QueryGraphVisitor.java | 4 +- .../core/compiler/api/QueryVisitor.java | 2 +- .../corese/core/compiler/eval/Custom.java | 6 +- .../core/compiler/eval/Interpreter.java | 16 ++--- .../core/compiler/eval/ProxyInterpreter.java | 12 ++-- .../core/compiler/eval/QuerySolver.java | 16 ++--- .../compiler/eval/QuerySolverOverload.java | 6 +- .../compiler/eval/QuerySolverVisitor.java | 12 ++-- .../eval/QuerySolverVisitorBasic.java | 12 ++-- .../eval/QuerySolverVisitorExtension.java | 4 +- .../compiler/federate/FederateVisitor.java | 6 +- .../core/compiler/federate/Provenance.java | 10 +-- .../core/compiler/federate/Selector.java | 4 +- .../core/compiler/federate/SelectorIndex.java | 2 +- .../corese/core/compiler/parser/Compiler.java | 8 +-- .../core/compiler/parser/CompilerKgram.java | 6 +- .../corese/core/compiler/parser/EdgeImpl.java | 8 +-- .../core/compiler/parser/ExpandList.java | 2 +- .../core/compiler/parser/ExpandPath.java | 4 +- .../core/compiler/parser/Extension.java | 2 +- .../compiler/parser/FunctionCompiler.java | 4 +- .../corese/core/compiler/parser/NodeImpl.java | 2 +- .../corese/core/compiler/parser/Pragma.java | 12 ++-- .../core/compiler/parser/QueryProfile.java | 8 +-- .../core/compiler/parser/Transformer.java | 37 +++++----- .../core/compiler/parser/VisitQuery.java | 14 ++-- .../core/compiler/result/XMLResult.java | 10 +-- .../compiler/visitor/MetadataVisitor.java | 2 +- .../fr/inria/corese/core/edge/EdgeBinary.java | 4 +- .../inria/corese/core/edge/EdgeDefault.java | 2 +- .../fr/inria/corese/core/edge/EdgeEntail.java | 2 +- .../inria/corese/core/edge/EdgeGeneric.java | 4 +- .../fr/inria/corese/core/edge/EdgeImpl.java | 4 +- .../fr/inria/corese/core/edge/EdgeQuad.java | 2 +- .../fr/inria/corese/core/edge/EdgeTop.java | 10 +-- .../fr/inria/corese/core/edge/EdgeTriple.java | 2 +- .../corese/core/edge/EdgeTripleNode.java | 2 +- .../fr/inria/corese/core/edge/TripleNode.java | 4 +- .../core/edge/binary/EdgeBinaryFirst.java | 2 +- .../core/edge/binary/EdgeBinaryLabel.java | 2 +- .../core/edge/binary/EdgeBinaryRest.java | 2 +- .../core/edge/binary/EdgeBinarySubclass.java | 2 +- .../core/edge/binary/EdgeBinaryType.java | 2 +- .../core/edge/internal/EdgeInternal.java | 4 +- .../edge/internal/EdgeInternalDefault.java | 4 +- .../edge/internal/EdgeInternalEntail.java | 4 +- .../core/edge/internal/EdgeInternalRule.java | 2 +- .../inria/corese/core/edge/rule/EdgeRule.java | 2 +- .../corese/core/edge/rule/EdgeRuleGraph.java | 2 +- .../core/edge/rule/EdgeRuleSubclass.java | 2 +- .../corese/core/edge/rule/EdgeRuleTop.java | 2 +- .../corese/core/edge/rule/EdgeRuleType.java | 2 +- .../elasticsearch/EdgeChangeListener.java | 2 +- .../fr/inria/corese/core/extension/Core.java | 8 +-- .../corese/core/extension/Extension.java | 14 ++-- .../corese/core/extension/JavaCompiler.java | 2 +- .../inria/corese/core/extension/Report.java | 4 +- .../corese/core/extension/core/Core.java | 14 ++-- .../inria/corese/core/index/EdgeManager.java | 4 +- .../corese/core/index/EdgeManagerIndexer.java | 6 +- .../corese/core/index/EdgeManagerIterate.java | 2 +- .../inria/corese/core/index/NodeManager.java | 2 +- .../corese/core/index/NodeManagerBasic.java | 2 +- .../corese/core/index/PredicateList.java | 2 +- .../core/kgram/api/query/DQPFactory.java | 12 ---- .../corese/core/kgram/api/query/Provider.java | 21 ------ .../corese/core/load/AddTripleHelper.java | 4 +- .../core/load/AddTripleHelperDataManager.java | 4 +- .../corese/core/load/ILoadSerialization.java | 2 +- .../java/fr/inria/corese/core/load/Load.java | 4 +- .../fr/inria/corese/core/load/QueryLoad.java | 2 +- .../corese/core/load/RdfxmlTripleCreator.java | 4 +- .../fr/inria/corese/core/load/Service.java | 7 +- .../inria/corese/core/load/ServiceParser.java | 4 +- .../inria/corese/core/load/ServiceReport.java | 6 +- .../corese/core/load/TripleCreatorBase.java | 4 +- .../core/load/TurtleSparqlTripleCreator.java | 4 +- .../load/jsonld/CoreseJsonTripleCallback.java | 2 +- .../core/load/rdfa/CoreseRDFaTripleSink.java | 2 +- .../core/load/result/SPARQLJSONResult.java | 6 +- .../core/load/result/SPARQLRDFResult.java | 6 +- .../corese/core/load/result/SPARQLResult.java | 4 +- .../core/load/result/SPARQLResultParser.java | 2 +- .../corese/core/load/result/XMLResult.java | 11 ++- .../corese/core/logic/BrokerDistance.java | 2 +- .../core/logic/BrokerDistanceDataManager.java | 6 +- .../fr/inria/corese/core/logic/Closure.java | 8 +-- .../corese/core/logic/ClosureDataManager.java | 8 +-- .../fr/inria/corese/core/logic/Distance.java | 2 +- .../inria/corese/core/logic/Entailment.java | 6 +- .../next/impl/temp/CoreseEdgeAdapter.java | 2 +- .../corese/core/next/impl/temp/CoreseIRI.java | 2 +- .../core/next/impl/temp/CoreseModel.java | 4 +- .../next/impl/temp/CoreseNodeAdapter.java | 2 +- .../core/next/impl/temp/CoreseStatement.java | 4 +- .../next/impl/temp/CoreseValueConverter.java | 4 +- .../temp/literal/AbstractCoreseNumber.java | 2 +- .../next/impl/temp/literal/CoreseBNode.java | 2 +- .../next/impl/temp/literal/CoreseBoolean.java | 2 +- .../next/impl/temp/literal/CoreseDate.java | 2 +- .../impl/temp/literal/CoreseDatetime.java | 2 +- .../impl/temp/literal/CoreseDuration.java | 2 +- .../CoreseLanguageTaggedStringLiteral.java | 2 +- .../next/impl/temp/literal/CoreseTyped.java | 2 +- .../kgram/api/core/DatatypeValue.java | 2 +- .../kgram/api/core/DatatypeValueFactory.java | 2 +- .../core/{ => next}/kgram/api/core/Edge.java | 2 +- .../{ => next}/kgram/api/core/ExpPattern.java | 2 +- .../{ => next}/kgram/api/core/ExpType.java | 2 +- .../core/{ => next}/kgram/api/core/Expr.java | 6 +- .../{ => next}/kgram/api/core/ExprLabel.java | 2 +- .../{ => next}/kgram/api/core/ExprType.java | 2 +- .../{ => next}/kgram/api/core/Filter.java | 2 +- .../core/{ => next}/kgram/api/core/Graph.java | 2 +- .../{ => next}/kgram/api/core/Loopable.java | 2 +- .../core/{ => next}/kgram/api/core/Node.java | 6 +- .../kgram/api/core/PointerType.java | 4 +- .../kgram/api/core/Pointerable.java | 12 ++-- .../core/{ => next}/kgram/api/core/Regex.java | 2 +- .../kgram/api/core/TripleStore.java | 2 +- .../core/{ => next}/kgram/api/query/AST.java | 2 +- .../core/{ => next}/kgram/api/query/ASTQ.java | 2 +- .../{ => next}/kgram/api/query/Binder.java | 8 +-- .../core/next/kgram/api/query/DQPFactory.java | 12 ++++ .../kgram/api/query/Environment.java | 18 ++--- .../{ => next}/kgram/api/query/Evaluator.java | 6 +- .../{ => next}/kgram/api/query/Graphable.java | 2 +- .../{ => next}/kgram/api/query/Hierarchy.java | 2 +- .../{ => next}/kgram/api/query/Matcher.java | 6 +- .../{ => next}/kgram/api/query/Plugin.java | 4 +- .../kgram/api/query/ProcessVisitor.java | 16 ++--- .../{ => next}/kgram/api/query/Producer.java | 12 ++-- .../core/next/kgram/api/query/Provider.java | 21 ++++++ .../{ => next}/kgram/api/query/Result.java | 4 +- .../{ => next}/kgram/api/query/Results.java | 4 +- .../kgram/api/query/SPARQLEngine.java | 12 ++-- .../{ => next}/kgram/core/BgpGenerator.java | 10 +-- .../core/{ => next}/kgram/core/Checker.java | 12 ++-- .../{ => next}/kgram/core/CompleteSPARQL.java | 8 +-- .../core/{ => next}/kgram/core/Distinct.java | 6 +- .../core/{ => next}/kgram/core/Eval.java | 18 ++--- .../core/{ => next}/kgram/core/EvalGraph.java | 8 +-- .../core/{ => next}/kgram/core/EvalJoin.java | 8 +-- .../{ => next}/kgram/core/EvalOptional.java | 10 +-- .../{ => next}/kgram/core/EvalSPARQL.java | 6 +- .../core/{ => next}/kgram/core/Exp.java | 8 +-- .../core/{ => next}/kgram/core/ExpEdge.java | 10 +-- .../{ => next}/kgram/core/ExpHandler.java | 4 +- .../core/{ => next}/kgram/core/Group.java | 4 +- .../{ => next}/kgram/core/IterableEntity.java | 6 +- .../core/{ => next}/kgram/core/Mapping.java | 20 +++--- .../{ => next}/kgram/core/MappingSet.java | 4 +- .../core/{ => next}/kgram/core/Mappings.java | 20 +++--- .../core/{ => next}/kgram/core/Memory.java | 18 ++--- .../core/{ => next}/kgram/core/Merge.java | 2 +- .../{ => next}/kgram/core/PointerObject.java | 4 +- .../kgram/core/ProcessVisitorDefault.java | 6 +- .../core/{ => next}/kgram/core/Query.java | 16 ++--- .../{ => next}/kgram/core/QuerySorter.java | 18 ++--- .../core/{ => next}/kgram/core/Sorter.java | 4 +- .../core/{ => next}/kgram/core/SorterNew.java | 20 +++--- .../kgram/core/SparqlException.java | 2 +- .../core/{ => next}/kgram/core/Stack.java | 4 +- .../{ => next}/kgram/event/EvalListener.java | 8 +-- .../core/{ => next}/kgram/event/Event.java | 4 +- .../{ => next}/kgram/event/EventImpl.java | 6 +- .../{ => next}/kgram/event/EventListener.java | 2 +- .../{ => next}/kgram/event/EventManager.java | 2 +- .../kgram/event/ResultListener.java | 14 ++-- .../{ => next}/kgram/event/StatListener.java | 6 +- .../core/{ => next}/kgram/event/User.java | 2 +- .../core/{ => next}/kgram/event/UserImpl.java | 2 +- .../core/{ => next}/kgram/filter/Checker.java | 9 ++- .../core/{ => next}/kgram/filter/Compile.java | 8 +-- .../{ => next}/kgram/filter/Extension.java | 6 +- .../{ => next}/kgram/filter/MatchBind.java | 4 +- .../core/{ => next}/kgram/filter/Matcher.java | 6 +- .../core/{ => next}/kgram/filter/Pattern.java | 14 ++-- .../core/{ => next}/kgram/path/Automaton.java | 4 +- .../core/{ => next}/kgram/path/Buffer.java | 4 +- .../core/{ => next}/kgram/path/GraphPath.java | 6 +- .../core/{ => next}/kgram/path/Path.java | 20 +++--- .../{ => next}/kgram/path/PathFinder.java | 36 +++++----- .../core/{ => next}/kgram/path/Record.java | 6 +- .../core/{ => next}/kgram/path/Stack.java | 2 +- .../core/{ => next}/kgram/path/State.java | 4 +- .../core/{ => next}/kgram/path/Step.java | 4 +- .../core/{ => next}/kgram/path/Visit.java | 6 +- .../kgram/sorter/core/AbstractCostModel.java | 2 +- .../{ => next}/kgram/sorter/core/Const.java | 4 +- .../kgram/sorter/core/IEstimate.java | 4 +- .../kgram/sorter/core/IProducerQP.java | 2 +- .../{ => next}/kgram/sorter/core/ISort.java | 4 +- .../{ => next}/kgram/sorter/core/QPGEdge.java | 4 +- .../{ => next}/kgram/sorter/core/QPGNode.java | 22 +++--- .../{ => next}/kgram/sorter/core/QPGraph.java | 6 +- .../impl/qpv1/BasicPatternGenerator.java | 18 ++--- .../impl/qpv1/DepthFirstBestSearch.java | 8 +-- .../sorter/impl/qpv1/DepthFirstSearch.java | 10 ++- .../impl/qpv1/HeuristicsBasedEstimation.java | 8 +-- .../sorter/impl/qpv1/QPGEdgeCostModel.java | 10 +-- .../sorter/impl/qpv1/QPGNodeCostModel.java | 38 +++++----- .../kgram/tool/ApproximateSearchEnv.java | 8 +-- .../{ => next}/kgram/tool/DistinctNode.java | 4 +- .../core/{ => next}/kgram/tool/EdgeInv.java | 12 ++-- .../{ => next}/kgram/tool/EntityImpl.java | 0 .../kgram/tool/EnvironmentImpl.java | 26 +++---- .../{ => next}/kgram/tool/MatcherDefault.java | 10 +-- .../core/{ => next}/kgram/tool/Message.java | 4 +- .../{ => next}/kgram/tool/MetaIterator.java | 2 +- .../kgram/tool/MetaIteratorCast.java | 2 +- .../{ => next}/kgram/tool/MetaProducer.java | 24 +++---- .../core/{ => next}/kgram/tool/NodeImpl.java | 12 ++-- .../kgram/tool/ProducerDefault.java | 22 +++--- .../{ => next}/kgram/tool/ResultsImpl.java | 12 ++-- .../print/AbstractNestedResultFormat.java | 10 +-- .../fr/inria/corese/core/print/CSVFormat.java | 8 +-- .../core/print/CanonicalRdf10Format.java | 4 +- .../inria/corese/core/print/HTMLFormat.java | 2 +- .../inria/corese/core/print/JSOND3Format.java | 8 +-- .../inria/corese/core/print/JSONFormat.java | 8 +-- .../inria/corese/core/print/JSONLDFormat.java | 8 +-- .../inria/corese/core/print/LogManager.java | 6 +- .../fr/inria/corese/core/print/Mapper.java | 6 +- .../corese/core/print/MarkdownFormat.java | 8 +-- .../inria/corese/core/print/NQuadsFormat.java | 6 +- .../corese/core/print/NTriplesFormat.java | 6 +- .../fr/inria/corese/core/print/RDFFormat.java | 10 +-- .../corese/core/print/RDFResultFormat.java | 10 +-- .../inria/corese/core/print/ResultFormat.java | 7 +- .../fr/inria/corese/core/print/TSVFormat.java | 4 +- .../corese/core/print/TemplateFormat.java | 7 +- .../inria/corese/core/print/TripleFormat.java | 8 +-- .../fr/inria/corese/core/print/XMLFormat.java | 6 +- .../fr/inria/corese/core/print/XSLTQuery.java | 4 +- .../core/print/rdfc10/CanonicalRdf10.java | 8 +-- .../print/rdfc10/CanonicalizationState.java | 2 +- .../print/rdfc10/CanonicalizedDataset.java | 2 +- .../producer/DataBrokerConstructExtern.java | 6 +- .../producer/DataBrokerConstructLocal.java | 6 +- .../corese/core/producer/DataBrokerLocal.java | 6 +- .../corese/core/producer/DataFilter.java | 6 +- .../corese/core/producer/DataFilterAnd.java | 2 +- .../core/producer/DataFilterFactory.java | 2 +- .../corese/core/producer/DataFilterNot.java | 2 +- .../corese/core/producer/DataFilterOr.java | 2 +- .../inria/corese/core/producer/DataFrom.java | 4 +- .../corese/core/producer/DataProducer.java | 12 ++-- .../corese/core/producer/MetadataManager.java | 4 +- .../fr/inria/corese/core/query/Cache.java | 4 +- .../corese/core/query/ClassHierarchy.java | 6 +- .../corese/core/query/CompileService.java | 10 +-- .../fr/inria/corese/core/query/Construct.java | 16 ++--- .../fr/inria/corese/core/query/Describe.java | 8 +-- .../core/query/FederatedQueryProcess.java | 4 +- .../fr/inria/corese/core/query/Mapper.java | 16 ++--- .../fr/inria/corese/core/query/MapperSQL.java | 8 +-- .../inria/corese/core/query/MatchBNode.java | 6 +- .../corese/core/query/MatchIterator.java | 8 +-- .../inria/corese/core/query/MatcherImpl.java | 10 +-- .../inria/corese/core/query/PluginImpl.java | 21 +++--- .../corese/core/query/PluginTransform.java | 13 ++-- .../inria/corese/core/query/PragmaImpl.java | 2 +- .../inria/corese/core/query/ProducerImpl.java | 19 ++--- .../corese/core/query/ProducerImplNode.java | 10 +-- .../inria/corese/core/query/ProviderImpl.java | 8 +-- .../corese/core/query/ProviderService.java | 12 ++-- .../corese/core/query/ProviderThread.java | 4 +- .../inria/corese/core/query/QueryCheck.java | 10 +-- .../inria/corese/core/query/QueryEngine.java | 10 +-- .../inria/corese/core/query/QueryProcess.java | 16 ++--- .../corese/core/query/QueryProcessUpdate.java | 10 +-- .../fr/inria/corese/core/query/RDFizer.java | 2 +- .../corese/core/query/ResultMessage.java | 2 +- .../inria/corese/core/query/SorterImpl.java | 8 +-- .../corese/core/query/TemplateIndex.java | 14 ++-- .../core/query/update/GraphManager.java | 6 +- .../corese/core/query/update/Manager.java | 4 +- .../corese/core/query/update/ManagerImpl.java | 4 +- .../core/query/update/UpdateProcess.java | 12 ++-- .../fr/inria/corese/core/rule/Cleaner.java | 8 +-- .../fr/inria/corese/core/rule/Record.java | 2 +- .../inria/corese/core/rule/ResultWatcher.java | 16 ++--- .../java/fr/inria/corese/core/rule/Rule.java | 10 +-- .../fr/inria/corese/core/rule/RuleEngine.java | 12 ++-- .../fr/inria/corese/core/rule/RuleError.java | 4 +- .../fr/inria/corese/core/shacl/Shacl.java | 2 +- .../corese/core/sparql/api/Computer.java | 2 +- .../corese/core/sparql/api/ComputerProxy.java | 6 +- .../inria/corese/core/sparql/api/Graph.java | 2 +- .../core/sparql/api/GraphProcessor.java | 8 +-- .../corese/core/sparql/api/IDatatype.java | 2 +- .../corese/core/sparql/api/QueryVisitor.java | 4 +- .../core/sparql/api/TransformProcessor.java | 6 +- .../sparql/compiler/java/JavaCompiler.java | 12 ++-- .../core/sparql/compiler/java/Rewrite.java | 2 +- .../core/sparql/compiler/java/Stack.java | 2 +- .../core/sparql/datatype/CoreseDatatype.java | 10 +-- .../core/sparql/datatype/CoreseTriple.java | 2 +- .../core/sparql/datatype/CoreseURI.java | 2 +- .../sparql/datatype/CoreseXMLLiteral.java | 2 +- .../sparql/datatype/DatatypeHierarchy.java | 2 +- .../core/sparql/datatype/DatatypeMap.java | 2 +- .../core/sparql/datatype/PointerObject.java | 2 +- .../datatype/extension/CoresePointer.java | 8 +-- .../function/VariableResolverImpl.java | 4 +- .../sparql/exceptions/EngineException.java | 2 +- .../triple/function/aggregate/Aggregate.java | 12 ++-- .../function/aggregate/AggregateCount.java | 6 +- .../aggregate/AggregateGroupConcat.java | 5 +- .../function/aggregate/AggregateMinMax.java | 2 +- .../function/aggregate/AggregateSumAvg.java | 2 +- .../function/aggregate/AggregateTemplate.java | 6 +- .../triple/function/core/BiTriFunction.java | 6 +- .../triple/function/core/BinaryFunction.java | 6 +- .../triple/function/core/BlankNode.java | 6 +- .../sparql/triple/function/core/Bound.java | 4 +- .../sparql/triple/function/core/Coalesce.java | 4 +- .../sparql/triple/function/core/Concat.java | 16 ++--- .../triple/function/core/DateFunction.java | 6 +- .../triple/function/core/ExistFunction.java | 24 +++---- .../sparql/triple/function/core/Extern.java | 4 +- .../function/core/FunctionEvaluator.java | 4 +- .../triple/function/core/HashFunction.java | 4 +- .../triple/function/core/IfThenElseTerm.java | 6 +- .../triple/function/core/StrPredicate.java | 6 +- .../triple/function/core/UUIDFunction.java | 6 +- .../triple/function/core/UnaryFunction.java | 6 +- .../triple/function/core/ZeroaryFunction.java | 6 +- .../function/extension/BinaryExtension.java | 14 ++-- .../triple/function/extension/Cast.java | 4 +- .../triple/function/extension/Display.java | 6 +- .../triple/function/extension/Focus.java | 5 +- .../sparql/triple/function/extension/Get.java | 8 +-- .../triple/function/extension/GetGen.java | 6 +- .../triple/function/extension/IOFunction.java | 6 +- .../triple/function/extension/Iterate.java | 4 +- .../triple/function/extension/JSONTerm.java | 4 +- .../triple/function/extension/ListBinary.java | 6 +- .../triple/function/extension/ListNary.java | 6 +- .../triple/function/extension/ListSort.java | 8 +-- .../triple/function/extension/ListTerm.java | 4 +- .../triple/function/extension/ListUnary.java | 6 +- .../triple/function/extension/MapTerm.java | 4 +- .../triple/function/extension/Namespace.java | 6 +- .../triple/function/extension/PathLength.java | 11 ++- .../triple/function/extension/Rest.java | 8 +-- .../function/extension/ResultFormater.java | 14 ++-- .../function/extension/SPINFormater.java | 4 +- .../triple/function/extension/Size.java | 5 +- .../triple/function/extension/Swap.java | 4 +- .../function/extension/SystemFunction.java | 6 +- .../function/extension/TernaryExtension.java | 6 +- .../function/extension/TripleAccess.java | 26 +++---- .../function/extension/UnaryExtension.java | 10 +-- .../sparql/triple/function/extension/XML.java | 40 +++++------ .../triple/function/extension/ZeroAry.java | 8 +-- .../triple/function/proxy/GraphFunction.java | 26 +++---- .../function/proxy/GraphSpecificFunction.java | 72 +++++++++---------- .../triple/function/proxy/Introspection.java | 21 +++--- .../triple/function/script/ErrorFunction.java | 4 +- .../sparql/triple/function/script/Eval.java | 6 +- .../triple/function/script/EventCall.java | 6 +- .../triple/function/script/Extension.java | 11 +-- .../triple/function/script/ForLoop.java | 4 +- .../triple/function/script/Funcall.java | 13 ++-- .../triple/function/script/Function.java | 6 +- .../function/script/FunctionDefined.java | 4 +- .../triple/function/script/JavaCast.java | 4 +- .../triple/function/script/JavaDScall.java | 5 +- .../triple/function/script/JavaFunction.java | 6 -- .../triple/function/script/Javacall.java | 13 ++-- .../triple/function/script/LDScript.java | 20 +++--- .../sparql/triple/function/script/Let.java | 6 +- .../triple/function/script/MapAnyEvery.java | 13 ++-- .../triple/function/script/MapFunction.java | 16 ++--- .../triple/function/script/MethodCall.java | 4 +- .../function/script/MethodTypeCall.java | 4 +- .../sparql/triple/function/script/Reduce.java | 30 ++++---- .../sparql/triple/function/script/Return.java | 4 +- .../sparql/triple/function/script/Self.java | 4 +- .../triple/function/script/Sequence.java | 4 +- .../triple/function/script/SetFunction.java | 12 ++-- .../sparql/triple/function/script/Throw.java | 6 +- .../triple/function/script/TryCatch.java | 4 +- .../function/template/ApplyTemplates.java | 4 +- .../function/template/ApplyTemplatesWith.java | 4 +- .../template/ApplyTemplatesWithGraph.java | 4 +- .../function/template/CGetSetContext.java | 6 +- .../function/template/CallTemplate.java | 4 +- .../function/template/CallTemplateWith.java | 4 +- .../triple/function/template/FocusNode.java | 6 +- .../function/template/GetSetContext.java | 6 +- .../triple/function/template/Prefix.java | 6 +- .../function/template/TemplateAccess.java | 14 ++-- .../function/template/TemplateFormat.java | 8 +-- .../function/template/TemplateFunction.java | 7 +- .../function/template/TemplateFuture.java | 4 +- .../function/template/TemplateNumber.java | 10 +-- .../function/template/TemplateProcess.java | 6 +- .../function/template/TemplateVisitor.java | 6 +- .../triple/function/template/Turtle.java | 6 +- .../sparql/triple/function/term/AndTerm.java | 4 +- .../sparql/triple/function/term/Binding.java | 14 ++-- .../sparql/triple/function/term/DivTerm.java | 4 +- .../core/sparql/triple/function/term/EQ.java | 4 +- .../core/sparql/triple/function/term/GE.java | 4 +- .../core/sparql/triple/function/term/GT.java | 4 +- .../core/sparql/triple/function/term/In.java | 4 +- .../core/sparql/triple/function/term/LE.java | 4 +- .../core/sparql/triple/function/term/LT.java | 4 +- .../triple/function/term/MinusTerm.java | 4 +- .../sparql/triple/function/term/MultTerm.java | 4 +- .../core/sparql/triple/function/term/NEQ.java | 4 +- .../sparql/triple/function/term/NotTerm.java | 4 +- .../triple/function/term/Operation.java | 6 +- .../sparql/triple/function/term/OrTerm.java | 4 +- .../sparql/triple/function/term/PlusTerm.java | 4 +- .../sparql/triple/function/term/TermEval.java | 8 +-- .../sparql/triple/parser/ASTExtension.java | 8 +-- .../core/sparql/triple/parser/ASTObject.java | 2 +- .../core/sparql/triple/parser/ASTQuery.java | 12 ++-- .../core/sparql/triple/parser/Access.java | 2 +- .../sparql/triple/parser/AccessRight.java | 3 +- .../triple/parser/AccessRightDefinition.java | 4 +- .../core/sparql/triple/parser/Atom.java | 4 +- .../core/sparql/triple/parser/Constant.java | 6 +- .../core/sparql/triple/parser/Context.java | 4 +- .../core/sparql/triple/parser/Dataset.java | 12 ++-- .../core/sparql/triple/parser/Expression.java | 28 ++++---- .../core/sparql/triple/parser/Metadata.java | 2 +- .../core/sparql/triple/parser/NSManager.java | 6 +- .../core/sparql/triple/parser/Processor.java | 15 ++-- .../core/sparql/triple/parser/Term.java | 12 ++-- .../core/sparql/triple/parser/Triple.java | 4 +- .../core/sparql/triple/parser/URLServer.java | 4 +- .../core/sparql/triple/parser/Variable.java | 8 +-- .../sparql/triple/parser/VariableLocal.java | 6 +- .../triple/parser/context/ContextLog.java | 2 +- .../triple/parser/context/PropertyMap.java | 4 +- .../triple/parser/visitor/ASTWalker.java | 36 +++++----- .../visitor/ExpressionVisitorVariable.java | 4 +- .../fr/inria/corese/core/stats/IStats.java | 4 +- .../core/stats/StatsBasedEstimation.java | 23 +++--- .../inria/corese/core/stats/data/BaseMap.java | 2 +- .../corese/core/stats/data/HashBucket.java | 2 +- .../corese/core/stats/data/ReducedMap.java | 2 +- .../corese/core/stats/data/SimpleAverage.java | 2 +- .../core/stats/data/TripleHashTable.java | 4 +- .../core/stats/data/TripleHashTable2.java | 4 +- .../corese/core/stats/data/WrappedNode.java | 2 +- .../core/storage/CoreseGraphDataManager.java | 4 +- .../corese/core/storage/DataManagerJava.java | 8 +-- .../api/dataManager/DataManagerRead.java | 4 +- .../api/dataManager/DataManagerUpdate.java | 4 +- .../corese/core/transform/ContextBuilder.java | 4 +- .../corese/core/transform/ContextManager.java | 8 +-- .../fr/inria/corese/core/transform/Stack.java | 2 +- .../core/transform/TemplatePrinter.java | 2 +- .../corese/core/transform/Transformer.java | 16 ++--- .../core/transform/TransformerMapping.java | 6 +- .../core/transform/TransformerVisitor.java | 12 ++-- .../fr/inria/corese/core/util/Duplicate.java | 4 +- .../inria/corese/core/util/GraphListen.java | 10 +-- .../corese/core/util/GraphListenerImpl.java | 9 ++- .../corese/core/util/MappingComparator.java | 6 +- .../inria/corese/core/util/MappingsGraph.java | 10 +-- .../fr/inria/corese/core/util/Property.java | 6 +- .../core/util/QueryGraphVisitorImpl.java | 10 +-- .../inria/corese/core/util/SPINProcess.java | 3 +- .../core/visitor/ldpath/LinkedDataPath.java | 8 +-- .../visitor/ldpath/QueryProcessThread.java | 2 +- .../corese/core/visitor/ldpath/Result.java | 6 +- .../solver/QuerySolverVisitorRule.java | 9 ++- .../solver/QuerySolverVisitorRuleUser.java | 6 +- .../solver/QuerySolverVisitorTransformer.java | 3 +- .../QuerySolverVisitorTransformerUser.java | 2 +- .../solver/QuerySolverVisitorUser.java | 4 +- .../fr/inria/corese/core/workflow/Data.java | 2 +- .../corese/core/workflow/ResultProcess.java | 2 +- .../corese/core/workflow/SPARQLProcess.java | 4 +- .../corese/core/workflow/ShapeWorkflow.java | 2 +- .../corese/core/workflow/TestProcess.java | 2 +- .../corese/core/workflow/WorkflowParser.java | 5 +- .../corese/core/workflow/WorkflowProcess.java | 2 +- .../inria/corese/core/engine/TestQuery1.java | 19 +++-- .../inria/corese/core/engine/TestQuery2.java | 7 +- .../corese/core/engine/TestRuleEngine.java | 4 +- .../inria/corese/core/load/QueryLoadTest.java | 2 +- .../inria/corese/core/load/ServiceTest.java | 2 +- .../core/next/impl/temp/CoreseModelTest.java | 18 ++--- .../next/impl/temp/CoreseStatementTest.java | 4 +- .../corese/core/query/QueryEngineTest.java | 2 +- .../core/sparql/EmptyResultFormatTest.java | 2 +- .../java/fr/inria/corese/test/MyTest.java | 2 +- 517 files changed, 1743 insertions(+), 1803 deletions(-) delete mode 100644 src/main/java/fr/inria/corese/core/kgram/api/query/DQPFactory.java delete mode 100644 src/main/java/fr/inria/corese/core/kgram/api/query/Provider.java rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/DatatypeValue.java (92%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/DatatypeValueFactory.java (78%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/Edge.java (99%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/ExpPattern.java (76%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/ExpType.java (97%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/Expr.java (92%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/ExprLabel.java (89%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/ExprType.java (99%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/Filter.java (95%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/Graph.java (82%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/Loopable.java (73%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/Node.java (93%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/PointerType.java (85%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/Pointerable.java (80%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/Regex.java (96%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/core/TripleStore.java (80%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/query/AST.java (89%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/query/ASTQ.java (66%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/query/Binder.java (71%) create mode 100644 src/main/java/fr/inria/corese/core/next/kgram/api/query/DQPFactory.java rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/query/Environment.java (85%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/query/Evaluator.java (80%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/query/Graphable.java (76%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/query/Hierarchy.java (83%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/query/Matcher.java (92%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/query/Plugin.java (70%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/query/ProcessVisitor.java (94%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/query/Producer.java (96%) create mode 100644 src/main/java/fr/inria/corese/core/next/kgram/api/query/Provider.java rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/query/Result.java (62%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/query/Results.java (65%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/api/query/SPARQLEngine.java (58%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/BgpGenerator.java (69%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/Checker.java (89%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/CompleteSPARQL.java (95%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/Distinct.java (93%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/Eval.java (99%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/EvalGraph.java (96%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/EvalJoin.java (96%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/EvalOptional.java (95%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/EvalSPARQL.java (97%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/Exp.java (99%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/ExpEdge.java (93%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/ExpHandler.java (98%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/Group.java (98%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/IterableEntity.java (82%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/Mapping.java (98%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/MappingSet.java (99%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/Mappings.java (99%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/Memory.java (98%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/Merge.java (98%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/PointerObject.java (66%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/ProcessVisitorDefault.java (93%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/Query.java (99%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/QuerySorter.java (97%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/Sorter.java (97%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/SorterNew.java (85%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/SparqlException.java (94%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/core/Stack.java (95%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/event/EvalListener.java (96%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/event/Event.java (92%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/event/EventImpl.java (95%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/event/EventListener.java (85%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/event/EventManager.java (97%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/event/ResultListener.java (67%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/event/StatListener.java (95%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/event/User.java (77%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/event/UserImpl.java (97%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/filter/Checker.java (97%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/filter/Compile.java (97%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/filter/Extension.java (82%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/filter/MatchBind.java (92%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/filter/Matcher.java (97%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/filter/Pattern.java (96%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/path/Automaton.java (98%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/path/Buffer.java (91%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/path/GraphPath.java (81%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/path/Path.java (91%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/path/PathFinder.java (97%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/path/Record.java (91%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/path/Stack.java (95%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/path/State.java (95%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/path/Step.java (93%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/path/Visit.java (98%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/sorter/core/AbstractCostModel.java (93%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/sorter/core/Const.java (91%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/sorter/core/IEstimate.java (85%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/sorter/core/IProducerQP.java (93%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/sorter/core/ISort.java (84%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/sorter/core/QPGEdge.java (95%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/sorter/core/QPGNode.java (93%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/sorter/core/QPGraph.java (97%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/sorter/impl/qpv1/BasicPatternGenerator.java (86%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java (97%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/sorter/impl/qpv1/DepthFirstSearch.java (96%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java (92%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java (90%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/sorter/impl/qpv1/QPGNodeCostModel.java (88%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/tool/ApproximateSearchEnv.java (96%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/tool/DistinctNode.java (91%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/tool/EdgeInv.java (85%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/tool/EntityImpl.java (100%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/tool/EnvironmentImpl.java (89%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/tool/MatcherDefault.java (68%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/tool/Message.java (91%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/tool/MetaIterator.java (97%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/tool/MetaIteratorCast.java (97%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/tool/MetaProducer.java (90%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/tool/NodeImpl.java (94%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/tool/ProducerDefault.java (86%) rename src/main/java/fr/inria/corese/core/{ => next}/kgram/tool/ResultsImpl.java (67%) diff --git a/src/main/java/fr/inria/corese/core/Context.java b/src/main/java/fr/inria/corese/core/Context.java index 93973ee41..7cfc3a8a9 100644 --- a/src/main/java/fr/inria/corese/core/Context.java +++ b/src/main/java/fr/inria/corese/core/Context.java @@ -1,8 +1,8 @@ package fr.inria.corese.core; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Graphable; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Graphable; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.load.QueryLoad; import fr.inria.corese.core.query.RDFizer; import fr.inria.corese.core.rule.RuleEngine; diff --git a/src/main/java/fr/inria/corese/core/DataStore.java b/src/main/java/fr/inria/corese/core/DataStore.java index a0effce2e..108bf0142 100644 --- a/src/main/java/fr/inria/corese/core/DataStore.java +++ b/src/main/java/fr/inria/corese/core/DataStore.java @@ -1,6 +1,6 @@ package fr.inria.corese.core; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.producer.DataProducer; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/EdgeFactory.java b/src/main/java/fr/inria/corese/core/EdgeFactory.java index 5618f09b8..7f5611921 100644 --- a/src/main/java/fr/inria/corese/core/EdgeFactory.java +++ b/src/main/java/fr/inria/corese/core/EdgeFactory.java @@ -10,8 +10,8 @@ import fr.inria.corese.core.edge.rule.EdgeRuleGraph; import fr.inria.corese.core.edge.rule.EdgeRuleSubclass; import fr.inria.corese.core.edge.rule.EdgeRuleType; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/EventHandler.java b/src/main/java/fr/inria/corese/core/EventHandler.java index 4130270e7..93b428868 100644 --- a/src/main/java/fr/inria/corese/core/EventHandler.java +++ b/src/main/java/fr/inria/corese/core/EventHandler.java @@ -1,6 +1,6 @@ package fr.inria.corese.core; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; /** * diff --git a/src/main/java/fr/inria/corese/core/EventLogger.java b/src/main/java/fr/inria/corese/core/EventLogger.java index e660f16b7..6ad7a9b0d 100644 --- a/src/main/java/fr/inria/corese/core/EventLogger.java +++ b/src/main/java/fr/inria/corese/core/EventLogger.java @@ -2,8 +2,8 @@ import fr.inria.corese.core.compiler.eval.QuerySolverVisitor; import fr.inria.corese.core.index.NodeManager; -import fr.inria.corese.core.kgram.api.core.DatatypeValue; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.DatatypeValue; +import fr.inria.corese.core.next.kgram.api.core.Edge; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/EventManager.java b/src/main/java/fr/inria/corese/core/EventManager.java index 9e65b76ef..4f5943e86 100644 --- a/src/main/java/fr/inria/corese/core/EventManager.java +++ b/src/main/java/fr/inria/corese/core/EventManager.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.api.Engine; import fr.inria.corese.core.compiler.parser.Transformer; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.sparql.triple.parser.ASTExtension; import fr.inria.corese.core.util.Property; diff --git a/src/main/java/fr/inria/corese/core/Graph.java b/src/main/java/fr/inria/corese/core/Graph.java index 0af9fa025..0698bfa98 100755 --- a/src/main/java/fr/inria/corese/core/Graph.java +++ b/src/main/java/fr/inria/corese/core/Graph.java @@ -6,12 +6,12 @@ import fr.inria.corese.core.elasticsearch.EdgeChangeListener; import fr.inria.corese.core.index.EdgeManagerIndexer; import fr.inria.corese.core.index.NodeManager; -import fr.inria.corese.core.kgram.api.core.*; -import fr.inria.corese.core.kgram.api.query.Graphable; -import fr.inria.corese.core.kgram.core.Distinct; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.tool.MetaIterator; +import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.api.query.Graphable; +import fr.inria.corese.core.next.kgram.core.Distinct; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.tool.MetaIterator; import fr.inria.corese.core.logic.*; import fr.inria.corese.core.producer.DataProducer; import fr.inria.corese.core.query.QueryCheck; @@ -35,7 +35,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import static fr.inria.corese.core.kgram.api.core.PointerType.GRAPH; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.GRAPH; /** * Graph Manager Edges are stored in an index An index is a table: predicate -> diff --git a/src/main/java/fr/inria/corese/core/GraphCompare.java b/src/main/java/fr/inria/corese/core/GraphCompare.java index d1172671a..ec8b7a49f 100644 --- a/src/main/java/fr/inria/corese/core/GraphCompare.java +++ b/src/main/java/fr/inria/corese/core/GraphCompare.java @@ -1,7 +1,7 @@ package fr.inria.corese.core; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/GraphDistance.java b/src/main/java/fr/inria/corese/core/GraphDistance.java index b2c6f16e2..d655e2b56 100644 --- a/src/main/java/fr/inria/corese/core/GraphDistance.java +++ b/src/main/java/fr/inria/corese/core/GraphDistance.java @@ -1,6 +1,6 @@ package fr.inria.corese.core; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Constant; diff --git a/src/main/java/fr/inria/corese/core/GraphObject.java b/src/main/java/fr/inria/corese/core/GraphObject.java index 234a9a2cc..31c6b4203 100644 --- a/src/main/java/fr/inria/corese/core/GraphObject.java +++ b/src/main/java/fr/inria/corese/core/GraphObject.java @@ -5,7 +5,7 @@ package fr.inria.corese.core; -import fr.inria.corese.core.kgram.core.PointerObject; +import fr.inria.corese.core.next.kgram.core.PointerObject; /** * @author Olivier Corby, Wimmics INRIA I3S, 2015 diff --git a/src/main/java/fr/inria/corese/core/GraphStore.java b/src/main/java/fr/inria/corese/core/GraphStore.java index 5ba9dea76..a1303d93d 100644 --- a/src/main/java/fr/inria/corese/core/GraphStore.java +++ b/src/main/java/fr/inria/corese/core/GraphStore.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.elasticsearch.EdgeChangeListener; import fr.inria.corese.core.logic.Entailment; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/fr/inria/corese/core/Index.java b/src/main/java/fr/inria/corese/core/Index.java index 9bd2ba0a6..0dd56f605 100644 --- a/src/main/java/fr/inria/corese/core/Index.java +++ b/src/main/java/fr/inria/corese/core/Index.java @@ -3,8 +3,8 @@ import fr.inria.corese.core.index.NodeManager; import fr.inria.corese.core.index.PredicateList; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/NodeGraph.java b/src/main/java/fr/inria/corese/core/NodeGraph.java index 390e668ce..80f675fcf 100644 --- a/src/main/java/fr/inria/corese/core/NodeGraph.java +++ b/src/main/java/fr/inria/corese/core/NodeGraph.java @@ -1,6 +1,6 @@ package fr.inria.corese.core; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype; /** diff --git a/src/main/java/fr/inria/corese/core/NodeGraphIndex.java b/src/main/java/fr/inria/corese/core/NodeGraphIndex.java index c7a1d5072..aabd0d769 100644 --- a/src/main/java/fr/inria/corese/core/NodeGraphIndex.java +++ b/src/main/java/fr/inria/corese/core/NodeGraphIndex.java @@ -1,9 +1,9 @@ package fr.inria.corese.core; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.tool.DistinctNode; -import fr.inria.corese.core.kgram.tool.MetaIterator; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.tool.DistinctNode; +import fr.inria.corese.core.next.kgram.tool.MetaIterator; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/NodeImpl.java b/src/main/java/fr/inria/corese/core/NodeImpl.java index e8cbd641c..f4633a848 100755 --- a/src/main/java/fr/inria/corese/core/NodeImpl.java +++ b/src/main/java/fr/inria/corese/core/NodeImpl.java @@ -1,10 +1,10 @@ package fr.inria.corese.core; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.TripleStore; -import fr.inria.corese.core.kgram.path.Path; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.TripleStore; +import fr.inria.corese.core.next.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.Objects; diff --git a/src/main/java/fr/inria/corese/core/NodeIterator.java b/src/main/java/fr/inria/corese/core/NodeIterator.java index 129cdecc1..0f4b98cfb 100644 --- a/src/main/java/fr/inria/corese/core/NodeIterator.java +++ b/src/main/java/fr/inria/corese/core/NodeIterator.java @@ -1,7 +1,7 @@ package fr.inria.corese.core; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.Iterator; diff --git a/src/main/java/fr/inria/corese/core/Workflow.java b/src/main/java/fr/inria/corese/core/Workflow.java index 5cfcfbc62..fc968a880 100644 --- a/src/main/java/fr/inria/corese/core/Workflow.java +++ b/src/main/java/fr/inria/corese/core/Workflow.java @@ -1,8 +1,8 @@ package fr.inria.corese.core; import fr.inria.corese.core.api.Engine; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.sparql.exceptions.EngineException; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/api/DataBroker.java b/src/main/java/fr/inria/corese/core/api/DataBroker.java index dc9f53f30..c509add2f 100644 --- a/src/main/java/fr/inria/corese/core/api/DataBroker.java +++ b/src/main/java/fr/inria/corese/core/api/DataBroker.java @@ -2,9 +2,9 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.NodeImpl; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.logic.RDF; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.storage.api.dataManager.DataManager; diff --git a/src/main/java/fr/inria/corese/core/api/DataBrokerConstruct.java b/src/main/java/fr/inria/corese/core/api/DataBrokerConstruct.java index 5dd401172..d26a06d35 100644 --- a/src/main/java/fr/inria/corese/core/api/DataBrokerConstruct.java +++ b/src/main/java/fr/inria/corese/core/api/DataBrokerConstruct.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.api; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/api/Engine.java b/src/main/java/fr/inria/corese/core/api/Engine.java index ba33ddf9d..f53b8b3fb 100644 --- a/src/main/java/fr/inria/corese/core/api/Engine.java +++ b/src/main/java/fr/inria/corese/core/api/Engine.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.api; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.exceptions.EngineException; /** diff --git a/src/main/java/fr/inria/corese/core/api/GraphListener.java b/src/main/java/fr/inria/corese/core/api/GraphListener.java index 0a064cb68..91d9e9ddf 100644 --- a/src/main/java/fr/inria/corese/core/api/GraphListener.java +++ b/src/main/java/fr/inria/corese/core/api/GraphListener.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.api; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; public interface GraphListener { diff --git a/src/main/java/fr/inria/corese/core/api/IGraph.java b/src/main/java/fr/inria/corese/core/api/IGraph.java index 2b765197d..e4b7455c5 100644 --- a/src/main/java/fr/inria/corese/core/api/IGraph.java +++ b/src/main/java/fr/inria/corese/core/api/IGraph.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.api; import fr.inria.corese.core.Index; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype; public interface IGraph { diff --git a/src/main/java/fr/inria/corese/core/api/QueryGraphVisitor.java b/src/main/java/fr/inria/corese/core/api/QueryGraphVisitor.java index 8d6c121bf..01a683e75 100644 --- a/src/main/java/fr/inria/corese/core/api/QueryGraphVisitor.java +++ b/src/main/java/fr/inria/corese/core/api/QueryGraphVisitor.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.api; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; /** diff --git a/src/main/java/fr/inria/corese/core/compiler/api/QueryVisitor.java b/src/main/java/fr/inria/corese/core/compiler/api/QueryVisitor.java index 6b10fc31d..7ed726372 100644 --- a/src/main/java/fr/inria/corese/core/compiler/api/QueryVisitor.java +++ b/src/main/java/fr/inria/corese/core/compiler/api/QueryVisitor.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.compiler.api; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Mappings; public interface QueryVisitor extends fr.inria.corese.core.sparql.api.QueryVisitor { diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/Custom.java b/src/main/java/fr/inria/corese/core/compiler/eval/Custom.java index ec47fd5c5..17fc9bab0 100644 --- a/src/main/java/fr/inria/corese/core/compiler/eval/Custom.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/Custom.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.compiler.eval; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/Interpreter.java b/src/main/java/fr/inria/corese/core/compiler/eval/Interpreter.java index aa1b7e530..cb02d59bd 100644 --- a/src/main/java/fr/inria/corese/core/compiler/eval/Interpreter.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/Interpreter.java @@ -1,13 +1,13 @@ package fr.inria.corese.core.compiler.eval; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Evaluator; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.event.ResultListener; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Evaluator; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.event.ResultListener; import fr.inria.corese.core.sparql.api.*; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/ProxyInterpreter.java b/src/main/java/fr/inria/corese/core/compiler/eval/ProxyInterpreter.java index f59881833..558a5601a 100644 --- a/src/main/java/fr/inria/corese/core/compiler/eval/ProxyInterpreter.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/ProxyInterpreter.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.compiler.eval; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Evaluator; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Evaluator; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Eval; import fr.inria.corese.core.sparql.api.ComputerProxy; import fr.inria.corese.core.sparql.api.GraphProcessor; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolver.java b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolver.java index efb59c27b..8f935209f 100755 --- a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolver.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolver.java @@ -3,14 +3,14 @@ import fr.inria.corese.core.compiler.api.QueryVisitor; import fr.inria.corese.core.compiler.parser.Pragma; import fr.inria.corese.core.compiler.parser.Transformer; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.*; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.core.*; -import fr.inria.corese.core.kgram.event.EventListener; -import fr.inria.corese.core.kgram.event.EventManager; -import fr.inria.corese.core.kgram.event.ResultListener; -import fr.inria.corese.core.kgram.tool.MetaProducer; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.*; +import fr.inria.corese.core.next.kgram.core.*; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.event.EventListener; +import fr.inria.corese.core.next.kgram.event.EventManager; +import fr.inria.corese.core.next.kgram.event.ResultListener; +import fr.inria.corese.core.next.kgram.tool.MetaProducer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverOverload.java b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverOverload.java index c050528f3..ca1c32331 100644 --- a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverOverload.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverOverload.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.compiler.eval; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.core.Eval; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitor.java b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitor.java index 7e6cb6ae0..dcb5d179f 100644 --- a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitor.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitor.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.compiler.eval; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.*; -import fr.inria.corese.core.kgram.path.Path; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.*; +import fr.inria.corese.core.next.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import org.slf4j.Logger; @@ -238,7 +238,7 @@ boolean result(IDatatype dt) { } @Override - public IDatatype statement(Eval eval, Node g, Exp e) { + public IDatatype statement(Eval eval, Node g, Exp e) { return callback(eval, STATEMENT, toArray(g, e)); } diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java index ff333b6cf..521c2c71b 100644 --- a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.compiler.eval; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.query.*; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.PointerObject; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.query.*; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.PointerObject; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorExtension.java b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorExtension.java index 5bb5640c9..d6adaeeb0 100644 --- a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorExtension.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorExtension.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.compiler.eval; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java b/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java index 0b4e79ee0..6f354edbe 100644 --- a/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java +++ b/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java @@ -3,7 +3,7 @@ import fr.inria.corese.core.compiler.api.QueryVisitor; import fr.inria.corese.core.compiler.eval.QuerySolver; import fr.inria.corese.core.compiler.federate.util.RewriteErrorManager; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.RDF; import fr.inria.corese.core.sparql.exceptions.EngineException; @@ -238,7 +238,7 @@ public void visit(ASTQuery ast) { } @Override - public void visit(fr.inria.corese.core.kgram.core.Query query) { + public void visit(fr.inria.corese.core.next.kgram.core.Query query) { query.setFederate(true); ASTQuery queryAST = query.getAST(); queryAST.getLog().setAST(queryAST); @@ -249,7 +249,7 @@ public void visit(fr.inria.corese.core.kgram.core.Query query) { // before solver query exec @Override - public void before(fr.inria.corese.core.kgram.core.Query q) { + public void before(fr.inria.corese.core.next.kgram.core.Query q) { } diff --git a/src/main/java/fr/inria/corese/core/compiler/federate/Provenance.java b/src/main/java/fr/inria/corese/core/compiler/federate/Provenance.java index 9bfe53b6f..8ffcc95e5 100644 --- a/src/main/java/fr/inria/corese/core/compiler/federate/Provenance.java +++ b/src/main/java/fr/inria/corese/core/compiler/federate/Provenance.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.compiler.federate; -import fr.inria.corese.core.kgram.api.core.DatatypeValue; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Group; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.DatatypeValue; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Group; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.triple.parser.Service; import fr.inria.corese.core.sparql.triple.parser.Variable; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/compiler/federate/Selector.java b/src/main/java/fr/inria/corese/core/compiler/federate/Selector.java index 209e5d74b..2827f3697 100644 --- a/src/main/java/fr/inria/corese/core/compiler/federate/Selector.java +++ b/src/main/java/fr/inria/corese/core/compiler/federate/Selector.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.compiler.federate; import fr.inria.corese.core.compiler.eval.QuerySolver; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.cst.LogKey; diff --git a/src/main/java/fr/inria/corese/core/compiler/federate/SelectorIndex.java b/src/main/java/fr/inria/corese/core/compiler/federate/SelectorIndex.java index bedf5d600..b19013937 100644 --- a/src/main/java/fr/inria/corese/core/compiler/federate/SelectorIndex.java +++ b/src/main/java/fr/inria/corese/core/compiler/federate/SelectorIndex.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.compiler.eval.QuerySolver; import fr.inria.corese.core.compiler.federate.util.ResourceReader; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.*; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/Compiler.java b/src/main/java/fr/inria/corese/core/compiler/parser/Compiler.java index 25a9c7d15..436c7bc89 100755 --- a/src/main/java/fr/inria/corese/core/compiler/parser/Compiler.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/Compiler.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Filter; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.Regex; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Filter; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Regex; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Atom; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/CompilerKgram.java b/src/main/java/fr/inria/corese/core/compiler/parser/CompilerKgram.java index e4de94a68..ee08908ee 100755 --- a/src/main/java/fr/inria/corese/core/compiler/parser/CompilerKgram.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/CompilerKgram.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.kgram.api.core.Filter; -import fr.inria.corese.core.kgram.api.core.*; -import fr.inria.corese.core.kgram.tool.Message; +import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.api.core.Filter; +import fr.inria.corese.core.next.kgram.tool.Message; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.*; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/EdgeImpl.java b/src/main/java/fr/inria/corese/core/compiler/parser/EdgeImpl.java index 86c15929c..d9ff766a6 100755 --- a/src/main/java/fr/inria/corese/core/compiler/parser/EdgeImpl.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/EdgeImpl.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.PointerType; -import fr.inria.corese.core.kgram.core.PointerObject; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.core.PointerObject; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.cst.RDFS; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/ExpandList.java b/src/main/java/fr/inria/corese/core/compiler/parser/ExpandList.java index 6c2923ccf..aa2f29804 100644 --- a/src/main/java/fr/inria/corese/core/compiler/parser/ExpandList.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/ExpandList.java @@ -5,7 +5,7 @@ package fr.inria.corese.core.compiler.parser; import fr.inria.corese.core.compiler.api.QueryVisitor; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Exp; import fr.inria.corese.core.sparql.triple.parser.RDFList; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/ExpandPath.java b/src/main/java/fr/inria/corese/core/compiler/parser/ExpandPath.java index 2f48db282..84b43fb18 100644 --- a/src/main/java/fr/inria/corese/core/compiler/parser/ExpandPath.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/ExpandPath.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.compiler.parser; import fr.inria.corese.core.compiler.api.QueryVisitor; -import fr.inria.corese.core.kgram.api.core.Regex; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Regex; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.triple.parser.*; import fr.inria.corese.core.sparql.triple.update.ASTUpdate; import fr.inria.corese.core.sparql.triple.update.Composite; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/Extension.java b/src/main/java/fr/inria/corese/core/compiler/parser/Extension.java index 9e9687022..e64a633a8 100644 --- a/src/main/java/fr/inria/corese/core/compiler/parser/Extension.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/Extension.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; /** diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java b/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java index 4f9ce4825..74c773652 100644 --- a/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.datatype.DatatypeHierarchy; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.exceptions.SafetyException; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/NodeImpl.java b/src/main/java/fr/inria/corese/core/compiler/parser/NodeImpl.java index bd719d183..a857a945e 100755 --- a/src/main/java/fr/inria/corese/core/compiler/parser/NodeImpl.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/NodeImpl.java @@ -5,7 +5,7 @@ import fr.inria.corese.core.sparql.triple.parser.Constant; import fr.inria.corese.core.sparql.triple.parser.Variable; -public class NodeImpl extends fr.inria.corese.core.kgram.tool.NodeImpl { +public class NodeImpl extends fr.inria.corese.core.next.kgram.tool.NodeImpl { public NodeImpl(Atom at) { diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/Pragma.java b/src/main/java/fr/inria/corese/core/compiler/parser/Pragma.java index b532bfd8c..8413cbd91 100755 --- a/src/main/java/fr/inria/corese/core/compiler/parser/Pragma.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/Pragma.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.api.query.Matcher; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.event.EvalListener; -import fr.inria.corese.core.kgram.event.EventListener; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.query.Matcher; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.event.EvalListener; +import fr.inria.corese.core.next.kgram.event.EventListener; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.cst.RDFS; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/QueryProfile.java b/src/main/java/fr/inria/corese/core/compiler/parser/QueryProfile.java index 9b32056d5..cdb5dec71 100644 --- a/src/main/java/fr/inria/corese/core/compiler/parser/QueryProfile.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/QueryProfile.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Filter; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Filter; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Query; /** * Detect Query Pattern, that may be optimized diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/Transformer.java b/src/main/java/fr/inria/corese/core/compiler/parser/Transformer.java index b4ee704b9..a41bb1295 100755 --- a/src/main/java/fr/inria/corese/core/compiler/parser/Transformer.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/Transformer.java @@ -5,10 +5,11 @@ import fr.inria.corese.core.compiler.eval.QuerySolverVisitor; import fr.inria.corese.core.compiler.federate.FederateVisitor; import fr.inria.corese.core.compiler.visitor.MetadataVisitor; -import fr.inria.corese.core.kgram.api.core.*; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.core.*; +import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.api.core.Filter; +import fr.inria.corese.core.next.kgram.core.*; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.exceptions.SafetyException; @@ -749,7 +750,7 @@ Exp compileBind(ASTQuery ast, Binding b) throws EngineException { } Exp compileBind(ASTQuery ast, Expression e, Variable var) throws EngineException { - fr.inria.corese.core.kgram.api.core.Filter f = compileSelect(e, ast); + Filter f = compileSelect(e, ast); Node node = compiler.createNode(var); Exp exp = Exp.create(Type.BIND); exp.setFilter(f); @@ -982,14 +983,14 @@ void path(Query q, ASTQuery ast) throws EngineException { } for (Expression test : ast.getRegexTest()) { // ?x c:isMemberOf[?this != ] + ?y - fr.inria.corese.core.kgram.api.core.Filter f = compile(test); + Filter f = compile(test); q.addPathFilter(f); } } void having(Query q, ASTQuery ast) throws EngineException { if (ast.getHaving() != null) { - fr.inria.corese.core.kgram.api.core.Filter having = compileSelect(ast.getHaving(), ast); + Filter having = compileSelect(ast.getHaving(), ast); q.setHaving(Exp.create(Type.FILTER, having)); } } @@ -1025,7 +1026,7 @@ List select(Query qCurrent, ASTQuery ast) throws EngineException { if (ee != null) { // select fun() as var - fr.inria.corese.core.kgram.api.core.Filter f = compileSelect(ee, ast); + Filter f = compileSelect(ee, ast); if (f != null) { // select fun() as var @@ -1186,7 +1187,7 @@ void function(Query qCurrent, Exp exp, Variable variable) { * @param query * @param f */ - void checkFilterVariables(Query query, fr.inria.corese.core.kgram.api.core.Filter f, List select, List lNodes) { + void checkFilterVariables(Query query, Filter f, List select, List lNodes) { switch (f.getExp().oper()) { // do not create Node for local variables case ExprType.PACKAGE: @@ -1269,7 +1270,7 @@ List orderBy(Query qCurrent, List input, ASTQuery ast) throws E } else { // order by fun(?x) // TODO: check rewrite fun() as var - fr.inria.corese.core.kgram.api.core.Filter f = compile(ee); + Filter f = compile(ee); Node node = createNode(); Exp exp = Exp.create(Type.NODE, node); exp.setFilter(f); @@ -1349,7 +1350,7 @@ Exp basicCompileEdge(Triple t) throws EngineException { if (t.isXPath()) { // deprecated ?x xpath() ?y exp.setType(Type.EVAL); - fr.inria.corese.core.kgram.api.core.Filter xpath = compiler.compile(t.getXPath()); + Filter xpath = compiler.compile(t.getXPath()); exp.setFilter(xpath); } else if (t.isPath()) { path(t, exp); @@ -1452,7 +1453,7 @@ Exp compileGraph(Exp exp, Atom at) { } Exp compileFilter(Expression ee, boolean opt) throws EngineException { - List qvec = compiler.compileFilter(ee); + List qvec = compiler.compileFilter(ee); Exp exp; if (qvec.size() == 1) { @@ -1460,7 +1461,7 @@ Exp compileFilter(Expression ee, boolean opt) throws EngineException { compileExist(qvec.get(0).getExp(), opt); } else { exp = Exp.create(Type.AND); - for (fr.inria.corese.core.kgram.api.core.Filter qm : qvec) { + for (Filter qm : qvec) { Exp f = Exp.create(Type.FILTER, qm); compileExist(qm.getExp(), opt); exp.add(f); @@ -1476,8 +1477,8 @@ Node compile(Atom at) { /** * Rewrite fun() as ?var in exp Compile exists {} */ - fr.inria.corese.core.kgram.api.core.Filter compile(Expression exp) throws EngineException { - fr.inria.corese.core.kgram.api.core.Filter f = compiler.compile(exp); + Filter compile(Expression exp) throws EngineException { + Filter f = compiler.compile(exp); compileExist(f.getExp(), false); return f; } @@ -1485,8 +1486,8 @@ fr.inria.corese.core.kgram.api.core.Filter compile(Expression exp) throws Engine /** * Do not rewrite fun() as var */ - fr.inria.corese.core.kgram.api.core.Filter compileSelect(Expression exp, ASTQuery ast) throws EngineException { - fr.inria.corese.core.kgram.api.core.Filter f = exp.compile(ast); + Filter compileSelect(Expression exp, ASTQuery ast) throws EngineException { + Filter f = exp.compile(ast); compileExist(f.getExp(), false); return f; } @@ -1531,7 +1532,7 @@ void path(Exp exp) throws EngineException { * Exp e */ void processPath(Exp exp, Exp ef) throws EngineException { - fr.inria.corese.core.kgram.api.core.Filter f = ef.getFilter(); + Filter f = ef.getFilter(); Edge e = exp.getEdge(); Node n = e.getEdgeVariable(); diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/VisitQuery.java b/src/main/java/fr/inria/corese/core/compiler/parser/VisitQuery.java index 26ffe833b..c1b5772d6 100644 --- a/src/main/java/fr/inria/corese/core/compiler/parser/VisitQuery.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/VisitQuery.java @@ -1,19 +1,17 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Expression; import java.util.ArrayList; import java.util.List; -import static fr.inria.corese.core.kgram.api.core.ExpType.*; - /** * @author Olivier Corby, Wimmics INRIA I3S, 2014 */ diff --git a/src/main/java/fr/inria/corese/core/compiler/result/XMLResult.java b/src/main/java/fr/inria/corese/core/compiler/result/XMLResult.java index 4dc1b43b1..6bc326e7b 100644 --- a/src/main/java/fr/inria/corese/core/compiler/result/XMLResult.java +++ b/src/main/java/fr/inria/corese/core/compiler/result/XMLResult.java @@ -2,11 +2,11 @@ import fr.inria.corese.core.compiler.eval.QuerySolver; import fr.inria.corese.core.compiler.parser.CompilerFacKgram; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/compiler/visitor/MetadataVisitor.java b/src/main/java/fr/inria/corese/core/compiler/visitor/MetadataVisitor.java index 719b9f1c0..a06681c89 100644 --- a/src/main/java/fr/inria/corese/core/compiler/visitor/MetadataVisitor.java +++ b/src/main/java/fr/inria/corese/core/compiler/visitor/MetadataVisitor.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.compiler.visitor; import fr.inria.corese.core.compiler.api.QueryVisitor; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.triple.parser.*; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeBinary.java b/src/main/java/fr/inria/corese/core/edge/EdgeBinary.java index 8ecccbe3b..4c0202633 100644 --- a/src/main/java/fr/inria/corese/core/edge/EdgeBinary.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeBinary.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeDefault.java b/src/main/java/fr/inria/corese/core/edge/EdgeDefault.java index e5fef7f17..83b311517 100644 --- a/src/main/java/fr/inria/corese/core/edge/EdgeDefault.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeDefault.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeEntail.java b/src/main/java/fr/inria/corese/core/edge/EdgeEntail.java index fe169eee9..e8a5a392e 100644 --- a/src/main/java/fr/inria/corese/core/edge/EdgeEntail.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeEntail.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * @author Olivier Corby, Wimmics INRIA I3S, 2016 diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeGeneric.java b/src/main/java/fr/inria/corese/core/edge/EdgeGeneric.java index 0c8dc30da..adc00f623 100644 --- a/src/main/java/fr/inria/corese/core/edge/EdgeGeneric.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeGeneric.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeImpl.java b/src/main/java/fr/inria/corese/core/edge/EdgeImpl.java index 1a656f008..fc610b406 100755 --- a/src/main/java/fr/inria/corese/core/edge/EdgeImpl.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeImpl.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeQuad.java b/src/main/java/fr/inria/corese/core/edge/EdgeQuad.java index 440427cd9..1d5405ae2 100755 --- a/src/main/java/fr/inria/corese/core/edge/EdgeQuad.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeQuad.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Graph Edge as Quad diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeTop.java b/src/main/java/fr/inria/corese/core/edge/EdgeTop.java index cbf25f11d..b03b15414 100644 --- a/src/main/java/fr/inria/corese/core/edge/EdgeTop.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeTop.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.GraphObject; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.PointerType; -import fr.inria.corese.core.kgram.api.core.TripleStore; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.api.core.TripleStore; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.AccessRight; @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Objects; -import static fr.inria.corese.core.kgram.api.core.PointerType.TRIPLE; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.TRIPLE; /** * @author Olivier Corby, Wimmics Inria I3S, 2014 diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeTriple.java b/src/main/java/fr/inria/corese/core/edge/EdgeTriple.java index 1a040f96a..d24e64b4b 100644 --- a/src/main/java/fr/inria/corese/core/edge/EdgeTriple.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeTriple.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeTripleNode.java b/src/main/java/fr/inria/corese/core/edge/EdgeTripleNode.java index f24d7c7f3..10d51f11a 100644 --- a/src/main/java/fr/inria/corese/core/edge/EdgeTripleNode.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeTripleNode.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype; /** diff --git a/src/main/java/fr/inria/corese/core/edge/TripleNode.java b/src/main/java/fr/inria/corese/core/edge/TripleNode.java index 7f14fc480..f029351e3 100644 --- a/src/main/java/fr/inria/corese/core/edge/TripleNode.java +++ b/src/main/java/fr/inria/corese/core/edge/TripleNode.java @@ -2,8 +2,8 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.NodeImpl; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype; /** diff --git a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryFirst.java b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryFirst.java index b55ea2e11..e45a4ee42 100644 --- a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryFirst.java +++ b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryFirst.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryLabel.java b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryLabel.java index a4a551aac..9ed96788e 100644 --- a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryLabel.java +++ b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryLabel.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryRest.java b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryRest.java index 61d9882fb..5ec4eae00 100644 --- a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryRest.java +++ b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryRest.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinarySubclass.java b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinarySubclass.java index 5e3b2c63c..351bc74b1 100644 --- a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinarySubclass.java +++ b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinarySubclass.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryType.java b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryType.java index dc52c12fa..d131a5beb 100644 --- a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryType.java +++ b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryType.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternal.java b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternal.java index 33e68be6c..e873d4769 100644 --- a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternal.java +++ b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternal.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.edge.internal; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Graph Edge for internal storage diff --git a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalDefault.java b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalDefault.java index 258db9768..febdd183f 100644 --- a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalDefault.java +++ b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalDefault.java @@ -2,8 +2,8 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Graph Edge for internal storage diff --git a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalEntail.java b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalEntail.java index 06bdab96e..f042bd02c 100644 --- a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalEntail.java +++ b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalEntail.java @@ -2,8 +2,8 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Graph Edge for internal storage diff --git a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalRule.java b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalRule.java index 3fa567ed8..3d56c1560 100644 --- a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalRule.java +++ b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalRule.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Graph Edge for internal storage diff --git a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRule.java b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRule.java index 1be13066a..813ba060f 100644 --- a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRule.java +++ b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRule.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeTriple; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleGraph.java b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleGraph.java index 2be228e27..506f37939 100644 --- a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleGraph.java +++ b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleGraph.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.edge.rule; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Edge entailed by a Rule diff --git a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleSubclass.java b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleSubclass.java index c6fae227d..36197be97 100644 --- a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleSubclass.java +++ b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleSubclass.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.edge.rule; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Edge entailed by a Rule diff --git a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleTop.java b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleTop.java index bdaf2d3ee..80db69f49 100644 --- a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleTop.java +++ b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleTop.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleType.java b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleType.java index 14ac24f47..db5e73dc9 100644 --- a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleType.java +++ b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleType.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.edge.rule; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Edge entailed by a Rule diff --git a/src/main/java/fr/inria/corese/core/elasticsearch/EdgeChangeListener.java b/src/main/java/fr/inria/corese/core/elasticsearch/EdgeChangeListener.java index 9824e5b22..02fa82540 100644 --- a/src/main/java/fr/inria/corese/core/elasticsearch/EdgeChangeListener.java +++ b/src/main/java/fr/inria/corese/core/elasticsearch/EdgeChangeListener.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.elasticsearch; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/extension/Core.java b/src/main/java/fr/inria/corese/core/extension/Core.java index 5024bb52b..4fc01c961 100644 --- a/src/main/java/fr/inria/corese/core/extension/Core.java +++ b/src/main/java/fr/inria/corese/core/extension/Core.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.extension; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.PointerType; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.query.PluginImpl; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/extension/Extension.java b/src/main/java/fr/inria/corese/core/extension/Extension.java index eacb780b8..73a030c96 100644 --- a/src/main/java/fr/inria/corese/core/extension/Extension.java +++ b/src/main/java/fr/inria/corese/core/extension/Extension.java @@ -2,13 +2,13 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.compiler.eval.QuerySolverVisitor; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.ProcessVisitorDefault; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.ProcessVisitorDefault; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.Service; import fr.inria.corese.core.logic.Distance; diff --git a/src/main/java/fr/inria/corese/core/extension/JavaCompiler.java b/src/main/java/fr/inria/corese/core/extension/JavaCompiler.java index fab923011..caedc975d 100644 --- a/src/main/java/fr/inria/corese/core/extension/JavaCompiler.java +++ b/src/main/java/fr/inria/corese/core/extension/JavaCompiler.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.extension; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/extension/Report.java b/src/main/java/fr/inria/corese/core/extension/Report.java index 63e248cc7..d2f3e95a2 100644 --- a/src/main/java/fr/inria/corese/core/extension/Report.java +++ b/src/main/java/fr/inria/corese/core/extension/Report.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.extension; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/extension/core/Core.java b/src/main/java/fr/inria/corese/core/extension/core/Core.java index e3fadc26d..5a26777f7 100644 --- a/src/main/java/fr/inria/corese/core/extension/core/Core.java +++ b/src/main/java/fr/inria/corese/core/extension/core/Core.java @@ -8,13 +8,13 @@ import fr.inria.corese.core.sparql.triple.parser.NSManager; import fr.inria.corese.core.sparql.triple.function.core.FunctionEvaluator; import fr.inria.corese.core.compiler.parser.NodeImpl; -import fr.inria.corese.core.kgram.api.core.Loopable; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Loopable; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.Graph; import fr.inria.corese.core.producer.DataProducer; import fr.inria.corese.core.query.PluginTransform; diff --git a/src/main/java/fr/inria/corese/core/index/EdgeManager.java b/src/main/java/fr/inria/corese/core/index/EdgeManager.java index 440cde04f..112a11487 100644 --- a/src/main/java/fr/inria/corese/core/index/EdgeManager.java +++ b/src/main/java/fr/inria/corese/core/index/EdgeManager.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.index; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.*; diff --git a/src/main/java/fr/inria/corese/core/index/EdgeManagerIndexer.java b/src/main/java/fr/inria/corese/core/index/EdgeManagerIndexer.java index 1e0d8467b..5e363ead2 100644 --- a/src/main/java/fr/inria/corese/core/index/EdgeManagerIndexer.java +++ b/src/main/java/fr/inria/corese/core/index/EdgeManagerIndexer.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.Index; import fr.inria.corese.core.Serializer; import fr.inria.corese.core.index.PredicateList.Cursor; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.tool.MetaIterator; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.tool.MetaIterator; import fr.inria.corese.core.sparql.triple.parser.AccessRight; import fr.inria.corese.core.util.Property; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/index/EdgeManagerIterate.java b/src/main/java/fr/inria/corese/core/index/EdgeManagerIterate.java index ba7318f26..501009308 100644 --- a/src/main/java/fr/inria/corese/core/index/EdgeManagerIterate.java +++ b/src/main/java/fr/inria/corese/core/index/EdgeManagerIterate.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.index; import fr.inria.corese.core.edge.EdgeGeneric; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; import java.util.Iterator; diff --git a/src/main/java/fr/inria/corese/core/index/NodeManager.java b/src/main/java/fr/inria/corese/core/index/NodeManager.java index 07fa8e62b..71fb5bcfc 100644 --- a/src/main/java/fr/inria/corese/core/index/NodeManager.java +++ b/src/main/java/fr/inria/corese/core/index/NodeManager.java @@ -7,7 +7,7 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype.NodeKind; /** diff --git a/src/main/java/fr/inria/corese/core/index/NodeManagerBasic.java b/src/main/java/fr/inria/corese/core/index/NodeManagerBasic.java index e96b8b283..079e978c0 100644 --- a/src/main/java/fr/inria/corese/core/index/NodeManagerBasic.java +++ b/src/main/java/fr/inria/corese/core/index/NodeManagerBasic.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/fr/inria/corese/core/index/PredicateList.java b/src/main/java/fr/inria/corese/core/index/PredicateList.java index 56f3f4fcc..63c093690 100644 --- a/src/main/java/fr/inria/corese/core/index/PredicateList.java +++ b/src/main/java/fr/inria/corese/core/index/PredicateList.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * List of predicates of a given Node in NodeManager diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/DQPFactory.java b/src/main/java/fr/inria/corese/core/kgram/api/query/DQPFactory.java deleted file mode 100644 index 1f807f461..000000000 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/DQPFactory.java +++ /dev/null @@ -1,12 +0,0 @@ -package fr.inria.corese.core.kgram.api.query; - -import fr.inria.corese.core.kgram.core.BgpGenerator; - -/** - * @author corby - */ -public interface DQPFactory { - - BgpGenerator instance(); - -} diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/Provider.java b/src/main/java/fr/inria/corese/core/kgram/api/query/Provider.java deleted file mode 100644 index 200f60506..000000000 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/Provider.java +++ /dev/null @@ -1,21 +0,0 @@ -package fr.inria.corese.core.kgram.api.query; - -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.SparqlException; - -/** - * Service Provider - * - * @author Olivier Corby, Edelweiss, INRIA 2011 - */ -public interface Provider { - - default Mappings service(Node serv, Exp exp, Mappings map, Eval eval) - throws SparqlException { - return null; - } - -} diff --git a/src/main/java/fr/inria/corese/core/load/AddTripleHelper.java b/src/main/java/fr/inria/corese/core/load/AddTripleHelper.java index a450b646a..c415d1a96 100644 --- a/src/main/java/fr/inria/corese/core/load/AddTripleHelper.java +++ b/src/main/java/fr/inria/corese/core/load/AddTripleHelper.java @@ -6,8 +6,8 @@ import org.semarglproject.vocab.core.RDF; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.triple.parser.NSManager; import fr.inria.corese.core.util.Property; import fr.inria.corese.core.util.Property.Value; diff --git a/src/main/java/fr/inria/corese/core/load/AddTripleHelperDataManager.java b/src/main/java/fr/inria/corese/core/load/AddTripleHelperDataManager.java index b8a446624..c1168c440 100644 --- a/src/main/java/fr/inria/corese/core/load/AddTripleHelperDataManager.java +++ b/src/main/java/fr/inria/corese/core/load/AddTripleHelperDataManager.java @@ -3,8 +3,8 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/load/ILoadSerialization.java b/src/main/java/fr/inria/corese/core/load/ILoadSerialization.java index 126b63199..0e23c17b9 100644 --- a/src/main/java/fr/inria/corese/core/load/ILoadSerialization.java +++ b/src/main/java/fr/inria/corese/core/load/ILoadSerialization.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.load; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Interface that needs to be implemented when loading serialization(mainly diff --git a/src/main/java/fr/inria/corese/core/load/Load.java b/src/main/java/fr/inria/corese/core/load/Load.java index 86f4ffcd0..c73cb02e2 100644 --- a/src/main/java/fr/inria/corese/core/load/Load.java +++ b/src/main/java/fr/inria/corese/core/load/Load.java @@ -30,8 +30,8 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.Loader; import fr.inria.corese.core.api.Log; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.load.jsonld.CoreseJsonTripleCallback; import fr.inria.corese.core.load.jsonld.JsonldLoader; import fr.inria.corese.core.load.rdfa.CoreseRDFaTripleSink; diff --git a/src/main/java/fr/inria/corese/core/load/QueryLoad.java b/src/main/java/fr/inria/corese/core/load/QueryLoad.java index 78f4c2e9a..98585c256 100644 --- a/src/main/java/fr/inria/corese/core/load/QueryLoad.java +++ b/src/main/java/fr/inria/corese/core/load/QueryLoad.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.load; import fr.inria.corese.core.compiler.parser.Pragma; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.query.QueryEngine; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/load/RdfxmlTripleCreator.java b/src/main/java/fr/inria/corese/core/load/RdfxmlTripleCreator.java index 510618ea1..7bb501686 100644 --- a/src/main/java/fr/inria/corese/core/load/RdfxmlTripleCreator.java +++ b/src/main/java/fr/inria/corese/core/load/RdfxmlTripleCreator.java @@ -9,8 +9,8 @@ import fr.com.hp.hpl.jena.rdf.arp.AResource; import fr.com.hp.hpl.jena.rdf.arp.StatementHandler; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.util.Property; import fr.inria.corese.core.util.Property.Value; diff --git a/src/main/java/fr/inria/corese/core/load/Service.java b/src/main/java/fr/inria/corese/core/load/Service.java index 3296bd678..256728d09 100644 --- a/src/main/java/fr/inria/corese/core/load/Service.java +++ b/src/main/java/fr/inria/corese/core/load/Service.java @@ -2,9 +2,9 @@ import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Metadata; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.Graph; import fr.inria.corese.core.print.ResultFormat; import static fr.inria.corese.core.print.ResultFormat.RDF_XML; @@ -24,7 +24,6 @@ import fr.inria.corese.core.sparql.triple.parser.context.ContextLog; import java.io.InputStream; -import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.Date; diff --git a/src/main/java/fr/inria/corese/core/load/ServiceParser.java b/src/main/java/fr/inria/corese/core/load/ServiceParser.java index eb790face..e5f948c48 100644 --- a/src/main/java/fr/inria/corese/core/load/ServiceParser.java +++ b/src/main/java/fr/inria/corese/core/load/ServiceParser.java @@ -6,8 +6,8 @@ import fr.inria.corese.core.load.result.SPARQLResult; import fr.inria.corese.core.print.ResultFormat; import fr.inria.corese.core.query.QueryProcess; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/load/ServiceReport.java b/src/main/java/fr/inria/corese/core/load/ServiceReport.java index 1fdb099e6..affe078ae 100644 --- a/src/main/java/fr/inria/corese/core/load/ServiceReport.java +++ b/src/main/java/fr/inria/corese/core/load/ServiceReport.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.compiler.parser.NodeImpl; import fr.inria.corese.core.util.Property; import static fr.inria.corese.core.util.Property.Value.SERVICE_REPORT; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/load/TripleCreatorBase.java b/src/main/java/fr/inria/corese/core/load/TripleCreatorBase.java index 2896151bc..6f71d6930 100644 --- a/src/main/java/fr/inria/corese/core/load/TripleCreatorBase.java +++ b/src/main/java/fr/inria/corese/core/load/TripleCreatorBase.java @@ -8,8 +8,8 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/load/TurtleSparqlTripleCreator.java b/src/main/java/fr/inria/corese/core/load/TurtleSparqlTripleCreator.java index 2e3aae10a..428918cae 100644 --- a/src/main/java/fr/inria/corese/core/load/TurtleSparqlTripleCreator.java +++ b/src/main/java/fr/inria/corese/core/load/TurtleSparqlTripleCreator.java @@ -6,8 +6,8 @@ import java.util.Stack; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.triple.api.Creator; import fr.inria.corese.core.sparql.triple.parser.Atom; import fr.inria.corese.core.sparql.triple.parser.Constant; diff --git a/src/main/java/fr/inria/corese/core/load/jsonld/CoreseJsonTripleCallback.java b/src/main/java/fr/inria/corese/core/load/jsonld/CoreseJsonTripleCallback.java index 409eee088..080f418dd 100644 --- a/src/main/java/fr/inria/corese/core/load/jsonld/CoreseJsonTripleCallback.java +++ b/src/main/java/fr/inria/corese/core/load/jsonld/CoreseJsonTripleCallback.java @@ -6,7 +6,7 @@ import com.github.jsonldjava.core.RDFDataset; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.load.AddTripleHelper; import fr.inria.corese.core.load.AddTripleHelperDataManager; import fr.inria.corese.core.load.ILoadSerialization; diff --git a/src/main/java/fr/inria/corese/core/load/rdfa/CoreseRDFaTripleSink.java b/src/main/java/fr/inria/corese/core/load/rdfa/CoreseRDFaTripleSink.java index c36a290f3..6be3937d7 100644 --- a/src/main/java/fr/inria/corese/core/load/rdfa/CoreseRDFaTripleSink.java +++ b/src/main/java/fr/inria/corese/core/load/rdfa/CoreseRDFaTripleSink.java @@ -4,7 +4,7 @@ import org.semarglproject.sink.TripleSink; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.load.AddTripleHelper; import fr.inria.corese.core.load.AddTripleHelperDataManager; import fr.inria.corese.core.load.ILoadSerialization; diff --git a/src/main/java/fr/inria/corese/core/load/result/SPARQLJSONResult.java b/src/main/java/fr/inria/corese/core/load/result/SPARQLJSONResult.java index d1778f11c..de89dca4f 100644 --- a/src/main/java/fr/inria/corese/core/load/result/SPARQLJSONResult.java +++ b/src/main/java/fr/inria/corese/core/load/result/SPARQLJSONResult.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.NodeImpl; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import java.io.IOException; diff --git a/src/main/java/fr/inria/corese/core/load/result/SPARQLRDFResult.java b/src/main/java/fr/inria/corese/core/load/result/SPARQLRDFResult.java index 81317ef4a..5dcfabc0b 100644 --- a/src/main/java/fr/inria/corese/core/load/result/SPARQLRDFResult.java +++ b/src/main/java/fr/inria/corese/core/load/result/SPARQLRDFResult.java @@ -6,9 +6,9 @@ import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.query.QueryProcess; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.exceptions.EngineException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/load/result/SPARQLResult.java b/src/main/java/fr/inria/corese/core/load/result/SPARQLResult.java index 3835a513e..4114717a0 100644 --- a/src/main/java/fr/inria/corese/core/load/result/SPARQLResult.java +++ b/src/main/java/fr/inria/corese/core/load/result/SPARQLResult.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.EdgeFactory; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; public class SPARQLResult extends XMLResult { diff --git a/src/main/java/fr/inria/corese/core/load/result/SPARQLResultParser.java b/src/main/java/fr/inria/corese/core/load/result/SPARQLResultParser.java index 46e61d9aa..0a6ae81ea 100644 --- a/src/main/java/fr/inria/corese/core/load/result/SPARQLResultParser.java +++ b/src/main/java/fr/inria/corese/core/load/result/SPARQLResultParser.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.api.Loader; import fr.inria.corese.core.load.LoadFormat; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.triple.parser.NSManager; import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; diff --git a/src/main/java/fr/inria/corese/core/load/result/XMLResult.java b/src/main/java/fr/inria/corese/core/load/result/XMLResult.java index 78185c9fc..6b171a20f 100644 --- a/src/main/java/fr/inria/corese/core/load/result/XMLResult.java +++ b/src/main/java/fr/inria/corese/core/load/result/XMLResult.java @@ -6,7 +6,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -30,11 +29,11 @@ import fr.inria.corese.core.compiler.eval.QuerySolver; import fr.inria.corese.core.compiler.parser.CompilerFacKgram; import fr.inria.corese.core.NodeImpl; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.exceptions.EngineException; import java.io.BufferedReader; import java.io.Reader; diff --git a/src/main/java/fr/inria/corese/core/logic/BrokerDistance.java b/src/main/java/fr/inria/corese/core/logic/BrokerDistance.java index b1aa95aef..043a062f0 100644 --- a/src/main/java/fr/inria/corese/core/logic/BrokerDistance.java +++ b/src/main/java/fr/inria/corese/core/logic/BrokerDistance.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.logic; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.List; /** diff --git a/src/main/java/fr/inria/corese/core/logic/BrokerDistanceDataManager.java b/src/main/java/fr/inria/corese/core/logic/BrokerDistanceDataManager.java index d63bb258d..df7bcbce2 100644 --- a/src/main/java/fr/inria/corese/core/logic/BrokerDistanceDataManager.java +++ b/src/main/java/fr/inria/corese/core/logic/BrokerDistanceDataManager.java @@ -6,9 +6,9 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/logic/Closure.java b/src/main/java/fr/inria/corese/core/logic/Closure.java index ecbb982a2..3ea18ce9f 100644 --- a/src/main/java/fr/inria/corese/core/logic/Closure.java +++ b/src/main/java/fr/inria/corese/core/logic/Closure.java @@ -1,13 +1,13 @@ package fr.inria.corese.core.logic; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Distinct; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Distinct; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.Graph; import fr.inria.corese.core.util.Property; import static fr.inria.corese.core.util.Property.Value.RULE_DATAMANAGER_FILTER_INDEX; import java.util.ArrayList; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; import java.util.List; /** diff --git a/src/main/java/fr/inria/corese/core/logic/ClosureDataManager.java b/src/main/java/fr/inria/corese/core/logic/ClosureDataManager.java index 340cb1b7a..884f00a95 100644 --- a/src/main/java/fr/inria/corese/core/logic/ClosureDataManager.java +++ b/src/main/java/fr/inria/corese/core/logic/ClosureDataManager.java @@ -2,10 +2,10 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Distinct; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Distinct; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/logic/Distance.java b/src/main/java/fr/inria/corese/core/logic/Distance.java index 41152c064..03fcc40fb 100644 --- a/src/main/java/fr/inria/corese/core/logic/Distance.java +++ b/src/main/java/fr/inria/corese/core/logic/Distance.java @@ -9,7 +9,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Semantic distance & similarity with Corese 2.4 Algorithm Extended to property diff --git a/src/main/java/fr/inria/corese/core/logic/Entailment.java b/src/main/java/fr/inria/corese/core/logic/Entailment.java index 0978f0856..9ad616357 100755 --- a/src/main/java/fr/inria/corese/core/logic/Entailment.java +++ b/src/main/java/fr/inria/corese/core/logic/Entailment.java @@ -10,9 +10,9 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.Engine; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseEdgeAdapter.java b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseEdgeAdapter.java index 301ebfb3e..ca001ca7f 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseEdgeAdapter.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseEdgeAdapter.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.next.impl.temp; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; /** * Interface that defines a wrapper for classes that represent Corese edges. diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseIRI.java b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseIRI.java index 1ef7445d1..f86514ffb 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseIRI.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseIRI.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.next.impl.temp; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.base.model.AbstractIRI; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseModel.java b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseModel.java index def34c0e7..2f78f2d03 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseModel.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseModel.java @@ -11,8 +11,8 @@ import fr.inria.corese.core.EdgeFactory; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.Model; import fr.inria.corese.core.next.api.Namespace; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseNodeAdapter.java b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseNodeAdapter.java index cafd4494a..87c978f21 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseNodeAdapter.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseNodeAdapter.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.next.impl.temp; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Wrapper for objects that are represented as Node in Corese code, e.g. IRI, Literal, etc. diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseStatement.java b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseStatement.java index 14752290b..5c3acdea9 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseStatement.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseStatement.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.next.impl.temp; import fr.inria.corese.core.edge.EdgeImpl; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.Resource; import fr.inria.corese.core.next.api.Value; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseValueConverter.java b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseValueConverter.java index 9d6ff57a1..47c4ed478 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseValueConverter.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseValueConverter.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.next.impl.temp; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.next.api.BNode; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.Literal; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/AbstractCoreseNumber.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/AbstractCoreseNumber.java index 924daf2a4..1af59edde 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/AbstractCoreseNumber.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/AbstractCoreseNumber.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.next.impl.temp.literal; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.base.model.literal.AbstractNumber; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBNode.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBNode.java index bd0cc8f99..db3d90918 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBNode.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBNode.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.next.impl.temp.literal; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.next.api.base.model.AbstractBNode; import fr.inria.corese.core.next.impl.exception.IncorrectOperationException; import fr.inria.corese.core.next.impl.temp.CoreseNodeAdapter; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBoolean.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBoolean.java index bd36570e8..1248eb8f0 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBoolean.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBoolean.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.next.impl.temp.literal; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.next.api.base.model.literal.AbstractLiteral; import fr.inria.corese.core.next.api.literal.CoreDatatype; import fr.inria.corese.core.next.impl.common.literal.XSD; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDate.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDate.java index 85a221e0d..93bd496c2 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDate.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDate.java @@ -9,7 +9,7 @@ import javax.xml.datatype.XMLGregorianCalendar; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.base.model.literal.AbstractTemporalPointLiteral; import fr.inria.corese.core.next.api.literal.CoreDatatype; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDatetime.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDatetime.java index b833e44d9..2d13fbf37 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDatetime.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDatetime.java @@ -7,7 +7,7 @@ import javax.xml.datatype.XMLGregorianCalendar; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.base.model.literal.AbstractTemporalPointLiteral; import fr.inria.corese.core.next.api.literal.CoreDatatype; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDuration.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDuration.java index 662a6be44..4d641bf22 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDuration.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDuration.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.next.impl.temp.literal; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.literal.CoreDatatype; import fr.inria.corese.core.next.impl.common.literal.XSD; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseLanguageTaggedStringLiteral.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseLanguageTaggedStringLiteral.java index a1ac7f753..f7c94c7ea 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseLanguageTaggedStringLiteral.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseLanguageTaggedStringLiteral.java @@ -2,7 +2,7 @@ import java.util.Optional; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.base.model.literal.AbstractStringLiteral; import fr.inria.corese.core.next.api.literal.CoreDatatype; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseTyped.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseTyped.java index d3408b855..8028af424 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseTyped.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseTyped.java @@ -2,7 +2,7 @@ import java.util.Objects; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.base.model.literal.AbstractStringLiteral; import fr.inria.corese.core.next.api.literal.CoreDatatype; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/DatatypeValue.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/DatatypeValue.java similarity index 92% rename from src/main/java/fr/inria/corese/core/kgram/api/core/DatatypeValue.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/DatatypeValue.java index 205ff7128..0c75f3f40 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/DatatypeValue.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/DatatypeValue.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; import java.math.BigDecimal; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/DatatypeValueFactory.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/DatatypeValueFactory.java similarity index 78% rename from src/main/java/fr/inria/corese/core/kgram/api/core/DatatypeValueFactory.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/DatatypeValueFactory.java index 81523e844..b7757eec5 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/DatatypeValueFactory.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/DatatypeValueFactory.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/Edge.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Edge.java similarity index 99% rename from src/main/java/fr/inria/corese/core/kgram/api/core/Edge.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/Edge.java index 0313cd4c0..c42ebbba7 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/Edge.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Edge.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/ExpPattern.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExpPattern.java similarity index 76% rename from src/main/java/fr/inria/corese/core/kgram/api/core/ExpPattern.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/ExpPattern.java index f1a729a58..e5ae878b1 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/ExpPattern.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExpPattern.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/ExpType.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExpType.java similarity index 97% rename from src/main/java/fr/inria/corese/core/kgram/api/core/ExpType.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/ExpType.java index 649b62081..13e8644c6 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/ExpType.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExpType.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; /** * Types of expression of KGRAM query language diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/Expr.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Expr.java similarity index 92% rename from src/main/java/fr/inria/corese/core/kgram/api/core/Expr.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/Expr.java index 872d3d164..2da4d31a5 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/Expr.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Expr.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/ExprLabel.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExprLabel.java similarity index 89% rename from src/main/java/fr/inria/corese/core/kgram/api/core/ExprLabel.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/ExprLabel.java index 7568bb391..fd2b5c240 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/ExprLabel.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExprLabel.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; /** * @author corby diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/ExprType.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExprType.java similarity index 99% rename from src/main/java/fr/inria/corese/core/kgram/api/core/ExprType.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/ExprType.java index 7070d3af6..41434a652 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/ExprType.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExprType.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; public interface ExprType { diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/Filter.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Filter.java similarity index 95% rename from src/main/java/fr/inria/corese/core/kgram/api/core/Filter.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/Filter.java index 032d46d77..5226a3f79 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/Filter.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Filter.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; import fr.inria.corese.core.sparql.triple.parser.Expression; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/Graph.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Graph.java similarity index 82% rename from src/main/java/fr/inria/corese/core/kgram/api/core/Graph.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/Graph.java index b10007954..93032402c 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/Graph.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Graph.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; /** * diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/Loopable.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Loopable.java similarity index 73% rename from src/main/java/fr/inria/corese/core/kgram/api/core/Loopable.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/Loopable.java index dc1ab7ff9..31ee69731 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/Loopable.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Loopable.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; /** * Interface for (var in exp) {} diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/Node.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Node.java similarity index 93% rename from src/main/java/fr/inria/corese/core/kgram/api/core/Node.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/Node.java index 97febf9ef..af5b12b0d 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/Node.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Node.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; -import fr.inria.corese.core.kgram.path.Path; +import fr.inria.corese.core.next.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.api.IDatatype.NodeKind; -import static fr.inria.corese.core.kgram.api.core.PointerType.NODE; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.NODE; /** * Interface of Node provided by graph implementation diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/PointerType.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/PointerType.java similarity index 85% rename from src/main/java/fr/inria/corese/core/kgram/api/core/PointerType.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/PointerType.java index 8c81365e9..a399bdaf5 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/PointerType.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/PointerType.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; -import static fr.inria.corese.core.kgram.api.core.ExpType.DT; +import static fr.inria.corese.core.next.kgram.api.core.ExpType.DT; /** * Pointer type for object that can be object of CoresePointer diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/Pointerable.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Pointerable.java similarity index 80% rename from src/main/java/fr/inria/corese/core/kgram/api/core/Pointerable.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/Pointerable.java index 64a66ce3e..4dc950623 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/Pointerable.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Pointerable.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.path.Path; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.path.Path; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/Regex.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Regex.java similarity index 96% rename from src/main/java/fr/inria/corese/core/kgram/api/core/Regex.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/Regex.java index 0df0cae70..4613bf74e 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/Regex.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/Regex.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/core/TripleStore.java b/src/main/java/fr/inria/corese/core/next/kgram/api/core/TripleStore.java similarity index 80% rename from src/main/java/fr/inria/corese/core/kgram/api/core/TripleStore.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/core/TripleStore.java index a7f5ec686..7ff5d870c 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/core/TripleStore.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/core/TripleStore.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.core; +package fr.inria.corese.core.next.kgram.api.core; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/AST.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/AST.java similarity index 89% rename from src/main/java/fr/inria/corese/core/kgram/api/query/AST.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/query/AST.java index 47ea19376..c9abdef3b 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/AST.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/AST.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.query; +package fr.inria.corese.core.next.kgram.api.query; /** * Olivier Corby - Wimmics INRIA I3S - 2020 diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/ASTQ.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/ASTQ.java similarity index 66% rename from src/main/java/fr/inria/corese/core/kgram/api/query/ASTQ.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/query/ASTQ.java index 65caa214e..b57e50c84 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/ASTQ.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/ASTQ.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.query; +package fr.inria.corese.core.next.kgram.api.query; /** * Olivier Corby - Wimmics INRIA I3S - 2020 diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/Binder.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Binder.java similarity index 71% rename from src/main/java/fr/inria/corese/core/kgram/api/query/Binder.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/query/Binder.java index 224b532de..c230e98f0 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/Binder.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Binder.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.kgram.api.query; +package fr.inria.corese.core.next.kgram.api.query; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/DQPFactory.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/DQPFactory.java new file mode 100644 index 000000000..3d3ba805c --- /dev/null +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/DQPFactory.java @@ -0,0 +1,12 @@ +package fr.inria.corese.core.next.kgram.api.query; + +import fr.inria.corese.core.next.kgram.core.BgpGenerator; + +/** + * @author corby + */ +public interface DQPFactory { + + BgpGenerator instance(); + +} diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/Environment.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Environment.java similarity index 85% rename from src/main/java/fr/inria/corese/core/kgram/api/query/Environment.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/query/Environment.java index af9339207..27f1de42e 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/Environment.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Environment.java @@ -1,12 +1,12 @@ -package fr.inria.corese.core.kgram.api.query; - -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.*; -import fr.inria.corese.core.kgram.event.EventManager; -import fr.inria.corese.core.kgram.path.Path; -import fr.inria.corese.core.kgram.tool.ApproximateSearchEnv; +package fr.inria.corese.core.next.kgram.api.query; + +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.*; +import fr.inria.corese.core.next.kgram.event.EventManager; +import fr.inria.corese.core.next.kgram.path.Path; +import fr.inria.corese.core.next.kgram.tool.ApproximateSearchEnv; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.parser.ASTExtension; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/Evaluator.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Evaluator.java similarity index 80% rename from src/main/java/fr/inria/corese/core/kgram/api/query/Evaluator.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/query/Evaluator.java index cb9d22ac0..faa818f65 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/Evaluator.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Evaluator.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.kgram.api.query; +package fr.inria.corese.core.next.kgram.api.query; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.event.ResultListener; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.event.ResultListener; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/Graphable.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Graphable.java similarity index 76% rename from src/main/java/fr/inria/corese/core/kgram/api/query/Graphable.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/query/Graphable.java index a261b4dd2..dd666cd29 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/Graphable.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Graphable.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.query; +package fr.inria.corese.core.next.kgram.api.query; /** * Olivier Corby - Wimmics INRIA I3S - 2014 diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/Hierarchy.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Hierarchy.java similarity index 83% rename from src/main/java/fr/inria/corese/core/kgram/api/query/Hierarchy.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/query/Hierarchy.java index 067a12d56..643be80c0 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/Hierarchy.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Hierarchy.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.api.query; +package fr.inria.corese.core.next.kgram.api.query; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/Matcher.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Matcher.java similarity index 92% rename from src/main/java/fr/inria/corese/core/kgram/api/query/Matcher.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/query/Matcher.java index 875d9dad7..a1c637315 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/Matcher.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Matcher.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.kgram.api.query; +package fr.inria.corese.core.next.kgram.api.query; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Interface for the Matcher that checks conformity of candidate edges and nodes diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/Plugin.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Plugin.java similarity index 70% rename from src/main/java/fr/inria/corese/core/kgram/api/query/Plugin.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/query/Plugin.java index 41fe29d0b..09f47a3f3 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/Plugin.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Plugin.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.kgram.api.query; +package fr.inria.corese.core.next.kgram.api.query; -import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Exp; /** * Draft KGRAM Plugin for EXTERN expression. diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/ProcessVisitor.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/ProcessVisitor.java similarity index 94% rename from src/main/java/fr/inria/corese/core/kgram/api/query/ProcessVisitor.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/query/ProcessVisitor.java index e7acb161a..3585e5a2f 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/ProcessVisitor.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/ProcessVisitor.java @@ -1,11 +1,11 @@ -package fr.inria.corese.core.kgram.api.query; - -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.Pointerable; -import fr.inria.corese.core.kgram.core.*; -import fr.inria.corese.core.kgram.path.Path; +package fr.inria.corese.core.next.kgram.api.query; + +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Pointerable; +import fr.inria.corese.core.next.kgram.core.*; +import fr.inria.corese.core.next.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/Producer.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Producer.java similarity index 96% rename from src/main/java/fr/inria/corese/core/kgram/api/query/Producer.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/query/Producer.java index a15d0fea7..3c1825731 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/Producer.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Producer.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.kgram.api.query; +package fr.inria.corese.core.next.kgram.api.query; -import fr.inria.corese.core.kgram.api.core.*; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.core.SparqlException; +import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.SparqlException; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Provider.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Provider.java new file mode 100644 index 000000000..d039b561f --- /dev/null +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Provider.java @@ -0,0 +1,21 @@ +package fr.inria.corese.core.next.kgram.api.query; + +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.SparqlException; + +/** + * Service Provider + * + * @author Olivier Corby, Edelweiss, INRIA 2011 + */ +public interface Provider { + + default Mappings service(Node serv, Exp exp, Mappings map, Eval eval) + throws SparqlException { + return null; + } + +} diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/Result.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Result.java similarity index 62% rename from src/main/java/fr/inria/corese/core/kgram/api/query/Result.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/query/Result.java index b05513cb3..458bbd934 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/Result.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Result.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.kgram.api.query; +package fr.inria.corese.core.next.kgram.api.query; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Interface to KGRAM elementary result (a mapping) diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/Results.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Results.java similarity index 65% rename from src/main/java/fr/inria/corese/core/kgram/api/query/Results.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/query/Results.java index a4ab26d0f..8371e334d 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/Results.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Results.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.kgram.api.query; +package fr.inria.corese.core.next.kgram.api.query; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/SPARQLEngine.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/SPARQLEngine.java similarity index 58% rename from src/main/java/fr/inria/corese/core/kgram/api/query/SPARQLEngine.java rename to src/main/java/fr/inria/corese/core/next/kgram/api/query/SPARQLEngine.java index e8ab956d6..b346cc474 100644 --- a/src/main/java/fr/inria/corese/core/kgram/api/query/SPARQLEngine.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/api/query/SPARQLEngine.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.kgram.api.query; +package fr.inria.corese.core.next.kgram.api.query; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.core.SparqlException; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.SparqlException; /** * @author corby diff --git a/src/main/java/fr/inria/corese/core/kgram/core/BgpGenerator.java b/src/main/java/fr/inria/corese/core/next/kgram/core/BgpGenerator.java similarity index 69% rename from src/main/java/fr/inria/corese/core/kgram/core/BgpGenerator.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/BgpGenerator.java index cb5b9fb11..45ff8b5c6 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/BgpGenerator.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/BgpGenerator.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Filter; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Filter; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Producer; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/Checker.java b/src/main/java/fr/inria/corese/core/next/kgram/core/Checker.java similarity index 89% rename from src/main/java/fr/inria/corese/core/kgram/core/Checker.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/Checker.java index fef82fcdb..9b2a2c228 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/Checker.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/Checker.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Matcher; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Matcher; +import fr.inria.corese.core.next.kgram.api.query.Producer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/CompleteSPARQL.java b/src/main/java/fr/inria/corese/core/next/kgram/core/CompleteSPARQL.java similarity index 95% rename from src/main/java/fr/inria/corese/core/kgram/core/CompleteSPARQL.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/CompleteSPARQL.java index 428117f03..ccb3a7078 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/CompleteSPARQL.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/CompleteSPARQL.java @@ -3,11 +3,11 @@ * and open the template in the editor. */ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Filter; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.Filter; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.IDatatype; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/Distinct.java b/src/main/java/fr/inria/corese/core/next/kgram/core/Distinct.java similarity index 93% rename from src/main/java/fr/inria/corese/core/kgram/core/Distinct.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/Distinct.java index 51aa7387e..b7fa7191c 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/Distinct.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/Distinct.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/Eval.java b/src/main/java/fr/inria/corese/core/next/kgram/core/Eval.java similarity index 99% rename from src/main/java/fr/inria/corese/core/kgram/core/Eval.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/Eval.java index 1e4b84403..7c19d8125 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/Eval.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/Eval.java @@ -1,11 +1,11 @@ -package fr.inria.corese.core.kgram.core; - -import fr.inria.corese.core.kgram.api.core.*; -import fr.inria.corese.core.kgram.api.query.*; -import fr.inria.corese.core.kgram.event.*; -import fr.inria.corese.core.kgram.path.PathFinder; -import fr.inria.corese.core.kgram.tool.Message; -import fr.inria.corese.core.kgram.tool.ResultsImpl; +package fr.inria.corese.core.next.kgram.core; + +import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.api.query.*; +import fr.inria.corese.core.next.kgram.event.*; +import fr.inria.corese.core.next.kgram.path.PathFinder; +import fr.inria.corese.core.next.kgram.tool.Message; +import fr.inria.corese.core.next.kgram.tool.ResultsImpl; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.List; -import static fr.inria.corese.core.kgram.api.core.ExprType.UNNEST; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.UNNEST; /** * KGRAM Knowledge Graph Abstract Machine Compute graph homomorphism and diff --git a/src/main/java/fr/inria/corese/core/kgram/core/EvalGraph.java b/src/main/java/fr/inria/corese/core/next/kgram/core/EvalGraph.java similarity index 96% rename from src/main/java/fr/inria/corese/core/kgram/core/EvalGraph.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/EvalGraph.java index 80414cc68..bcd7e272c 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/EvalGraph.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/EvalGraph.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Matcher; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Matcher; +import fr.inria.corese.core.next.kgram.api.query.Producer; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/EvalJoin.java b/src/main/java/fr/inria/corese/core/next/kgram/core/EvalJoin.java similarity index 96% rename from src/main/java/fr/inria/corese/core/kgram/core/EvalJoin.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/EvalJoin.java index a7c91fded..a58460191 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/EvalJoin.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/EvalJoin.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Producer; -import static fr.inria.corese.core.kgram.core.Eval.STOP; +import static fr.inria.corese.core.next.kgram.core.Eval.STOP; /** * @author corby diff --git a/src/main/java/fr/inria/corese/core/kgram/core/EvalOptional.java b/src/main/java/fr/inria/corese/core/next/kgram/core/EvalOptional.java similarity index 95% rename from src/main/java/fr/inria/corese/core/kgram/core/EvalOptional.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/EvalOptional.java index 8ecd88a1d..b0df81d7f 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/EvalOptional.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/EvalOptional.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; -import static fr.inria.corese.core.kgram.core.Eval.STOP; +import static fr.inria.corese.core.next.kgram.core.Eval.STOP; /** * @author corby diff --git a/src/main/java/fr/inria/corese/core/kgram/core/EvalSPARQL.java b/src/main/java/fr/inria/corese/core/next/kgram/core/EvalSPARQL.java similarity index 97% rename from src/main/java/fr/inria/corese/core/kgram/core/EvalSPARQL.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/EvalSPARQL.java index 50852cdf1..c68828590 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/EvalSPARQL.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/EvalSPARQL.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/Exp.java b/src/main/java/fr/inria/corese/core/next/kgram/core/Exp.java similarity index 99% rename from src/main/java/fr/inria/corese/core/kgram/core/Exp.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/Exp.java index 2d44374a1..592b4d215 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/Exp.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/Exp.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.*; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.Expression; import java.util.ArrayList; @@ -9,7 +9,7 @@ import java.util.Iterator; import java.util.List; -import static fr.inria.corese.core.kgram.api.core.PointerType.STATEMENT; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.STATEMENT; /** * KGRAM/SPARQL expressions: bgp, union, optional, etc. diff --git a/src/main/java/fr/inria/corese/core/kgram/core/ExpEdge.java b/src/main/java/fr/inria/corese/core/next/kgram/core/ExpEdge.java similarity index 93% rename from src/main/java/fr/inria/corese/core/kgram/core/ExpEdge.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/ExpEdge.java index 3a09a5342..ee0d71a3a 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/ExpEdge.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/ExpEdge.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Filter; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Filter; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/ExpHandler.java b/src/main/java/fr/inria/corese/core/next/kgram/core/ExpHandler.java similarity index 98% rename from src/main/java/fr/inria/corese/core/kgram/core/ExpHandler.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/ExpHandler.java index e7c551a0a..f6c7f1f02 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/ExpHandler.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/ExpHandler.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/Group.java b/src/main/java/fr/inria/corese/core/next/kgram/core/Group.java similarity index 98% rename from src/main/java/fr/inria/corese/core/kgram/core/Group.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/Group.java index 207c7e2a1..f253a4a5a 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/Group.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/Group.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.*; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/IterableEntity.java b/src/main/java/fr/inria/corese/core/next/kgram/core/IterableEntity.java similarity index 82% rename from src/main/java/fr/inria/corese/core/kgram/core/IterableEntity.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/IterableEntity.java index 1e7b1e7b9..95e7c38e0 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/IterableEntity.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/IterableEntity.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.Iterator; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/Mapping.java b/src/main/java/fr/inria/corese/core/next/kgram/core/Mapping.java similarity index 98% rename from src/main/java/fr/inria/corese/core/kgram/core/Mapping.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/Mapping.java index c74f477f9..423e85ada 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/Mapping.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/Mapping.java @@ -1,12 +1,12 @@ -package fr.inria.corese.core.kgram.core; - -import fr.inria.corese.core.kgram.api.core.*; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.kgram.api.query.Result; -import fr.inria.corese.core.kgram.path.Path; -import fr.inria.corese.core.kgram.tool.ApproximateSearchEnv; -import fr.inria.corese.core.kgram.tool.EnvironmentImpl; +package fr.inria.corese.core.next.kgram.core; + +import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.next.kgram.api.query.Result; +import fr.inria.corese.core.next.kgram.path.Path; +import fr.inria.corese.core.next.kgram.tool.ApproximateSearchEnv; +import fr.inria.corese.core.next.kgram.tool.EnvironmentImpl; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.api.IDatatypeList; import fr.inria.corese.core.sparql.datatype.DatatypeMap; @@ -15,7 +15,7 @@ import java.util.*; -import static fr.inria.corese.core.kgram.api.core.PointerType.MAPPING; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.MAPPING; /** * An elementary result of a query or a subquery diff --git a/src/main/java/fr/inria/corese/core/kgram/core/MappingSet.java b/src/main/java/fr/inria/corese/core/next/kgram/core/MappingSet.java similarity index 99% rename from src/main/java/fr/inria/corese/core/kgram/core/MappingSet.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/MappingSet.java index e12018fbb..757e2dfc8 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/MappingSet.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/MappingSet.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/Mappings.java b/src/main/java/fr/inria/corese/core/next/kgram/core/Mappings.java similarity index 99% rename from src/main/java/fr/inria/corese/core/kgram/core/Mappings.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/Mappings.java index dd5dcb79c..e8ba14e00 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/Mappings.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/Mappings.java @@ -1,12 +1,12 @@ -package fr.inria.corese.core.kgram.core; - -import fr.inria.corese.core.kgram.api.core.*; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Evaluator; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.event.Event; -import fr.inria.corese.core.kgram.event.EventImpl; -import fr.inria.corese.core.kgram.event.EventManager; +package fr.inria.corese.core.next.kgram.core; + +import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Evaluator; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.event.Event; +import fr.inria.corese.core.next.kgram.event.EventImpl; +import fr.inria.corese.core.next.kgram.event.EventManager; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; @@ -18,7 +18,7 @@ import java.util.*; -import static fr.inria.corese.core.kgram.api.core.PointerType.MAPPINGS; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.MAPPINGS; /* * Manage list of Mapping, result of a query diff --git a/src/main/java/fr/inria/corese/core/kgram/core/Memory.java b/src/main/java/fr/inria/corese/core/next/kgram/core/Memory.java similarity index 98% rename from src/main/java/fr/inria/corese/core/kgram/core/Memory.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/Memory.java index da8e1f764..0b118f735 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/Memory.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/Memory.java @@ -1,12 +1,12 @@ -package fr.inria.corese.core.kgram.core; - -import fr.inria.corese.core.kgram.api.core.*; -import fr.inria.corese.core.kgram.api.query.*; -import fr.inria.corese.core.kgram.event.Event; -import fr.inria.corese.core.kgram.event.EventImpl; -import fr.inria.corese.core.kgram.event.EventManager; -import fr.inria.corese.core.kgram.path.Path; -import fr.inria.corese.core.kgram.tool.ApproximateSearchEnv; +package fr.inria.corese.core.next.kgram.core; + +import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.api.query.*; +import fr.inria.corese.core.next.kgram.event.Event; +import fr.inria.corese.core.next.kgram.event.EventImpl; +import fr.inria.corese.core.next.kgram.event.EventManager; +import fr.inria.corese.core.next.kgram.path.Path; +import fr.inria.corese.core.next.kgram.tool.ApproximateSearchEnv; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.parser.ASTExtension; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/Merge.java b/src/main/java/fr/inria/corese/core/next/kgram/core/Merge.java similarity index 98% rename from src/main/java/fr/inria/corese/core/kgram/core/Merge.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/Merge.java index 50b7698a9..b1514313f 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/Merge.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/Merge.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/PointerObject.java b/src/main/java/fr/inria/corese/core/next/kgram/core/PointerObject.java similarity index 66% rename from src/main/java/fr/inria/corese/core/kgram/core/PointerObject.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/PointerObject.java index 151061de9..7ba62c98a 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/PointerObject.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/PointerObject.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Pointerable; +import fr.inria.corese.core.next.kgram.api.core.Pointerable; /** * diff --git a/src/main/java/fr/inria/corese/core/kgram/core/ProcessVisitorDefault.java b/src/main/java/fr/inria/corese/core/next/kgram/core/ProcessVisitorDefault.java similarity index 93% rename from src/main/java/fr/inria/corese/core/kgram/core/ProcessVisitorDefault.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/ProcessVisitorDefault.java index 2a4605181..df51edd68 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/ProcessVisitorDefault.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/ProcessVisitorDefault.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Metadata; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/Query.java b/src/main/java/fr/inria/corese/core/next/kgram/core/Query.java similarity index 99% rename from src/main/java/fr/inria/corese/core/kgram/core/Query.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/Query.java index 8151a5e9e..f536aa586 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/Query.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/Query.java @@ -1,16 +1,16 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import fr.inria.corese.core.kgram.api.core.*; -import fr.inria.corese.core.kgram.api.query.DQPFactory; -import fr.inria.corese.core.kgram.api.query.Graphable; -import fr.inria.corese.core.kgram.api.query.Matcher; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.filter.Compile; -import fr.inria.corese.core.kgram.tool.Message; +import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.api.query.DQPFactory; +import fr.inria.corese.core.next.kgram.api.query.Graphable; +import fr.inria.corese.core.next.kgram.api.query.Matcher; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.filter.Compile; +import fr.inria.corese.core.next.kgram.tool.Message; import fr.inria.corese.core.sparql.triple.parser.ASTExtension; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Context; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/QuerySorter.java b/src/main/java/fr/inria/corese/core/next/kgram/core/QuerySorter.java similarity index 97% rename from src/main/java/fr/inria/corese/core/kgram/core/QuerySorter.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/QuerySorter.java index 08ec041df..4e925ff16 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/QuerySorter.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/QuerySorter.java @@ -1,12 +1,12 @@ -package fr.inria.corese.core.kgram.core; - -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Filter; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.filter.Compile; +package fr.inria.corese.core.next.kgram.core; + +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Filter; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.filter.Compile; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/core/Sorter.java b/src/main/java/fr/inria/corese/core/next/kgram/core/Sorter.java similarity index 97% rename from src/main/java/fr/inria/corese/core/kgram/core/Sorter.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/Sorter.java index 79c553533..d0bf0b91a 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/Sorter.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/Sorter.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Sort KGRAM edges in connected order before query process diff --git a/src/main/java/fr/inria/corese/core/kgram/core/SorterNew.java b/src/main/java/fr/inria/corese/core/next/kgram/core/SorterNew.java similarity index 85% rename from src/main/java/fr/inria/corese/core/kgram/core/SorterNew.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/SorterNew.java index 34b647c6e..bce21c7eb 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/SorterNew.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/SorterNew.java @@ -1,17 +1,17 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.sorter.core.IEstimate; -import fr.inria.corese.core.kgram.sorter.core.ISort; -import fr.inria.corese.core.kgram.sorter.core.QPGNode; -import fr.inria.corese.core.kgram.sorter.core.QPGraph; -import fr.inria.corese.core.kgram.sorter.impl.qpv1.DepthFirstBestSearch; -import fr.inria.corese.core.kgram.sorter.impl.qpv1.HeuristicsBasedEstimation; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.sorter.core.IEstimate; +import fr.inria.corese.core.next.kgram.sorter.core.ISort; +import fr.inria.corese.core.next.kgram.sorter.core.QPGNode; +import fr.inria.corese.core.next.kgram.sorter.core.QPGraph; +import fr.inria.corese.core.next.kgram.sorter.impl.qpv1.DepthFirstBestSearch; +import fr.inria.corese.core.next.kgram.sorter.impl.qpv1.HeuristicsBasedEstimation; import java.util.*; import java.util.Map.Entry; -import static fr.inria.corese.core.kgram.sorter.core.Const.plannable; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.plannable; /** * A new sorter for QP diff --git a/src/main/java/fr/inria/corese/core/kgram/core/SparqlException.java b/src/main/java/fr/inria/corese/core/next/kgram/core/SparqlException.java similarity index 94% rename from src/main/java/fr/inria/corese/core/kgram/core/SparqlException.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/SparqlException.java index eaa95116c..fd4d7fc6a 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/SparqlException.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/SparqlException.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; /** * diff --git a/src/main/java/fr/inria/corese/core/kgram/core/Stack.java b/src/main/java/fr/inria/corese/core/next/kgram/core/Stack.java similarity index 95% rename from src/main/java/fr/inria/corese/core/kgram/core/Stack.java rename to src/main/java/fr/inria/corese/core/next/kgram/core/Stack.java index 826efac36..a4232216e 100644 --- a/src/main/java/fr/inria/corese/core/kgram/core/Stack.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/core/Stack.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.kgram.core; +package fr.inria.corese.core.next.kgram.core; import java.util.ArrayList; -import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.core.ExpType; /** * diff --git a/src/main/java/fr/inria/corese/core/kgram/event/EvalListener.java b/src/main/java/fr/inria/corese/core/next/kgram/event/EvalListener.java similarity index 96% rename from src/main/java/fr/inria/corese/core/kgram/event/EvalListener.java rename to src/main/java/fr/inria/corese/core/next/kgram/event/EvalListener.java index 5783e2cb9..8640fbfa1 100644 --- a/src/main/java/fr/inria/corese/core/kgram/event/EvalListener.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/event/EvalListener.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.kgram.event; +package fr.inria.corese.core.next.kgram.event; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Exp; import java.util.Hashtable; diff --git a/src/main/java/fr/inria/corese/core/kgram/event/Event.java b/src/main/java/fr/inria/corese/core/next/kgram/event/Event.java similarity index 92% rename from src/main/java/fr/inria/corese/core/kgram/event/Event.java rename to src/main/java/fr/inria/corese/core/next/kgram/event/Event.java index ba619ba07..ab5246b0a 100644 --- a/src/main/java/fr/inria/corese/core/kgram/event/Event.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/event/Event.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.kgram.event; +package fr.inria.corese.core.next.kgram.event; -import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Exp; /** * Event to trace KGRAM execution diff --git a/src/main/java/fr/inria/corese/core/kgram/event/EventImpl.java b/src/main/java/fr/inria/corese/core/next/kgram/event/EventImpl.java similarity index 95% rename from src/main/java/fr/inria/corese/core/kgram/event/EventImpl.java rename to src/main/java/fr/inria/corese/core/next/kgram/event/EventImpl.java index 01f607e78..18721f2b3 100644 --- a/src/main/java/fr/inria/corese/core/kgram/event/EventImpl.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/event/EventImpl.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.kgram.event; +package fr.inria.corese.core.next.kgram.event; import java.util.Hashtable; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Stack; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Stack; /** diff --git a/src/main/java/fr/inria/corese/core/kgram/event/EventListener.java b/src/main/java/fr/inria/corese/core/next/kgram/event/EventListener.java similarity index 85% rename from src/main/java/fr/inria/corese/core/kgram/event/EventListener.java rename to src/main/java/fr/inria/corese/core/next/kgram/event/EventListener.java index 1accb2a7a..0ee6d2f09 100644 --- a/src/main/java/fr/inria/corese/core/kgram/event/EventListener.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/event/EventListener.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.event; +package fr.inria.corese.core.next.kgram.event; diff --git a/src/main/java/fr/inria/corese/core/kgram/event/EventManager.java b/src/main/java/fr/inria/corese/core/next/kgram/event/EventManager.java similarity index 97% rename from src/main/java/fr/inria/corese/core/kgram/event/EventManager.java rename to src/main/java/fr/inria/corese/core/next/kgram/event/EventManager.java index 7b6c4ce7c..6b23a9088 100644 --- a/src/main/java/fr/inria/corese/core/kgram/event/EventManager.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/event/EventManager.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.event; +package fr.inria.corese.core.next.kgram.event; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/event/ResultListener.java b/src/main/java/fr/inria/corese/core/next/kgram/event/ResultListener.java similarity index 67% rename from src/main/java/fr/inria/corese/core/kgram/event/ResultListener.java rename to src/main/java/fr/inria/corese/core/next/kgram/event/ResultListener.java index 52d24845b..6921d6dad 100644 --- a/src/main/java/fr/inria/corese/core/kgram/event/ResultListener.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/event/ResultListener.java @@ -1,11 +1,11 @@ -package fr.inria.corese.core.kgram.event; +package fr.inria.corese.core.next.kgram.event; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.Regex; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.path.Path; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.Regex; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.path.Path; /** * Result Listener to process KGRAM result on the fly diff --git a/src/main/java/fr/inria/corese/core/kgram/event/StatListener.java b/src/main/java/fr/inria/corese/core/next/kgram/event/StatListener.java similarity index 95% rename from src/main/java/fr/inria/corese/core/kgram/event/StatListener.java rename to src/main/java/fr/inria/corese/core/next/kgram/event/StatListener.java index 0e52b1f6b..f2b85b449 100644 --- a/src/main/java/fr/inria/corese/core/kgram/event/StatListener.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/event/StatListener.java @@ -1,11 +1,11 @@ -package fr.inria.corese.core.kgram.event; +package fr.inria.corese.core.next.kgram.event; import java.text.NumberFormat; import java.util.EnumMap; import java.util.Map; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.ExpType; /** * Event Listener to trace KGRAM execution with statistics diff --git a/src/main/java/fr/inria/corese/core/kgram/event/User.java b/src/main/java/fr/inria/corese/core/next/kgram/event/User.java similarity index 77% rename from src/main/java/fr/inria/corese/core/kgram/event/User.java rename to src/main/java/fr/inria/corese/core/next/kgram/event/User.java index 73184c10c..1faedabd4 100644 --- a/src/main/java/fr/inria/corese/core/kgram/event/User.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/event/User.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.event; +package fr.inria.corese.core.next.kgram.event; /** * Model user interaction with debugger diff --git a/src/main/java/fr/inria/corese/core/kgram/event/UserImpl.java b/src/main/java/fr/inria/corese/core/next/kgram/event/UserImpl.java similarity index 97% rename from src/main/java/fr/inria/corese/core/kgram/event/UserImpl.java rename to src/main/java/fr/inria/corese/core/next/kgram/event/UserImpl.java index 79d3daf56..aae7e6382 100644 --- a/src/main/java/fr/inria/corese/core/kgram/event/UserImpl.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/event/UserImpl.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.event; +package fr.inria.corese.core.next.kgram.event; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/fr/inria/corese/core/kgram/filter/Checker.java b/src/main/java/fr/inria/corese/core/next/kgram/filter/Checker.java similarity index 97% rename from src/main/java/fr/inria/corese/core/kgram/filter/Checker.java rename to src/main/java/fr/inria/corese/core/next/kgram/filter/Checker.java index dad930187..014bd5372 100644 --- a/src/main/java/fr/inria/corese/core/kgram/filter/Checker.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/filter/Checker.java @@ -1,12 +1,11 @@ -package fr.inria.corese.core.kgram.filter; +package fr.inria.corese.core.next.kgram.filter; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.tool.Message; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.core.Query; /** diff --git a/src/main/java/fr/inria/corese/core/kgram/filter/Compile.java b/src/main/java/fr/inria/corese/core/next/kgram/filter/Compile.java similarity index 97% rename from src/main/java/fr/inria/corese/core/kgram/filter/Compile.java rename to src/main/java/fr/inria/corese/core/next/kgram/filter/Compile.java index a4494c486..161a2e543 100644 --- a/src/main/java/fr/inria/corese/core/kgram/filter/Compile.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/filter/Compile.java @@ -1,11 +1,11 @@ -package fr.inria.corese.core.kgram.filter; +package fr.inria.corese.core.next.kgram.filter; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.kgram.api.core.*; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Query; /** * Filter Exp Compiler for Optimizations diff --git a/src/main/java/fr/inria/corese/core/kgram/filter/Extension.java b/src/main/java/fr/inria/corese/core/next/kgram/filter/Extension.java similarity index 82% rename from src/main/java/fr/inria/corese/core/kgram/filter/Extension.java rename to src/main/java/fr/inria/corese/core/next/kgram/filter/Extension.java index a67bb349a..608dcb3db 100644 --- a/src/main/java/fr/inria/corese/core/kgram/filter/Extension.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/filter/Extension.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.kgram.filter; +package fr.inria.corese.core.next.kgram.filter; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.query.Hierarchy; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.query.Hierarchy; import fr.inria.corese.core.sparql.api.IDatatype; /** diff --git a/src/main/java/fr/inria/corese/core/kgram/filter/MatchBind.java b/src/main/java/fr/inria/corese/core/next/kgram/filter/MatchBind.java similarity index 92% rename from src/main/java/fr/inria/corese/core/kgram/filter/MatchBind.java rename to src/main/java/fr/inria/corese/core/next/kgram/filter/MatchBind.java index 45b48d0b4..e6beb49a5 100644 --- a/src/main/java/fr/inria/corese/core/kgram/filter/MatchBind.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/filter/MatchBind.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.filter; +package fr.inria.corese.core.next.kgram.filter; import java.util.ArrayList; import java.util.Hashtable; @@ -7,7 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.Expr; diff --git a/src/main/java/fr/inria/corese/core/kgram/filter/Matcher.java b/src/main/java/fr/inria/corese/core/next/kgram/filter/Matcher.java similarity index 97% rename from src/main/java/fr/inria/corese/core/kgram/filter/Matcher.java rename to src/main/java/fr/inria/corese/core/next/kgram/filter/Matcher.java index 12101ab49..e6106a4ed 100644 --- a/src/main/java/fr/inria/corese/core/kgram/filter/Matcher.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/filter/Matcher.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.kgram.filter; +package fr.inria.corese.core.next.kgram.filter; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; /** diff --git a/src/main/java/fr/inria/corese/core/kgram/filter/Pattern.java b/src/main/java/fr/inria/corese/core/next/kgram/filter/Pattern.java similarity index 96% rename from src/main/java/fr/inria/corese/core/kgram/filter/Pattern.java rename to src/main/java/fr/inria/corese/core/next/kgram/filter/Pattern.java index 6dbf9a989..cce513492 100644 --- a/src/main/java/fr/inria/corese/core/kgram/filter/Pattern.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/filter/Pattern.java @@ -1,14 +1,14 @@ -package fr.inria.corese.core.kgram.filter; +package fr.inria.corese.core.next.kgram.filter; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Filter; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Filter; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Exp; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/kgram/path/Automaton.java b/src/main/java/fr/inria/corese/core/next/kgram/path/Automaton.java similarity index 98% rename from src/main/java/fr/inria/corese/core/kgram/path/Automaton.java rename to src/main/java/fr/inria/corese/core/next/kgram/path/Automaton.java index 459d745ec..0138e4c64 100644 --- a/src/main/java/fr/inria/corese/core/kgram/path/Automaton.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/path/Automaton.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.kgram.path; +package fr.inria.corese.core.next.kgram.path; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.kgram.api.core.Regex; +import fr.inria.corese.core.next.kgram.api.core.Regex; /** * Compile Reg Exp into NDFSA diff --git a/src/main/java/fr/inria/corese/core/kgram/path/Buffer.java b/src/main/java/fr/inria/corese/core/next/kgram/path/Buffer.java similarity index 91% rename from src/main/java/fr/inria/corese/core/kgram/path/Buffer.java rename to src/main/java/fr/inria/corese/core/next/kgram/path/Buffer.java index d9949a1e3..304063925 100644 --- a/src/main/java/fr/inria/corese/core/kgram/path/Buffer.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/path/Buffer.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.kgram.path; +package fr.inria.corese.core.next.kgram.path; import java.util.Iterator; -import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mapping; /** * Synchronized buffer to put/get path edges diff --git a/src/main/java/fr/inria/corese/core/kgram/path/GraphPath.java b/src/main/java/fr/inria/corese/core/next/kgram/path/GraphPath.java similarity index 81% rename from src/main/java/fr/inria/corese/core/kgram/path/GraphPath.java rename to src/main/java/fr/inria/corese/core/next/kgram/path/GraphPath.java index 18139418e..1ef0edcc6 100644 --- a/src/main/java/fr/inria/corese/core/kgram/path/GraphPath.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/path/GraphPath.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.kgram.path; +package fr.inria.corese.core.next.kgram.path; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; /** * Draft to compute path in the graph diff --git a/src/main/java/fr/inria/corese/core/kgram/path/Path.java b/src/main/java/fr/inria/corese/core/next/kgram/path/Path.java similarity index 91% rename from src/main/java/fr/inria/corese/core/kgram/path/Path.java rename to src/main/java/fr/inria/corese/core/next/kgram/path/Path.java index 1e1dbf571..1a2eb920f 100644 --- a/src/main/java/fr/inria/corese/core/kgram/path/Path.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/path/Path.java @@ -1,18 +1,18 @@ -package fr.inria.corese.core.kgram.path; +package fr.inria.corese.core.next.kgram.path; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.PointerType; -import static fr.inria.corese.core.kgram.api.core.PointerType.PATH; -import fr.inria.corese.core.kgram.api.core.Pointerable; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.tool.EdgeInv; -import fr.inria.corese.core.kgram.tool.ProducerDefault; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.PATH; +import fr.inria.corese.core.next.kgram.api.core.Pointerable; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.tool.EdgeInv; +import fr.inria.corese.core.next.kgram.tool.ProducerDefault; /** * diff --git a/src/main/java/fr/inria/corese/core/kgram/path/PathFinder.java b/src/main/java/fr/inria/corese/core/next/kgram/path/PathFinder.java similarity index 97% rename from src/main/java/fr/inria/corese/core/kgram/path/PathFinder.java rename to src/main/java/fr/inria/corese/core/next/kgram/path/PathFinder.java index 5d00dbf7b..14a04d807 100644 --- a/src/main/java/fr/inria/corese/core/kgram/path/PathFinder.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/path/PathFinder.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.path; +package fr.inria.corese.core.next.kgram.path; import java.util.ArrayList; import java.util.Hashtable; @@ -6,23 +6,23 @@ import java.util.List; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Filter; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.Regex; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Evaluator; -import fr.inria.corese.core.kgram.api.query.Matcher; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Memory; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.core.SparqlException; -import fr.inria.corese.core.kgram.event.EventManager; -import fr.inria.corese.core.kgram.event.ResultListener; -import fr.inria.corese.core.kgram.tool.EdgeInv; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Filter; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Regex; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Evaluator; +import fr.inria.corese.core.next.kgram.api.query.Matcher; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Memory; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.SparqlException; +import fr.inria.corese.core.next.kgram.event.EventManager; +import fr.inria.corese.core.next.kgram.event.ResultListener; +import fr.inria.corese.core.next.kgram.tool.EdgeInv; import java.util.HashMap; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/kgram/path/Record.java b/src/main/java/fr/inria/corese/core/next/kgram/path/Record.java similarity index 91% rename from src/main/java/fr/inria/corese/core/kgram/path/Record.java rename to src/main/java/fr/inria/corese/core/next/kgram/path/Record.java index a7df1a28d..1870bb0f9 100644 --- a/src/main/java/fr/inria/corese/core/kgram/path/Record.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/path/Record.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.kgram.path; +package fr.inria.corese.core.next.kgram.path; import java.util.ArrayList; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.Regex; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Regex; /** * Stack of Regex + Visit for loop check diff --git a/src/main/java/fr/inria/corese/core/kgram/path/Stack.java b/src/main/java/fr/inria/corese/core/next/kgram/path/Stack.java similarity index 95% rename from src/main/java/fr/inria/corese/core/kgram/path/Stack.java rename to src/main/java/fr/inria/corese/core/next/kgram/path/Stack.java index 160e23673..830bab979 100644 --- a/src/main/java/fr/inria/corese/core/kgram/path/Stack.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/path/Stack.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.path; +package fr.inria.corese.core.next.kgram.path; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/path/State.java b/src/main/java/fr/inria/corese/core/next/kgram/path/State.java similarity index 95% rename from src/main/java/fr/inria/corese/core/kgram/path/State.java rename to src/main/java/fr/inria/corese/core/next/kgram/path/State.java index 2089ec537..519dd5fbe 100644 --- a/src/main/java/fr/inria/corese/core/kgram/path/State.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/path/State.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.kgram.path; +package fr.inria.corese.core.next.kgram.path; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.kgram.api.core.Regex; +import fr.inria.corese.core.next.kgram.api.core.Regex; /** * Regex Automaton State diff --git a/src/main/java/fr/inria/corese/core/kgram/path/Step.java b/src/main/java/fr/inria/corese/core/next/kgram/path/Step.java similarity index 93% rename from src/main/java/fr/inria/corese/core/kgram/path/Step.java rename to src/main/java/fr/inria/corese/core/next/kgram/path/Step.java index 468c1a1fd..52f2be88b 100644 --- a/src/main/java/fr/inria/corese/core/kgram/path/Step.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/path/Step.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.kgram.path; +package fr.inria.corese.core.next.kgram.path; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.kgram.api.core.Regex; +import fr.inria.corese.core.next.kgram.api.core.Regex; /** * Regex Automaton Transition diff --git a/src/main/java/fr/inria/corese/core/kgram/path/Visit.java b/src/main/java/fr/inria/corese/core/next/kgram/path/Visit.java similarity index 98% rename from src/main/java/fr/inria/corese/core/kgram/path/Visit.java rename to src/main/java/fr/inria/corese/core/next/kgram/path/Visit.java index b5e8306c8..621087fcc 100644 --- a/src/main/java/fr/inria/corese/core/kgram/path/Visit.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/path/Visit.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.path; +package fr.inria.corese.core.next.kgram.path; import java.util.ArrayList; import java.util.Collection; @@ -7,8 +7,8 @@ import java.util.List; import java.util.TreeMap; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.Regex; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Regex; /** * Record intermediate nodes that are visited by a loop path expression such as diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/AbstractCostModel.java b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/AbstractCostModel.java similarity index 93% rename from src/main/java/fr/inria/corese/core/kgram/sorter/core/AbstractCostModel.java rename to src/main/java/fr/inria/corese/core/next/kgram/sorter/core/AbstractCostModel.java index fc6fa3b87..28404c304 100644 --- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/AbstractCostModel.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/AbstractCostModel.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.sorter.core; +package fr.inria.corese.core.next.kgram.sorter.core; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/Const.java b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/Const.java similarity index 91% rename from src/main/java/fr/inria/corese/core/kgram/sorter/core/Const.java rename to src/main/java/fr/inria/corese/core/next/kgram/sorter/core/Const.java index 6801b5788..40502f81c 100644 --- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/Const.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/Const.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.kgram.sorter.core; +package fr.inria.corese.core.next.kgram.sorter.core; -import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.core.ExpType; /** * Constants diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/IEstimate.java b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/IEstimate.java similarity index 85% rename from src/main/java/fr/inria/corese/core/kgram/sorter/core/IEstimate.java rename to src/main/java/fr/inria/corese/core/next/kgram/sorter/core/IEstimate.java index 2f16310f1..65bca0b56 100644 --- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/IEstimate.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/IEstimate.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.kgram.sorter.core; +package fr.inria.corese.core.next.kgram.sorter.core; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * Interface for estimating the cost of nodes and edges in QPGraph diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/IProducerQP.java b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/IProducerQP.java similarity index 93% rename from src/main/java/fr/inria/corese/core/kgram/sorter/core/IProducerQP.java rename to src/main/java/fr/inria/corese/core/next/kgram/sorter/core/IProducerQP.java index 23170dc89..7ee6668be 100644 --- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/IProducerQP.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/IProducerQP.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.sorter.core; +package fr.inria.corese.core.next.kgram.sorter.core; /** * Interface for calling Producer from kgraph, these methods are implemented diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/ISort.java b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/ISort.java similarity index 84% rename from src/main/java/fr/inria/corese/core/kgram/sorter/core/ISort.java rename to src/main/java/fr/inria/corese/core/next/kgram/sorter/core/ISort.java index 1c9398a4a..d9f1e58e7 100644 --- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/ISort.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/ISort.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.kgram.sorter.core; +package fr.inria.corese.core.next.kgram.sorter.core; -import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Exp; import java.util.List; /** diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGEdge.java b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGEdge.java similarity index 95% rename from src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGEdge.java rename to src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGEdge.java index a4863ff75..d180f7f63 100644 --- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGEdge.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGEdge.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.kgram.sorter.core; +package fr.inria.corese.core.next.kgram.sorter.core; -import fr.inria.corese.core.kgram.sorter.impl.qpv1.QPGEdgeCostModel; +import fr.inria.corese.core.next.kgram.sorter.impl.qpv1.QPGEdgeCostModel; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGNode.java b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGNode.java similarity index 93% rename from src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGNode.java rename to src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGNode.java index 763b19449..733498592 100644 --- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGNode.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGNode.java @@ -1,14 +1,14 @@ -package fr.inria.corese.core.kgram.sorter.core; - -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.sorter.impl.qpv1.QPGNodeCostModel; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Filter; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Exp; -import static fr.inria.corese.core.kgram.sorter.core.Const.OBJECT; -import static fr.inria.corese.core.kgram.sorter.core.Const.PREDICATE; -import static fr.inria.corese.core.kgram.sorter.core.Const.SUBJECT; +package fr.inria.corese.core.next.kgram.sorter.core; + +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.sorter.impl.qpv1.QPGNodeCostModel; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Filter; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Exp; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.OBJECT; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.PREDICATE; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.SUBJECT; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGraph.java b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGraph.java similarity index 97% rename from src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGraph.java rename to src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGraph.java index 9f1ffe667..fd2c56a73 100644 --- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGraph.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGraph.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.kgram.sorter.core; +package fr.inria.corese.core.next.kgram.sorter.core; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.core.Exp; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/BasicPatternGenerator.java b/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/BasicPatternGenerator.java similarity index 86% rename from src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/BasicPatternGenerator.java rename to src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/BasicPatternGenerator.java index 72f102be3..69390d7b5 100644 --- a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/BasicPatternGenerator.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/BasicPatternGenerator.java @@ -1,12 +1,12 @@ -package fr.inria.corese.core.kgram.sorter.impl.qpv1; - -import static fr.inria.corese.core.kgram.sorter.core.Const.BOUND; -import static fr.inria.corese.core.kgram.sorter.core.Const.NA; -import static fr.inria.corese.core.kgram.sorter.core.Const.OBJECT; -import static fr.inria.corese.core.kgram.sorter.core.Const.PREDICATE; -import static fr.inria.corese.core.kgram.sorter.core.Const.SUBJECT; -import static fr.inria.corese.core.kgram.sorter.core.Const.UNBOUND; -import fr.inria.corese.core.kgram.sorter.core.IProducerQP; +package fr.inria.corese.core.next.kgram.sorter.impl.qpv1; + +import static fr.inria.corese.core.next.kgram.sorter.core.Const.BOUND; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.NA; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.OBJECT; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.PREDICATE; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.SUBJECT; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.UNBOUND; +import fr.inria.corese.core.next.kgram.sorter.core.IProducerQP; /** * Generate the basic patterns ordering by the selectivity acorrding to the size diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java b/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java similarity index 97% rename from src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java rename to src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java index 3c16dc223..88844333c 100644 --- a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java @@ -1,14 +1,14 @@ -package fr.inria.corese.core.kgram.sorter.impl.qpv1; +package fr.inria.corese.core.next.kgram.sorter.impl.qpv1; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.sorter.core.*; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.sorter.core.*; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import static fr.inria.corese.core.kgram.api.core.ExpType.*; +import static fr.inria.corese.core.next.kgram.api.core.ExpType.*; /** * An implementation for sorting the triple pattern depth-first & best greedy diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstSearch.java b/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/DepthFirstSearch.java similarity index 96% rename from src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstSearch.java rename to src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/DepthFirstSearch.java index a8f9f7ac5..65df709af 100644 --- a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstSearch.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/DepthFirstSearch.java @@ -1,13 +1,11 @@ -package fr.inria.corese.core.kgram.sorter.impl.qpv1; +package fr.inria.corese.core.next.kgram.sorter.impl.qpv1; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.sorter.core.*; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.sorter.core.*; import java.util.*; -import static fr.inria.corese.core.kgram.api.core.ExpType.*; - /** * An implementation for sorting the triple pattern Pure depth-first greedy * algorithm diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java b/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java similarity index 92% rename from src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java rename to src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java index e2cd26a90..1ba172c7e 100644 --- a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.kgram.sorter.impl.qpv1; +package fr.inria.corese.core.next.kgram.sorter.impl.qpv1; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.sorter.core.*; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.sorter.core.*; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java b/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java similarity index 90% rename from src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java rename to src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java index ba7061eed..192f1fc84 100644 --- a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java @@ -1,11 +1,11 @@ -package fr.inria.corese.core.kgram.sorter.impl.qpv1; +package fr.inria.corese.core.next.kgram.sorter.impl.qpv1; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.sorter.core.*; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.sorter.core.*; import java.util.List; -import static fr.inria.corese.core.kgram.sorter.core.Const.*; -import static fr.inria.corese.core.kgram.sorter.core.IEstimate.MAX_COST; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.*; +import static fr.inria.corese.core.next.kgram.sorter.core.IEstimate.MAX_COST; /** * Cost model for QPG edge diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGNodeCostModel.java b/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/QPGNodeCostModel.java similarity index 88% rename from src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGNodeCostModel.java rename to src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/QPGNodeCostModel.java index 7f099a43b..f0cec943d 100644 --- a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGNodeCostModel.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/QPGNodeCostModel.java @@ -1,22 +1,22 @@ -package fr.inria.corese.core.kgram.sorter.impl.qpv1; - -import fr.inria.corese.core.kgram.api.core.Edge; - -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.sorter.core.AbstractCostModel; -import fr.inria.corese.core.kgram.sorter.core.Const; -import static fr.inria.corese.core.kgram.sorter.core.Const.BOUND; -import static fr.inria.corese.core.kgram.sorter.core.Const.LIST; -import static fr.inria.corese.core.kgram.sorter.core.Const.NA; -import static fr.inria.corese.core.kgram.sorter.core.Const.PREDICATE; -import static fr.inria.corese.core.kgram.sorter.core.Const.UNBOUND; -import fr.inria.corese.core.kgram.sorter.core.QPGNode; -import fr.inria.corese.core.kgram.sorter.core.QPGraph; -import static fr.inria.corese.core.kgram.sorter.core.IEstimate.MAX_COST; -import static fr.inria.corese.core.kgram.sorter.core.IEstimate.MIN_COST_0; -import fr.inria.corese.core.kgram.sorter.core.IProducerQP; +package fr.inria.corese.core.next.kgram.sorter.impl.qpv1; + +import fr.inria.corese.core.next.kgram.api.core.Edge; + +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.sorter.core.AbstractCostModel; +import fr.inria.corese.core.next.kgram.sorter.core.Const; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.BOUND; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.LIST; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.NA; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.PREDICATE; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.UNBOUND; +import fr.inria.corese.core.next.kgram.sorter.core.QPGNode; +import fr.inria.corese.core.next.kgram.sorter.core.QPGraph; +import static fr.inria.corese.core.next.kgram.sorter.core.IEstimate.MAX_COST; +import static fr.inria.corese.core.next.kgram.sorter.core.IEstimate.MIN_COST_0; +import fr.inria.corese.core.next.kgram.sorter.core.IProducerQP; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/src/main/java/fr/inria/corese/core/kgram/tool/ApproximateSearchEnv.java b/src/main/java/fr/inria/corese/core/next/kgram/tool/ApproximateSearchEnv.java similarity index 96% rename from src/main/java/fr/inria/corese/core/kgram/tool/ApproximateSearchEnv.java rename to src/main/java/fr/inria/corese/core/next/kgram/tool/ApproximateSearchEnv.java index 832f006c9..45f4a82d9 100644 --- a/src/main/java/fr/inria/corese/core/kgram/tool/ApproximateSearchEnv.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/tool/ApproximateSearchEnv.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.kgram.tool; +package fr.inria.corese.core.next.kgram.tool; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/tool/DistinctNode.java b/src/main/java/fr/inria/corese/core/next/kgram/tool/DistinctNode.java similarity index 91% rename from src/main/java/fr/inria/corese/core/kgram/tool/DistinctNode.java rename to src/main/java/fr/inria/corese/core/next/kgram/tool/DistinctNode.java index 78603de96..9b53d1b54 100644 --- a/src/main/java/fr/inria/corese/core/kgram/tool/DistinctNode.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/tool/DistinctNode.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.kgram.tool; +package fr.inria.corese.core.next.kgram.tool; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/fr/inria/corese/core/kgram/tool/EdgeInv.java b/src/main/java/fr/inria/corese/core/next/kgram/tool/EdgeInv.java similarity index 85% rename from src/main/java/fr/inria/corese/core/kgram/tool/EdgeInv.java rename to src/main/java/fr/inria/corese/core/next/kgram/tool/EdgeInv.java index ce63a406b..dddbd2777 100644 --- a/src/main/java/fr/inria/corese/core/kgram/tool/EdgeInv.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/tool/EdgeInv.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.kgram.tool; +package fr.inria.corese.core.next.kgram.tool; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.PointerType; -import static fr.inria.corese.core.kgram.api.core.PointerType.TRIPLE; -import fr.inria.corese.core.kgram.core.PointerObject; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.TRIPLE; +import fr.inria.corese.core.next.kgram.core.PointerObject; public class EdgeInv extends PointerObject implements Edge{ diff --git a/src/main/java/fr/inria/corese/core/kgram/tool/EntityImpl.java b/src/main/java/fr/inria/corese/core/next/kgram/tool/EntityImpl.java similarity index 100% rename from src/main/java/fr/inria/corese/core/kgram/tool/EntityImpl.java rename to src/main/java/fr/inria/corese/core/next/kgram/tool/EntityImpl.java diff --git a/src/main/java/fr/inria/corese/core/kgram/tool/EnvironmentImpl.java b/src/main/java/fr/inria/corese/core/next/kgram/tool/EnvironmentImpl.java similarity index 89% rename from src/main/java/fr/inria/corese/core/kgram/tool/EnvironmentImpl.java rename to src/main/java/fr/inria/corese/core/next/kgram/tool/EnvironmentImpl.java index 7bcccd24e..e79212c55 100644 --- a/src/main/java/fr/inria/corese/core/kgram/tool/EnvironmentImpl.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/tool/EnvironmentImpl.java @@ -1,19 +1,19 @@ -package fr.inria.corese.core.kgram.tool; +package fr.inria.corese.core.next.kgram.tool; import java.util.Map; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.event.EventManager; -import fr.inria.corese.core.kgram.path.Path; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.event.EventManager; +import fr.inria.corese.core.next.kgram.path.Path; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.next.kgram.core.Eval; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.parser.ASTExtension; diff --git a/src/main/java/fr/inria/corese/core/kgram/tool/MatcherDefault.java b/src/main/java/fr/inria/corese/core/next/kgram/tool/MatcherDefault.java similarity index 68% rename from src/main/java/fr/inria/corese/core/kgram/tool/MatcherDefault.java rename to src/main/java/fr/inria/corese/core/next/kgram/tool/MatcherDefault.java index af6cf57a9..c9375b059 100644 --- a/src/main/java/fr/inria/corese/core/kgram/tool/MatcherDefault.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/tool/MatcherDefault.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.kgram.tool; +package fr.inria.corese.core.next.kgram.tool; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Matcher; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Matcher; public class MatcherDefault implements Matcher { diff --git a/src/main/java/fr/inria/corese/core/kgram/tool/Message.java b/src/main/java/fr/inria/corese/core/next/kgram/tool/Message.java similarity index 91% rename from src/main/java/fr/inria/corese/core/kgram/tool/Message.java rename to src/main/java/fr/inria/corese/core/next/kgram/tool/Message.java index 537a0f7d8..c665ce8b6 100644 --- a/src/main/java/fr/inria/corese/core/kgram/tool/Message.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/tool/Message.java @@ -1,6 +1,4 @@ -package fr.inria.corese.core.kgram.tool; - -import java.util.Hashtable; +package fr.inria.corese.core.next.kgram.tool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/kgram/tool/MetaIterator.java b/src/main/java/fr/inria/corese/core/next/kgram/tool/MetaIterator.java similarity index 97% rename from src/main/java/fr/inria/corese/core/kgram/tool/MetaIterator.java rename to src/main/java/fr/inria/corese/core/next/kgram/tool/MetaIterator.java index 31149d9e4..41a0590dd 100644 --- a/src/main/java/fr/inria/corese/core/kgram/tool/MetaIterator.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/tool/MetaIterator.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.tool; +package fr.inria.corese.core.next.kgram.tool; import java.util.Iterator; diff --git a/src/main/java/fr/inria/corese/core/kgram/tool/MetaIteratorCast.java b/src/main/java/fr/inria/corese/core/next/kgram/tool/MetaIteratorCast.java similarity index 97% rename from src/main/java/fr/inria/corese/core/kgram/tool/MetaIteratorCast.java rename to src/main/java/fr/inria/corese/core/next/kgram/tool/MetaIteratorCast.java index fddec9159..13fb793ff 100644 --- a/src/main/java/fr/inria/corese/core/kgram/tool/MetaIteratorCast.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/tool/MetaIteratorCast.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.kgram.tool; +package fr.inria.corese.core.next.kgram.tool; import java.util.Iterator; diff --git a/src/main/java/fr/inria/corese/core/kgram/tool/MetaProducer.java b/src/main/java/fr/inria/corese/core/next/kgram/tool/MetaProducer.java similarity index 90% rename from src/main/java/fr/inria/corese/core/kgram/tool/MetaProducer.java rename to src/main/java/fr/inria/corese/core/next/kgram/tool/MetaProducer.java index 4fc927b8b..1f0c8cf1f 100644 --- a/src/main/java/fr/inria/corese/core/kgram/tool/MetaProducer.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/tool/MetaProducer.java @@ -1,20 +1,20 @@ -package fr.inria.corese.core.kgram.tool; +package fr.inria.corese.core.next.kgram.tool; -import fr.inria.corese.core.kgram.api.core.DatatypeValueFactory; +import fr.inria.corese.core.next.kgram.api.core.DatatypeValueFactory; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import fr.inria.corese.core.kgram.api.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.Regex; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.core.SparqlException; +import fr.inria.corese.core.next.kgram.api.core.Graph; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Regex; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.core.SparqlException; import fr.inria.corese.core.sparql.api.IDatatype; /** diff --git a/src/main/java/fr/inria/corese/core/kgram/tool/NodeImpl.java b/src/main/java/fr/inria/corese/core/next/kgram/tool/NodeImpl.java similarity index 94% rename from src/main/java/fr/inria/corese/core/kgram/tool/NodeImpl.java rename to src/main/java/fr/inria/corese/core/next/kgram/tool/NodeImpl.java index e60b10b73..a4e27eec1 100644 --- a/src/main/java/fr/inria/corese/core/kgram/tool/NodeImpl.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/tool/NodeImpl.java @@ -1,11 +1,9 @@ -package fr.inria.corese.core.kgram.tool; +package fr.inria.corese.core.next.kgram.tool; -import java.util.Objects; - -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.TripleStore; -import fr.inria.corese.core.kgram.path.Path; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.TripleStore; +import fr.inria.corese.core.next.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.cst.RDFS; import fr.inria.corese.core.sparql.triple.parser.Atom; diff --git a/src/main/java/fr/inria/corese/core/kgram/tool/ProducerDefault.java b/src/main/java/fr/inria/corese/core/next/kgram/tool/ProducerDefault.java similarity index 86% rename from src/main/java/fr/inria/corese/core/kgram/tool/ProducerDefault.java rename to src/main/java/fr/inria/corese/core/next/kgram/tool/ProducerDefault.java index 23ad7e7f9..7102b14ab 100644 --- a/src/main/java/fr/inria/corese/core/kgram/tool/ProducerDefault.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/tool/ProducerDefault.java @@ -1,18 +1,18 @@ -package fr.inria.corese.core.kgram.tool; +package fr.inria.corese.core.next.kgram.tool; -import fr.inria.corese.core.kgram.api.core.DatatypeValueFactory; +import fr.inria.corese.core.next.kgram.api.core.DatatypeValueFactory; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.kgram.api.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.Regex; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Graph; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Regex; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; import fr.inria.corese.core.sparql.api.IDatatype; /** diff --git a/src/main/java/fr/inria/corese/core/kgram/tool/ResultsImpl.java b/src/main/java/fr/inria/corese/core/next/kgram/tool/ResultsImpl.java similarity index 67% rename from src/main/java/fr/inria/corese/core/kgram/tool/ResultsImpl.java rename to src/main/java/fr/inria/corese/core/next/kgram/tool/ResultsImpl.java index 97a5d97a0..997df1239 100644 --- a/src/main/java/fr/inria/corese/core/kgram/tool/ResultsImpl.java +++ b/src/main/java/fr/inria/corese/core/next/kgram/tool/ResultsImpl.java @@ -1,13 +1,13 @@ -package fr.inria.corese.core.kgram.tool; +package fr.inria.corese.core.next.kgram.tool; import java.util.Iterator; import java.util.List; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Result; -import fr.inria.corese.core.kgram.api.query.Results; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Result; +import fr.inria.corese.core.next.kgram.api.query.Results; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; public class ResultsImpl implements Results { diff --git a/src/main/java/fr/inria/corese/core/print/AbstractNestedResultFormat.java b/src/main/java/fr/inria/corese/core/print/AbstractNestedResultFormat.java index 672011715..56d18c5a6 100644 --- a/src/main/java/fr/inria/corese/core/print/AbstractNestedResultFormat.java +++ b/src/main/java/fr/inria/corese/core/print/AbstractNestedResultFormat.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.print; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/print/CSVFormat.java b/src/main/java/fr/inria/corese/core/print/CSVFormat.java index 7c81e4f69..f9cf0bc64 100644 --- a/src/main/java/fr/inria/corese/core/print/CSVFormat.java +++ b/src/main/java/fr/inria/corese/core/print/CSVFormat.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; public class CSVFormat extends QueryResultFormat { // The end-of-line in CSV is CRLF i.e. Unicode codepoints 13 (0x0D) and 10 diff --git a/src/main/java/fr/inria/corese/core/print/CanonicalRdf10Format.java b/src/main/java/fr/inria/corese/core/print/CanonicalRdf10Format.java index af49f6c5d..b4b23b3d5 100644 --- a/src/main/java/fr/inria/corese/core/print/CanonicalRdf10Format.java +++ b/src/main/java/fr/inria/corese/core/print/CanonicalRdf10Format.java @@ -6,8 +6,8 @@ import fr.inria.corese.core.print.rdfc10.CanonicalRdf10; import fr.inria.corese.core.print.rdfc10.CanonicalizedDataset; import fr.inria.corese.core.print.rdfc10.HashingUtility.HashAlgorithm; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; /** * This class provides functionality to convert a Graph object to a string in diff --git a/src/main/java/fr/inria/corese/core/print/HTMLFormat.java b/src/main/java/fr/inria/corese/core/print/HTMLFormat.java index 30c7939b4..62a8759af 100644 --- a/src/main/java/fr/inria/corese/core/print/HTMLFormat.java +++ b/src/main/java/fr/inria/corese/core/print/HTMLFormat.java @@ -3,7 +3,7 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.Context; import fr.inria.corese.core.sparql.triple.parser.NSManager; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.Graph; import fr.inria.corese.core.transform.Transformer; import fr.inria.corese.core.transform.TransformerUtils; diff --git a/src/main/java/fr/inria/corese/core/print/JSOND3Format.java b/src/main/java/fr/inria/corese/core/print/JSOND3Format.java index 669e69336..904fbdd06 100644 --- a/src/main/java/fr/inria/corese/core/print/JSOND3Format.java +++ b/src/main/java/fr/inria/corese/core/print/JSOND3Format.java @@ -4,10 +4,10 @@ import java.util.Map; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/print/JSONFormat.java b/src/main/java/fr/inria/corese/core/print/JSONFormat.java index e04a224e6..42488f578 100755 --- a/src/main/java/fr/inria/corese/core/print/JSONFormat.java +++ b/src/main/java/fr/inria/corese/core/print/JSONFormat.java @@ -1,13 +1,11 @@ package fr.inria.corese.core.print; -import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; -import java.util.Locale; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/print/JSONLDFormat.java b/src/main/java/fr/inria/corese/core/print/JSONLDFormat.java index e10a5661a..e777df82c 100644 --- a/src/main/java/fr/inria/corese/core/print/JSONLDFormat.java +++ b/src/main/java/fr/inria/corese/core/print/JSONLDFormat.java @@ -11,10 +11,10 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.logic.RDF; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/print/LogManager.java b/src/main/java/fr/inria/corese/core/print/LogManager.java index 724327b57..12b6cfecd 100644 --- a/src/main/java/fr/inria/corese/core/print/LogManager.java +++ b/src/main/java/fr/inria/corese/core/print/LogManager.java @@ -5,14 +5,13 @@ import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.cst.LogKey; import fr.inria.corese.core.sparql.triple.parser.context.ContextLog; -import fr.inria.corese.core.sparql.triple.parser.URLServer; import java.io.BufferedWriter; import java.io.FileWriter; @@ -20,7 +19,6 @@ import java.util.ArrayList; import java.util.List; import jakarta.ws.rs.client.ResponseProcessingException; -import jakarta.ws.rs.core.Link; import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/print/Mapper.java b/src/main/java/fr/inria/corese/core/print/Mapper.java index ca1001a43..41b306250 100644 --- a/src/main/java/fr/inria/corese/core/print/Mapper.java +++ b/src/main/java/fr/inria/corese/core/print/Mapper.java @@ -3,9 +3,9 @@ import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.api.core.Edge; public class Mapper { diff --git a/src/main/java/fr/inria/corese/core/print/MarkdownFormat.java b/src/main/java/fr/inria/corese/core/print/MarkdownFormat.java index d871452af..9f31a87dc 100644 --- a/src/main/java/fr/inria/corese/core/print/MarkdownFormat.java +++ b/src/main/java/fr/inria/corese/core/print/MarkdownFormat.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Map; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; /** * Format the results of a SPARQL query in Markdown. diff --git a/src/main/java/fr/inria/corese/core/print/NQuadsFormat.java b/src/main/java/fr/inria/corese/core/print/NQuadsFormat.java index 0708910bc..032e545b5 100644 --- a/src/main/java/fr/inria/corese/core/print/NQuadsFormat.java +++ b/src/main/java/fr/inria/corese/core/print/NQuadsFormat.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.print; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.core.Mappings; public class NQuadsFormat extends NTriplesFormat { diff --git a/src/main/java/fr/inria/corese/core/print/NTriplesFormat.java b/src/main/java/fr/inria/corese/core/print/NTriplesFormat.java index 9097d5f85..5133470e5 100644 --- a/src/main/java/fr/inria/corese/core/print/NTriplesFormat.java +++ b/src/main/java/fr/inria/corese/core/print/NTriplesFormat.java @@ -4,9 +4,9 @@ import java.io.OutputStream; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.datatype.RDF; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/print/RDFFormat.java b/src/main/java/fr/inria/corese/core/print/RDFFormat.java index 4a1159a1e..0b5592af1 100755 --- a/src/main/java/fr/inria/corese/core/print/RDFFormat.java +++ b/src/main/java/fr/inria/corese/core/print/RDFFormat.java @@ -13,11 +13,11 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.logic.OWL; import fr.inria.corese.core.logic.RDF; import fr.inria.corese.core.logic.RDFS; diff --git a/src/main/java/fr/inria/corese/core/print/RDFResultFormat.java b/src/main/java/fr/inria/corese/core/print/RDFResultFormat.java index 641bcce7f..95601efea 100644 --- a/src/main/java/fr/inria/corese/core/print/RDFResultFormat.java +++ b/src/main/java/fr/inria/corese/core/print/RDFResultFormat.java @@ -2,11 +2,11 @@ import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.NSManager; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Graphable; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Graphable; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.Serializer; import static fr.inria.corese.core.print.RDFFormat.NL; diff --git a/src/main/java/fr/inria/corese/core/print/ResultFormat.java b/src/main/java/fr/inria/corese/core/print/ResultFormat.java index 79e46242e..c8b78ef1b 100644 --- a/src/main/java/fr/inria/corese/core/print/ResultFormat.java +++ b/src/main/java/fr/inria/corese/core/print/ResultFormat.java @@ -13,9 +13,9 @@ import fr.inria.corese.core.transform.Transformer; import fr.inria.corese.core.transform.TransformerUtils; import fr.inria.corese.core.util.MappingsGraph; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.api.ResultFormatDef; import fr.inria.corese.core.sparql.triple.function.term.Binding; @@ -24,7 +24,6 @@ import fr.inria.corese.core.sparql.triple.parser.Dataset; import fr.inria.corese.core.sparql.triple.parser.Metadata; import fr.inria.corese.core.sparql.triple.parser.NSManager; -import fr.inria.corese.core.sparql.triple.parser.URLParam; /** * Select Result format according to query form and @display annotation., diff --git a/src/main/java/fr/inria/corese/core/print/TSVFormat.java b/src/main/java/fr/inria/corese/core/print/TSVFormat.java index 5b97248b3..5c097fc2a 100644 --- a/src/main/java/fr/inria/corese/core/print/TSVFormat.java +++ b/src/main/java/fr/inria/corese/core/print/TSVFormat.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.print; import fr.inria.corese.core.sparql.api.IDatatype; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; public class TSVFormat extends CSVFormat { diff --git a/src/main/java/fr/inria/corese/core/print/TemplateFormat.java b/src/main/java/fr/inria/corese/core/print/TemplateFormat.java index 3d5c4227c..bec4d95f0 100644 --- a/src/main/java/fr/inria/corese/core/print/TemplateFormat.java +++ b/src/main/java/fr/inria/corese/core/print/TemplateFormat.java @@ -6,13 +6,12 @@ import java.io.FileWriter; import java.io.IOException; -import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.NSManager; import fr.inria.corese.core.compiler.parser.Pragma; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.Graph; /* diff --git a/src/main/java/fr/inria/corese/core/print/TripleFormat.java b/src/main/java/fr/inria/corese/core/print/TripleFormat.java index 2078c317b..f7ca3c3d8 100644 --- a/src/main/java/fr/inria/corese/core/print/TripleFormat.java +++ b/src/main/java/fr/inria/corese/core/print/TripleFormat.java @@ -2,10 +2,10 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.logic.RDF; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.NSManager; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/print/XMLFormat.java b/src/main/java/fr/inria/corese/core/print/XMLFormat.java index 423435b45..512265dba 100755 --- a/src/main/java/fr/inria/corese/core/print/XMLFormat.java +++ b/src/main/java/fr/inria/corese/core/print/XMLFormat.java @@ -4,9 +4,9 @@ import org.apache.commons.text.StringEscapeUtils; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/print/XSLTQuery.java b/src/main/java/fr/inria/corese/core/print/XSLTQuery.java index 3f84aa93a..39a398a69 100755 --- a/src/main/java/fr/inria/corese/core/print/XSLTQuery.java +++ b/src/main/java/fr/inria/corese/core/print/XSLTQuery.java @@ -21,8 +21,8 @@ import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.compiler.eval.QuerySolver; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.Graph; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalRdf10.java b/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalRdf10.java index 2c7a14f96..c77204628 100644 --- a/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalRdf10.java +++ b/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalRdf10.java @@ -9,10 +9,10 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.print.NTriplesFormat; import fr.inria.corese.core.print.rdfc10.HashingUtility.HashAlgorithm; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; /** * The {@code CanonicalRdf10Format} class extends {@code RDFFormat} to provide diff --git a/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizationState.java b/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizationState.java index 16f51670e..93250cf5c 100644 --- a/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizationState.java +++ b/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizationState.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; /** * This class manages the state of canonicalization, particularly handling diff --git a/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizedDataset.java b/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizedDataset.java index b8e24394d..7efedc93d 100644 --- a/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizedDataset.java +++ b/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizedDataset.java @@ -6,7 +6,7 @@ import java.util.Map; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Represents a dataset that has undergone canonicalization. diff --git a/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructExtern.java b/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructExtern.java index f453e67d7..4267b2ea5 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructExtern.java +++ b/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructExtern.java @@ -8,9 +8,9 @@ import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.Access; import fr.inria.corese.core.sparql.triple.parser.AccessRight; diff --git a/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructLocal.java b/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructLocal.java index 22ca9d472..0b23b9846 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructLocal.java +++ b/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructLocal.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.api.DataBrokerConstruct; import fr.inria.corese.core.query.update.GraphManager; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.Access; diff --git a/src/main/java/fr/inria/corese/core/producer/DataBrokerLocal.java b/src/main/java/fr/inria/corese/core/producer/DataBrokerLocal.java index 2544aee89..cf9d23d2c 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataBrokerLocal.java +++ b/src/main/java/fr/inria/corese/core/producer/DataBrokerLocal.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.DataBroker; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Query; /** * Broker between ProducerImpl and corese graph diff --git a/src/main/java/fr/inria/corese/core/producer/DataFilter.java b/src/main/java/fr/inria/corese/core/producer/DataFilter.java index 024391bf4..4fe631121 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataFilter.java +++ b/src/main/java/fr/inria/corese/core/producer/DataFilter.java @@ -2,11 +2,11 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.Graph; import java.util.ArrayList; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; import fr.inria.corese.core.sparql.triple.parser.AccessRight; /** diff --git a/src/main/java/fr/inria/corese/core/producer/DataFilterAnd.java b/src/main/java/fr/inria/corese/core/producer/DataFilterAnd.java index 73312f815..ddceb2c3b 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataFilterAnd.java +++ b/src/main/java/fr/inria/corese/core/producer/DataFilterAnd.java @@ -5,7 +5,7 @@ package fr.inria.corese.core.producer; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; /** * diff --git a/src/main/java/fr/inria/corese/core/producer/DataFilterFactory.java b/src/main/java/fr/inria/corese/core/producer/DataFilterFactory.java index 311cd152d..26c7da14b 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataFilterFactory.java +++ b/src/main/java/fr/inria/corese/core/producer/DataFilterFactory.java @@ -3,7 +3,7 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.Processor; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * ****************************************************** diff --git a/src/main/java/fr/inria/corese/core/producer/DataFilterNot.java b/src/main/java/fr/inria/corese/core/producer/DataFilterNot.java index 7e1b9df34..8cf1f98a0 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataFilterNot.java +++ b/src/main/java/fr/inria/corese/core/producer/DataFilterNot.java @@ -5,7 +5,7 @@ package fr.inria.corese.core.producer; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; /** * diff --git a/src/main/java/fr/inria/corese/core/producer/DataFilterOr.java b/src/main/java/fr/inria/corese/core/producer/DataFilterOr.java index 1023dc49c..63f3f3c02 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataFilterOr.java +++ b/src/main/java/fr/inria/corese/core/producer/DataFilterOr.java @@ -5,7 +5,7 @@ package fr.inria.corese.core.producer; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; /** * diff --git a/src/main/java/fr/inria/corese/core/producer/DataFrom.java b/src/main/java/fr/inria/corese/core/producer/DataFrom.java index a103f1618..d7c8db01e 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataFrom.java +++ b/src/main/java/fr/inria/corese/core/producer/DataFrom.java @@ -6,8 +6,8 @@ import java.util.List; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * from, from named dataset for edge iteration diff --git a/src/main/java/fr/inria/corese/core/producer/DataProducer.java b/src/main/java/fr/inria/corese/core/producer/DataProducer.java index 746acccb0..21e93ce12 100755 --- a/src/main/java/fr/inria/corese/core/producer/DataProducer.java +++ b/src/main/java/fr/inria/corese/core/producer/DataProducer.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.producer; -import static fr.inria.corese.core.kgram.api.core.PointerType.PRODUCER; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.PRODUCER; import java.util.ArrayList; import java.util.Collections; @@ -10,11 +10,11 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.GraphObject; import fr.inria.corese.core.edge.EdgeTop; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.PointerType; -import fr.inria.corese.core.kgram.tool.MetaIterator; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.tool.MetaIterator; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.AccessRight; diff --git a/src/main/java/fr/inria/corese/core/producer/MetadataManager.java b/src/main/java/fr/inria/corese/core/producer/MetadataManager.java index d7444650d..1837654ba 100644 --- a/src/main/java/fr/inria/corese/core/producer/MetadataManager.java +++ b/src/main/java/fr/inria/corese/core/producer/MetadataManager.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.producer; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.logic.Distance; import fr.inria.corese.core.storage.api.dataManager.DataManager; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/query/Cache.java b/src/main/java/fr/inria/corese/core/query/Cache.java index 10f001387..986b465d8 100644 --- a/src/main/java/fr/inria/corese/core/query/Cache.java +++ b/src/main/java/fr/inria/corese/core/query/Cache.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.query; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Query; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/query/ClassHierarchy.java b/src/main/java/fr/inria/corese/core/query/ClassHierarchy.java index e65b9b4da..fe8849d62 100644 --- a/src/main/java/fr/inria/corese/core/query/ClassHierarchy.java +++ b/src/main/java/fr/inria/corese/core/query/ClassHierarchy.java @@ -2,9 +2,9 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.compiler.parser.NodeImpl; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeHierarchy; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/query/CompileService.java b/src/main/java/fr/inria/corese/core/query/CompileService.java index fe1f57603..5923d0a20 100644 --- a/src/main/java/fr/inria/corese/core/query/CompileService.java +++ b/src/main/java/fr/inria/corese/core/query/CompileService.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.query; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.cst.LogKey; diff --git a/src/main/java/fr/inria/corese/core/query/Construct.java b/src/main/java/fr/inria/corese/core/query/Construct.java index c36356eb8..3e128d26a 100755 --- a/src/main/java/fr/inria/corese/core/query/Construct.java +++ b/src/main/java/fr/inria/corese/core/query/Construct.java @@ -1,14 +1,14 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Event; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.query.update.GraphManager; import fr.inria.corese.core.rule.Rule; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/query/Describe.java b/src/main/java/fr/inria/corese/core/query/Describe.java index fe1eae301..529132026 100644 --- a/src/main/java/fr/inria/corese/core/query/Describe.java +++ b/src/main/java/fr/inria/corese/core/query/Describe.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.tool.MetaProducer; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.tool.MetaProducer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/query/FederatedQueryProcess.java b/src/main/java/fr/inria/corese/core/query/FederatedQueryProcess.java index fb93fb4d6..0538ad655 100644 --- a/src/main/java/fr/inria/corese/core/query/FederatedQueryProcess.java +++ b/src/main/java/fr/inria/corese/core/query/FederatedQueryProcess.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.Metadata; diff --git a/src/main/java/fr/inria/corese/core/query/Mapper.java b/src/main/java/fr/inria/corese/core/query/Mapper.java index 33374859d..79fd6a27e 100644 --- a/src/main/java/fr/inria/corese/core/query/Mapper.java +++ b/src/main/java/fr/inria/corese/core/query/Mapper.java @@ -2,14 +2,14 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.compiler.eval.SQLResult; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.PointerType; -import fr.inria.corese.core.kgram.api.core.Pointerable; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.api.core.Pointerable; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.load.result.SPARQLResultParser; import fr.inria.corese.core.producer.DataProducer; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/query/MapperSQL.java b/src/main/java/fr/inria/corese/core/query/MapperSQL.java index 2cc4e0ea0..0f9c31d5f 100644 --- a/src/main/java/fr/inria/corese/core/query/MapperSQL.java +++ b/src/main/java/fr/inria/corese/core/query/MapperSQL.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.compiler.eval.SQLResult; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/query/MatchBNode.java b/src/main/java/fr/inria/corese/core/query/MatchBNode.java index 01d81db40..804671fc6 100644 --- a/src/main/java/fr/inria/corese/core/query/MatchBNode.java +++ b/src/main/java/fr/inria/corese/core/query/MatchBNode.java @@ -5,9 +5,9 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.Comparator; diff --git a/src/main/java/fr/inria/corese/core/query/MatchIterator.java b/src/main/java/fr/inria/corese/core/query/MatchIterator.java index a09709479..f4af65579 100644 --- a/src/main/java/fr/inria/corese/core/query/MatchIterator.java +++ b/src/main/java/fr/inria/corese/core/query/MatchIterator.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Matcher; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Matcher; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/fr/inria/corese/core/query/MatcherImpl.java b/src/main/java/fr/inria/corese/core/query/MatcherImpl.java index 2fbfad488..b0b6760aa 100755 --- a/src/main/java/fr/inria/corese/core/query/MatcherImpl.java +++ b/src/main/java/fr/inria/corese/core/query/MatcherImpl.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Matcher; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Matcher; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/query/PluginImpl.java b/src/main/java/fr/inria/corese/core/query/PluginImpl.java index 555d95503..d9864d868 100644 --- a/src/main/java/fr/inria/corese/core/query/PluginImpl.java +++ b/src/main/java/fr/inria/corese/core/query/PluginImpl.java @@ -10,14 +10,14 @@ import fr.inria.corese.core.compiler.eval.QuerySolver; import fr.inria.corese.core.compiler.eval.QuerySolverVisitorBasic; import fr.inria.corese.core.compiler.parser.NodeImpl; -import fr.inria.corese.core.kgram.api.core.*; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Evaluator; -import fr.inria.corese.core.kgram.api.query.Matcher; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Memory; +import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Evaluator; +import fr.inria.corese.core.next.kgram.api.query.Matcher; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Memory; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.LoadFormat; @@ -44,7 +44,6 @@ import fr.inria.corese.core.sparql.triple.parser.Access.Level; import fr.inria.corese.core.storage.api.dataManager.DataManager; import fr.inria.corese.core.transform.TemplateVisitor; -import fr.inria.corese.core.transform.Transformer; import fr.inria.corese.core.transform.TransformerUtils; import fr.inria.corese.core.util.GraphListen; import fr.inria.corese.core.util.MappingsGraph; @@ -58,8 +57,8 @@ import java.io.IOException; import java.util.ArrayList; -import static fr.inria.corese.core.kgram.api.core.PointerType.GRAPH; -import static fr.inria.corese.core.kgram.api.core.PointerType.MAPPINGS; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.GRAPH; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.MAPPINGS; /** * Plugin for filter evaluator diff --git a/src/main/java/fr/inria/corese/core/query/PluginTransform.java b/src/main/java/fr/inria/corese/core/query/PluginTransform.java index 45a2b3b88..4cdd53cd7 100644 --- a/src/main/java/fr/inria/corese/core/query/PluginTransform.java +++ b/src/main/java/fr/inria/corese/core/query/PluginTransform.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; import fr.inria.corese.core.sparql.api.ComputerProxy; @@ -13,7 +13,6 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Context; import fr.inria.corese.core.sparql.triple.parser.NSManager; import fr.inria.corese.core.transform.DefaultVisitor; @@ -25,7 +24,7 @@ import java.io.IOException; -import static fr.inria.corese.core.kgram.api.core.PointerType.GRAPH; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.GRAPH; /** * Transformer LDScript functions. diff --git a/src/main/java/fr/inria/corese/core/query/PragmaImpl.java b/src/main/java/fr/inria/corese/core/query/PragmaImpl.java index b7f199458..21674b02a 100644 --- a/src/main/java/fr/inria/corese/core/query/PragmaImpl.java +++ b/src/main/java/fr/inria/corese/core/query/PragmaImpl.java @@ -4,7 +4,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.Engine; import fr.inria.corese.core.compiler.parser.Pragma; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.logic.Distance; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.logic.RDFS; diff --git a/src/main/java/fr/inria/corese/core/query/ProducerImpl.java b/src/main/java/fr/inria/corese/core/query/ProducerImpl.java index 0d5fc4db3..231688216 100644 --- a/src/main/java/fr/inria/corese/core/query/ProducerImpl.java +++ b/src/main/java/fr/inria/corese/core/query/ProducerImpl.java @@ -4,14 +4,14 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.Index; import fr.inria.corese.core.api.DataBroker; -import fr.inria.corese.core.kgram.api.core.*; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Matcher; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.*; -import fr.inria.corese.core.kgram.sorter.core.IProducerQP; -import fr.inria.corese.core.kgram.sorter.core.QPGNode; -import fr.inria.corese.core.kgram.tool.MetaIterator; +import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Matcher; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.*; +import fr.inria.corese.core.next.kgram.sorter.core.IProducerQP; +import fr.inria.corese.core.next.kgram.sorter.core.QPGNode; +import fr.inria.corese.core.next.kgram.tool.MetaIterator; import fr.inria.corese.core.producer.DataBrokerExtern; import fr.inria.corese.core.producer.DataBrokerLocal; import fr.inria.corese.core.producer.DataProducer; @@ -27,7 +27,8 @@ import java.util.Iterator; import java.util.List; -import static fr.inria.corese.core.kgram.sorter.core.Const.*; +import static fr.inria.corese.core.next.kgram.sorter.core.Const.*; + /** * Producer Implement getEdges() for KGRAM interpreter rely on diff --git a/src/main/java/fr/inria/corese/core/query/ProducerImplNode.java b/src/main/java/fr/inria/corese/core/query/ProducerImplNode.java index 9ae82983a..ef5fe499d 100644 --- a/src/main/java/fr/inria/corese/core/query/ProducerImplNode.java +++ b/src/main/java/fr/inria/corese/core/query/ProducerImplNode.java @@ -2,11 +2,11 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.DataBroker; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.Regex; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.tool.MetaIterator; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Regex; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.tool.MetaIterator; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/query/ProviderImpl.java b/src/main/java/fr/inria/corese/core/query/ProviderImpl.java index b8c8973dd..541122ffc 100644 --- a/src/main/java/fr/inria/corese/core/query/ProviderImpl.java +++ b/src/main/java/fr/inria/corese/core/query/ProviderImpl.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Provider; -import fr.inria.corese.core.kgram.core.*; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Provider; +import fr.inria.corese.core.next.kgram.core.*; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.exceptions.SafetyException; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/query/ProviderService.java b/src/main/java/fr/inria/corese/core/query/ProviderService.java index f9e7b2cce..d2cea73d1 100644 --- a/src/main/java/fr/inria/corese/core/query/ProviderService.java +++ b/src/main/java/fr/inria/corese/core/query/ProviderService.java @@ -4,15 +4,15 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.NodeImpl; import fr.inria.corese.core.compiler.federate.FederateVisitor; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.core.*; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.*; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.Service; import fr.inria.corese.core.load.ServiceReport; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/query/ProviderThread.java b/src/main/java/fr/inria/corese/core/query/ProviderThread.java index 20826b5aa..bd9ff03bc 100644 --- a/src/main/java/fr/inria/corese/core/query/ProviderThread.java +++ b/src/main/java/fr/inria/corese/core/query/ProviderThread.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.query; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.URLServer; diff --git a/src/main/java/fr/inria/corese/core/query/QueryCheck.java b/src/main/java/fr/inria/corese/core/query/QueryCheck.java index 5d519106b..69eba5040 100644 --- a/src/main/java/fr/inria/corese/core/query/QueryCheck.java +++ b/src/main/java/fr/inria/corese/core/query/QueryCheck.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Query; /** * Draft check if query may succeed on graph PRAGMA: diff --git a/src/main/java/fr/inria/corese/core/query/QueryEngine.java b/src/main/java/fr/inria/corese/core/query/QueryEngine.java index ef9cad652..9f21c8fc0 100644 --- a/src/main/java/fr/inria/corese/core/query/QueryEngine.java +++ b/src/main/java/fr/inria/corese/core/query/QueryEngine.java @@ -3,11 +3,11 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.Engine; import fr.inria.corese.core.compiler.api.QueryVisitor; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTExtension; diff --git a/src/main/java/fr/inria/corese/core/query/QueryProcess.java b/src/main/java/fr/inria/corese/core/query/QueryProcess.java index 54bc89fb9..bf02dce37 100755 --- a/src/main/java/fr/inria/corese/core/query/QueryProcess.java +++ b/src/main/java/fr/inria/corese/core/query/QueryProcess.java @@ -9,14 +9,14 @@ import fr.inria.corese.core.compiler.eval.QuerySolver; import fr.inria.corese.core.compiler.federate.FederateVisitor; import fr.inria.corese.core.compiler.parser.Transformer; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Evaluator; -import fr.inria.corese.core.kgram.api.query.Matcher; -import fr.inria.corese.core.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.core.*; -import fr.inria.corese.core.kgram.tool.MetaProducer; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Evaluator; +import fr.inria.corese.core.next.kgram.api.query.Matcher; +import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.*; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.tool.MetaProducer; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; diff --git a/src/main/java/fr/inria/corese/core/query/QueryProcessUpdate.java b/src/main/java/fr/inria/corese/core/query/QueryProcessUpdate.java index 72b3a28bf..e65934a3a 100644 --- a/src/main/java/fr/inria/corese/core/query/QueryProcessUpdate.java +++ b/src/main/java/fr/inria/corese/core/query/QueryProcessUpdate.java @@ -6,11 +6,11 @@ import fr.inria.corese.core.GraphStore; import fr.inria.corese.core.api.GraphListener; import fr.inria.corese.core.compiler.parser.Pragma; -import fr.inria.corese.core.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.query.update.GraphManager; import fr.inria.corese.core.query.update.ManagerImpl; import fr.inria.corese.core.query.update.UpdateProcess; diff --git a/src/main/java/fr/inria/corese/core/query/RDFizer.java b/src/main/java/fr/inria/corese/core/query/RDFizer.java index 63085916c..0b0b9a01b 100644 --- a/src/main/java/fr/inria/corese/core/query/RDFizer.java +++ b/src/main/java/fr/inria/corese/core/query/RDFizer.java @@ -7,7 +7,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.Loader; -import fr.inria.corese.core.kgram.api.query.Graphable; +import fr.inria.corese.core.next.kgram.api.query.Graphable; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/query/ResultMessage.java b/src/main/java/fr/inria/corese/core/query/ResultMessage.java index cd90ecb76..41b93ba47 100644 --- a/src/main/java/fr/inria/corese/core/query/ResultMessage.java +++ b/src/main/java/fr/inria/corese/core/query/ResultMessage.java @@ -4,7 +4,7 @@ import fr.inria.corese.core.GraphDistance; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/query/SorterImpl.java b/src/main/java/fr/inria/corese/core/query/SorterImpl.java index 0fa2fccb8..d08004372 100644 --- a/src/main/java/fr/inria/corese/core/query/SorterImpl.java +++ b/src/main/java/fr/inria/corese/core/query/SorterImpl.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.core.Sorter; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Sorter; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/query/TemplateIndex.java b/src/main/java/fr/inria/corese/core/query/TemplateIndex.java index 3cfa998ce..6e3962f7b 100644 --- a/src/main/java/fr/inria/corese/core/query/TemplateIndex.java +++ b/src/main/java/fr/inria/corese/core/query/TemplateIndex.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.query; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.logic.RDF; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/query/update/GraphManager.java b/src/main/java/fr/inria/corese/core/query/update/GraphManager.java index 15f3bc217..eb96d03b3 100644 --- a/src/main/java/fr/inria/corese/core/query/update/GraphManager.java +++ b/src/main/java/fr/inria/corese/core/query/update/GraphManager.java @@ -6,9 +6,9 @@ import fr.inria.corese.core.api.DataBrokerConstruct; import fr.inria.corese.core.api.Engine; import fr.inria.corese.core.api.Loader; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.LoadFormat; diff --git a/src/main/java/fr/inria/corese/core/query/update/Manager.java b/src/main/java/fr/inria/corese/core/query/update/Manager.java index 49cac98dc..6567c65f9 100644 --- a/src/main/java/fr/inria/corese/core/query/update/Manager.java +++ b/src/main/java/fr/inria/corese/core/query/update/Manager.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.query.update; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.Access.Level; import fr.inria.corese.core.sparql.triple.parser.AccessRight; diff --git a/src/main/java/fr/inria/corese/core/query/update/ManagerImpl.java b/src/main/java/fr/inria/corese/core/query/update/ManagerImpl.java index d2a9eb9d8..a6e7fdc6d 100644 --- a/src/main/java/fr/inria/corese/core/query/update/ManagerImpl.java +++ b/src/main/java/fr/inria/corese/core/query/update/ManagerImpl.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.query.update; import fr.inria.corese.core.Event; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.query.Construct; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.Access.Level; diff --git a/src/main/java/fr/inria/corese/core/query/update/UpdateProcess.java b/src/main/java/fr/inria/corese/core/query/update/UpdateProcess.java index 19786eb74..d954d3f3e 100644 --- a/src/main/java/fr/inria/corese/core/query/update/UpdateProcess.java +++ b/src/main/java/fr/inria/corese/core/query/update/UpdateProcess.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.query.update; import fr.inria.corese.core.Event; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/rule/Cleaner.java b/src/main/java/fr/inria/corese/core/rule/Cleaner.java index 0ad3ad154..c954da1b2 100644 --- a/src/main/java/fr/inria/corese/core/rule/Cleaner.java +++ b/src/main/java/fr/inria/corese/core/rule/Cleaner.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.rule; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.query.Evaluator; -import fr.inria.corese.core.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.query.Evaluator; +import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; import fr.inria.corese.core.query.QueryProcess; diff --git a/src/main/java/fr/inria/corese/core/rule/Record.java b/src/main/java/fr/inria/corese/core/rule/Record.java index e19352e99..122258d9b 100644 --- a/src/main/java/fr/inria/corese/core/rule/Record.java +++ b/src/main/java/fr/inria/corese/core/rule/Record.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.rule; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/fr/inria/corese/core/rule/ResultWatcher.java b/src/main/java/fr/inria/corese/core/rule/ResultWatcher.java index aaaf818f9..b177e894c 100644 --- a/src/main/java/fr/inria/corese/core/rule/ResultWatcher.java +++ b/src/main/java/fr/inria/corese/core/rule/ResultWatcher.java @@ -1,13 +1,13 @@ package fr.inria.corese.core.rule; -import fr.inria.corese.core.kgram.api.core.*; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.core.Distinct; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.event.ResultListener; -import fr.inria.corese.core.kgram.path.Path; +import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.core.Distinct; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.event.ResultListener; +import fr.inria.corese.core.next.kgram.path.Path; import fr.inria.corese.core.api.GraphListener; import fr.inria.corese.core.Graph; import fr.inria.corese.core.logic.RDFS; diff --git a/src/main/java/fr/inria/corese/core/rule/Rule.java b/src/main/java/fr/inria/corese/core/rule/Rule.java index 9b5e52b08..4b8ebae39 100755 --- a/src/main/java/fr/inria/corese/core/rule/Rule.java +++ b/src/main/java/fr/inria/corese/core/rule/Rule.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.rule; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; import fr.inria.corese.core.logic.Closure; diff --git a/src/main/java/fr/inria/corese/core/rule/RuleEngine.java b/src/main/java/fr/inria/corese/core/rule/RuleEngine.java index e087ae759..09a13c6a8 100644 --- a/src/main/java/fr/inria/corese/core/rule/RuleEngine.java +++ b/src/main/java/fr/inria/corese/core/rule/RuleEngine.java @@ -5,18 +5,18 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.Engine; import fr.inria.corese.core.api.Loader; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Graphable; -import fr.inria.corese.core.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.core.*; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Graphable; +import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.next.kgram.core.*; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; import fr.inria.corese.core.logic.Closure; import fr.inria.corese.core.logic.ClosureDataManager; import fr.inria.corese.core.logic.Entailment; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.query.Construct; import fr.inria.corese.core.query.QueryEngine; import fr.inria.corese.core.query.QueryProcess; diff --git a/src/main/java/fr/inria/corese/core/rule/RuleError.java b/src/main/java/fr/inria/corese/core/rule/RuleError.java index 04addf1c3..abcd4f2d8 100644 --- a/src/main/java/fr/inria/corese/core/rule/RuleError.java +++ b/src/main/java/fr/inria/corese/core/rule/RuleError.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.rule; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.core.Mappings; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/shacl/Shacl.java b/src/main/java/fr/inria/corese/core/shacl/Shacl.java index 7942e865c..041706745 100644 --- a/src/main/java/fr/inria/corese/core/shacl/Shacl.java +++ b/src/main/java/fr/inria/corese/core/shacl/Shacl.java @@ -8,7 +8,7 @@ import fr.inria.corese.core.producer.DataProducer; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/sparql/api/Computer.java b/src/main/java/fr/inria/corese/core/sparql/api/Computer.java index 31ef1db82..ee01ccf4d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/api/Computer.java +++ b/src/main/java/fr/inria/corese/core/sparql/api/Computer.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.api; -import fr.inria.corese.core.kgram.api.query.Evaluator; +import fr.inria.corese.core.next.kgram.api.query.Evaluator; /** * Interface for Interpreter diff --git a/src/main/java/fr/inria/corese/core/sparql/api/ComputerProxy.java b/src/main/java/fr/inria/corese/core/sparql/api/ComputerProxy.java index a17c04d62..8e276bc1f 100644 --- a/src/main/java/fr/inria/corese/core/sparql/api/ComputerProxy.java +++ b/src/main/java/fr/inria/corese/core/sparql/api/ComputerProxy.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql.api; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.parser.Context; diff --git a/src/main/java/fr/inria/corese/core/sparql/api/Graph.java b/src/main/java/fr/inria/corese/core/sparql/api/Graph.java index 142de767e..655ce585b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/api/Graph.java +++ b/src/main/java/fr/inria/corese/core/sparql/api/Graph.java @@ -3,7 +3,7 @@ /** * @author corby */ -public interface Graph extends fr.inria.corese.core.kgram.api.core.Graph { +public interface Graph extends fr.inria.corese.core.next.kgram.api.core.Graph { } diff --git a/src/main/java/fr/inria/corese/core/sparql/api/GraphProcessor.java b/src/main/java/fr/inria/corese/core/sparql/api/GraphProcessor.java index 4348b5529..c28c016b3 100644 --- a/src/main/java/fr/inria/corese/core/sparql/api/GraphProcessor.java +++ b/src/main/java/fr/inria/corese/core/sparql/api/GraphProcessor.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.sparql.api; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.Access.Level; diff --git a/src/main/java/fr/inria/corese/core/sparql/api/IDatatype.java b/src/main/java/fr/inria/corese/core/sparql/api/IDatatype.java index 5fb56f01b..44085c499 100644 --- a/src/main/java/fr/inria/corese/core/sparql/api/IDatatype.java +++ b/src/main/java/fr/inria/corese/core/sparql/api/IDatatype.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.api; -import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.api.core.*; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; import fr.inria.corese.core.sparql.storage.api.IStorage; diff --git a/src/main/java/fr/inria/corese/core/sparql/api/QueryVisitor.java b/src/main/java/fr/inria/corese/core/sparql/api/QueryVisitor.java index ee6c33b3c..049eb5c5f 100644 --- a/src/main/java/fr/inria/corese/core/sparql/api/QueryVisitor.java +++ b/src/main/java/fr/inria/corese/core/sparql/api/QueryVisitor.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.api; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; public interface QueryVisitor { diff --git a/src/main/java/fr/inria/corese/core/sparql/api/TransformProcessor.java b/src/main/java/fr/inria/corese/core/sparql/api/TransformProcessor.java index 9f83bcc09..28291ed6c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/api/TransformProcessor.java +++ b/src/main/java/fr/inria/corese/core/sparql/api/TransformProcessor.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql.api; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.exceptions.EngineException; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/compiler/java/JavaCompiler.java b/src/main/java/fr/inria/corese/core/sparql/compiler/java/JavaCompiler.java index b29abc320..2d77c18ab 100644 --- a/src/main/java/fr/inria/corese/core/sparql/compiler/java/JavaCompiler.java +++ b/src/main/java/fr/inria/corese/core/sparql/compiler/java/JavaCompiler.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.compiler.java; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.script.ForLoop; @@ -9,8 +9,6 @@ import fr.inria.corese.core.sparql.triple.function.script.Let; import fr.inria.corese.core.sparql.triple.function.script.Statement; import fr.inria.corese.core.sparql.triple.parser.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.BufferedWriter; import java.io.FileWriter; @@ -19,7 +17,7 @@ import java.util.Arrays; import java.util.HashMap; -import static fr.inria.corese.core.kgram.api.core.ExprType.*; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.*; /** * Java Compiler for LDScript Take an AST as input and compile the LDScript @@ -297,7 +295,7 @@ void term(Term term, boolean arg) { case ExprType.NOT: not(term, arg); return; - case ExprType.AND: + case AND: case ExprType.OR: bool(term, arg); return; @@ -350,7 +348,7 @@ void functionCall(Term term, boolean arg) { ifthenelse(term, arg); return; - case ExprType.RETURN: + case RETURN: append("return"); append(SPACE); toJava(term.getArg(0), true); diff --git a/src/main/java/fr/inria/corese/core/sparql/compiler/java/Rewrite.java b/src/main/java/fr/inria/corese/core/sparql/compiler/java/Rewrite.java index 7be56be61..919bca9cc 100644 --- a/src/main/java/fr/inria/corese/core/sparql/compiler/java/Rewrite.java +++ b/src/main/java/fr/inria/corese/core/sparql/compiler/java/Rewrite.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.compiler.java; -import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.script.Let; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/sparql/compiler/java/Stack.java b/src/main/java/fr/inria/corese/core/sparql/compiler/java/Stack.java index 2e73173a4..18a147712 100644 --- a/src/main/java/fr/inria/corese/core/sparql/compiler/java/Stack.java +++ b/src/main/java/fr/inria/corese/core/sparql/compiler/java/Stack.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.compiler.java; -import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.triple.function.script.ForLoop; import fr.inria.corese.core.sparql.triple.function.script.Function; import fr.inria.corese.core.sparql.triple.function.script.Let; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java index c60da9b80..83586683d 100755 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.sparql.datatype; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.PointerType; -import fr.inria.corese.core.kgram.api.core.Pointerable; -import fr.inria.corese.core.kgram.api.core.TripleStore; -import fr.inria.corese.core.kgram.path.Path; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.api.core.Pointerable; +import fr.inria.corese.core.next.kgram.api.core.TripleStore; +import fr.inria.corese.core.next.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.api.IDatatypeList; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseTriple.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseTriple.java index 1e527cdf5..7e0be11c1 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseTriple.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseTriple.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.datatype; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseURI.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseURI.java index 4c25638b8..c75749a6d 100755 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseURI.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseURI.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.datatype; -import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.core.ExpType; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseXMLLiteral.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseXMLLiteral.java index 21aff5323..0add3dea9 100755 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseXMLLiteral.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseXMLLiteral.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; -import fr.inria.corese.core.kgram.api.core.Loopable; +import fr.inria.corese.core.next.kgram.api.core.Loopable; /** *

Title: Corese

diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeHierarchy.java b/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeHierarchy.java index a856d8e08..c04aad2eb 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeHierarchy.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeHierarchy.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.NSManager; -import fr.inria.corese.core.kgram.api.query.Hierarchy; +import fr.inria.corese.core.next.kgram.api.query.Hierarchy; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java b/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java index 6e8af313a..8a2e67195 100755 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.datatype; -import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.next.kgram.api.core.*; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.extension.*; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/PointerObject.java b/src/main/java/fr/inria/corese/core/sparql/datatype/PointerObject.java index bdb34cd07..ed0523fb8 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/PointerObject.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/PointerObject.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.datatype; -import fr.inria.corese.core.kgram.api.core.Pointerable; +import fr.inria.corese.core.next.kgram.api.core.Pointerable; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoresePointer.java b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoresePointer.java index 34701ffaf..e801355fb 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoresePointer.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoresePointer.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.sparql.datatype.extension; -import fr.inria.corese.core.kgram.api.core.PointerType; -import fr.inria.corese.core.kgram.api.core.Pointerable; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.path.Path; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.api.core.Pointerable; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.CoreseUndefLiteral; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/function/VariableResolverImpl.java b/src/main/java/fr/inria/corese/core/sparql/datatype/function/VariableResolverImpl.java index 86624fe97..77e1ba108 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/function/VariableResolverImpl.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/function/VariableResolverImpl.java @@ -5,8 +5,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Text; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; /** * Variable resolver for XPath diff --git a/src/main/java/fr/inria/corese/core/sparql/exceptions/EngineException.java b/src/main/java/fr/inria/corese/core/sparql/exceptions/EngineException.java index 90a741b10..1812366b5 100644 --- a/src/main/java/fr/inria/corese/core/sparql/exceptions/EngineException.java +++ b/src/main/java/fr/inria/corese/core/sparql/exceptions/EngineException.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.exceptions; -import fr.inria.corese.core.kgram.core.SparqlException; +import fr.inria.corese.core.next.kgram.core.SparqlException; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.URLServer; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/Aggregate.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/Aggregate.java index c884e4b69..7e8f25def 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/Aggregate.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/Aggregate.java @@ -5,13 +5,13 @@ import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.aggregate.Distinct.TreeData; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Group; -import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Group; +import fr.inria.corese.core.next.kgram.core.Mapping; import fr.inria.corese.core.sparql.triple.function.script.LDScript; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateCount.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateCount.java index cd620a34d..436b0183c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateCount.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateCount.java @@ -3,10 +3,10 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mapping; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateGroupConcat.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateGroupConcat.java index f1781312e..2be239b0d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateGroupConcat.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateGroupConcat.java @@ -4,11 +4,10 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.Expression; -import static fr.inria.corese.core.sparql.triple.function.aggregate.Aggregate.NL; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateMinMax.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateMinMax.java index 9df473773..c25cc51c8 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateMinMax.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateMinMax.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; -import static fr.inria.corese.core.kgram.api.core.ExprType.MIN; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.MIN; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateSumAvg.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateSumAvg.java index 4895dbd14..4152c4384 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateSumAvg.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateSumAvg.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; -import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.ExprType; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateTemplate.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateTemplate.java index f13f484e7..2a8ee437d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateTemplate.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateTemplate.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.script.Function; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BiTriFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BiTriFunction.java index 65ca96915..e609ef421 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BiTriFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BiTriFunction.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BinaryFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BinaryFunction.java index 69472985b..ef43bb50c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BinaryFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BinaryFunction.java @@ -7,10 +7,10 @@ import fr.inria.corese.core.sparql.triple.function.script.Function; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import java.util.ArrayList; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BlankNode.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BlankNode.java index 2a18d12ff..d1e341ee2 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BlankNode.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BlankNode.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import java.util.Map; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Bound.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Bound.java index 4a97108ad..b7b56f8ee 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Bound.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Bound.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Coalesce.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Coalesce.java index 122664768..06598683e 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Coalesce.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Coalesce.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.Access; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Concat.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Concat.java index 674aa429d..2e4d36ad0 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Concat.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Concat.java @@ -1,14 +1,14 @@ package fr.inria.corese.core.sparql.triple.function.core; -import fr.inria.corese.core.kgram.api.core.Expr; -import static fr.inria.corese.core.kgram.api.core.ExprType.CONCAT; -import static fr.inria.corese.core.kgram.api.core.ExprType.FORMAT; -import static fr.inria.corese.core.kgram.api.core.ExprType.STL_CONCAT; -import static fr.inria.corese.core.kgram.api.core.ExprType.STL_FORMAT; -import static fr.inria.corese.core.kgram.api.core.ExprType.STL_NUMBER; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.CONCAT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.FORMAT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.STL_CONCAT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.STL_FORMAT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.STL_NUMBER; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/DateFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/DateFunction.java index 5a4f18e58..7553d18f7 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/DateFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/DateFunction.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ExistFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ExistFunction.java index 7656ff086..4eb8c5c1b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ExistFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ExistFunction.java @@ -1,17 +1,17 @@ package fr.inria.corese.core.sparql.triple.function.core; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Memory; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.core.SparqlException; -import fr.inria.corese.core.kgram.core.Stack; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Memory; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.SparqlException; +import fr.inria.corese.core.next.kgram.core.Stack; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Extern.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Extern.java index 7037ac3a1..8a21d1818 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Extern.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Extern.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.sparql.triple.parser.Processor; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.Access.Feature; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/FunctionEvaluator.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/FunctionEvaluator.java index 988387f14..4be17d5f9 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/FunctionEvaluator.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/FunctionEvaluator.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.triple.function.core; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/HashFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/HashFunction.java index d7653330c..b66f2ed5f 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/HashFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/HashFunction.java @@ -10,9 +10,9 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/IfThenElseTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/IfThenElseTerm.java index 507f4d332..f73411f1b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/IfThenElseTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/IfThenElseTerm.java @@ -2,15 +2,13 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; -import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; import fr.inria.corese.core.sparql.triple.parser.Expression; -import fr.inria.corese.core.sparql.triple.parser.Term; import fr.inria.corese.core.sparql.triple.function.script.Function; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import java.util.ArrayList; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/StrPredicate.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/StrPredicate.java index 1bd06b5ba..b769de61b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/StrPredicate.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/StrPredicate.java @@ -3,10 +3,10 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UUIDFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UUIDFunction.java index 596d15014..1065448ea 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UUIDFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UUIDFunction.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import java.util.UUID; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UnaryFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UnaryFunction.java index 05c3b590a..da3d6bc1b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UnaryFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UnaryFunction.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ZeroaryFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ZeroaryFunction.java index 9d4e0e0b5..0d5f19f22 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ZeroaryFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ZeroaryFunction.java @@ -2,9 +2,9 @@ import java.util.Optional; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.CoreseDouble; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/BinaryExtension.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/BinaryExtension.java index b9e104d6d..5a956bb41 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/BinaryExtension.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/BinaryExtension.java @@ -1,17 +1,17 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import static fr.inria.corese.core.kgram.api.core.ExprType.EXTCONT; -import static fr.inria.corese.core.kgram.api.core.ExprType.EXTEQUAL; -import static fr.inria.corese.core.kgram.api.core.ExprType.XPATH; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_COMPARE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_DISTANCE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.EXTCONT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.EXTEQUAL; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XPATH; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_COMPARE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_DISTANCE; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.datatype.function.StringHelper; import fr.inria.corese.core.sparql.datatype.function.VariableResolverImpl; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Cast.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Cast.java index 15e20d41a..1c677f2c6 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Cast.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Cast.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.GraphProcessor; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Display.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Display.java index 5c9a60419..8bc8d0fdf 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Display.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Display.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Focus.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Focus.java index 79d2a1e23..2568c492b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Focus.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Focus.java @@ -4,10 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.sparql.triple.parser.Expression; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Get.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Get.java index bc62ffda9..ea4ba0236 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Get.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Get.java @@ -1,15 +1,15 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_HAS; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_PATH; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_HAS; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_PATH; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/GetGen.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/GetGen.java index 2bfbbbb0e..da5f0710f 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/GetGen.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/GetGen.java @@ -1,14 +1,14 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/IOFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/IOFunction.java index 66fa576cc..dab52a7a6 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/IOFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/IOFunction.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Iterate.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Iterate.java index eb384579d..450a1e104 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Iterate.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Iterate.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/JSONTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/JSONTerm.java index 2fb2375f5..2090b02cd 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/JSONTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/JSONTerm.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListBinary.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListBinary.java index 2b575a706..3095844ba 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListBinary.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListBinary.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListNary.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListNary.java index 6f1fa85a5..328f40ef9 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListNary.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListNary.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListSort.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListSort.java index 3c68d4cfb..a1e1c24dc 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListSort.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListSort.java @@ -1,15 +1,13 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import fr.inria.corese.core.kgram.api.core.Pointerable; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.triple.function.script.Funcall; import fr.inria.corese.core.sparql.triple.function.script.Function; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListTerm.java index 8a848dcf1..7db1ee9a8 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListTerm.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListUnary.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListUnary.java index b1e7884eb..376e1bcc5 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListUnary.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListUnary.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/MapTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/MapTerm.java index 07130fd52..b0f7c4f23 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/MapTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/MapTerm.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Namespace.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Namespace.java index 5d6ea9e2d..3e24d425f 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Namespace.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Namespace.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/PathLength.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/PathLength.java index a6bc825e3..c72b8eb33 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/PathLength.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/PathLength.java @@ -4,13 +4,12 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Node; -import static fr.inria.corese.core.kgram.api.core.PointerType.PATH; -import fr.inria.corese.core.kgram.api.core.Pointerable; -import fr.inria.corese.core.kgram.api.query.Environment; + +import static fr.inria.corese.core.next.kgram.api.core.PointerType.PATH; + +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Rest.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Rest.java index a72cac11d..ad345b1fd 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Rest.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Rest.java @@ -6,11 +6,11 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import static fr.inria.corese.core.kgram.api.core.PointerType.EXPRESSION; -import fr.inria.corese.core.kgram.api.core.Pointerable; -import fr.inria.corese.core.kgram.api.query.Environment; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.EXPRESSION; +import fr.inria.corese.core.next.kgram.api.core.Pointerable; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ResultFormater.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ResultFormater.java index 771eeaad2..9ded16b06 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ResultFormater.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ResultFormater.java @@ -1,13 +1,13 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_JSON; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_RDF; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_XML; -import static fr.inria.corese.core.kgram.api.core.PointerType.MAPPINGS; -import fr.inria.corese.core.kgram.api.query.Environment; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_JSON; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_RDF; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_XML; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.MAPPINGS; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.api.ResultFormatDef; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SPINFormater.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SPINFormater.java index c3e0e4367..44ef803d5 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SPINFormater.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SPINFormater.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Size.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Size.java index 8fe59c459..d00c38015 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Size.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Size.java @@ -2,12 +2,11 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; -import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Swap.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Swap.java index a2c0b8490..33fbfc11a 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Swap.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Swap.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SystemFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SystemFunction.java index 960c81f26..faabcfc19 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SystemFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SystemFunction.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TernaryExtension.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TernaryExtension.java index 7129f1abc..eb05bf1c2 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TernaryExtension.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TernaryExtension.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_REPLACE; -import fr.inria.corese.core.kgram.api.query.Environment; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_REPLACE; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TripleAccess.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TripleAccess.java index e71a3adeb..6435162e1 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TripleAccess.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TripleAccess.java @@ -1,24 +1,24 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import fr.inria.corese.core.kgram.api.core.Edge; -import static fr.inria.corese.core.kgram.api.core.ExprType.IS_TRIPLE; -import static fr.inria.corese.core.kgram.api.core.ExprType.OBJECT; -import static fr.inria.corese.core.kgram.api.core.ExprType.PREDICATE; -import static fr.inria.corese.core.kgram.api.core.ExprType.SPARQL_COMPARE; -import static fr.inria.corese.core.kgram.api.core.ExprType.SUBJECT; -import static fr.inria.corese.core.kgram.api.core.ExprType.TRIPLE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_ASSERTED; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_EDGE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_REFERENCE; -import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.IS_TRIPLE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.OBJECT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.PREDICATE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.SPARQL_COMPARE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.SUBJECT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.TRIPLE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_ASSERTED; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_EDGE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_REFERENCE; +import fr.inria.corese.core.next.kgram.api.core.PointerType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/UnaryExtension.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/UnaryExtension.java index eb471a397..7928ce827 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/UnaryExtension.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/UnaryExtension.java @@ -4,12 +4,12 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.core.ExprType; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_LABEL; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_LABEL; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/XML.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/XML.java index 3d3885392..507ba5afe 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/XML.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/XML.java @@ -5,27 +5,27 @@ */ package fr.inria.corese.core.sparql.triple.function.extension; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_ATTRIBUTE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_ATTRIBUTES; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_BASE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_CHILDREN; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_ELEMENTS; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_HAS_ATTRIBUTE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NAMESPACE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_DOCUMENT; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_ELEMENT; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_FIRST_CHILD; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_LOCAL_NAME; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_NAME; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_PARENT; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_PROPERTY; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_TYPE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_VALUE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_TEXT_CONTENT; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_XSLT; -import fr.inria.corese.core.kgram.api.query.Environment; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_ATTRIBUTE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_ATTRIBUTES; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_BASE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_CHILDREN; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_ELEMENTS; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_HAS_ATTRIBUTE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NAMESPACE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_DOCUMENT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_ELEMENT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_FIRST_CHILD; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_LOCAL_NAME; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_NAME; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_PARENT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_PROPERTY; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_TYPE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_VALUE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_TEXT_CONTENT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_XSLT; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ZeroAry.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ZeroAry.java index 12e86e22d..e9b638f0e 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ZeroAry.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ZeroAry.java @@ -4,11 +4,11 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphFunction.java index 31cdf64f2..a8c313713 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphFunction.java @@ -1,22 +1,22 @@ package fr.inria.corese.core.sparql.triple.function.proxy; -import fr.inria.corese.core.kgram.api.core.Edge; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_GRAPH; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_INDEX; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_OBJECT; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_PROPERTY; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_SUBJECT; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_VERTEX; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_GRAPH; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_INDEX; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_OBJECT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_PROPERTY; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_SUBJECT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_VERTEX; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.PointerType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.script.LDScript; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphSpecificFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphSpecificFunction.java index 920777a9c..b227a2f35 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphSpecificFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphSpecificFunction.java @@ -1,49 +1,47 @@ package fr.inria.corese.core.sparql.triple.function.proxy; -import fr.inria.corese.core.kgram.api.core.Edge; -import static fr.inria.corese.core.kgram.api.core.ExprType.APPROXIMATE; -import static fr.inria.corese.core.kgram.api.core.ExprType.APP_SIM; -import static fr.inria.corese.core.kgram.api.core.ExprType.DEPTH; -import static fr.inria.corese.core.kgram.api.core.ExprType.KGRAM; -import static fr.inria.corese.core.kgram.api.core.ExprType.LOAD; -import static fr.inria.corese.core.kgram.api.core.ExprType.READ; -import static fr.inria.corese.core.kgram.api.core.ExprType.WRITE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_TUNE; -import static fr.inria.corese.core.kgram.api.core.ExprType.SIM; -import static fr.inria.corese.core.kgram.api.core.ExprType.STL_INDEX; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_CREATE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_DEGREE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_DELETE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_ENTAILMENT; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_EXISTS; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_JOIN; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_MINUS; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_OPTIONAL; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_UNION; +import fr.inria.corese.core.next.kgram.api.core.Edge; + +import static fr.inria.corese.core.next.kgram.api.core.ExprType.DEPTH; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.KGRAM; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.LOAD; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.READ; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.WRITE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_TUNE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.SIM; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.STL_INDEX; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_CREATE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_DEGREE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_DELETE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_ENTAILMENT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_EXISTS; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_JOIN; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_MINUS; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_OPTIONAL; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_UNION; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.GraphProcessor; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_SHAPE_GRAPH; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_SHAPE_NODE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_TOGRAPH; -import fr.inria.corese.core.kgram.api.core.PointerType; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_SHAPE_GRAPH; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_SHAPE_NODE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_TOGRAPH; +import fr.inria.corese.core.next.kgram.api.core.PointerType; import fr.inria.corese.core.sparql.triple.function.script.LDScript; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_EDGES; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_HTTP_GET; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_INSERT; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_MERGE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_MINDEGREE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_OBJECTS; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_SUBJECTS; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_SYNTAX; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_VALUE; -import fr.inria.corese.core.kgram.api.core.Node; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_EDGES; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_HTTP_GET; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_INSERT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_MERGE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_MINDEGREE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_OBJECTS; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_SUBJECTS; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_SYNTAX; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_VALUE; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.datatype.DatatypeMap; -import fr.inria.corese.core.sparql.exceptions.SafetyException; import fr.inria.corese.core.sparql.triple.function.term.TermEval; import fr.inria.corese.core.sparql.triple.parser.Access; import fr.inria.corese.core.sparql.triple.parser.Access.Feature; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/Introspection.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/Introspection.java index 37384f62d..89f81e19b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/Introspection.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/Introspection.java @@ -1,20 +1,19 @@ package fr.inria.corese.core.sparql.triple.function.proxy; -import fr.inria.corese.core.kgram.api.core.Expr; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_CONTEXT; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_FROM; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_MAPPINGS; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_METADATA; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NAME; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NAMED; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_QUERY; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_CONTEXT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_FROM; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_METADATA; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NAME; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NAMED; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_QUERY; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.script.LDScript; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ErrorFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ErrorFunction.java index dcc6c193c..de4dad90b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ErrorFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ErrorFunction.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Eval.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Eval.java index 0cc6bb472..33b6c77fb 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Eval.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Eval.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.kgram.api.core.PointerType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/EventCall.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/EventCall.java index 0737ac0df..0fd83e51b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/EventCall.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/EventCall.java @@ -5,10 +5,10 @@ */ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Extension.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Extension.java index 14112d986..e669866c7 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Extension.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Extension.java @@ -1,14 +1,15 @@ package fr.inria.corese.core.sparql.triple.function.script; +import fr.inria.corese.core.next.kgram.core.Eval; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.parser.Term; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import java.util.List; import org.slf4j.LoggerFactory; import org.slf4j.Logger; @@ -137,7 +138,7 @@ public IDatatype eval(Computer eval, Binding b, Environment env, Producer p) thr IDatatype dt = null; if (isSystem) { //fr.inria.corese.core.kgram.core.Eval cc = eval.getComputerEval(env, p, function); - fr.inria.corese.core.kgram.core.Eval cc = getComputerEval(eval.getEvaluator(), env, p, function); + Eval cc = getComputerEval(eval.getEvaluator(), env, p, function); // PRAGMA: b = cc.getEnvironment().getBind() dt = body.eval(cc.getEvaluator(), b, cc.getEnvironment(), p); } else { @@ -189,7 +190,7 @@ public IDatatype eval(Computer eval, Binding b, Environment env, Producer p, IDa b.set(function, fun.getExpList(), param); if (function.isSystem()) { //fr.inria.corese.core.kgram.core.Eval cc = eval.getComputerEval(env, p, function); - fr.inria.corese.core.kgram.core.Eval cc = getComputerEval(eval.getEvaluator(), env, p, function); + Eval cc = getComputerEval(eval.getEvaluator(), env, p, function); // PRAGMA: b = cc.getEnvironment().getBind() dt = function.getBody().eval(cc.getEvaluator(), b, cc.getEnvironment(), p); } else { diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ForLoop.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ForLoop.java index 4c8c2d666..31866b93f 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ForLoop.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ForLoop.java @@ -7,9 +7,9 @@ import fr.inria.corese.core.sparql.triple.parser.Processor; import fr.inria.corese.core.sparql.triple.parser.Variable; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.ASTBuffer; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Funcall.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Funcall.java index ff3668cda..6e0ce3b13 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Funcall.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Funcall.java @@ -1,14 +1,15 @@ package fr.inria.corese.core.sparql.triple.function.script; +import fr.inria.corese.core.next.kgram.core.Eval; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.PointerType; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.SparqlException; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.SparqlException; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.exceptions.UndefinedExpressionException; @@ -88,7 +89,7 @@ public IDatatype call(Computer eval, Binding b, Environment env, Producer p, Fun IDatatype dt = null; if (function.isSystem()) { // fr.inria.corese.core.kgram.core.Eval cc = eval.getComputerEval(env, p, function); - fr.inria.corese.core.kgram.core.Eval cc = getComputerEval(eval.getEvaluator(), env, p, function); + Eval cc = getComputerEval(eval.getEvaluator(), env, p, function); dt = function.getBody().eval(cc.getEvaluator(), b, cc.getEnvironment(), p); } else { dt = function.getBody().eval(eval, b, env, p); diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Function.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Function.java index 0787ff4d2..1033d9b62 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Function.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Function.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; @@ -14,8 +14,8 @@ import fr.inria.corese.core.sparql.triple.parser.Variable; import fr.inria.corese.core.sparql.compiler.java.JavaCompiler; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.GraphProcessor; import fr.inria.corese.core.sparql.datatype.RDF; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/FunctionDefined.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/FunctionDefined.java index 12a3ab357..d7de0ed9c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/FunctionDefined.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/FunctionDefined.java @@ -5,9 +5,9 @@ */ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaCast.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaCast.java index 384f8aa81..f57b47f60 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaCast.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaCast.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * cast:node(exp) return eval(exp) diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaDScall.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaDScall.java index d6bbc6d6c..54e97a4c6 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaDScall.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaDScall.java @@ -3,11 +3,10 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; -import fr.inria.corese.core.sparql.exceptions.SafetyException; import fr.inria.corese.core.sparql.triple.parser.Access.Feature; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaFunction.java index 25ac46b90..ec3af6849 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaFunction.java @@ -1,11 +1,5 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.sparql.api.Computer; -import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.sparql.triple.parser.Access.Feature; - /** * * @author Olivier Corby, Wimmics INRIA I3S, 2016 diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Javacall.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Javacall.java index 58d61467f..8880fe311 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Javacall.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Javacall.java @@ -1,23 +1,20 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; -import static fr.inria.corese.core.sparql.triple.function.term.TermEval.JAVA_FUNCTION_MESS; -import fr.inria.corese.core.sparql.triple.parser.Access; import fr.inria.corese.core.sparql.triple.parser.Access.Feature; import fr.inria.corese.core.sparql.triple.parser.NSManager; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory;; +; /** * Call Corese Java function with parameters as getObject() or diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/LDScript.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/LDScript.java index 5419eead9..615114cf7 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/LDScript.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/LDScript.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Evaluator; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.sparql.api.Computer; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Evaluator; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.term.TermEval; @@ -156,10 +156,10 @@ public ASTExtension getExtension() { * public query q1 which may be different from the query q2 where public * function call occur */ - fr.inria.corese.core.kgram.core.Eval getComputerEval(Evaluator evaluator, Environment env, Producer p, Expr function) { + Eval getComputerEval(Evaluator evaluator, Environment env, Producer p, Expr function) { Query q = getQuery(env, function); - fr.inria.corese.core.kgram.core.Eval currentEval = env.getEval(); - fr.inria.corese.core.kgram.core.Eval eval = new fr.inria.corese.core.kgram.core.Eval(p, evaluator, currentEval.getMatcher()); + Eval currentEval = env.getEval(); + Eval eval = new Eval(p, evaluator, currentEval.getMatcher()); eval.setSPARQLEngine(currentEval.getSPARQLEngine()); eval.set(currentEval.getProvider()); eval.init(q); diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Let.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Let.java index c473d45fa..78b1d5fb5 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Let.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Let.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; @@ -8,9 +8,9 @@ import fr.inria.corese.core.sparql.triple.parser.Processor; import fr.inria.corese.core.sparql.triple.parser.Variable; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.ASTBuffer; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapAnyEvery.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapAnyEvery.java index 68e2d7715..5fdd07293 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapAnyEvery.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapAnyEvery.java @@ -3,16 +3,13 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import static fr.inria.corese.core.kgram.api.core.ExprType.MAPANY; -import static fr.inria.corese.core.kgram.api.core.ExprType.MAPEVERY; -import fr.inria.corese.core.kgram.api.query.Environment; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAPANY; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAPEVERY; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.sparql.exceptions.EngineException; -import java.util.Iterator; +import fr.inria.corese.core.next.kgram.api.query.Producer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.util.Iterator; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapFunction.java index ed1e8feca..eee1c07ea 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapFunction.java @@ -4,15 +4,15 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.core.Expr; -import static fr.inria.corese.core.kgram.api.core.ExprType.MAPAPPEND; -import static fr.inria.corese.core.kgram.api.core.ExprType.MAPFIND; -import static fr.inria.corese.core.kgram.api.core.ExprType.MAPFINDLIST; -import static fr.inria.corese.core.kgram.api.core.ExprType.MAPLIST; -import static fr.inria.corese.core.kgram.api.core.ExprType.MAPMERGE; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAPAPPEND; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAPFIND; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAPFINDLIST; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAPLIST; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAPMERGE; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodCall.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodCall.java index e21938d0c..032873d1a 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodCall.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodCall.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodTypeCall.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodTypeCall.java index eef85c21b..3ff7bcb0c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodTypeCall.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodTypeCall.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Reduce.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Reduce.java index 5db2fd0c5..fd81fe21c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Reduce.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Reduce.java @@ -4,26 +4,22 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.core.Expr; -import static fr.inria.corese.core.kgram.api.core.ExprType.AND; -import static fr.inria.corese.core.kgram.api.core.ExprType.CONCAT; -import static fr.inria.corese.core.kgram.api.core.ExprType.DIV; -import static fr.inria.corese.core.kgram.api.core.ExprType.MINUS; -import static fr.inria.corese.core.kgram.api.core.ExprType.MULT; -import static fr.inria.corese.core.kgram.api.core.ExprType.OR; -import static fr.inria.corese.core.kgram.api.core.ExprType.PLUS; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_APPEND; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_MERGE; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; + +import static fr.inria.corese.core.next.kgram.api.core.ExprType.AND; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.CONCAT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.DIV; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.MINUS; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.MULT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.OR; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.PLUS; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_APPEND; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_MERGE; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.Expression; -import fr.inria.corese.core.sparql.triple.parser.Processor; -import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.util.List; /** * reduce(rq:plus, list) diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Return.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Return.java index b01c10865..668d15ce8 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Return.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Return.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Self.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Self.java index d976e0200..9bbda96ec 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Self.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Self.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Sequence.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Sequence.java index d9ae1d946..57ccb5942 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Sequence.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Sequence.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.ASTBuffer; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/SetFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/SetFunction.java index 743385212..53dfd139d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/SetFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/SetFunction.java @@ -1,15 +1,15 @@ package fr.inria.corese.core.sparql.triple.function.script; -import static fr.inria.corese.core.kgram.api.core.ExprType.SET; -import static fr.inria.corese.core.kgram.api.core.ExprType.STATIC; -import static fr.inria.corese.core.kgram.api.core.ExprType.STATIC_UNSET; -import static fr.inria.corese.core.kgram.api.core.ExprType.UNSET; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.SET; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.STATIC; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.STATIC_UNSET; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.UNSET; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Throw.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Throw.java index 2881ab963..c6874c16a 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Throw.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Throw.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql.triple.function.script; -import static fr.inria.corese.core.kgram.api.core.ExprType.THROW; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.THROW; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/TryCatch.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/TryCatch.java index 6d3314c9b..fa55f57b8 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/TryCatch.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/TryCatch.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplates.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplates.java index e52d3aad6..8f56912bb 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplates.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplates.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.api.TransformProcessor; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWith.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWith.java index cea4995cb..a590f4ef5 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWith.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWith.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.TransformProcessor; import fr.inria.corese.core.sparql.triple.parser.Access; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWithGraph.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWithGraph.java index 38aa3c57c..39634e28a 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWithGraph.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWithGraph.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.TransformProcessor; import fr.inria.corese.core.sparql.triple.parser.Access; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CGetSetContext.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CGetSetContext.java index 732ddea49..0ec7dc5fb 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CGetSetContext.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CGetSetContext.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.Context; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplate.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplate.java index da0fdf797..6c453d821 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplate.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplate.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.TransformProcessor; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplateWith.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplateWith.java index f96fdfbe5..c087c18cd 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplateWith.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplateWith.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.TransformProcessor; import fr.inria.corese.core.sparql.triple.parser.Access; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/FocusNode.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/FocusNode.java index b5c18203e..c4ab5974b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/FocusNode.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/FocusNode.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/GetSetContext.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/GetSetContext.java index 5a3a96ebc..8b9a9aaa6 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/GetSetContext.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/GetSetContext.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.Context; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Prefix.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Prefix.java index 08be6edce..907dc53d2 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Prefix.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Prefix.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateAccess.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateAccess.java index d4a3d0771..321d717ef 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateAccess.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateAccess.java @@ -1,16 +1,16 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.kgram.api.core.ExprType; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_LOAD_MAPPINGS; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_MAPPINGS; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_PARSE_MAPPINGS; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_LOAD_MAPPINGS; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_MAPPINGS; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_PARSE_MAPPINGS; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.TransformProcessor; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFormat.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFormat.java index d67253960..c81b5ca97 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFormat.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFormat.java @@ -1,14 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; -import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.sparql.triple.function.term.TermEval; import fr.inria.corese.core.sparql.triple.parser.Access; import fr.inria.corese.core.sparql.triple.parser.Access.Feature; import fr.inria.corese.core.sparql.triple.parser.Processor; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFunction.java index b5a745af0..c08d025a9 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFunction.java @@ -1,14 +1,13 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; -import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.script.LDScript; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Constant; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFuture.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFuture.java index eba39adf0..9ca1d7b2e 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFuture.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFuture.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateNumber.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateNumber.java index 62174feae..8f5887ae9 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateNumber.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateNumber.java @@ -1,14 +1,14 @@ package fr.inria.corese.core.sparql.triple.function.template; -import static fr.inria.corese.core.kgram.api.core.ExprType.NUMBER; -import static fr.inria.corese.core.kgram.api.core.ExprType.STL_INDEX; -import static fr.inria.corese.core.kgram.api.core.ExprType.STL_NUMBER; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.NUMBER; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.STL_INDEX; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.STL_NUMBER; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateProcess.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateProcess.java index 947f29b62..5a6d4e3f4 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateProcess.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateProcess.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.script.Extension; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * st:process(?x) can be overloaded by diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateVisitor.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateVisitor.java index 746f965d6..58cf42258 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateVisitor.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateVisitor.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.TransformVisitor; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Turtle.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Turtle.java index 556001fee..195983bb1 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Turtle.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Turtle.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/AndTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/AndTerm.java index 4f77c26f9..b0bf3fa38 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/AndTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/AndTerm.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Binding.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Binding.java index 09b8a2b84..98eb2d63e 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Binding.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Binding.java @@ -2,13 +2,13 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.script.Function; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Binder; -import fr.inria.corese.core.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Binder; +import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.Access; import fr.inria.corese.core.sparql.triple.parser.AccessRight; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/DivTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/DivTerm.java index 68e27c586..8a10f8db0 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/DivTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/DivTerm.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/EQ.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/EQ.java index 8279006be..954282b1d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/EQ.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/EQ.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GE.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GE.java index 277419609..54b28b5f7 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GE.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GE.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GT.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GT.java index 2cf9edfd1..9d8fca5a6 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GT.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GT.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/In.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/In.java index ff898092d..5579ae35d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/In.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/In.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; import fr.inria.corese.core.sparql.triple.parser.Expression; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LE.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LE.java index a38e7182d..751caa66c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LE.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LE.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LT.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LT.java index eb14883ab..67e30cea4 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LT.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LT.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MinusTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MinusTerm.java index a4ed73bd6..06b80322f 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MinusTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MinusTerm.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MultTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MultTerm.java index 1a2a08f52..06df3e427 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MultTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MultTerm.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NEQ.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NEQ.java index d1efde7b4..bd9f822d0 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NEQ.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NEQ.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NotTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NotTerm.java index 515cff167..74e33256b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NotTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NotTerm.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Operation.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Operation.java index cf19040bd..62c2f47c6 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Operation.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Operation.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/OrTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/OrTerm.java index 45334c235..bd69bac51 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/OrTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/OrTerm.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/PlusTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/PlusTerm.java index 3cb221a54..8b2e80ec8 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/PlusTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/PlusTerm.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/TermEval.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/TermEval.java index 97ef35f3c..fc026c748 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/TermEval.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/TermEval.java @@ -1,16 +1,16 @@ package fr.inria.corese.core.sparql.triple.function.term; -import fr.inria.corese.core.kgram.api.core.Node; -import static fr.inria.corese.core.kgram.api.core.PointerType.NODE; +import fr.inria.corese.core.next.kgram.api.core.Node; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.NODE; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.parser.Term; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.exceptions.SafetyException; import fr.inria.corese.core.sparql.triple.parser.Access; import fr.inria.corese.core.sparql.triple.parser.Access.Feature; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTExtension.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTExtension.java index 6ebadaa25..6421cfb8a 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTExtension.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTExtension.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.query.Hierarchy; -import fr.inria.corese.core.kgram.filter.Extension; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.query.Hierarchy; +import fr.inria.corese.core.next.kgram.filter.Extension; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.script.Function; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTObject.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTObject.java index 8eaa3547f..fa2c6cdda 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTObject.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTObject.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; -import fr.inria.corese.core.kgram.core.PointerObject; +import fr.inria.corese.core.next.kgram.core.PointerObject; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java index 0f9cdf053..089c65bc3 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java @@ -20,9 +20,9 @@ import fr.inria.corese.core.sparql.triple.cst.RDFS; import fr.inria.corese.core.sparql.triple.printer.SPIN; import fr.inria.corese.core.sparql.triple.update.ASTUpdate; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.ASTQ; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.ASTQ; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.QueryVisitor; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.api.Walker; @@ -243,7 +243,7 @@ public class ASTQuery // triple without path, triple with path private final List tripleList; private List pathList; - private fr.inria.corese.core.kgram.core.Query updateQuery; + private fr.inria.corese.core.next.kgram.core.Query updateQuery; /* --- dead code removal --- private AccessRight accessRight; */ private ASTSelector astSelector; @@ -3747,11 +3747,11 @@ public Term function(String name, Expression... exp) { return t; } - public fr.inria.corese.core.kgram.core.Query getUpdateQuery() { + public fr.inria.corese.core.next.kgram.core.Query getUpdateQuery() { return updateQuery; } - public void setUpdateQuery(fr.inria.corese.core.kgram.core.Query updateQuery) { + public void setUpdateQuery(fr.inria.corese.core.next.kgram.core.Query updateQuery) { this.updateQuery = updateQuery; } diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Access.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Access.java index 3560f0a82..caa139ec7 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Access.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Access.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mapping; import fr.inria.corese.core.sparql.exceptions.SafetyException; import static fr.inria.corese.core.sparql.triple.parser.Access.Feature.*; import static fr.inria.corese.core.sparql.triple.parser.Access.Level.*; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java index aa1c6c9a7..889c5b990 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java @@ -1,7 +1,6 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.sparql.api.IDatatype; +import fr.inria.corese.core.next.kgram.api.core.Edge; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java index 35f30f5a6..03198102b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.HashMap; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Atom.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Atom.java index 0a665c7b3..4824d0b11 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Atom.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Atom.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Constant.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Constant.java index 8940a56af..b452c5c43 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Constant.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Constant.java @@ -12,9 +12,9 @@ import fr.inria.corese.core.sparql.triple.cst.RDFS; import fr.inria.corese.core.sparql.compiler.java.JavaCompiler; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.exceptions.EngineException; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Context.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Context.java index a107d6508..ede4d7669 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Context.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Context.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql.triple.parser; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.core.PointerType; -import static fr.inria.corese.core.kgram.api.core.PointerType.CONTEXT; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.CONTEXT; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.context.ContextLog; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Dataset.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Dataset.java index 9a87243ba..6f81c9b61 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Dataset.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Dataset.java @@ -8,15 +8,15 @@ import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.api.core.PointerType; -import static fr.inria.corese.core.kgram.api.core.PointerType.DATASET; -import fr.inria.corese.core.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.DATASET; +import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.next.kgram.core.Mapping; import fr.inria.corese.core.sparql.triple.parser.Access.Level; import static fr.inria.corese.core.sparql.triple.parser.URLParam.INDEX; import static fr.inria.corese.core.sparql.triple.parser.URLServer.STORE; -import java.io.UnsupportedEncodingException; + import java.net.URLEncoder; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Expression.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Expression.java index c20fe8f74..6b1ff2eab 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Expression.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Expression.java @@ -13,20 +13,20 @@ import fr.inria.corese.core.sparql.compiler.java.JavaCompiler; import fr.inria.corese.core.sparql.triple.function.script.Function; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Filter; -import fr.inria.corese.core.kgram.api.core.PointerType; -import static fr.inria.corese.core.kgram.api.core.PointerType.EXPRESSION; -import fr.inria.corese.core.kgram.api.core.Pointerable; -import fr.inria.corese.core.kgram.api.core.Regex; -import fr.inria.corese.core.kgram.api.core.TripleStore; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Filter; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.EXPRESSION; +import fr.inria.corese.core.next.kgram.api.core.Pointerable; +import fr.inria.corese.core.next.kgram.api.core.Regex; +import fr.inria.corese.core.next.kgram.api.core.TripleStore; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.api.Walker; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Metadata.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Metadata.java index bb0b0587c..c632b3d6e 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Metadata.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Metadata.java @@ -6,7 +6,7 @@ import java.util.Iterator; import java.util.List; -import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.api.core.PointerType; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/NSManager.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/NSManager.java index e8689a242..a2917aa84 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/NSManager.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/NSManager.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.core.PointerType; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.cst.KeywordPP; @@ -19,7 +19,7 @@ import java.util.Set; import java.util.StringTokenizer; -import static fr.inria.corese.core.kgram.api.core.PointerType.NSMANAGER; +import static fr.inria.corese.core.next.kgram.api.core.PointerType.NSMANAGER; /** *

diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Processor.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Processor.java index c90178691..34801f57d 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Processor.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Processor.java @@ -17,14 +17,13 @@ import fr.inria.corese.core.sparql.datatype.function.XPathFun; import fr.inria.corese.core.sparql.triple.cst.RDFS; import fr.inria.corese.core.sparql.triple.cst.KeywordPP; -import fr.inria.corese.core.kgram.api.core.ExpPattern; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import static fr.inria.corese.core.kgram.api.core.ExprType.IS_TRIPLE; -import static fr.inria.corese.core.kgram.api.core.ExprType.OBJECT; -import static fr.inria.corese.core.kgram.api.core.ExprType.PREDICATE; -import static fr.inria.corese.core.kgram.api.core.ExprType.SUBJECT; -import static fr.inria.corese.core.kgram.api.core.ExprType.TRIPLE; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.IS_TRIPLE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.OBJECT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.PREDICATE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.SUBJECT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.TRIPLE; import fr.inria.corese.core.sparql.exceptions.EngineException; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Term.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Term.java index 5db3a3436..698971495 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Term.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Term.java @@ -16,12 +16,12 @@ import fr.inria.corese.core.sparql.triple.cst.Keyword; import fr.inria.corese.core.sparql.triple.cst.KeywordPP; import fr.inria.corese.core.sparql.compiler.java.JavaCompiler; -import fr.inria.corese.core.kgram.api.core.ExpPattern; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_CREATE; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.ExpPattern; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_CREATE; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.exceptions.SafetyException; import fr.inria.corese.core.sparql.triple.parser.Access.Feature; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Triple.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Triple.java index 9eb54ee78..28fdb35d9 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Triple.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Triple.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.kgram.api.core.Pointerable; +import fr.inria.corese.core.next.kgram.api.core.Pointerable; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.RDF; -import static fr.inria.corese.core.sparql.datatype.RDF.OWL; + import static fr.inria.corese.core.sparql.datatype.RDF.OWL_SAME_AS; import fr.inria.corese.core.sparql.triple.api.ExpressionVisitor; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/URLServer.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/URLServer.java index 7c573b3de..1d4c4bc24 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/URLServer.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/URLServer.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.Graph; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import java.io.UnsupportedEncodingException; + import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Variable.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Variable.java index a379f7acd..f574ae2f7 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Variable.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Variable.java @@ -9,11 +9,11 @@ import fr.inria.corese.core.sparql.triple.cst.KeywordPP; import fr.inria.corese.core.sparql.compiler.java.JavaCompiler; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.query.Producer; /** *

diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/VariableLocal.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/VariableLocal.java index 1fd9c299c..2439c68a3 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/VariableLocal.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/VariableLocal.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/ContextLog.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/ContextLog.java index a031c4a05..2666f8a52 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/ContextLog.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/ContextLog.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.triple.parser.context; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.cst.LogKey; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/PropertyMap.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/PropertyMap.java index b5fcf01d2..a0d620668 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/PropertyMap.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/PropertyMap.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.triple.parser.context; -import fr.inria.corese.core.kgram.api.core.PointerType; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTWalker.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTWalker.java index 95e59cd82..0f00c9efa 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTWalker.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTWalker.java @@ -1,23 +1,23 @@ package fr.inria.corese.core.sparql.triple.parser.visitor; -import static fr.inria.corese.core.kgram.api.core.ExprType.APPLY; -import static fr.inria.corese.core.kgram.api.core.ExprType.APPLY_TEMPLATES; -import static fr.inria.corese.core.kgram.api.core.ExprType.APPLY_TEMPLATES_WITH; -import static fr.inria.corese.core.kgram.api.core.ExprType.APPLY_TEMPLATES_WITH_GRAPH; -import static fr.inria.corese.core.kgram.api.core.ExprType.CALL_TEMPLATE; -import static fr.inria.corese.core.kgram.api.core.ExprType.CALL_TEMPLATE_WITH; -import static fr.inria.corese.core.kgram.api.core.ExprType.DSCALL; -import static fr.inria.corese.core.kgram.api.core.ExprType.EXTERN; -import static fr.inria.corese.core.kgram.api.core.ExprType.FUNCALL; -import static fr.inria.corese.core.kgram.api.core.ExprType.JAVACALL; -import static fr.inria.corese.core.kgram.api.core.ExprType.KGRAM; -import static fr.inria.corese.core.kgram.api.core.ExprType.LOAD; -import static fr.inria.corese.core.kgram.api.core.ExprType.MAP; -import static fr.inria.corese.core.kgram.api.core.ExprType.READ; -import static fr.inria.corese.core.kgram.api.core.ExprType.REDUCE; -import static fr.inria.corese.core.kgram.api.core.ExprType.WRITE; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_ENTAILMENT; -import static fr.inria.corese.core.kgram.api.core.ExprType.XT_HTTP_GET; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.APPLY; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.APPLY_TEMPLATES; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.APPLY_TEMPLATES_WITH; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.APPLY_TEMPLATES_WITH_GRAPH; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.CALL_TEMPLATE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.CALL_TEMPLATE_WITH; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.DSCALL; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.EXTERN; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.FUNCALL; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.JAVACALL; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.KGRAM; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.LOAD; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAP; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.READ; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.REDUCE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.WRITE; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_ENTAILMENT; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_HTTP_GET; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.api.Walker; import fr.inria.corese.core.sparql.triple.function.script.Function; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ExpressionVisitorVariable.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ExpressionVisitorVariable.java index b79827a6c..a6db1fa61 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ExpressionVisitorVariable.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ExpressionVisitorVariable.java @@ -2,8 +2,8 @@ import fr.inria.corese.core.sparql.triple.function.script.Function; import fr.inria.corese.core.sparql.triple.api.ExpressionVisitor; -import fr.inria.corese.core.kgram.api.core.ExprType; -import static fr.inria.corese.core.kgram.api.core.ExprType.LOCAL; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import static fr.inria.corese.core.next.kgram.api.core.ExprType.LOCAL; import fr.inria.corese.core.sparql.triple.function.script.ForLoop; import fr.inria.corese.core.sparql.triple.function.script.Let; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/stats/IStats.java b/src/main/java/fr/inria/corese/core/stats/IStats.java index 25ff01846..e425cec23 100644 --- a/src/main/java/fr/inria/corese/core/stats/IStats.java +++ b/src/main/java/fr/inria/corese/core/stats/IStats.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.stats; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Interface for calling Producer from kgraph to do statistics diff --git a/src/main/java/fr/inria/corese/core/stats/StatsBasedEstimation.java b/src/main/java/fr/inria/corese/core/stats/StatsBasedEstimation.java index b6c20776a..a6a503867 100644 --- a/src/main/java/fr/inria/corese/core/stats/StatsBasedEstimation.java +++ b/src/main/java/fr/inria/corese/core/stats/StatsBasedEstimation.java @@ -1,17 +1,16 @@ package fr.inria.corese.core.stats; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.sorter.impl.qpv1.QPGNodeCostModel; -import fr.inria.corese.core.kgram.sorter.core.QPGraph; -import fr.inria.corese.core.kgram.sorter.core.QPGNode; -import fr.inria.corese.core.kgram.sorter.core.IEstimate; -import fr.inria.corese.core.kgram.api.core.Filter; -import fr.inria.corese.core.kgram.api.core.Node; -import static fr.inria.corese.core.kgram.api.core.Node.OBJECT; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.sorter.core.QPGEdge; -import fr.inria.corese.core.kgram.sorter.impl.qpv1.BasicPatternGenerator; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.sorter.impl.qpv1.QPGNodeCostModel; +import fr.inria.corese.core.next.kgram.sorter.core.QPGraph; +import fr.inria.corese.core.next.kgram.sorter.core.QPGNode; +import fr.inria.corese.core.next.kgram.sorter.core.IEstimate; +import fr.inria.corese.core.next.kgram.api.core.Filter; +import fr.inria.corese.core.next.kgram.api.core.Node; +import static fr.inria.corese.core.next.kgram.api.core.Node.OBJECT; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.sorter.impl.qpv1.BasicPatternGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/stats/data/BaseMap.java b/src/main/java/fr/inria/corese/core/stats/data/BaseMap.java index 4d739d7b7..f5b4508ad 100644 --- a/src/main/java/fr/inria/corese/core/stats/data/BaseMap.java +++ b/src/main/java/fr/inria/corese/core/stats/data/BaseMap.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.stats.data; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/fr/inria/corese/core/stats/data/HashBucket.java b/src/main/java/fr/inria/corese/core/stats/data/HashBucket.java index 62c6071b9..c5e34cf21 100644 --- a/src/main/java/fr/inria/corese/core/stats/data/HashBucket.java +++ b/src/main/java/fr/inria/corese/core/stats/data/HashBucket.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.stats.data; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.stats.Options; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/fr/inria/corese/core/stats/data/ReducedMap.java b/src/main/java/fr/inria/corese/core/stats/data/ReducedMap.java index dffdbd838..147a0f207 100644 --- a/src/main/java/fr/inria/corese/core/stats/data/ReducedMap.java +++ b/src/main/java/fr/inria/corese/core/stats/data/ReducedMap.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.stats.data; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.stats.Options; import java.util.ArrayList; import java.util.Comparator; diff --git a/src/main/java/fr/inria/corese/core/stats/data/SimpleAverage.java b/src/main/java/fr/inria/corese/core/stats/data/SimpleAverage.java index a8811f40f..179b767f8 100644 --- a/src/main/java/fr/inria/corese/core/stats/data/SimpleAverage.java +++ b/src/main/java/fr/inria/corese/core/stats/data/SimpleAverage.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.stats.data; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Simple average, number of all triples/number of distinct resources diff --git a/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable.java b/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable.java index d9c27b9b3..a534d560d 100644 --- a/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable.java +++ b/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.stats.data; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import static fr.inria.corese.core.stats.IStats.OBJECT; import static fr.inria.corese.core.stats.IStats.PREDICATE; import static fr.inria.corese.core.stats.IStats.SUBJECT; diff --git a/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable2.java b/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable2.java index 7d00f71df..f9009a03e 100644 --- a/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable2.java +++ b/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable2.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.stats.data; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import static fr.inria.corese.core.stats.IStats.OBJECT; import static fr.inria.corese.core.stats.IStats.PREDICATE; import static fr.inria.corese.core.stats.IStats.SUBJECT; diff --git a/src/main/java/fr/inria/corese/core/stats/data/WrappedNode.java b/src/main/java/fr/inria/corese/core/stats/data/WrappedNode.java index 53cec5bd0..4be719364 100644 --- a/src/main/java/fr/inria/corese/core/stats/data/WrappedNode.java +++ b/src/main/java/fr/inria/corese/core/stats/data/WrappedNode.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.stats.data; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * mainly for overriding the hashCode and equals methods of Node, same object if diff --git a/src/main/java/fr/inria/corese/core/storage/CoreseGraphDataManager.java b/src/main/java/fr/inria/corese/core/storage/CoreseGraphDataManager.java index 88aac3850..00c375b87 100644 --- a/src/main/java/fr/inria/corese/core/storage/CoreseGraphDataManager.java +++ b/src/main/java/fr/inria/corese/core/storage/CoreseGraphDataManager.java @@ -9,8 +9,8 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.producer.MetadataManager; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.triple.parser.HashMapList; /** diff --git a/src/main/java/fr/inria/corese/core/storage/DataManagerJava.java b/src/main/java/fr/inria/corese/core/storage/DataManagerJava.java index f678ad643..357a2f006 100644 --- a/src/main/java/fr/inria/corese/core/storage/DataManagerJava.java +++ b/src/main/java/fr/inria/corese/core/storage/DataManagerJava.java @@ -11,16 +11,14 @@ import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; import fr.inria.corese.core.query.QueryProcess; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.proxy.GraphSpecificFunction; import fr.inria.corese.core.sparql.triple.parser.Access; -import fr.inria.corese.core.sparql.triple.parser.Access.Feature; -import fr.inria.corese.core.sparql.triple.parser.Access.Level; import fr.inria.corese.core.sparql.triple.parser.HashMapList; import fr.inria.corese.core.sparql.triple.parser.NSManager; import fr.inria.corese.core.sparql.triple.parser.URLServer; diff --git a/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerRead.java b/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerRead.java index a549ebb6c..647a697a4 100644 --- a/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerRead.java +++ b/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerRead.java @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; /** * Interface to adapt an external storage system to Corese. diff --git a/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerUpdate.java b/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerUpdate.java index 3c00f8b70..10cc54dce 100644 --- a/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerUpdate.java +++ b/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerUpdate.java @@ -4,8 +4,8 @@ import java.util.List; import fr.inria.corese.core.edge.EdgeImpl; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/transform/ContextBuilder.java b/src/main/java/fr/inria/corese/core/transform/ContextBuilder.java index b20af3009..f37b12dca 100644 --- a/src/main/java/fr/inria/corese/core/transform/ContextBuilder.java +++ b/src/main/java/fr/inria/corese/core/transform/ContextBuilder.java @@ -6,8 +6,8 @@ import org.slf4j.LoggerFactory; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/transform/ContextManager.java b/src/main/java/fr/inria/corese/core/transform/ContextManager.java index c65d615cb..74d3b1b1a 100644 --- a/src/main/java/fr/inria/corese/core/transform/ContextManager.java +++ b/src/main/java/fr/inria/corese/core/transform/ContextManager.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.transform; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.parser.Context; diff --git a/src/main/java/fr/inria/corese/core/transform/Stack.java b/src/main/java/fr/inria/corese/core/transform/Stack.java index 0f53292f1..98d126a3f 100644 --- a/src/main/java/fr/inria/corese/core/transform/Stack.java +++ b/src/main/java/fr/inria/corese/core/transform/Stack.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.transform; import fr.inria.corese.core.sparql.api.IDatatype; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Query; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/transform/TemplatePrinter.java b/src/main/java/fr/inria/corese/core/transform/TemplatePrinter.java index 25d68aeb1..644e01d38 100644 --- a/src/main/java/fr/inria/corese/core/transform/TemplatePrinter.java +++ b/src/main/java/fr/inria/corese/core/transform/TemplatePrinter.java @@ -5,7 +5,7 @@ import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.NSManager; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.Graph; import fr.inria.corese.core.query.QueryEngine; import fr.inria.corese.core.load.Load; diff --git a/src/main/java/fr/inria/corese/core/transform/Transformer.java b/src/main/java/fr/inria/corese/core/transform/Transformer.java index 0b2cf3770..dab1f44a3 100644 --- a/src/main/java/fr/inria/corese/core/transform/Transformer.java +++ b/src/main/java/fr/inria/corese/core/transform/Transformer.java @@ -2,14 +2,14 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.compiler.parser.Pragma; -import fr.inria.corese.core.kgram.api.core.Expr; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Environment; -import fr.inria.corese.core.kgram.api.query.Producer; -import fr.inria.corese.core.kgram.core.*; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.filter.Extension; +import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.next.kgram.core.*; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.filter.Extension; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.query.QueryEngine; diff --git a/src/main/java/fr/inria/corese/core/transform/TransformerMapping.java b/src/main/java/fr/inria/corese/core/transform/TransformerMapping.java index 29b5af21e..d73532dbf 100644 --- a/src/main/java/fr/inria/corese/core/transform/TransformerMapping.java +++ b/src/main/java/fr/inria/corese/core/transform/TransformerMapping.java @@ -2,9 +2,9 @@ import fr.inria.corese.core.compiler.parser.NodeImpl; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/transform/TransformerVisitor.java b/src/main/java/fr/inria/corese/core/transform/TransformerVisitor.java index 14bea3e72..210666bc3 100644 --- a/src/main/java/fr/inria/corese/core/transform/TransformerVisitor.java +++ b/src/main/java/fr/inria/corese/core/transform/TransformerVisitor.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.transform; +import fr.inria.corese.core.next.kgram.core.Exp; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; -import fr.inria.corese.core.sparql.triple.parser.Exp; import fr.inria.corese.core.compiler.api.QueryVisitor; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.ExpHandler; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.ExpHandler; +import fr.inria.corese.core.next.kgram.core.Query; /** * QueryVisitor for Transformation templates @@ -69,7 +69,7 @@ void optimize(Query query){ */ void optimize(Query query, String graph, String var) { if (query.getBody().size() > 0) { - fr.inria.corese.core.kgram.core.Exp exp = query.getBody().get(0); + Exp exp = query.getBody().get(0); if (exp.isGraph() && exp.getGraphName().getLabel().equals(graph)) { Node n = query.getNode(var); if (n != null) { diff --git a/src/main/java/fr/inria/corese/core/util/Duplicate.java b/src/main/java/fr/inria/corese/core/util/Duplicate.java index d6120f0ac..278d9f2fb 100644 --- a/src/main/java/fr/inria/corese/core/util/Duplicate.java +++ b/src/main/java/fr/inria/corese/core/util/Duplicate.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.util; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Distinct; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Distinct; import java.util.HashMap; /** diff --git a/src/main/java/fr/inria/corese/core/util/GraphListen.java b/src/main/java/fr/inria/corese/core/util/GraphListen.java index 08cfd0060..6ad3635a6 100644 --- a/src/main/java/fr/inria/corese/core/util/GraphListen.java +++ b/src/main/java/fr/inria/corese/core/util/GraphListen.java @@ -6,16 +6,16 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.api.GraphListener; import fr.inria.corese.core.Graph; import fr.inria.corese.core.query.QueryProcess; import org.slf4j.LoggerFactory; -import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Edge; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/util/GraphListenerImpl.java b/src/main/java/fr/inria/corese/core/util/GraphListenerImpl.java index 3875c7192..bd32e533f 100644 --- a/src/main/java/fr/inria/corese/core/util/GraphListenerImpl.java +++ b/src/main/java/fr/inria/corese/core/util/GraphListenerImpl.java @@ -7,13 +7,12 @@ import fr.inria.corese.core.sparql.triple.parser.Atom; import fr.inria.corese.core.sparql.triple.parser.Triple; import fr.inria.corese.core.compiler.parser.Pragma; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.api.GraphListener; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; /** diff --git a/src/main/java/fr/inria/corese/core/util/MappingComparator.java b/src/main/java/fr/inria/corese/core/util/MappingComparator.java index 166752dad..0bc0d3664 100644 --- a/src/main/java/fr/inria/corese/core/util/MappingComparator.java +++ b/src/main/java/fr/inria/corese/core/util/MappingComparator.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; /** * diff --git a/src/main/java/fr/inria/corese/core/util/MappingsGraph.java b/src/main/java/fr/inria/corese/core/util/MappingsGraph.java index 58e9a0d27..9f366fdc3 100644 --- a/src/main/java/fr/inria/corese/core/util/MappingsGraph.java +++ b/src/main/java/fr/inria/corese/core/util/MappingsGraph.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.util; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.query.Graphable; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.query.Graphable; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.logic.RDF; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/util/Property.java b/src/main/java/fr/inria/corese/core/util/Property.java index 06c6a2af3..8b5c54971 100644 --- a/src/main/java/fr/inria/corese/core/util/Property.java +++ b/src/main/java/fr/inria/corese/core/util/Property.java @@ -10,9 +10,9 @@ import fr.inria.corese.core.compiler.federate.SelectorFilter; import fr.inria.corese.core.compiler.federate.SelectorIndex; import fr.inria.corese.core.index.EdgeManagerIndexer; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.load.Service; import fr.inria.corese.core.load.*; import fr.inria.corese.core.producer.DataFilter; diff --git a/src/main/java/fr/inria/corese/core/util/QueryGraphVisitorImpl.java b/src/main/java/fr/inria/corese/core/util/QueryGraphVisitorImpl.java index c0158200f..8e50b229f 100644 --- a/src/main/java/fr/inria/corese/core/util/QueryGraphVisitorImpl.java +++ b/src/main/java/fr/inria/corese/core/util/QueryGraphVisitorImpl.java @@ -4,11 +4,11 @@ import fr.inria.corese.core.api.QueryGraphVisitor; import fr.inria.corese.core.compiler.parser.NodeImpl; import fr.inria.corese.core.edge.EdgeImpl; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.ExpType; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Exp; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Constant; diff --git a/src/main/java/fr/inria/corese/core/util/SPINProcess.java b/src/main/java/fr/inria/corese/core/util/SPINProcess.java index dc374fda1..0de93999c 100644 --- a/src/main/java/fr/inria/corese/core/util/SPINProcess.java +++ b/src/main/java/fr/inria/corese/core/util/SPINProcess.java @@ -5,14 +5,13 @@ import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.NSManager; import fr.inria.corese.core.sparql.triple.printer.SPIN; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.Graph; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.transform.Transformer; import java.io.ByteArrayInputStream; -import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import fr.inria.corese.core.transform.TransformerUtils; diff --git a/src/main/java/fr/inria/corese/core/visitor/ldpath/LinkedDataPath.java b/src/main/java/fr/inria/corese/core/visitor/ldpath/LinkedDataPath.java index e01e2144d..cf1a72f70 100644 --- a/src/main/java/fr/inria/corese/core/visitor/ldpath/LinkedDataPath.java +++ b/src/main/java/fr/inria/corese/core/visitor/ldpath/LinkedDataPath.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.query.QueryProcess; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.ProcessVisitorDefault; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.ProcessVisitorDefault; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/visitor/ldpath/QueryProcessThread.java b/src/main/java/fr/inria/corese/core/visitor/ldpath/QueryProcessThread.java index 6d6138cce..351085055 100644 --- a/src/main/java/fr/inria/corese/core/visitor/ldpath/QueryProcessThread.java +++ b/src/main/java/fr/inria/corese/core/visitor/ldpath/QueryProcessThread.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.query.QueryProcess; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Constant; diff --git a/src/main/java/fr/inria/corese/core/visitor/ldpath/Result.java b/src/main/java/fr/inria/corese/core/visitor/ldpath/Result.java index 89fba17bb..151dc3bd8 100644 --- a/src/main/java/fr/inria/corese/core/visitor/ldpath/Result.java +++ b/src/main/java/fr/inria/corese/core/visitor/ldpath/Result.java @@ -4,13 +4,13 @@ import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.transform.Transformer; -import fr.inria.corese.core.kgram.api.core.DatatypeValue; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.DatatypeValue; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Constant; import fr.inria.corese.core.sparql.triple.parser.Exp; -import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mapping; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRule.java b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRule.java index eb2b4f97f..781c632c5 100644 --- a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRule.java +++ b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRule.java @@ -1,12 +1,11 @@ package fr.inria.corese.core.visitor.solver; import fr.inria.corese.core.compiler.eval.QuerySolverVisitorBasic; -import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.rule.RuleEngine; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import java.lang.reflect.InvocationTargetException; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRuleUser.java b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRuleUser.java index a0622f6a0..b5e746fb4 100644 --- a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRuleUser.java +++ b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRuleUser.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.visitor.solver; import fr.inria.corese.core.rule.RuleEngine; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformer.java b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformer.java index 29c088e5b..e15a8c71d 100644 --- a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformer.java +++ b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformer.java @@ -1,10 +1,9 @@ package fr.inria.corese.core.visitor.solver; import fr.inria.corese.core.compiler.eval.QuerySolverVisitorBasic; -import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.transform.Transformer; import fr.inria.corese.core.workflow.Data; -import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Eval; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Context; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformerUser.java b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformerUser.java index c155eb172..15af62d8d 100644 --- a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformerUser.java +++ b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformerUser.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.visitor.solver; import fr.inria.corese.core.transform.Transformer; -import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Eval; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorUser.java b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorUser.java index a0355856e..ae621e181 100644 --- a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorUser.java +++ b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorUser.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.visitor.solver; import fr.inria.corese.core.compiler.eval.QuerySolverVisitor; -import fr.inria.corese.core.kgram.core.Eval; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/workflow/Data.java b/src/main/java/fr/inria/corese/core/workflow/Data.java index 914c6c3a8..49fe3d994 100644 --- a/src/main/java/fr/inria/corese/core/workflow/Data.java +++ b/src/main/java/fr/inria/corese/core/workflow/Data.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.EventManager; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/workflow/ResultProcess.java b/src/main/java/fr/inria/corese/core/workflow/ResultProcess.java index 4ed56238f..efd0bb56c 100644 --- a/src/main/java/fr/inria/corese/core/workflow/ResultProcess.java +++ b/src/main/java/fr/inria/corese/core/workflow/ResultProcess.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.workflow; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.print.ResultFormat; import fr.inria.corese.core.sparql.api.ResultFormatDef; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/workflow/SPARQLProcess.java b/src/main/java/fr/inria/corese/core/workflow/SPARQLProcess.java index fa5eacb44..8d6bc37fb 100644 --- a/src/main/java/fr/inria/corese/core/workflow/SPARQLProcess.java +++ b/src/main/java/fr/inria/corese/core/workflow/SPARQLProcess.java @@ -8,8 +8,8 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; import fr.inria.corese.core.GraphStore; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.print.ResultFormat; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/workflow/ShapeWorkflow.java b/src/main/java/fr/inria/corese/core/workflow/ShapeWorkflow.java index 16b9f678a..b91fdd0fd 100644 --- a/src/main/java/fr/inria/corese/core/workflow/ShapeWorkflow.java +++ b/src/main/java/fr/inria/corese/core/workflow/ShapeWorkflow.java @@ -9,7 +9,7 @@ import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.transform.Transformer; -import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.api.core.PointerType; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.transform.TransformerUtils; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/workflow/TestProcess.java b/src/main/java/fr/inria/corese/core/workflow/TestProcess.java index 2a49e0a12..6e0ba0b4f 100644 --- a/src/main/java/fr/inria/corese/core/workflow/TestProcess.java +++ b/src/main/java/fr/inria/corese/core/workflow/TestProcess.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.workflow; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/workflow/WorkflowParser.java b/src/main/java/fr/inria/corese/core/workflow/WorkflowParser.java index 71ce1ee76..aec1c0f9f 100644 --- a/src/main/java/fr/inria/corese/core/workflow/WorkflowParser.java +++ b/src/main/java/fr/inria/corese/core/workflow/WorkflowParser.java @@ -3,8 +3,8 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.Loader; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; @@ -17,7 +17,6 @@ import fr.inria.corese.core.sparql.triple.parser.Context; import fr.inria.corese.core.sparql.triple.parser.NSManager; import fr.inria.corese.core.transform.ContextBuilder; -import fr.inria.corese.core.transform.Transformer; import fr.inria.corese.core.transform.TransformerUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/workflow/WorkflowProcess.java b/src/main/java/fr/inria/corese/core/workflow/WorkflowProcess.java index 0dd49bc0f..62b1e032e 100644 --- a/src/main/java/fr/inria/corese/core/workflow/WorkflowProcess.java +++ b/src/main/java/fr/inria/corese/core/workflow/WorkflowProcess.java @@ -6,7 +6,7 @@ package fr.inria.corese.core.workflow; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.api.core.PointerType; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/test/java/fr/inria/corese/core/engine/TestQuery1.java b/src/test/java/fr/inria/corese/core/engine/TestQuery1.java index fcdcef2e4..1c5e625a3 100644 --- a/src/test/java/fr/inria/corese/core/engine/TestQuery1.java +++ b/src/test/java/fr/inria/corese/core/engine/TestQuery1.java @@ -24,16 +24,15 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.GraphStore; import fr.inria.corese.core.compiler.eval.QuerySolver; -import fr.inria.corese.core.compiler.result.XMLResult; -import fr.inria.corese.core.kgram.api.core.DatatypeValue; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.ExprType; -import fr.inria.corese.core.kgram.api.core.Node; -import fr.inria.corese.core.kgram.api.core.PointerType; -import fr.inria.corese.core.kgram.core.Mapping; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.event.StatListener; +import fr.inria.corese.core.next.kgram.api.core.DatatypeValue; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.event.StatListener; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; diff --git a/src/test/java/fr/inria/corese/core/engine/TestQuery2.java b/src/test/java/fr/inria/corese/core/engine/TestQuery2.java index e0d5ebb47..f9ba0e1c4 100644 --- a/src/test/java/fr/inria/corese/core/engine/TestQuery2.java +++ b/src/test/java/fr/inria/corese/core/engine/TestQuery2.java @@ -6,10 +6,9 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.query.QueryProcess; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; -import fr.inria.corese.core.kgram.core.SparqlException; -import fr.inria.corese.core.sparql.exceptions.EngineException; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.SparqlException; import fr.inria.corese.core.sparql.triple.parser.NSManager; /** diff --git a/src/test/java/fr/inria/corese/core/engine/TestRuleEngine.java b/src/test/java/fr/inria/corese/core/engine/TestRuleEngine.java index b25b89ba4..7cf20ba61 100644 --- a/src/test/java/fr/inria/corese/core/engine/TestRuleEngine.java +++ b/src/test/java/fr/inria/corese/core/engine/TestRuleEngine.java @@ -18,8 +18,8 @@ import fr.inria.corese.core.query.QueryEngine; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.rule.RuleEngine; -import fr.inria.corese.core.kgram.core.Mappings; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.storage.api.Parameters; diff --git a/src/test/java/fr/inria/corese/core/load/QueryLoadTest.java b/src/test/java/fr/inria/corese/core/load/QueryLoadTest.java index f330d35f2..7138fcd24 100644 --- a/src/test/java/fr/inria/corese/core/load/QueryLoadTest.java +++ b/src/test/java/fr/inria/corese/core/load/QueryLoadTest.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.load; import fr.inria.corese.core.compiler.parser.Pragma; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.query.QueryEngine; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/test/java/fr/inria/corese/core/load/ServiceTest.java b/src/test/java/fr/inria/corese/core/load/ServiceTest.java index afeaf3442..1edb95b55 100644 --- a/src/test/java/fr/inria/corese/core/load/ServiceTest.java +++ b/src/test/java/fr/inria/corese/core/load/ServiceTest.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.load; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.exceptions.EngineException; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseModelTest.java b/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseModelTest.java index ebcded5d4..7348fbcb8 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseModelTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseModelTest.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.next.impl.temp; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.Model; import fr.inria.corese.core.next.api.Namespace; @@ -237,7 +237,7 @@ void testAddStatementWithoutContext() { IRI realPredicateIRI = new CoreseIRI("http://example.org/realPredicate"); IRI realObjectIRI = new CoreseIRI("http://example.org/realObject"); - when(mockCoreseGraph.addEdge(any(Node.class), any(Node.class), any(Node.class))).thenReturn(mock(fr.inria.corese.core.kgram.api.core.Edge.class)); + when(mockCoreseGraph.addEdge(any(Node.class), any(Node.class), any(Node.class))).thenReturn(mock(Edge.class)); boolean added = coreseModel.add(realSubjectIRI, realPredicateIRI, realObjectIRI); @@ -326,8 +326,8 @@ void testAddStatementNoChange() { @Test @DisplayName("Should return true if the model contains an existing statement without context") void testContainsExistingStatementWithoutContext() { - fr.inria.corese.core.kgram.api.core.Edge mockReturnedEdge = mock(fr.inria.corese.core.kgram.api.core.Edge.class); - List edges = List.of(mockReturnedEdge); + Edge mockReturnedEdge = mock(Edge.class); + List edges = List.of(mockReturnedEdge); IRI realSubject = new CoreseIRI("http://example.org/subjectToFind"); IRI realPredicate = new CoreseIRI("http://example.org/predicateToFind"); @@ -336,7 +336,7 @@ void testContainsExistingStatementWithoutContext() { when(mockCoreseGraph.getEdgesRDF4J(any(Node.class), any(Node.class), any(Node.class), any(Node[].class))) .thenReturn(edges); when(mockCoreseGraph.getEdgeFactory()).thenReturn(mock(fr.inria.corese.core.EdgeFactory.class)); - when(mockCoreseGraph.getEdgeFactory().copy(any(fr.inria.corese.core.kgram.api.core.Edge.class))).thenReturn(mockReturnedEdge); + when(mockCoreseGraph.getEdgeFactory().copy(any(Edge.class))).thenReturn(mockReturnedEdge); // Call the contains method boolean contains = coreseModel.contains(realSubject, realPredicate, realObject); @@ -377,8 +377,8 @@ void testContainsStatementNotPresent() { @Test @DisplayName("Should return true if the model contains an existing statement with a specific context") void testContainsExistingStatementWithContext() { - fr.inria.corese.core.kgram.api.core.Edge mockReturnedEdge = mock(fr.inria.corese.core.kgram.api.core.Edge.class); - List edges = List.of(mockReturnedEdge); + Edge mockReturnedEdge = mock(Edge.class); + List edges = List.of(mockReturnedEdge); IRI realSubject = new CoreseIRI("http://example.org/subjectWithSpecificContext"); IRI realPredicate = new CoreseIRI("http://example.org/predicateWithSpecificContext"); @@ -388,7 +388,7 @@ void testContainsExistingStatementWithContext() { when(mockCoreseGraph.getEdgesRDF4J(any(Node.class), any(Node.class), any(Node.class), any(Node.class))) .thenReturn(edges); when(mockCoreseGraph.getEdgeFactory()).thenReturn(mock(fr.inria.corese.core.EdgeFactory.class)); - when(mockCoreseGraph.getEdgeFactory().copy(any(fr.inria.corese.core.kgram.api.core.Edge.class))).thenReturn(mockReturnedEdge); + when(mockCoreseGraph.getEdgeFactory().copy(any(Edge.class))).thenReturn(mockReturnedEdge); boolean contains = coreseModel.contains(realSubject, realPredicate, realObject, realContext); diff --git a/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseStatementTest.java b/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseStatementTest.java index 34c78ea11..4d92b0cda 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseStatementTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseStatementTest.java @@ -2,8 +2,8 @@ import fr.inria.corese.core.NodeImpl; import fr.inria.corese.core.edge.EdgeImpl; -import fr.inria.corese.core.kgram.api.core.Edge; -import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.next.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.Resource; import fr.inria.corese.core.next.api.Value; diff --git a/src/test/java/fr/inria/corese/core/query/QueryEngineTest.java b/src/test/java/fr/inria/corese/core/query/QueryEngineTest.java index eab91369f..d64014001 100644 --- a/src/test/java/fr/inria/corese/core/query/QueryEngineTest.java +++ b/src/test/java/fr/inria/corese/core/query/QueryEngineTest.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Dataset; diff --git a/src/test/java/fr/inria/corese/core/sparql/EmptyResultFormatTest.java b/src/test/java/fr/inria/corese/core/sparql/EmptyResultFormatTest.java index 665d3c407..ff5b94eb6 100644 --- a/src/test/java/fr/inria/corese/core/sparql/EmptyResultFormatTest.java +++ b/src/test/java/fr/inria/corese/core/sparql/EmptyResultFormatTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.print.CSVFormat; import fr.inria.corese.core.print.JSONFormat; import fr.inria.corese.core.print.TSVFormat; diff --git a/src/test/java/fr/inria/corese/test/MyTest.java b/src/test/java/fr/inria/corese/test/MyTest.java index 6d604051f..7237a78d9 100644 --- a/src/test/java/fr/inria/corese/test/MyTest.java +++ b/src/test/java/fr/inria/corese/test/MyTest.java @@ -4,7 +4,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.query.QueryProcess; -import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import java.util.Date; From 05f438da91664d5bcae022694ee02bdf75e364b7 Mon Sep 17 00:00:00 2001 From: "AD\\aabdoun" Date: Wed, 10 Dec 2025 15:22:15 +0100 Subject: [PATCH 2/2] Revert "Copy Kgram codebase into next package" This reverts commit b4449bcb3333b44d68e84612ed93a06b2b3e6708. --- .../java/fr/inria/corese/core/Context.java | 6 +- .../java/fr/inria/corese/core/DataStore.java | 2 +- .../fr/inria/corese/core/EdgeFactory.java | 4 +- .../fr/inria/corese/core/EventHandler.java | 2 +- .../fr/inria/corese/core/EventLogger.java | 4 +- .../fr/inria/corese/core/EventManager.java | 2 +- src/main/java/fr/inria/corese/core/Graph.java | 14 ++-- .../fr/inria/corese/core/GraphCompare.java | 4 +- .../fr/inria/corese/core/GraphDistance.java | 2 +- .../fr/inria/corese/core/GraphObject.java | 2 +- .../java/fr/inria/corese/core/GraphStore.java | 2 +- src/main/java/fr/inria/corese/core/Index.java | 4 +- .../java/fr/inria/corese/core/NodeGraph.java | 2 +- .../fr/inria/corese/core/NodeGraphIndex.java | 8 +-- .../java/fr/inria/corese/core/NodeImpl.java | 8 +-- .../fr/inria/corese/core/NodeIterator.java | 4 +- .../java/fr/inria/corese/core/Workflow.java | 4 +- .../fr/inria/corese/core/api/DataBroker.java | 6 +- .../corese/core/api/DataBrokerConstruct.java | 6 +- .../java/fr/inria/corese/core/api/Engine.java | 4 +- .../inria/corese/core/api/GraphListener.java | 6 +- .../java/fr/inria/corese/core/api/IGraph.java | 4 +- .../corese/core/api/QueryGraphVisitor.java | 4 +- .../core/compiler/api/QueryVisitor.java | 2 +- .../corese/core/compiler/eval/Custom.java | 6 +- .../core/compiler/eval/Interpreter.java | 16 ++--- .../core/compiler/eval/ProxyInterpreter.java | 12 ++-- .../core/compiler/eval/QuerySolver.java | 16 ++--- .../compiler/eval/QuerySolverOverload.java | 6 +- .../compiler/eval/QuerySolverVisitor.java | 12 ++-- .../eval/QuerySolverVisitorBasic.java | 12 ++-- .../eval/QuerySolverVisitorExtension.java | 4 +- .../compiler/federate/FederateVisitor.java | 6 +- .../core/compiler/federate/Provenance.java | 10 +-- .../core/compiler/federate/Selector.java | 4 +- .../core/compiler/federate/SelectorIndex.java | 2 +- .../corese/core/compiler/parser/Compiler.java | 8 +-- .../core/compiler/parser/CompilerKgram.java | 6 +- .../corese/core/compiler/parser/EdgeImpl.java | 8 +-- .../core/compiler/parser/ExpandList.java | 2 +- .../core/compiler/parser/ExpandPath.java | 4 +- .../core/compiler/parser/Extension.java | 2 +- .../compiler/parser/FunctionCompiler.java | 4 +- .../corese/core/compiler/parser/NodeImpl.java | 2 +- .../corese/core/compiler/parser/Pragma.java | 12 ++-- .../core/compiler/parser/QueryProfile.java | 8 +-- .../core/compiler/parser/Transformer.java | 37 +++++----- .../core/compiler/parser/VisitQuery.java | 14 ++-- .../core/compiler/result/XMLResult.java | 10 +-- .../compiler/visitor/MetadataVisitor.java | 2 +- .../fr/inria/corese/core/edge/EdgeBinary.java | 4 +- .../inria/corese/core/edge/EdgeDefault.java | 2 +- .../fr/inria/corese/core/edge/EdgeEntail.java | 2 +- .../inria/corese/core/edge/EdgeGeneric.java | 4 +- .../fr/inria/corese/core/edge/EdgeImpl.java | 4 +- .../fr/inria/corese/core/edge/EdgeQuad.java | 2 +- .../fr/inria/corese/core/edge/EdgeTop.java | 10 +-- .../fr/inria/corese/core/edge/EdgeTriple.java | 2 +- .../corese/core/edge/EdgeTripleNode.java | 2 +- .../fr/inria/corese/core/edge/TripleNode.java | 4 +- .../core/edge/binary/EdgeBinaryFirst.java | 2 +- .../core/edge/binary/EdgeBinaryLabel.java | 2 +- .../core/edge/binary/EdgeBinaryRest.java | 2 +- .../core/edge/binary/EdgeBinarySubclass.java | 2 +- .../core/edge/binary/EdgeBinaryType.java | 2 +- .../core/edge/internal/EdgeInternal.java | 4 +- .../edge/internal/EdgeInternalDefault.java | 4 +- .../edge/internal/EdgeInternalEntail.java | 4 +- .../core/edge/internal/EdgeInternalRule.java | 2 +- .../inria/corese/core/edge/rule/EdgeRule.java | 2 +- .../corese/core/edge/rule/EdgeRuleGraph.java | 2 +- .../core/edge/rule/EdgeRuleSubclass.java | 2 +- .../corese/core/edge/rule/EdgeRuleTop.java | 2 +- .../corese/core/edge/rule/EdgeRuleType.java | 2 +- .../elasticsearch/EdgeChangeListener.java | 2 +- .../fr/inria/corese/core/extension/Core.java | 8 +-- .../corese/core/extension/Extension.java | 14 ++-- .../corese/core/extension/JavaCompiler.java | 2 +- .../inria/corese/core/extension/Report.java | 4 +- .../corese/core/extension/core/Core.java | 14 ++-- .../inria/corese/core/index/EdgeManager.java | 4 +- .../corese/core/index/EdgeManagerIndexer.java | 6 +- .../corese/core/index/EdgeManagerIterate.java | 2 +- .../inria/corese/core/index/NodeManager.java | 2 +- .../corese/core/index/NodeManagerBasic.java | 2 +- .../corese/core/index/PredicateList.java | 2 +- .../kgram/api/core/DatatypeValue.java | 2 +- .../kgram/api/core/DatatypeValueFactory.java | 2 +- .../core/{next => }/kgram/api/core/Edge.java | 2 +- .../{next => }/kgram/api/core/ExpPattern.java | 2 +- .../{next => }/kgram/api/core/ExpType.java | 2 +- .../core/{next => }/kgram/api/core/Expr.java | 6 +- .../{next => }/kgram/api/core/ExprLabel.java | 2 +- .../{next => }/kgram/api/core/ExprType.java | 2 +- .../{next => }/kgram/api/core/Filter.java | 2 +- .../core/{next => }/kgram/api/core/Graph.java | 2 +- .../{next => }/kgram/api/core/Loopable.java | 2 +- .../core/{next => }/kgram/api/core/Node.java | 6 +- .../kgram/api/core/PointerType.java | 4 +- .../kgram/api/core/Pointerable.java | 12 ++-- .../core/{next => }/kgram/api/core/Regex.java | 2 +- .../kgram/api/core/TripleStore.java | 2 +- .../core/{next => }/kgram/api/query/AST.java | 2 +- .../core/{next => }/kgram/api/query/ASTQ.java | 2 +- .../{next => }/kgram/api/query/Binder.java | 8 +-- .../core/kgram/api/query/DQPFactory.java | 12 ++++ .../kgram/api/query/Environment.java | 18 ++--- .../{next => }/kgram/api/query/Evaluator.java | 6 +- .../{next => }/kgram/api/query/Graphable.java | 2 +- .../{next => }/kgram/api/query/Hierarchy.java | 2 +- .../{next => }/kgram/api/query/Matcher.java | 6 +- .../{next => }/kgram/api/query/Plugin.java | 4 +- .../kgram/api/query/ProcessVisitor.java | 16 ++--- .../{next => }/kgram/api/query/Producer.java | 12 ++-- .../corese/core/kgram/api/query/Provider.java | 21 ++++++ .../{next => }/kgram/api/query/Result.java | 4 +- .../{next => }/kgram/api/query/Results.java | 4 +- .../kgram/api/query/SPARQLEngine.java | 12 ++-- .../{next => }/kgram/core/BgpGenerator.java | 10 +-- .../core/{next => }/kgram/core/Checker.java | 12 ++-- .../{next => }/kgram/core/CompleteSPARQL.java | 8 +-- .../core/{next => }/kgram/core/Distinct.java | 6 +- .../core/{next => }/kgram/core/Eval.java | 18 ++--- .../core/{next => }/kgram/core/EvalGraph.java | 8 +-- .../core/{next => }/kgram/core/EvalJoin.java | 8 +-- .../{next => }/kgram/core/EvalOptional.java | 10 +-- .../{next => }/kgram/core/EvalSPARQL.java | 6 +- .../core/{next => }/kgram/core/Exp.java | 8 +-- .../core/{next => }/kgram/core/ExpEdge.java | 10 +-- .../{next => }/kgram/core/ExpHandler.java | 4 +- .../core/{next => }/kgram/core/Group.java | 4 +- .../{next => }/kgram/core/IterableEntity.java | 6 +- .../core/{next => }/kgram/core/Mapping.java | 20 +++--- .../{next => }/kgram/core/MappingSet.java | 4 +- .../core/{next => }/kgram/core/Mappings.java | 20 +++--- .../core/{next => }/kgram/core/Memory.java | 18 ++--- .../core/{next => }/kgram/core/Merge.java | 2 +- .../{next => }/kgram/core/PointerObject.java | 4 +- .../kgram/core/ProcessVisitorDefault.java | 6 +- .../core/{next => }/kgram/core/Query.java | 16 ++--- .../{next => }/kgram/core/QuerySorter.java | 18 ++--- .../core/{next => }/kgram/core/Sorter.java | 4 +- .../core/{next => }/kgram/core/SorterNew.java | 20 +++--- .../kgram/core/SparqlException.java | 2 +- .../core/{next => }/kgram/core/Stack.java | 4 +- .../{next => }/kgram/event/EvalListener.java | 8 +-- .../core/{next => }/kgram/event/Event.java | 4 +- .../{next => }/kgram/event/EventImpl.java | 6 +- .../{next => }/kgram/event/EventListener.java | 2 +- .../{next => }/kgram/event/EventManager.java | 2 +- .../kgram/event/ResultListener.java | 14 ++-- .../{next => }/kgram/event/StatListener.java | 6 +- .../core/{next => }/kgram/event/User.java | 2 +- .../core/{next => }/kgram/event/UserImpl.java | 2 +- .../core/{next => }/kgram/filter/Checker.java | 9 +-- .../core/{next => }/kgram/filter/Compile.java | 8 +-- .../{next => }/kgram/filter/Extension.java | 6 +- .../{next => }/kgram/filter/MatchBind.java | 4 +- .../core/{next => }/kgram/filter/Matcher.java | 6 +- .../core/{next => }/kgram/filter/Pattern.java | 14 ++-- .../core/{next => }/kgram/path/Automaton.java | 4 +- .../core/{next => }/kgram/path/Buffer.java | 4 +- .../core/{next => }/kgram/path/GraphPath.java | 6 +- .../core/{next => }/kgram/path/Path.java | 20 +++--- .../{next => }/kgram/path/PathFinder.java | 36 +++++----- .../core/{next => }/kgram/path/Record.java | 6 +- .../core/{next => }/kgram/path/Stack.java | 2 +- .../core/{next => }/kgram/path/State.java | 4 +- .../core/{next => }/kgram/path/Step.java | 4 +- .../core/{next => }/kgram/path/Visit.java | 6 +- .../kgram/sorter/core/AbstractCostModel.java | 2 +- .../{next => }/kgram/sorter/core/Const.java | 4 +- .../kgram/sorter/core/IEstimate.java | 4 +- .../kgram/sorter/core/IProducerQP.java | 2 +- .../{next => }/kgram/sorter/core/ISort.java | 4 +- .../{next => }/kgram/sorter/core/QPGEdge.java | 4 +- .../{next => }/kgram/sorter/core/QPGNode.java | 22 +++--- .../{next => }/kgram/sorter/core/QPGraph.java | 6 +- .../impl/qpv1/BasicPatternGenerator.java | 18 ++--- .../impl/qpv1/DepthFirstBestSearch.java | 8 +-- .../sorter/impl/qpv1/DepthFirstSearch.java | 10 +-- .../impl/qpv1/HeuristicsBasedEstimation.java | 8 +-- .../sorter/impl/qpv1/QPGEdgeCostModel.java | 10 +-- .../sorter/impl/qpv1/QPGNodeCostModel.java | 38 +++++----- .../kgram/tool/ApproximateSearchEnv.java | 8 +-- .../{next => }/kgram/tool/DistinctNode.java | 4 +- .../core/{next => }/kgram/tool/EdgeInv.java | 12 ++-- .../{next => }/kgram/tool/EntityImpl.java | 0 .../kgram/tool/EnvironmentImpl.java | 26 +++---- .../{next => }/kgram/tool/MatcherDefault.java | 10 +-- .../core/{next => }/kgram/tool/Message.java | 4 +- .../{next => }/kgram/tool/MetaIterator.java | 2 +- .../kgram/tool/MetaIteratorCast.java | 2 +- .../{next => }/kgram/tool/MetaProducer.java | 24 +++---- .../core/{next => }/kgram/tool/NodeImpl.java | 12 ++-- .../kgram/tool/ProducerDefault.java | 22 +++--- .../{next => }/kgram/tool/ResultsImpl.java | 12 ++-- .../corese/core/load/AddTripleHelper.java | 4 +- .../core/load/AddTripleHelperDataManager.java | 4 +- .../corese/core/load/ILoadSerialization.java | 2 +- .../java/fr/inria/corese/core/load/Load.java | 4 +- .../fr/inria/corese/core/load/QueryLoad.java | 2 +- .../corese/core/load/RdfxmlTripleCreator.java | 4 +- .../fr/inria/corese/core/load/Service.java | 7 +- .../inria/corese/core/load/ServiceParser.java | 4 +- .../inria/corese/core/load/ServiceReport.java | 6 +- .../corese/core/load/TripleCreatorBase.java | 4 +- .../core/load/TurtleSparqlTripleCreator.java | 4 +- .../load/jsonld/CoreseJsonTripleCallback.java | 2 +- .../core/load/rdfa/CoreseRDFaTripleSink.java | 2 +- .../core/load/result/SPARQLJSONResult.java | 6 +- .../core/load/result/SPARQLRDFResult.java | 6 +- .../corese/core/load/result/SPARQLResult.java | 4 +- .../core/load/result/SPARQLResultParser.java | 2 +- .../corese/core/load/result/XMLResult.java | 11 +-- .../corese/core/logic/BrokerDistance.java | 2 +- .../core/logic/BrokerDistanceDataManager.java | 6 +- .../fr/inria/corese/core/logic/Closure.java | 8 +-- .../corese/core/logic/ClosureDataManager.java | 8 +-- .../fr/inria/corese/core/logic/Distance.java | 2 +- .../inria/corese/core/logic/Entailment.java | 6 +- .../next/impl/temp/CoreseEdgeAdapter.java | 2 +- .../corese/core/next/impl/temp/CoreseIRI.java | 2 +- .../core/next/impl/temp/CoreseModel.java | 4 +- .../next/impl/temp/CoreseNodeAdapter.java | 2 +- .../core/next/impl/temp/CoreseStatement.java | 4 +- .../next/impl/temp/CoreseValueConverter.java | 4 +- .../temp/literal/AbstractCoreseNumber.java | 2 +- .../next/impl/temp/literal/CoreseBNode.java | 2 +- .../next/impl/temp/literal/CoreseBoolean.java | 2 +- .../next/impl/temp/literal/CoreseDate.java | 2 +- .../impl/temp/literal/CoreseDatetime.java | 2 +- .../impl/temp/literal/CoreseDuration.java | 2 +- .../CoreseLanguageTaggedStringLiteral.java | 2 +- .../next/impl/temp/literal/CoreseTyped.java | 2 +- .../core/next/kgram/api/query/DQPFactory.java | 12 ---- .../core/next/kgram/api/query/Provider.java | 21 ------ .../print/AbstractNestedResultFormat.java | 10 +-- .../fr/inria/corese/core/print/CSVFormat.java | 8 +-- .../core/print/CanonicalRdf10Format.java | 4 +- .../inria/corese/core/print/HTMLFormat.java | 2 +- .../inria/corese/core/print/JSOND3Format.java | 8 +-- .../inria/corese/core/print/JSONFormat.java | 8 ++- .../inria/corese/core/print/JSONLDFormat.java | 8 +-- .../inria/corese/core/print/LogManager.java | 6 +- .../fr/inria/corese/core/print/Mapper.java | 6 +- .../corese/core/print/MarkdownFormat.java | 8 +-- .../inria/corese/core/print/NQuadsFormat.java | 6 +- .../corese/core/print/NTriplesFormat.java | 6 +- .../fr/inria/corese/core/print/RDFFormat.java | 10 +-- .../corese/core/print/RDFResultFormat.java | 10 +-- .../inria/corese/core/print/ResultFormat.java | 7 +- .../fr/inria/corese/core/print/TSVFormat.java | 4 +- .../corese/core/print/TemplateFormat.java | 7 +- .../inria/corese/core/print/TripleFormat.java | 8 +-- .../fr/inria/corese/core/print/XMLFormat.java | 6 +- .../fr/inria/corese/core/print/XSLTQuery.java | 4 +- .../core/print/rdfc10/CanonicalRdf10.java | 8 +-- .../print/rdfc10/CanonicalizationState.java | 2 +- .../print/rdfc10/CanonicalizedDataset.java | 2 +- .../producer/DataBrokerConstructExtern.java | 6 +- .../producer/DataBrokerConstructLocal.java | 6 +- .../corese/core/producer/DataBrokerLocal.java | 6 +- .../corese/core/producer/DataFilter.java | 6 +- .../corese/core/producer/DataFilterAnd.java | 2 +- .../core/producer/DataFilterFactory.java | 2 +- .../corese/core/producer/DataFilterNot.java | 2 +- .../corese/core/producer/DataFilterOr.java | 2 +- .../inria/corese/core/producer/DataFrom.java | 4 +- .../corese/core/producer/DataProducer.java | 12 ++-- .../corese/core/producer/MetadataManager.java | 4 +- .../fr/inria/corese/core/query/Cache.java | 4 +- .../corese/core/query/ClassHierarchy.java | 6 +- .../corese/core/query/CompileService.java | 10 +-- .../fr/inria/corese/core/query/Construct.java | 16 ++--- .../fr/inria/corese/core/query/Describe.java | 8 +-- .../core/query/FederatedQueryProcess.java | 4 +- .../fr/inria/corese/core/query/Mapper.java | 16 ++--- .../fr/inria/corese/core/query/MapperSQL.java | 8 +-- .../inria/corese/core/query/MatchBNode.java | 6 +- .../corese/core/query/MatchIterator.java | 8 +-- .../inria/corese/core/query/MatcherImpl.java | 10 +-- .../inria/corese/core/query/PluginImpl.java | 21 +++--- .../corese/core/query/PluginTransform.java | 13 ++-- .../inria/corese/core/query/PragmaImpl.java | 2 +- .../inria/corese/core/query/ProducerImpl.java | 19 +++-- .../corese/core/query/ProducerImplNode.java | 10 +-- .../inria/corese/core/query/ProviderImpl.java | 8 +-- .../corese/core/query/ProviderService.java | 12 ++-- .../corese/core/query/ProviderThread.java | 4 +- .../inria/corese/core/query/QueryCheck.java | 10 +-- .../inria/corese/core/query/QueryEngine.java | 10 +-- .../inria/corese/core/query/QueryProcess.java | 16 ++--- .../corese/core/query/QueryProcessUpdate.java | 10 +-- .../fr/inria/corese/core/query/RDFizer.java | 2 +- .../corese/core/query/ResultMessage.java | 2 +- .../inria/corese/core/query/SorterImpl.java | 8 +-- .../corese/core/query/TemplateIndex.java | 14 ++-- .../core/query/update/GraphManager.java | 6 +- .../corese/core/query/update/Manager.java | 4 +- .../corese/core/query/update/ManagerImpl.java | 4 +- .../core/query/update/UpdateProcess.java | 12 ++-- .../fr/inria/corese/core/rule/Cleaner.java | 8 +-- .../fr/inria/corese/core/rule/Record.java | 2 +- .../inria/corese/core/rule/ResultWatcher.java | 16 ++--- .../java/fr/inria/corese/core/rule/Rule.java | 10 +-- .../fr/inria/corese/core/rule/RuleEngine.java | 12 ++-- .../fr/inria/corese/core/rule/RuleError.java | 4 +- .../fr/inria/corese/core/shacl/Shacl.java | 2 +- .../corese/core/sparql/api/Computer.java | 2 +- .../corese/core/sparql/api/ComputerProxy.java | 6 +- .../inria/corese/core/sparql/api/Graph.java | 2 +- .../core/sparql/api/GraphProcessor.java | 8 +-- .../corese/core/sparql/api/IDatatype.java | 2 +- .../corese/core/sparql/api/QueryVisitor.java | 4 +- .../core/sparql/api/TransformProcessor.java | 6 +- .../sparql/compiler/java/JavaCompiler.java | 12 ++-- .../core/sparql/compiler/java/Rewrite.java | 2 +- .../core/sparql/compiler/java/Stack.java | 2 +- .../core/sparql/datatype/CoreseDatatype.java | 10 +-- .../core/sparql/datatype/CoreseTriple.java | 2 +- .../core/sparql/datatype/CoreseURI.java | 2 +- .../sparql/datatype/CoreseXMLLiteral.java | 2 +- .../sparql/datatype/DatatypeHierarchy.java | 2 +- .../core/sparql/datatype/DatatypeMap.java | 2 +- .../core/sparql/datatype/PointerObject.java | 2 +- .../datatype/extension/CoresePointer.java | 8 +-- .../function/VariableResolverImpl.java | 4 +- .../sparql/exceptions/EngineException.java | 2 +- .../triple/function/aggregate/Aggregate.java | 12 ++-- .../function/aggregate/AggregateCount.java | 6 +- .../aggregate/AggregateGroupConcat.java | 5 +- .../function/aggregate/AggregateMinMax.java | 2 +- .../function/aggregate/AggregateSumAvg.java | 2 +- .../function/aggregate/AggregateTemplate.java | 6 +- .../triple/function/core/BiTriFunction.java | 6 +- .../triple/function/core/BinaryFunction.java | 6 +- .../triple/function/core/BlankNode.java | 6 +- .../sparql/triple/function/core/Bound.java | 4 +- .../sparql/triple/function/core/Coalesce.java | 4 +- .../sparql/triple/function/core/Concat.java | 16 ++--- .../triple/function/core/DateFunction.java | 6 +- .../triple/function/core/ExistFunction.java | 24 +++---- .../sparql/triple/function/core/Extern.java | 4 +- .../function/core/FunctionEvaluator.java | 4 +- .../triple/function/core/HashFunction.java | 4 +- .../triple/function/core/IfThenElseTerm.java | 6 +- .../triple/function/core/StrPredicate.java | 6 +- .../triple/function/core/UUIDFunction.java | 6 +- .../triple/function/core/UnaryFunction.java | 6 +- .../triple/function/core/ZeroaryFunction.java | 6 +- .../function/extension/BinaryExtension.java | 14 ++-- .../triple/function/extension/Cast.java | 4 +- .../triple/function/extension/Display.java | 6 +- .../triple/function/extension/Focus.java | 5 +- .../sparql/triple/function/extension/Get.java | 8 +-- .../triple/function/extension/GetGen.java | 6 +- .../triple/function/extension/IOFunction.java | 6 +- .../triple/function/extension/Iterate.java | 4 +- .../triple/function/extension/JSONTerm.java | 4 +- .../triple/function/extension/ListBinary.java | 6 +- .../triple/function/extension/ListNary.java | 6 +- .../triple/function/extension/ListSort.java | 8 ++- .../triple/function/extension/ListTerm.java | 4 +- .../triple/function/extension/ListUnary.java | 6 +- .../triple/function/extension/MapTerm.java | 4 +- .../triple/function/extension/Namespace.java | 6 +- .../triple/function/extension/PathLength.java | 11 +-- .../triple/function/extension/Rest.java | 8 +-- .../function/extension/ResultFormater.java | 14 ++-- .../function/extension/SPINFormater.java | 4 +- .../triple/function/extension/Size.java | 5 +- .../triple/function/extension/Swap.java | 4 +- .../function/extension/SystemFunction.java | 6 +- .../function/extension/TernaryExtension.java | 6 +- .../function/extension/TripleAccess.java | 26 +++---- .../function/extension/UnaryExtension.java | 10 +-- .../sparql/triple/function/extension/XML.java | 40 +++++------ .../triple/function/extension/ZeroAry.java | 8 +-- .../triple/function/proxy/GraphFunction.java | 26 +++---- .../function/proxy/GraphSpecificFunction.java | 72 ++++++++++--------- .../triple/function/proxy/Introspection.java | 21 +++--- .../triple/function/script/ErrorFunction.java | 4 +- .../sparql/triple/function/script/Eval.java | 6 +- .../triple/function/script/EventCall.java | 6 +- .../triple/function/script/Extension.java | 11 ++- .../triple/function/script/ForLoop.java | 4 +- .../triple/function/script/Funcall.java | 13 ++-- .../triple/function/script/Function.java | 6 +- .../function/script/FunctionDefined.java | 4 +- .../triple/function/script/JavaCast.java | 4 +- .../triple/function/script/JavaDScall.java | 5 +- .../triple/function/script/JavaFunction.java | 6 ++ .../triple/function/script/Javacall.java | 13 ++-- .../triple/function/script/LDScript.java | 20 +++--- .../sparql/triple/function/script/Let.java | 6 +- .../triple/function/script/MapAnyEvery.java | 13 ++-- .../triple/function/script/MapFunction.java | 16 ++--- .../triple/function/script/MethodCall.java | 4 +- .../function/script/MethodTypeCall.java | 4 +- .../sparql/triple/function/script/Reduce.java | 30 ++++---- .../sparql/triple/function/script/Return.java | 4 +- .../sparql/triple/function/script/Self.java | 4 +- .../triple/function/script/Sequence.java | 4 +- .../triple/function/script/SetFunction.java | 12 ++-- .../sparql/triple/function/script/Throw.java | 6 +- .../triple/function/script/TryCatch.java | 4 +- .../function/template/ApplyTemplates.java | 4 +- .../function/template/ApplyTemplatesWith.java | 4 +- .../template/ApplyTemplatesWithGraph.java | 4 +- .../function/template/CGetSetContext.java | 6 +- .../function/template/CallTemplate.java | 4 +- .../function/template/CallTemplateWith.java | 4 +- .../triple/function/template/FocusNode.java | 6 +- .../function/template/GetSetContext.java | 6 +- .../triple/function/template/Prefix.java | 6 +- .../function/template/TemplateAccess.java | 14 ++-- .../function/template/TemplateFormat.java | 8 ++- .../function/template/TemplateFunction.java | 7 +- .../function/template/TemplateFuture.java | 4 +- .../function/template/TemplateNumber.java | 10 +-- .../function/template/TemplateProcess.java | 6 +- .../function/template/TemplateVisitor.java | 6 +- .../triple/function/template/Turtle.java | 6 +- .../sparql/triple/function/term/AndTerm.java | 4 +- .../sparql/triple/function/term/Binding.java | 14 ++-- .../sparql/triple/function/term/DivTerm.java | 4 +- .../core/sparql/triple/function/term/EQ.java | 4 +- .../core/sparql/triple/function/term/GE.java | 4 +- .../core/sparql/triple/function/term/GT.java | 4 +- .../core/sparql/triple/function/term/In.java | 4 +- .../core/sparql/triple/function/term/LE.java | 4 +- .../core/sparql/triple/function/term/LT.java | 4 +- .../triple/function/term/MinusTerm.java | 4 +- .../sparql/triple/function/term/MultTerm.java | 4 +- .../core/sparql/triple/function/term/NEQ.java | 4 +- .../sparql/triple/function/term/NotTerm.java | 4 +- .../triple/function/term/Operation.java | 6 +- .../sparql/triple/function/term/OrTerm.java | 4 +- .../sparql/triple/function/term/PlusTerm.java | 4 +- .../sparql/triple/function/term/TermEval.java | 8 +-- .../sparql/triple/parser/ASTExtension.java | 8 +-- .../core/sparql/triple/parser/ASTObject.java | 2 +- .../core/sparql/triple/parser/ASTQuery.java | 12 ++-- .../core/sparql/triple/parser/Access.java | 2 +- .../sparql/triple/parser/AccessRight.java | 3 +- .../triple/parser/AccessRightDefinition.java | 4 +- .../core/sparql/triple/parser/Atom.java | 4 +- .../core/sparql/triple/parser/Constant.java | 6 +- .../core/sparql/triple/parser/Context.java | 4 +- .../core/sparql/triple/parser/Dataset.java | 12 ++-- .../core/sparql/triple/parser/Expression.java | 28 ++++---- .../core/sparql/triple/parser/Metadata.java | 2 +- .../core/sparql/triple/parser/NSManager.java | 6 +- .../core/sparql/triple/parser/Processor.java | 15 ++-- .../core/sparql/triple/parser/Term.java | 12 ++-- .../core/sparql/triple/parser/Triple.java | 4 +- .../core/sparql/triple/parser/URLServer.java | 4 +- .../core/sparql/triple/parser/Variable.java | 8 +-- .../sparql/triple/parser/VariableLocal.java | 6 +- .../triple/parser/context/ContextLog.java | 2 +- .../triple/parser/context/PropertyMap.java | 4 +- .../triple/parser/visitor/ASTWalker.java | 36 +++++----- .../visitor/ExpressionVisitorVariable.java | 4 +- .../fr/inria/corese/core/stats/IStats.java | 4 +- .../core/stats/StatsBasedEstimation.java | 23 +++--- .../inria/corese/core/stats/data/BaseMap.java | 2 +- .../corese/core/stats/data/HashBucket.java | 2 +- .../corese/core/stats/data/ReducedMap.java | 2 +- .../corese/core/stats/data/SimpleAverage.java | 2 +- .../core/stats/data/TripleHashTable.java | 4 +- .../core/stats/data/TripleHashTable2.java | 4 +- .../corese/core/stats/data/WrappedNode.java | 2 +- .../core/storage/CoreseGraphDataManager.java | 4 +- .../corese/core/storage/DataManagerJava.java | 8 ++- .../api/dataManager/DataManagerRead.java | 4 +- .../api/dataManager/DataManagerUpdate.java | 4 +- .../corese/core/transform/ContextBuilder.java | 4 +- .../corese/core/transform/ContextManager.java | 8 +-- .../fr/inria/corese/core/transform/Stack.java | 2 +- .../core/transform/TemplatePrinter.java | 2 +- .../corese/core/transform/Transformer.java | 16 ++--- .../core/transform/TransformerMapping.java | 6 +- .../core/transform/TransformerVisitor.java | 12 ++-- .../fr/inria/corese/core/util/Duplicate.java | 4 +- .../inria/corese/core/util/GraphListen.java | 10 +-- .../corese/core/util/GraphListenerImpl.java | 9 +-- .../corese/core/util/MappingComparator.java | 6 +- .../inria/corese/core/util/MappingsGraph.java | 10 +-- .../fr/inria/corese/core/util/Property.java | 6 +- .../core/util/QueryGraphVisitorImpl.java | 10 +-- .../inria/corese/core/util/SPINProcess.java | 3 +- .../core/visitor/ldpath/LinkedDataPath.java | 8 +-- .../visitor/ldpath/QueryProcessThread.java | 2 +- .../corese/core/visitor/ldpath/Result.java | 6 +- .../solver/QuerySolverVisitorRule.java | 9 +-- .../solver/QuerySolverVisitorRuleUser.java | 6 +- .../solver/QuerySolverVisitorTransformer.java | 3 +- .../QuerySolverVisitorTransformerUser.java | 2 +- .../solver/QuerySolverVisitorUser.java | 4 +- .../fr/inria/corese/core/workflow/Data.java | 2 +- .../corese/core/workflow/ResultProcess.java | 2 +- .../corese/core/workflow/SPARQLProcess.java | 4 +- .../corese/core/workflow/ShapeWorkflow.java | 2 +- .../corese/core/workflow/TestProcess.java | 2 +- .../corese/core/workflow/WorkflowParser.java | 5 +- .../corese/core/workflow/WorkflowProcess.java | 2 +- .../inria/corese/core/engine/TestQuery1.java | 19 ++--- .../inria/corese/core/engine/TestQuery2.java | 7 +- .../corese/core/engine/TestRuleEngine.java | 4 +- .../inria/corese/core/load/QueryLoadTest.java | 2 +- .../inria/corese/core/load/ServiceTest.java | 2 +- .../core/next/impl/temp/CoreseModelTest.java | 18 ++--- .../next/impl/temp/CoreseStatementTest.java | 4 +- .../corese/core/query/QueryEngineTest.java | 2 +- .../core/sparql/EmptyResultFormatTest.java | 2 +- .../java/fr/inria/corese/test/MyTest.java | 2 +- 517 files changed, 1803 insertions(+), 1743 deletions(-) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/DatatypeValue.java (92%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/DatatypeValueFactory.java (78%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/Edge.java (99%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/ExpPattern.java (76%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/ExpType.java (97%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/Expr.java (92%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/ExprLabel.java (89%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/ExprType.java (99%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/Filter.java (95%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/Graph.java (82%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/Loopable.java (73%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/Node.java (93%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/PointerType.java (85%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/Pointerable.java (80%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/Regex.java (96%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/core/TripleStore.java (80%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/query/AST.java (89%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/query/ASTQ.java (66%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/query/Binder.java (71%) create mode 100644 src/main/java/fr/inria/corese/core/kgram/api/query/DQPFactory.java rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/query/Environment.java (85%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/query/Evaluator.java (80%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/query/Graphable.java (76%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/query/Hierarchy.java (83%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/query/Matcher.java (92%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/query/Plugin.java (70%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/query/ProcessVisitor.java (94%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/query/Producer.java (96%) create mode 100644 src/main/java/fr/inria/corese/core/kgram/api/query/Provider.java rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/query/Result.java (62%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/query/Results.java (65%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/api/query/SPARQLEngine.java (58%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/BgpGenerator.java (69%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/Checker.java (89%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/CompleteSPARQL.java (95%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/Distinct.java (93%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/Eval.java (99%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/EvalGraph.java (96%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/EvalJoin.java (96%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/EvalOptional.java (95%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/EvalSPARQL.java (97%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/Exp.java (99%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/ExpEdge.java (93%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/ExpHandler.java (98%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/Group.java (98%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/IterableEntity.java (82%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/Mapping.java (98%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/MappingSet.java (99%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/Mappings.java (99%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/Memory.java (98%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/Merge.java (98%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/PointerObject.java (66%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/ProcessVisitorDefault.java (93%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/Query.java (99%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/QuerySorter.java (97%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/Sorter.java (97%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/SorterNew.java (85%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/SparqlException.java (94%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/core/Stack.java (95%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/event/EvalListener.java (96%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/event/Event.java (92%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/event/EventImpl.java (95%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/event/EventListener.java (85%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/event/EventManager.java (97%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/event/ResultListener.java (67%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/event/StatListener.java (95%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/event/User.java (77%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/event/UserImpl.java (97%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/filter/Checker.java (97%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/filter/Compile.java (97%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/filter/Extension.java (82%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/filter/MatchBind.java (92%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/filter/Matcher.java (97%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/filter/Pattern.java (96%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/path/Automaton.java (98%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/path/Buffer.java (91%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/path/GraphPath.java (81%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/path/Path.java (91%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/path/PathFinder.java (97%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/path/Record.java (91%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/path/Stack.java (95%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/path/State.java (95%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/path/Step.java (93%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/path/Visit.java (98%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/sorter/core/AbstractCostModel.java (93%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/sorter/core/Const.java (91%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/sorter/core/IEstimate.java (85%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/sorter/core/IProducerQP.java (93%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/sorter/core/ISort.java (84%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/sorter/core/QPGEdge.java (95%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/sorter/core/QPGNode.java (93%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/sorter/core/QPGraph.java (97%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/sorter/impl/qpv1/BasicPatternGenerator.java (86%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java (97%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/sorter/impl/qpv1/DepthFirstSearch.java (96%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java (92%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java (90%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/sorter/impl/qpv1/QPGNodeCostModel.java (88%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/tool/ApproximateSearchEnv.java (96%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/tool/DistinctNode.java (91%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/tool/EdgeInv.java (85%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/tool/EntityImpl.java (100%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/tool/EnvironmentImpl.java (89%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/tool/MatcherDefault.java (68%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/tool/Message.java (91%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/tool/MetaIterator.java (97%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/tool/MetaIteratorCast.java (97%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/tool/MetaProducer.java (90%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/tool/NodeImpl.java (94%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/tool/ProducerDefault.java (86%) rename src/main/java/fr/inria/corese/core/{next => }/kgram/tool/ResultsImpl.java (67%) delete mode 100644 src/main/java/fr/inria/corese/core/next/kgram/api/query/DQPFactory.java delete mode 100644 src/main/java/fr/inria/corese/core/next/kgram/api/query/Provider.java diff --git a/src/main/java/fr/inria/corese/core/Context.java b/src/main/java/fr/inria/corese/core/Context.java index 7cfc3a8a9..93973ee41 100644 --- a/src/main/java/fr/inria/corese/core/Context.java +++ b/src/main/java/fr/inria/corese/core/Context.java @@ -1,8 +1,8 @@ package fr.inria.corese.core; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Graphable; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Graphable; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.load.QueryLoad; import fr.inria.corese.core.query.RDFizer; import fr.inria.corese.core.rule.RuleEngine; diff --git a/src/main/java/fr/inria/corese/core/DataStore.java b/src/main/java/fr/inria/corese/core/DataStore.java index 108bf0142..a0effce2e 100644 --- a/src/main/java/fr/inria/corese/core/DataStore.java +++ b/src/main/java/fr/inria/corese/core/DataStore.java @@ -1,6 +1,6 @@ package fr.inria.corese.core; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.producer.DataProducer; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/EdgeFactory.java b/src/main/java/fr/inria/corese/core/EdgeFactory.java index 7f5611921..5618f09b8 100644 --- a/src/main/java/fr/inria/corese/core/EdgeFactory.java +++ b/src/main/java/fr/inria/corese/core/EdgeFactory.java @@ -10,8 +10,8 @@ import fr.inria.corese.core.edge.rule.EdgeRuleGraph; import fr.inria.corese.core.edge.rule.EdgeRuleSubclass; import fr.inria.corese.core.edge.rule.EdgeRuleType; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/EventHandler.java b/src/main/java/fr/inria/corese/core/EventHandler.java index 93b428868..4130270e7 100644 --- a/src/main/java/fr/inria/corese/core/EventHandler.java +++ b/src/main/java/fr/inria/corese/core/EventHandler.java @@ -1,6 +1,6 @@ package fr.inria.corese.core; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; /** * diff --git a/src/main/java/fr/inria/corese/core/EventLogger.java b/src/main/java/fr/inria/corese/core/EventLogger.java index 6ad7a9b0d..e660f16b7 100644 --- a/src/main/java/fr/inria/corese/core/EventLogger.java +++ b/src/main/java/fr/inria/corese/core/EventLogger.java @@ -2,8 +2,8 @@ import fr.inria.corese.core.compiler.eval.QuerySolverVisitor; import fr.inria.corese.core.index.NodeManager; -import fr.inria.corese.core.next.kgram.api.core.DatatypeValue; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.DatatypeValue; +import fr.inria.corese.core.kgram.api.core.Edge; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/EventManager.java b/src/main/java/fr/inria/corese/core/EventManager.java index 4f5943e86..9e65b76ef 100644 --- a/src/main/java/fr/inria/corese/core/EventManager.java +++ b/src/main/java/fr/inria/corese/core/EventManager.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.api.Engine; import fr.inria.corese.core.compiler.parser.Transformer; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.sparql.triple.parser.ASTExtension; import fr.inria.corese.core.util.Property; diff --git a/src/main/java/fr/inria/corese/core/Graph.java b/src/main/java/fr/inria/corese/core/Graph.java index 0698bfa98..0af9fa025 100755 --- a/src/main/java/fr/inria/corese/core/Graph.java +++ b/src/main/java/fr/inria/corese/core/Graph.java @@ -6,12 +6,12 @@ import fr.inria.corese.core.elasticsearch.EdgeChangeListener; import fr.inria.corese.core.index.EdgeManagerIndexer; import fr.inria.corese.core.index.NodeManager; -import fr.inria.corese.core.next.kgram.api.core.*; -import fr.inria.corese.core.next.kgram.api.query.Graphable; -import fr.inria.corese.core.next.kgram.core.Distinct; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.tool.MetaIterator; +import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.kgram.api.query.Graphable; +import fr.inria.corese.core.kgram.core.Distinct; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.tool.MetaIterator; import fr.inria.corese.core.logic.*; import fr.inria.corese.core.producer.DataProducer; import fr.inria.corese.core.query.QueryCheck; @@ -35,7 +35,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.GRAPH; +import static fr.inria.corese.core.kgram.api.core.PointerType.GRAPH; /** * Graph Manager Edges are stored in an index An index is a table: predicate -> diff --git a/src/main/java/fr/inria/corese/core/GraphCompare.java b/src/main/java/fr/inria/corese/core/GraphCompare.java index ec8b7a49f..d1172671a 100644 --- a/src/main/java/fr/inria/corese/core/GraphCompare.java +++ b/src/main/java/fr/inria/corese/core/GraphCompare.java @@ -1,7 +1,7 @@ package fr.inria.corese.core; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/GraphDistance.java b/src/main/java/fr/inria/corese/core/GraphDistance.java index d655e2b56..b2c6f16e2 100644 --- a/src/main/java/fr/inria/corese/core/GraphDistance.java +++ b/src/main/java/fr/inria/corese/core/GraphDistance.java @@ -1,6 +1,6 @@ package fr.inria.corese.core; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Constant; diff --git a/src/main/java/fr/inria/corese/core/GraphObject.java b/src/main/java/fr/inria/corese/core/GraphObject.java index 31c6b4203..234a9a2cc 100644 --- a/src/main/java/fr/inria/corese/core/GraphObject.java +++ b/src/main/java/fr/inria/corese/core/GraphObject.java @@ -5,7 +5,7 @@ package fr.inria.corese.core; -import fr.inria.corese.core.next.kgram.core.PointerObject; +import fr.inria.corese.core.kgram.core.PointerObject; /** * @author Olivier Corby, Wimmics INRIA I3S, 2015 diff --git a/src/main/java/fr/inria/corese/core/GraphStore.java b/src/main/java/fr/inria/corese/core/GraphStore.java index a1303d93d..5ba9dea76 100644 --- a/src/main/java/fr/inria/corese/core/GraphStore.java +++ b/src/main/java/fr/inria/corese/core/GraphStore.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.elasticsearch.EdgeChangeListener; import fr.inria.corese.core.logic.Entailment; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/fr/inria/corese/core/Index.java b/src/main/java/fr/inria/corese/core/Index.java index 0dd56f605..9bd2ba0a6 100644 --- a/src/main/java/fr/inria/corese/core/Index.java +++ b/src/main/java/fr/inria/corese/core/Index.java @@ -3,8 +3,8 @@ import fr.inria.corese.core.index.NodeManager; import fr.inria.corese.core.index.PredicateList; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/NodeGraph.java b/src/main/java/fr/inria/corese/core/NodeGraph.java index 80f675fcf..390e668ce 100644 --- a/src/main/java/fr/inria/corese/core/NodeGraph.java +++ b/src/main/java/fr/inria/corese/core/NodeGraph.java @@ -1,6 +1,6 @@ package fr.inria.corese.core; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype; /** diff --git a/src/main/java/fr/inria/corese/core/NodeGraphIndex.java b/src/main/java/fr/inria/corese/core/NodeGraphIndex.java index aabd0d769..c7a1d5072 100644 --- a/src/main/java/fr/inria/corese/core/NodeGraphIndex.java +++ b/src/main/java/fr/inria/corese/core/NodeGraphIndex.java @@ -1,9 +1,9 @@ package fr.inria.corese.core; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.tool.DistinctNode; -import fr.inria.corese.core.next.kgram.tool.MetaIterator; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.tool.DistinctNode; +import fr.inria.corese.core.kgram.tool.MetaIterator; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/NodeImpl.java b/src/main/java/fr/inria/corese/core/NodeImpl.java index f4633a848..e8cbd641c 100755 --- a/src/main/java/fr/inria/corese/core/NodeImpl.java +++ b/src/main/java/fr/inria/corese/core/NodeImpl.java @@ -1,10 +1,10 @@ package fr.inria.corese.core; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.TripleStore; -import fr.inria.corese.core.next.kgram.path.Path; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.TripleStore; +import fr.inria.corese.core.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.Objects; diff --git a/src/main/java/fr/inria/corese/core/NodeIterator.java b/src/main/java/fr/inria/corese/core/NodeIterator.java index 0f4b98cfb..129cdecc1 100644 --- a/src/main/java/fr/inria/corese/core/NodeIterator.java +++ b/src/main/java/fr/inria/corese/core/NodeIterator.java @@ -1,7 +1,7 @@ package fr.inria.corese.core; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.Iterator; diff --git a/src/main/java/fr/inria/corese/core/Workflow.java b/src/main/java/fr/inria/corese/core/Workflow.java index fc968a880..5cfcfbc62 100644 --- a/src/main/java/fr/inria/corese/core/Workflow.java +++ b/src/main/java/fr/inria/corese/core/Workflow.java @@ -1,8 +1,8 @@ package fr.inria.corese.core; import fr.inria.corese.core.api.Engine; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.sparql.exceptions.EngineException; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/api/DataBroker.java b/src/main/java/fr/inria/corese/core/api/DataBroker.java index c509add2f..dc9f53f30 100644 --- a/src/main/java/fr/inria/corese/core/api/DataBroker.java +++ b/src/main/java/fr/inria/corese/core/api/DataBroker.java @@ -2,9 +2,9 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.NodeImpl; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.logic.RDF; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.storage.api.dataManager.DataManager; diff --git a/src/main/java/fr/inria/corese/core/api/DataBrokerConstruct.java b/src/main/java/fr/inria/corese/core/api/DataBrokerConstruct.java index d26a06d35..5dd401172 100644 --- a/src/main/java/fr/inria/corese/core/api/DataBrokerConstruct.java +++ b/src/main/java/fr/inria/corese/core/api/DataBrokerConstruct.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.api; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/api/Engine.java b/src/main/java/fr/inria/corese/core/api/Engine.java index f53b8b3fb..ba33ddf9d 100644 --- a/src/main/java/fr/inria/corese/core/api/Engine.java +++ b/src/main/java/fr/inria/corese/core/api/Engine.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.api; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.exceptions.EngineException; /** diff --git a/src/main/java/fr/inria/corese/core/api/GraphListener.java b/src/main/java/fr/inria/corese/core/api/GraphListener.java index 91d9e9ddf..0a064cb68 100644 --- a/src/main/java/fr/inria/corese/core/api/GraphListener.java +++ b/src/main/java/fr/inria/corese/core/api/GraphListener.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.api; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; public interface GraphListener { diff --git a/src/main/java/fr/inria/corese/core/api/IGraph.java b/src/main/java/fr/inria/corese/core/api/IGraph.java index e4b7455c5..2b765197d 100644 --- a/src/main/java/fr/inria/corese/core/api/IGraph.java +++ b/src/main/java/fr/inria/corese/core/api/IGraph.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.api; import fr.inria.corese.core.Index; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype; public interface IGraph { diff --git a/src/main/java/fr/inria/corese/core/api/QueryGraphVisitor.java b/src/main/java/fr/inria/corese/core/api/QueryGraphVisitor.java index 01a683e75..8d6c121bf 100644 --- a/src/main/java/fr/inria/corese/core/api/QueryGraphVisitor.java +++ b/src/main/java/fr/inria/corese/core/api/QueryGraphVisitor.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.api; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; /** diff --git a/src/main/java/fr/inria/corese/core/compiler/api/QueryVisitor.java b/src/main/java/fr/inria/corese/core/compiler/api/QueryVisitor.java index 7ed726372..6b10fc31d 100644 --- a/src/main/java/fr/inria/corese/core/compiler/api/QueryVisitor.java +++ b/src/main/java/fr/inria/corese/core/compiler/api/QueryVisitor.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.compiler.api; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Mappings; public interface QueryVisitor extends fr.inria.corese.core.sparql.api.QueryVisitor { diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/Custom.java b/src/main/java/fr/inria/corese/core/compiler/eval/Custom.java index 17fc9bab0..ec47fd5c5 100644 --- a/src/main/java/fr/inria/corese/core/compiler/eval/Custom.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/Custom.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.compiler.eval; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/Interpreter.java b/src/main/java/fr/inria/corese/core/compiler/eval/Interpreter.java index cb02d59bd..aa1b7e530 100644 --- a/src/main/java/fr/inria/corese/core/compiler/eval/Interpreter.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/Interpreter.java @@ -1,13 +1,13 @@ package fr.inria.corese.core.compiler.eval; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Evaluator; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.event.ResultListener; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Evaluator; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.event.ResultListener; import fr.inria.corese.core.sparql.api.*; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/ProxyInterpreter.java b/src/main/java/fr/inria/corese/core/compiler/eval/ProxyInterpreter.java index 558a5601a..f59881833 100644 --- a/src/main/java/fr/inria/corese/core/compiler/eval/ProxyInterpreter.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/ProxyInterpreter.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.compiler.eval; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Evaluator; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Evaluator; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Eval; import fr.inria.corese.core.sparql.api.ComputerProxy; import fr.inria.corese.core.sparql.api.GraphProcessor; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolver.java b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolver.java index 8f935209f..efb59c27b 100755 --- a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolver.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolver.java @@ -3,14 +3,14 @@ import fr.inria.corese.core.compiler.api.QueryVisitor; import fr.inria.corese.core.compiler.parser.Pragma; import fr.inria.corese.core.compiler.parser.Transformer; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.*; -import fr.inria.corese.core.next.kgram.core.*; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.event.EventListener; -import fr.inria.corese.core.next.kgram.event.EventManager; -import fr.inria.corese.core.next.kgram.event.ResultListener; -import fr.inria.corese.core.next.kgram.tool.MetaProducer; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.*; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.core.*; +import fr.inria.corese.core.kgram.event.EventListener; +import fr.inria.corese.core.kgram.event.EventManager; +import fr.inria.corese.core.kgram.event.ResultListener; +import fr.inria.corese.core.kgram.tool.MetaProducer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverOverload.java b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverOverload.java index ca1c32331..c050528f3 100644 --- a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverOverload.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverOverload.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.compiler.eval; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.core.Eval; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitor.java b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitor.java index dcb5d179f..7e6cb6ae0 100644 --- a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitor.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitor.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.compiler.eval; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.*; -import fr.inria.corese.core.next.kgram.path.Path; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.*; +import fr.inria.corese.core.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import org.slf4j.Logger; @@ -238,7 +238,7 @@ boolean result(IDatatype dt) { } @Override - public IDatatype statement(Eval eval, Node g, Exp e) { + public IDatatype statement(Eval eval, Node g, Exp e) { return callback(eval, STATEMENT, toArray(g, e)); } diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java index 521c2c71b..ff333b6cf 100644 --- a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.compiler.eval; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.query.*; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.PointerObject; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.query.*; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.PointerObject; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorExtension.java b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorExtension.java index d6adaeeb0..5bb5640c9 100644 --- a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorExtension.java +++ b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorExtension.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.compiler.eval; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java b/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java index 6f354edbe..0b4e79ee0 100644 --- a/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java +++ b/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java @@ -3,7 +3,7 @@ import fr.inria.corese.core.compiler.api.QueryVisitor; import fr.inria.corese.core.compiler.eval.QuerySolver; import fr.inria.corese.core.compiler.federate.util.RewriteErrorManager; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.RDF; import fr.inria.corese.core.sparql.exceptions.EngineException; @@ -238,7 +238,7 @@ public void visit(ASTQuery ast) { } @Override - public void visit(fr.inria.corese.core.next.kgram.core.Query query) { + public void visit(fr.inria.corese.core.kgram.core.Query query) { query.setFederate(true); ASTQuery queryAST = query.getAST(); queryAST.getLog().setAST(queryAST); @@ -249,7 +249,7 @@ public void visit(fr.inria.corese.core.next.kgram.core.Query query) { // before solver query exec @Override - public void before(fr.inria.corese.core.next.kgram.core.Query q) { + public void before(fr.inria.corese.core.kgram.core.Query q) { } diff --git a/src/main/java/fr/inria/corese/core/compiler/federate/Provenance.java b/src/main/java/fr/inria/corese/core/compiler/federate/Provenance.java index 8ffcc95e5..9bfe53b6f 100644 --- a/src/main/java/fr/inria/corese/core/compiler/federate/Provenance.java +++ b/src/main/java/fr/inria/corese/core/compiler/federate/Provenance.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.compiler.federate; -import fr.inria.corese.core.next.kgram.api.core.DatatypeValue; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Group; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.DatatypeValue; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Group; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.triple.parser.Service; import fr.inria.corese.core.sparql.triple.parser.Variable; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/compiler/federate/Selector.java b/src/main/java/fr/inria/corese/core/compiler/federate/Selector.java index 2827f3697..209e5d74b 100644 --- a/src/main/java/fr/inria/corese/core/compiler/federate/Selector.java +++ b/src/main/java/fr/inria/corese/core/compiler/federate/Selector.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.compiler.federate; import fr.inria.corese.core.compiler.eval.QuerySolver; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.cst.LogKey; diff --git a/src/main/java/fr/inria/corese/core/compiler/federate/SelectorIndex.java b/src/main/java/fr/inria/corese/core/compiler/federate/SelectorIndex.java index b19013937..bedf5d600 100644 --- a/src/main/java/fr/inria/corese/core/compiler/federate/SelectorIndex.java +++ b/src/main/java/fr/inria/corese/core/compiler/federate/SelectorIndex.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.compiler.eval.QuerySolver; import fr.inria.corese.core.compiler.federate.util.ResourceReader; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.*; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/Compiler.java b/src/main/java/fr/inria/corese/core/compiler/parser/Compiler.java index 436c7bc89..25a9c7d15 100755 --- a/src/main/java/fr/inria/corese/core/compiler/parser/Compiler.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/Compiler.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Filter; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.Regex; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Filter; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Regex; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Atom; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/CompilerKgram.java b/src/main/java/fr/inria/corese/core/compiler/parser/CompilerKgram.java index ee08908ee..e4de94a68 100755 --- a/src/main/java/fr/inria/corese/core/compiler/parser/CompilerKgram.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/CompilerKgram.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.next.kgram.api.core.*; -import fr.inria.corese.core.next.kgram.api.core.Filter; -import fr.inria.corese.core.next.kgram.tool.Message; +import fr.inria.corese.core.kgram.api.core.Filter; +import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.kgram.tool.Message; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.*; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/EdgeImpl.java b/src/main/java/fr/inria/corese/core/compiler/parser/EdgeImpl.java index d9ff766a6..86c15929c 100755 --- a/src/main/java/fr/inria/corese/core/compiler/parser/EdgeImpl.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/EdgeImpl.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import fr.inria.corese.core.next.kgram.core.PointerObject; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.core.PointerObject; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.cst.RDFS; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/ExpandList.java b/src/main/java/fr/inria/corese/core/compiler/parser/ExpandList.java index aa2f29804..6c2923ccf 100644 --- a/src/main/java/fr/inria/corese/core/compiler/parser/ExpandList.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/ExpandList.java @@ -5,7 +5,7 @@ package fr.inria.corese.core.compiler.parser; import fr.inria.corese.core.compiler.api.QueryVisitor; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Exp; import fr.inria.corese.core.sparql.triple.parser.RDFList; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/ExpandPath.java b/src/main/java/fr/inria/corese/core/compiler/parser/ExpandPath.java index 84b43fb18..2f48db282 100644 --- a/src/main/java/fr/inria/corese/core/compiler/parser/ExpandPath.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/ExpandPath.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.compiler.parser; import fr.inria.corese.core.compiler.api.QueryVisitor; -import fr.inria.corese.core.next.kgram.api.core.Regex; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Regex; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.triple.parser.*; import fr.inria.corese.core.sparql.triple.update.ASTUpdate; import fr.inria.corese.core.sparql.triple.update.Composite; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/Extension.java b/src/main/java/fr/inria/corese/core/compiler/parser/Extension.java index e64a633a8..9e9687022 100644 --- a/src/main/java/fr/inria/corese/core/compiler/parser/Extension.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/Extension.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; /** diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java b/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java index 74c773652..4f9ce4825 100644 --- a/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.datatype.DatatypeHierarchy; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.exceptions.SafetyException; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/NodeImpl.java b/src/main/java/fr/inria/corese/core/compiler/parser/NodeImpl.java index a857a945e..bd719d183 100755 --- a/src/main/java/fr/inria/corese/core/compiler/parser/NodeImpl.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/NodeImpl.java @@ -5,7 +5,7 @@ import fr.inria.corese.core.sparql.triple.parser.Constant; import fr.inria.corese.core.sparql.triple.parser.Variable; -public class NodeImpl extends fr.inria.corese.core.next.kgram.tool.NodeImpl { +public class NodeImpl extends fr.inria.corese.core.kgram.tool.NodeImpl { public NodeImpl(Atom at) { diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/Pragma.java b/src/main/java/fr/inria/corese/core/compiler/parser/Pragma.java index 8413cbd91..b532bfd8c 100755 --- a/src/main/java/fr/inria/corese/core/compiler/parser/Pragma.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/Pragma.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.api.query.Matcher; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.event.EvalListener; -import fr.inria.corese.core.next.kgram.event.EventListener; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.query.Matcher; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.event.EvalListener; +import fr.inria.corese.core.kgram.event.EventListener; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.cst.RDFS; diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/QueryProfile.java b/src/main/java/fr/inria/corese/core/compiler/parser/QueryProfile.java index cdb5dec71..9b32056d5 100644 --- a/src/main/java/fr/inria/corese/core/compiler/parser/QueryProfile.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/QueryProfile.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Filter; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Filter; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Query; /** * Detect Query Pattern, that may be optimized diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/Transformer.java b/src/main/java/fr/inria/corese/core/compiler/parser/Transformer.java index a41bb1295..b4ee704b9 100755 --- a/src/main/java/fr/inria/corese/core/compiler/parser/Transformer.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/Transformer.java @@ -5,11 +5,10 @@ import fr.inria.corese.core.compiler.eval.QuerySolverVisitor; import fr.inria.corese.core.compiler.federate.FederateVisitor; import fr.inria.corese.core.compiler.visitor.MetadataVisitor; -import fr.inria.corese.core.next.kgram.api.core.*; -import fr.inria.corese.core.next.kgram.api.core.Filter; -import fr.inria.corese.core.next.kgram.core.*; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.core.*; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.exceptions.SafetyException; @@ -750,7 +749,7 @@ Exp compileBind(ASTQuery ast, Binding b) throws EngineException { } Exp compileBind(ASTQuery ast, Expression e, Variable var) throws EngineException { - Filter f = compileSelect(e, ast); + fr.inria.corese.core.kgram.api.core.Filter f = compileSelect(e, ast); Node node = compiler.createNode(var); Exp exp = Exp.create(Type.BIND); exp.setFilter(f); @@ -983,14 +982,14 @@ void path(Query q, ASTQuery ast) throws EngineException { } for (Expression test : ast.getRegexTest()) { // ?x c:isMemberOf[?this != ] + ?y - Filter f = compile(test); + fr.inria.corese.core.kgram.api.core.Filter f = compile(test); q.addPathFilter(f); } } void having(Query q, ASTQuery ast) throws EngineException { if (ast.getHaving() != null) { - Filter having = compileSelect(ast.getHaving(), ast); + fr.inria.corese.core.kgram.api.core.Filter having = compileSelect(ast.getHaving(), ast); q.setHaving(Exp.create(Type.FILTER, having)); } } @@ -1026,7 +1025,7 @@ List select(Query qCurrent, ASTQuery ast) throws EngineException { if (ee != null) { // select fun() as var - Filter f = compileSelect(ee, ast); + fr.inria.corese.core.kgram.api.core.Filter f = compileSelect(ee, ast); if (f != null) { // select fun() as var @@ -1187,7 +1186,7 @@ void function(Query qCurrent, Exp exp, Variable variable) { * @param query * @param f */ - void checkFilterVariables(Query query, Filter f, List select, List lNodes) { + void checkFilterVariables(Query query, fr.inria.corese.core.kgram.api.core.Filter f, List select, List lNodes) { switch (f.getExp().oper()) { // do not create Node for local variables case ExprType.PACKAGE: @@ -1270,7 +1269,7 @@ List orderBy(Query qCurrent, List input, ASTQuery ast) throws E } else { // order by fun(?x) // TODO: check rewrite fun() as var - Filter f = compile(ee); + fr.inria.corese.core.kgram.api.core.Filter f = compile(ee); Node node = createNode(); Exp exp = Exp.create(Type.NODE, node); exp.setFilter(f); @@ -1350,7 +1349,7 @@ Exp basicCompileEdge(Triple t) throws EngineException { if (t.isXPath()) { // deprecated ?x xpath() ?y exp.setType(Type.EVAL); - Filter xpath = compiler.compile(t.getXPath()); + fr.inria.corese.core.kgram.api.core.Filter xpath = compiler.compile(t.getXPath()); exp.setFilter(xpath); } else if (t.isPath()) { path(t, exp); @@ -1453,7 +1452,7 @@ Exp compileGraph(Exp exp, Atom at) { } Exp compileFilter(Expression ee, boolean opt) throws EngineException { - List qvec = compiler.compileFilter(ee); + List qvec = compiler.compileFilter(ee); Exp exp; if (qvec.size() == 1) { @@ -1461,7 +1460,7 @@ Exp compileFilter(Expression ee, boolean opt) throws EngineException { compileExist(qvec.get(0).getExp(), opt); } else { exp = Exp.create(Type.AND); - for (Filter qm : qvec) { + for (fr.inria.corese.core.kgram.api.core.Filter qm : qvec) { Exp f = Exp.create(Type.FILTER, qm); compileExist(qm.getExp(), opt); exp.add(f); @@ -1477,8 +1476,8 @@ Node compile(Atom at) { /** * Rewrite fun() as ?var in exp Compile exists {} */ - Filter compile(Expression exp) throws EngineException { - Filter f = compiler.compile(exp); + fr.inria.corese.core.kgram.api.core.Filter compile(Expression exp) throws EngineException { + fr.inria.corese.core.kgram.api.core.Filter f = compiler.compile(exp); compileExist(f.getExp(), false); return f; } @@ -1486,8 +1485,8 @@ Filter compile(Expression exp) throws EngineException { /** * Do not rewrite fun() as var */ - Filter compileSelect(Expression exp, ASTQuery ast) throws EngineException { - Filter f = exp.compile(ast); + fr.inria.corese.core.kgram.api.core.Filter compileSelect(Expression exp, ASTQuery ast) throws EngineException { + fr.inria.corese.core.kgram.api.core.Filter f = exp.compile(ast); compileExist(f.getExp(), false); return f; } @@ -1532,7 +1531,7 @@ void path(Exp exp) throws EngineException { * Exp e */ void processPath(Exp exp, Exp ef) throws EngineException { - Filter f = ef.getFilter(); + fr.inria.corese.core.kgram.api.core.Filter f = ef.getFilter(); Edge e = exp.getEdge(); Node n = e.getEdgeVariable(); diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/VisitQuery.java b/src/main/java/fr/inria/corese/core/compiler/parser/VisitQuery.java index c1b5772d6..26ffe833b 100644 --- a/src/main/java/fr/inria/corese/core/compiler/parser/VisitQuery.java +++ b/src/main/java/fr/inria/corese/core/compiler/parser/VisitQuery.java @@ -1,17 +1,19 @@ package fr.inria.corese.core.compiler.parser; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Expression; import java.util.ArrayList; import java.util.List; +import static fr.inria.corese.core.kgram.api.core.ExpType.*; + /** * @author Olivier Corby, Wimmics INRIA I3S, 2014 */ diff --git a/src/main/java/fr/inria/corese/core/compiler/result/XMLResult.java b/src/main/java/fr/inria/corese/core/compiler/result/XMLResult.java index 6bc326e7b..4dc1b43b1 100644 --- a/src/main/java/fr/inria/corese/core/compiler/result/XMLResult.java +++ b/src/main/java/fr/inria/corese/core/compiler/result/XMLResult.java @@ -2,11 +2,11 @@ import fr.inria.corese.core.compiler.eval.QuerySolver; import fr.inria.corese.core.compiler.parser.CompilerFacKgram; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/compiler/visitor/MetadataVisitor.java b/src/main/java/fr/inria/corese/core/compiler/visitor/MetadataVisitor.java index a06681c89..719b9f1c0 100644 --- a/src/main/java/fr/inria/corese/core/compiler/visitor/MetadataVisitor.java +++ b/src/main/java/fr/inria/corese/core/compiler/visitor/MetadataVisitor.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.compiler.visitor; import fr.inria.corese.core.compiler.api.QueryVisitor; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.triple.parser.*; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeBinary.java b/src/main/java/fr/inria/corese/core/edge/EdgeBinary.java index 4c0202633..8ecccbe3b 100644 --- a/src/main/java/fr/inria/corese/core/edge/EdgeBinary.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeBinary.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeDefault.java b/src/main/java/fr/inria/corese/core/edge/EdgeDefault.java index 83b311517..e5fef7f17 100644 --- a/src/main/java/fr/inria/corese/core/edge/EdgeDefault.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeDefault.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeEntail.java b/src/main/java/fr/inria/corese/core/edge/EdgeEntail.java index e8a5a392e..fe169eee9 100644 --- a/src/main/java/fr/inria/corese/core/edge/EdgeEntail.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeEntail.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * @author Olivier Corby, Wimmics INRIA I3S, 2016 diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeGeneric.java b/src/main/java/fr/inria/corese/core/edge/EdgeGeneric.java index adc00f623..0c8dc30da 100644 --- a/src/main/java/fr/inria/corese/core/edge/EdgeGeneric.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeGeneric.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeImpl.java b/src/main/java/fr/inria/corese/core/edge/EdgeImpl.java index fc610b406..1a656f008 100755 --- a/src/main/java/fr/inria/corese/core/edge/EdgeImpl.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeImpl.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeQuad.java b/src/main/java/fr/inria/corese/core/edge/EdgeQuad.java index 1d5405ae2..440427cd9 100755 --- a/src/main/java/fr/inria/corese/core/edge/EdgeQuad.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeQuad.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Graph Edge as Quad diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeTop.java b/src/main/java/fr/inria/corese/core/edge/EdgeTop.java index b03b15414..cbf25f11d 100644 --- a/src/main/java/fr/inria/corese/core/edge/EdgeTop.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeTop.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.GraphObject; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import fr.inria.corese.core.next.kgram.api.core.TripleStore; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.api.core.TripleStore; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.AccessRight; @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Objects; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.TRIPLE; +import static fr.inria.corese.core.kgram.api.core.PointerType.TRIPLE; /** * @author Olivier Corby, Wimmics Inria I3S, 2014 diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeTriple.java b/src/main/java/fr/inria/corese/core/edge/EdgeTriple.java index d24e64b4b..1a040f96a 100644 --- a/src/main/java/fr/inria/corese/core/edge/EdgeTriple.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeTriple.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/EdgeTripleNode.java b/src/main/java/fr/inria/corese/core/edge/EdgeTripleNode.java index 10d51f11a..f24d7c7f3 100644 --- a/src/main/java/fr/inria/corese/core/edge/EdgeTripleNode.java +++ b/src/main/java/fr/inria/corese/core/edge/EdgeTripleNode.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.edge; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype; /** diff --git a/src/main/java/fr/inria/corese/core/edge/TripleNode.java b/src/main/java/fr/inria/corese/core/edge/TripleNode.java index f029351e3..7f14fc480 100644 --- a/src/main/java/fr/inria/corese/core/edge/TripleNode.java +++ b/src/main/java/fr/inria/corese/core/edge/TripleNode.java @@ -2,8 +2,8 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.NodeImpl; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype; /** diff --git a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryFirst.java b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryFirst.java index e45a4ee42..b55ea2e11 100644 --- a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryFirst.java +++ b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryFirst.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryLabel.java b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryLabel.java index 9ed96788e..a4a551aac 100644 --- a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryLabel.java +++ b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryLabel.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryRest.java b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryRest.java index 5ec4eae00..61d9882fb 100644 --- a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryRest.java +++ b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryRest.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinarySubclass.java b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinarySubclass.java index 351bc74b1..5e3b2c63c 100644 --- a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinarySubclass.java +++ b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinarySubclass.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryType.java b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryType.java index d131a5beb..dc52c12fa 100644 --- a/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryType.java +++ b/src/main/java/fr/inria/corese/core/edge/binary/EdgeBinaryType.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Graph Edge for the defaultGraph diff --git a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternal.java b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternal.java index e873d4769..33e68be6c 100644 --- a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternal.java +++ b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternal.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.edge.internal; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; /** * Graph Edge for internal storage diff --git a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalDefault.java b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalDefault.java index febdd183f..258db9768 100644 --- a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalDefault.java +++ b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalDefault.java @@ -2,8 +2,8 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; /** * Graph Edge for internal storage diff --git a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalEntail.java b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalEntail.java index f042bd02c..06bdab96e 100644 --- a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalEntail.java +++ b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalEntail.java @@ -2,8 +2,8 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; /** * Graph Edge for internal storage diff --git a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalRule.java b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalRule.java index 3d56c1560..3fa567ed8 100644 --- a/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalRule.java +++ b/src/main/java/fr/inria/corese/core/edge/internal/EdgeInternalRule.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Graph Edge for internal storage diff --git a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRule.java b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRule.java index 813ba060f..1be13066a 100644 --- a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRule.java +++ b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRule.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeTriple; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleGraph.java b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleGraph.java index 506f37939..2be228e27 100644 --- a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleGraph.java +++ b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleGraph.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.edge.rule; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Edge entailed by a Rule diff --git a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleSubclass.java b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleSubclass.java index 36197be97..c6fae227d 100644 --- a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleSubclass.java +++ b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleSubclass.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.edge.rule; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Edge entailed by a Rule diff --git a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleTop.java b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleTop.java index 80db69f49..bdaf2d3ee 100644 --- a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleTop.java +++ b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleTop.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.edge.EdgeBinary; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleType.java b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleType.java index db5e73dc9..14ac24f47 100644 --- a/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleType.java +++ b/src/main/java/fr/inria/corese/core/edge/rule/EdgeRuleType.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.edge.rule; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Edge entailed by a Rule diff --git a/src/main/java/fr/inria/corese/core/elasticsearch/EdgeChangeListener.java b/src/main/java/fr/inria/corese/core/elasticsearch/EdgeChangeListener.java index 02fa82540..9824e5b22 100644 --- a/src/main/java/fr/inria/corese/core/elasticsearch/EdgeChangeListener.java +++ b/src/main/java/fr/inria/corese/core/elasticsearch/EdgeChangeListener.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.elasticsearch; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/extension/Core.java b/src/main/java/fr/inria/corese/core/extension/Core.java index 4fc01c961..5024bb52b 100644 --- a/src/main/java/fr/inria/corese/core/extension/Core.java +++ b/src/main/java/fr/inria/corese/core/extension/Core.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.extension; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.query.PluginImpl; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/extension/Extension.java b/src/main/java/fr/inria/corese/core/extension/Extension.java index 73a030c96..eacb780b8 100644 --- a/src/main/java/fr/inria/corese/core/extension/Extension.java +++ b/src/main/java/fr/inria/corese/core/extension/Extension.java @@ -2,13 +2,13 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.compiler.eval.QuerySolverVisitor; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.ProcessVisitorDefault; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.ProcessVisitorDefault; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.Service; import fr.inria.corese.core.logic.Distance; diff --git a/src/main/java/fr/inria/corese/core/extension/JavaCompiler.java b/src/main/java/fr/inria/corese/core/extension/JavaCompiler.java index caedc975d..fab923011 100644 --- a/src/main/java/fr/inria/corese/core/extension/JavaCompiler.java +++ b/src/main/java/fr/inria/corese/core/extension/JavaCompiler.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.extension; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/extension/Report.java b/src/main/java/fr/inria/corese/core/extension/Report.java index d2f3e95a2..63e248cc7 100644 --- a/src/main/java/fr/inria/corese/core/extension/Report.java +++ b/src/main/java/fr/inria/corese/core/extension/Report.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.extension; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/extension/core/Core.java b/src/main/java/fr/inria/corese/core/extension/core/Core.java index 5a26777f7..e3fadc26d 100644 --- a/src/main/java/fr/inria/corese/core/extension/core/Core.java +++ b/src/main/java/fr/inria/corese/core/extension/core/Core.java @@ -8,13 +8,13 @@ import fr.inria.corese.core.sparql.triple.parser.NSManager; import fr.inria.corese.core.sparql.triple.function.core.FunctionEvaluator; import fr.inria.corese.core.compiler.parser.NodeImpl; -import fr.inria.corese.core.next.kgram.api.core.Loopable; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Loopable; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.Graph; import fr.inria.corese.core.producer.DataProducer; import fr.inria.corese.core.query.PluginTransform; diff --git a/src/main/java/fr/inria/corese/core/index/EdgeManager.java b/src/main/java/fr/inria/corese/core/index/EdgeManager.java index 112a11487..440cde04f 100644 --- a/src/main/java/fr/inria/corese/core/index/EdgeManager.java +++ b/src/main/java/fr/inria/corese/core/index/EdgeManager.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.index; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.*; diff --git a/src/main/java/fr/inria/corese/core/index/EdgeManagerIndexer.java b/src/main/java/fr/inria/corese/core/index/EdgeManagerIndexer.java index 5e363ead2..1e0d8467b 100644 --- a/src/main/java/fr/inria/corese/core/index/EdgeManagerIndexer.java +++ b/src/main/java/fr/inria/corese/core/index/EdgeManagerIndexer.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.Index; import fr.inria.corese.core.Serializer; import fr.inria.corese.core.index.PredicateList.Cursor; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.tool.MetaIterator; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.tool.MetaIterator; import fr.inria.corese.core.sparql.triple.parser.AccessRight; import fr.inria.corese.core.util.Property; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/index/EdgeManagerIterate.java b/src/main/java/fr/inria/corese/core/index/EdgeManagerIterate.java index 501009308..ba7318f26 100644 --- a/src/main/java/fr/inria/corese/core/index/EdgeManagerIterate.java +++ b/src/main/java/fr/inria/corese/core/index/EdgeManagerIterate.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.index; import fr.inria.corese.core.edge.EdgeGeneric; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; import java.util.Iterator; diff --git a/src/main/java/fr/inria/corese/core/index/NodeManager.java b/src/main/java/fr/inria/corese/core/index/NodeManager.java index 71fb5bcfc..07fa8e62b 100644 --- a/src/main/java/fr/inria/corese/core/index/NodeManager.java +++ b/src/main/java/fr/inria/corese/core/index/NodeManager.java @@ -7,7 +7,7 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype.NodeKind; /** diff --git a/src/main/java/fr/inria/corese/core/index/NodeManagerBasic.java b/src/main/java/fr/inria/corese/core/index/NodeManagerBasic.java index 079e978c0..e96b8b283 100644 --- a/src/main/java/fr/inria/corese/core/index/NodeManagerBasic.java +++ b/src/main/java/fr/inria/corese/core/index/NodeManagerBasic.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/fr/inria/corese/core/index/PredicateList.java b/src/main/java/fr/inria/corese/core/index/PredicateList.java index 63c093690..56f3f4fcc 100644 --- a/src/main/java/fr/inria/corese/core/index/PredicateList.java +++ b/src/main/java/fr/inria/corese/core/index/PredicateList.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * List of predicates of a given Node in NodeManager diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/DatatypeValue.java b/src/main/java/fr/inria/corese/core/kgram/api/core/DatatypeValue.java similarity index 92% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/DatatypeValue.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/DatatypeValue.java index 0c75f3f40..205ff7128 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/DatatypeValue.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/DatatypeValue.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; import java.math.BigDecimal; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/DatatypeValueFactory.java b/src/main/java/fr/inria/corese/core/kgram/api/core/DatatypeValueFactory.java similarity index 78% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/DatatypeValueFactory.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/DatatypeValueFactory.java index b7757eec5..81523e844 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/DatatypeValueFactory.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/DatatypeValueFactory.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Edge.java b/src/main/java/fr/inria/corese/core/kgram/api/core/Edge.java similarity index 99% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/Edge.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/Edge.java index c42ebbba7..0313cd4c0 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Edge.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/Edge.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExpPattern.java b/src/main/java/fr/inria/corese/core/kgram/api/core/ExpPattern.java similarity index 76% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/ExpPattern.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/ExpPattern.java index e5ae878b1..f1a729a58 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExpPattern.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/ExpPattern.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExpType.java b/src/main/java/fr/inria/corese/core/kgram/api/core/ExpType.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/ExpType.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/ExpType.java index 13e8644c6..649b62081 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExpType.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/ExpType.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; /** * Types of expression of KGRAM query language diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Expr.java b/src/main/java/fr/inria/corese/core/kgram/api/core/Expr.java similarity index 92% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/Expr.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/Expr.java index 2da4d31a5..872d3d164 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Expr.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/Expr.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExprLabel.java b/src/main/java/fr/inria/corese/core/kgram/api/core/ExprLabel.java similarity index 89% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/ExprLabel.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/ExprLabel.java index fd2b5c240..7568bb391 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExprLabel.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/ExprLabel.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; /** * @author corby diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExprType.java b/src/main/java/fr/inria/corese/core/kgram/api/core/ExprType.java similarity index 99% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/ExprType.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/ExprType.java index 41434a652..7070d3af6 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/ExprType.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/ExprType.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; public interface ExprType { diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Filter.java b/src/main/java/fr/inria/corese/core/kgram/api/core/Filter.java similarity index 95% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/Filter.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/Filter.java index 5226a3f79..032d46d77 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Filter.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/Filter.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; import fr.inria.corese.core.sparql.triple.parser.Expression; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Graph.java b/src/main/java/fr/inria/corese/core/kgram/api/core/Graph.java similarity index 82% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/Graph.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/Graph.java index 93032402c..b10007954 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Graph.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/Graph.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; /** * diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Loopable.java b/src/main/java/fr/inria/corese/core/kgram/api/core/Loopable.java similarity index 73% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/Loopable.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/Loopable.java index 31ee69731..dc1ab7ff9 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Loopable.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/Loopable.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; /** * Interface for (var in exp) {} diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Node.java b/src/main/java/fr/inria/corese/core/kgram/api/core/Node.java similarity index 93% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/Node.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/Node.java index af5b12b0d..97febf9ef 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Node.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/Node.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; -import fr.inria.corese.core.next.kgram.path.Path; +import fr.inria.corese.core.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.api.IDatatype.NodeKind; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.NODE; +import static fr.inria.corese.core.kgram.api.core.PointerType.NODE; /** * Interface of Node provided by graph implementation diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/PointerType.java b/src/main/java/fr/inria/corese/core/kgram/api/core/PointerType.java similarity index 85% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/PointerType.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/PointerType.java index a399bdaf5..8c81365e9 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/PointerType.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/PointerType.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; -import static fr.inria.corese.core.next.kgram.api.core.ExpType.DT; +import static fr.inria.corese.core.kgram.api.core.ExpType.DT; /** * Pointer type for object that can be object of CoresePointer diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Pointerable.java b/src/main/java/fr/inria/corese/core/kgram/api/core/Pointerable.java similarity index 80% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/Pointerable.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/Pointerable.java index 4dc950623..64a66ce3e 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Pointerable.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/Pointerable.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.path.Path; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.path.Path; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Regex.java b/src/main/java/fr/inria/corese/core/kgram/api/core/Regex.java similarity index 96% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/Regex.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/Regex.java index 4613bf74e..0df0cae70 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/Regex.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/Regex.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/core/TripleStore.java b/src/main/java/fr/inria/corese/core/kgram/api/core/TripleStore.java similarity index 80% rename from src/main/java/fr/inria/corese/core/next/kgram/api/core/TripleStore.java rename to src/main/java/fr/inria/corese/core/kgram/api/core/TripleStore.java index 7ff5d870c..a7f5ec686 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/core/TripleStore.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/core/TripleStore.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.core; +package fr.inria.corese.core.kgram.api.core; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/AST.java b/src/main/java/fr/inria/corese/core/kgram/api/query/AST.java similarity index 89% rename from src/main/java/fr/inria/corese/core/next/kgram/api/query/AST.java rename to src/main/java/fr/inria/corese/core/kgram/api/query/AST.java index c9abdef3b..47ea19376 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/AST.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/AST.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.query; +package fr.inria.corese.core.kgram.api.query; /** * Olivier Corby - Wimmics INRIA I3S - 2020 diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/ASTQ.java b/src/main/java/fr/inria/corese/core/kgram/api/query/ASTQ.java similarity index 66% rename from src/main/java/fr/inria/corese/core/next/kgram/api/query/ASTQ.java rename to src/main/java/fr/inria/corese/core/kgram/api/query/ASTQ.java index b57e50c84..65caa214e 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/ASTQ.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/ASTQ.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.query; +package fr.inria.corese.core.kgram.api.query; /** * Olivier Corby - Wimmics INRIA I3S - 2020 diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Binder.java b/src/main/java/fr/inria/corese/core/kgram/api/query/Binder.java similarity index 71% rename from src/main/java/fr/inria/corese/core/next/kgram/api/query/Binder.java rename to src/main/java/fr/inria/corese/core/kgram/api/query/Binder.java index c230e98f0..224b532de 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Binder.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/Binder.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.next.kgram.api.query; +package fr.inria.corese.core.kgram.api.query; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/DQPFactory.java b/src/main/java/fr/inria/corese/core/kgram/api/query/DQPFactory.java new file mode 100644 index 000000000..1f807f461 --- /dev/null +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/DQPFactory.java @@ -0,0 +1,12 @@ +package fr.inria.corese.core.kgram.api.query; + +import fr.inria.corese.core.kgram.core.BgpGenerator; + +/** + * @author corby + */ +public interface DQPFactory { + + BgpGenerator instance(); + +} diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Environment.java b/src/main/java/fr/inria/corese/core/kgram/api/query/Environment.java similarity index 85% rename from src/main/java/fr/inria/corese/core/next/kgram/api/query/Environment.java rename to src/main/java/fr/inria/corese/core/kgram/api/query/Environment.java index 27f1de42e..af9339207 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Environment.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/Environment.java @@ -1,12 +1,12 @@ -package fr.inria.corese.core.next.kgram.api.query; - -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.*; -import fr.inria.corese.core.next.kgram.event.EventManager; -import fr.inria.corese.core.next.kgram.path.Path; -import fr.inria.corese.core.next.kgram.tool.ApproximateSearchEnv; +package fr.inria.corese.core.kgram.api.query; + +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.*; +import fr.inria.corese.core.kgram.event.EventManager; +import fr.inria.corese.core.kgram.path.Path; +import fr.inria.corese.core.kgram.tool.ApproximateSearchEnv; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.parser.ASTExtension; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Evaluator.java b/src/main/java/fr/inria/corese/core/kgram/api/query/Evaluator.java similarity index 80% rename from src/main/java/fr/inria/corese/core/next/kgram/api/query/Evaluator.java rename to src/main/java/fr/inria/corese/core/kgram/api/query/Evaluator.java index faa818f65..cb9d22ac0 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Evaluator.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/Evaluator.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.next.kgram.api.query; +package fr.inria.corese.core.kgram.api.query; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.event.ResultListener; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.event.ResultListener; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Graphable.java b/src/main/java/fr/inria/corese/core/kgram/api/query/Graphable.java similarity index 76% rename from src/main/java/fr/inria/corese/core/next/kgram/api/query/Graphable.java rename to src/main/java/fr/inria/corese/core/kgram/api/query/Graphable.java index dd666cd29..a261b4dd2 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Graphable.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/Graphable.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.query; +package fr.inria.corese.core.kgram.api.query; /** * Olivier Corby - Wimmics INRIA I3S - 2014 diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Hierarchy.java b/src/main/java/fr/inria/corese/core/kgram/api/query/Hierarchy.java similarity index 83% rename from src/main/java/fr/inria/corese/core/next/kgram/api/query/Hierarchy.java rename to src/main/java/fr/inria/corese/core/kgram/api/query/Hierarchy.java index 643be80c0..067a12d56 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Hierarchy.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/Hierarchy.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.api.query; +package fr.inria.corese.core.kgram.api.query; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Matcher.java b/src/main/java/fr/inria/corese/core/kgram/api/query/Matcher.java similarity index 92% rename from src/main/java/fr/inria/corese/core/next/kgram/api/query/Matcher.java rename to src/main/java/fr/inria/corese/core/kgram/api/query/Matcher.java index a1c637315..875d9dad7 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Matcher.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/Matcher.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.next.kgram.api.query; +package fr.inria.corese.core.kgram.api.query; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; /** * Interface for the Matcher that checks conformity of candidate edges and nodes diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Plugin.java b/src/main/java/fr/inria/corese/core/kgram/api/query/Plugin.java similarity index 70% rename from src/main/java/fr/inria/corese/core/next/kgram/api/query/Plugin.java rename to src/main/java/fr/inria/corese/core/kgram/api/query/Plugin.java index 09f47a3f3..41fe29d0b 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Plugin.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/Plugin.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.next.kgram.api.query; +package fr.inria.corese.core.kgram.api.query; -import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Exp; /** * Draft KGRAM Plugin for EXTERN expression. diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/ProcessVisitor.java b/src/main/java/fr/inria/corese/core/kgram/api/query/ProcessVisitor.java similarity index 94% rename from src/main/java/fr/inria/corese/core/next/kgram/api/query/ProcessVisitor.java rename to src/main/java/fr/inria/corese/core/kgram/api/query/ProcessVisitor.java index 3585e5a2f..e7acb161a 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/ProcessVisitor.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/ProcessVisitor.java @@ -1,11 +1,11 @@ -package fr.inria.corese.core.next.kgram.api.query; - -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.Pointerable; -import fr.inria.corese.core.next.kgram.core.*; -import fr.inria.corese.core.next.kgram.path.Path; +package fr.inria.corese.core.kgram.api.query; + +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Pointerable; +import fr.inria.corese.core.kgram.core.*; +import fr.inria.corese.core.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Producer.java b/src/main/java/fr/inria/corese/core/kgram/api/query/Producer.java similarity index 96% rename from src/main/java/fr/inria/corese/core/next/kgram/api/query/Producer.java rename to src/main/java/fr/inria/corese/core/kgram/api/query/Producer.java index 3c1825731..a15d0fea7 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Producer.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/Producer.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.next.kgram.api.query; +package fr.inria.corese.core.kgram.api.query; -import fr.inria.corese.core.next.kgram.api.core.*; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.core.SparqlException; +import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.core.SparqlException; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/kgram/api/query/Provider.java b/src/main/java/fr/inria/corese/core/kgram/api/query/Provider.java new file mode 100644 index 000000000..200f60506 --- /dev/null +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/Provider.java @@ -0,0 +1,21 @@ +package fr.inria.corese.core.kgram.api.query; + +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.SparqlException; + +/** + * Service Provider + * + * @author Olivier Corby, Edelweiss, INRIA 2011 + */ +public interface Provider { + + default Mappings service(Node serv, Exp exp, Mappings map, Eval eval) + throws SparqlException { + return null; + } + +} diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Result.java b/src/main/java/fr/inria/corese/core/kgram/api/query/Result.java similarity index 62% rename from src/main/java/fr/inria/corese/core/next/kgram/api/query/Result.java rename to src/main/java/fr/inria/corese/core/kgram/api/query/Result.java index 458bbd934..b05513cb3 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Result.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/Result.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.next.kgram.api.query; +package fr.inria.corese.core.kgram.api.query; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Interface to KGRAM elementary result (a mapping) diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Results.java b/src/main/java/fr/inria/corese/core/kgram/api/query/Results.java similarity index 65% rename from src/main/java/fr/inria/corese/core/next/kgram/api/query/Results.java rename to src/main/java/fr/inria/corese/core/kgram/api/query/Results.java index 8371e334d..a4ab26d0f 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Results.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/Results.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.next.kgram.api.query; +package fr.inria.corese.core.kgram.api.query; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/SPARQLEngine.java b/src/main/java/fr/inria/corese/core/kgram/api/query/SPARQLEngine.java similarity index 58% rename from src/main/java/fr/inria/corese/core/next/kgram/api/query/SPARQLEngine.java rename to src/main/java/fr/inria/corese/core/kgram/api/query/SPARQLEngine.java index b346cc474..e8ab956d6 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/SPARQLEngine.java +++ b/src/main/java/fr/inria/corese/core/kgram/api/query/SPARQLEngine.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.next.kgram.api.query; +package fr.inria.corese.core.kgram.api.query; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.core.SparqlException; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.core.SparqlException; /** * @author corby diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/BgpGenerator.java b/src/main/java/fr/inria/corese/core/kgram/core/BgpGenerator.java similarity index 69% rename from src/main/java/fr/inria/corese/core/next/kgram/core/BgpGenerator.java rename to src/main/java/fr/inria/corese/core/kgram/core/BgpGenerator.java index 45ff8b5c6..cb5b9fb11 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/BgpGenerator.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/BgpGenerator.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Filter; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Filter; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Producer; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/Checker.java b/src/main/java/fr/inria/corese/core/kgram/core/Checker.java similarity index 89% rename from src/main/java/fr/inria/corese/core/next/kgram/core/Checker.java rename to src/main/java/fr/inria/corese/core/kgram/core/Checker.java index 9b2a2c228..fef82fcdb 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/Checker.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/Checker.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Matcher; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Matcher; +import fr.inria.corese.core.kgram.api.query.Producer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/CompleteSPARQL.java b/src/main/java/fr/inria/corese/core/kgram/core/CompleteSPARQL.java similarity index 95% rename from src/main/java/fr/inria/corese/core/next/kgram/core/CompleteSPARQL.java rename to src/main/java/fr/inria/corese/core/kgram/core/CompleteSPARQL.java index ccb3a7078..428117f03 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/CompleteSPARQL.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/CompleteSPARQL.java @@ -3,11 +3,11 @@ * and open the template in the editor. */ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Filter; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.Filter; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.IDatatype; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/Distinct.java b/src/main/java/fr/inria/corese/core/kgram/core/Distinct.java similarity index 93% rename from src/main/java/fr/inria/corese/core/next/kgram/core/Distinct.java rename to src/main/java/fr/inria/corese/core/kgram/core/Distinct.java index b7fa7191c..51aa7387e 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/Distinct.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/Distinct.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/Eval.java b/src/main/java/fr/inria/corese/core/kgram/core/Eval.java similarity index 99% rename from src/main/java/fr/inria/corese/core/next/kgram/core/Eval.java rename to src/main/java/fr/inria/corese/core/kgram/core/Eval.java index 7c19d8125..1e4b84403 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/Eval.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/Eval.java @@ -1,11 +1,11 @@ -package fr.inria.corese.core.next.kgram.core; - -import fr.inria.corese.core.next.kgram.api.core.*; -import fr.inria.corese.core.next.kgram.api.query.*; -import fr.inria.corese.core.next.kgram.event.*; -import fr.inria.corese.core.next.kgram.path.PathFinder; -import fr.inria.corese.core.next.kgram.tool.Message; -import fr.inria.corese.core.next.kgram.tool.ResultsImpl; +package fr.inria.corese.core.kgram.core; + +import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.kgram.api.query.*; +import fr.inria.corese.core.kgram.event.*; +import fr.inria.corese.core.kgram.path.PathFinder; +import fr.inria.corese.core.kgram.tool.Message; +import fr.inria.corese.core.kgram.tool.ResultsImpl; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.List; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.UNNEST; +import static fr.inria.corese.core.kgram.api.core.ExprType.UNNEST; /** * KGRAM Knowledge Graph Abstract Machine Compute graph homomorphism and diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/EvalGraph.java b/src/main/java/fr/inria/corese/core/kgram/core/EvalGraph.java similarity index 96% rename from src/main/java/fr/inria/corese/core/next/kgram/core/EvalGraph.java rename to src/main/java/fr/inria/corese/core/kgram/core/EvalGraph.java index bcd7e272c..80414cc68 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/EvalGraph.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/EvalGraph.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Matcher; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Matcher; +import fr.inria.corese.core.kgram.api.query.Producer; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/EvalJoin.java b/src/main/java/fr/inria/corese/core/kgram/core/EvalJoin.java similarity index 96% rename from src/main/java/fr/inria/corese/core/next/kgram/core/EvalJoin.java rename to src/main/java/fr/inria/corese/core/kgram/core/EvalJoin.java index a58460191..a7c91fded 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/EvalJoin.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/EvalJoin.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Producer; -import static fr.inria.corese.core.next.kgram.core.Eval.STOP; +import static fr.inria.corese.core.kgram.core.Eval.STOP; /** * @author corby diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/EvalOptional.java b/src/main/java/fr/inria/corese/core/kgram/core/EvalOptional.java similarity index 95% rename from src/main/java/fr/inria/corese/core/next/kgram/core/EvalOptional.java rename to src/main/java/fr/inria/corese/core/kgram/core/EvalOptional.java index b0df81d7f..8ecd88a1d 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/EvalOptional.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/EvalOptional.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; -import static fr.inria.corese.core.next.kgram.core.Eval.STOP; +import static fr.inria.corese.core.kgram.core.Eval.STOP; /** * @author corby diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/EvalSPARQL.java b/src/main/java/fr/inria/corese/core/kgram/core/EvalSPARQL.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/kgram/core/EvalSPARQL.java rename to src/main/java/fr/inria/corese/core/kgram/core/EvalSPARQL.java index c68828590..50852cdf1 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/EvalSPARQL.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/EvalSPARQL.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/Exp.java b/src/main/java/fr/inria/corese/core/kgram/core/Exp.java similarity index 99% rename from src/main/java/fr/inria/corese/core/next/kgram/core/Exp.java rename to src/main/java/fr/inria/corese/core/kgram/core/Exp.java index 592b4d215..2d44374a1 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/Exp.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/Exp.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.*; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.Expression; import java.util.ArrayList; @@ -9,7 +9,7 @@ import java.util.Iterator; import java.util.List; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.STATEMENT; +import static fr.inria.corese.core.kgram.api.core.PointerType.STATEMENT; /** * KGRAM/SPARQL expressions: bgp, union, optional, etc. diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/ExpEdge.java b/src/main/java/fr/inria/corese/core/kgram/core/ExpEdge.java similarity index 93% rename from src/main/java/fr/inria/corese/core/next/kgram/core/ExpEdge.java rename to src/main/java/fr/inria/corese/core/kgram/core/ExpEdge.java index ee0d71a3a..3a09a5342 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/ExpEdge.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/ExpEdge.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Filter; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Filter; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/ExpHandler.java b/src/main/java/fr/inria/corese/core/kgram/core/ExpHandler.java similarity index 98% rename from src/main/java/fr/inria/corese/core/next/kgram/core/ExpHandler.java rename to src/main/java/fr/inria/corese/core/kgram/core/ExpHandler.java index f6c7f1f02..e7c551a0a 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/ExpHandler.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/ExpHandler.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/Group.java b/src/main/java/fr/inria/corese/core/kgram/core/Group.java similarity index 98% rename from src/main/java/fr/inria/corese/core/next/kgram/core/Group.java rename to src/main/java/fr/inria/corese/core/kgram/core/Group.java index f253a4a5a..207c7e2a1 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/Group.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/Group.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.*; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/IterableEntity.java b/src/main/java/fr/inria/corese/core/kgram/core/IterableEntity.java similarity index 82% rename from src/main/java/fr/inria/corese/core/next/kgram/core/IterableEntity.java rename to src/main/java/fr/inria/corese/core/kgram/core/IterableEntity.java index 95e7c38e0..1e7b1e7b9 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/IterableEntity.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/IterableEntity.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.Iterator; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/Mapping.java b/src/main/java/fr/inria/corese/core/kgram/core/Mapping.java similarity index 98% rename from src/main/java/fr/inria/corese/core/next/kgram/core/Mapping.java rename to src/main/java/fr/inria/corese/core/kgram/core/Mapping.java index 423e85ada..c74f477f9 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/Mapping.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/Mapping.java @@ -1,12 +1,12 @@ -package fr.inria.corese.core.next.kgram.core; - -import fr.inria.corese.core.next.kgram.api.core.*; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.next.kgram.api.query.Result; -import fr.inria.corese.core.next.kgram.path.Path; -import fr.inria.corese.core.next.kgram.tool.ApproximateSearchEnv; -import fr.inria.corese.core.next.kgram.tool.EnvironmentImpl; +package fr.inria.corese.core.kgram.core; + +import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.kgram.api.query.Result; +import fr.inria.corese.core.kgram.path.Path; +import fr.inria.corese.core.kgram.tool.ApproximateSearchEnv; +import fr.inria.corese.core.kgram.tool.EnvironmentImpl; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.api.IDatatypeList; import fr.inria.corese.core.sparql.datatype.DatatypeMap; @@ -15,7 +15,7 @@ import java.util.*; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.MAPPING; +import static fr.inria.corese.core.kgram.api.core.PointerType.MAPPING; /** * An elementary result of a query or a subquery diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/MappingSet.java b/src/main/java/fr/inria/corese/core/kgram/core/MappingSet.java similarity index 99% rename from src/main/java/fr/inria/corese/core/next/kgram/core/MappingSet.java rename to src/main/java/fr/inria/corese/core/kgram/core/MappingSet.java index 757e2dfc8..e12018fbb 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/MappingSet.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/MappingSet.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/Mappings.java b/src/main/java/fr/inria/corese/core/kgram/core/Mappings.java similarity index 99% rename from src/main/java/fr/inria/corese/core/next/kgram/core/Mappings.java rename to src/main/java/fr/inria/corese/core/kgram/core/Mappings.java index e8ba14e00..dd5dcb79c 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/Mappings.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/Mappings.java @@ -1,12 +1,12 @@ -package fr.inria.corese.core.next.kgram.core; - -import fr.inria.corese.core.next.kgram.api.core.*; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Evaluator; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.event.Event; -import fr.inria.corese.core.next.kgram.event.EventImpl; -import fr.inria.corese.core.next.kgram.event.EventManager; +package fr.inria.corese.core.kgram.core; + +import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Evaluator; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.event.Event; +import fr.inria.corese.core.kgram.event.EventImpl; +import fr.inria.corese.core.kgram.event.EventManager; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; @@ -18,7 +18,7 @@ import java.util.*; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.MAPPINGS; +import static fr.inria.corese.core.kgram.api.core.PointerType.MAPPINGS; /* * Manage list of Mapping, result of a query diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/Memory.java b/src/main/java/fr/inria/corese/core/kgram/core/Memory.java similarity index 98% rename from src/main/java/fr/inria/corese/core/next/kgram/core/Memory.java rename to src/main/java/fr/inria/corese/core/kgram/core/Memory.java index 0b118f735..da8e1f764 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/Memory.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/Memory.java @@ -1,12 +1,12 @@ -package fr.inria.corese.core.next.kgram.core; - -import fr.inria.corese.core.next.kgram.api.core.*; -import fr.inria.corese.core.next.kgram.api.query.*; -import fr.inria.corese.core.next.kgram.event.Event; -import fr.inria.corese.core.next.kgram.event.EventImpl; -import fr.inria.corese.core.next.kgram.event.EventManager; -import fr.inria.corese.core.next.kgram.path.Path; -import fr.inria.corese.core.next.kgram.tool.ApproximateSearchEnv; +package fr.inria.corese.core.kgram.core; + +import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.kgram.api.query.*; +import fr.inria.corese.core.kgram.event.Event; +import fr.inria.corese.core.kgram.event.EventImpl; +import fr.inria.corese.core.kgram.event.EventManager; +import fr.inria.corese.core.kgram.path.Path; +import fr.inria.corese.core.kgram.tool.ApproximateSearchEnv; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.parser.ASTExtension; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/Merge.java b/src/main/java/fr/inria/corese/core/kgram/core/Merge.java similarity index 98% rename from src/main/java/fr/inria/corese/core/next/kgram/core/Merge.java rename to src/main/java/fr/inria/corese/core/kgram/core/Merge.java index b1514313f..50b7698a9 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/Merge.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/Merge.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/PointerObject.java b/src/main/java/fr/inria/corese/core/kgram/core/PointerObject.java similarity index 66% rename from src/main/java/fr/inria/corese/core/next/kgram/core/PointerObject.java rename to src/main/java/fr/inria/corese/core/kgram/core/PointerObject.java index 7ba62c98a..151061de9 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/PointerObject.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/PointerObject.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Pointerable; +import fr.inria.corese.core.kgram.api.core.Pointerable; /** * diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/ProcessVisitorDefault.java b/src/main/java/fr/inria/corese/core/kgram/core/ProcessVisitorDefault.java similarity index 93% rename from src/main/java/fr/inria/corese/core/next/kgram/core/ProcessVisitorDefault.java rename to src/main/java/fr/inria/corese/core/kgram/core/ProcessVisitorDefault.java index df51edd68..2a4605181 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/ProcessVisitorDefault.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/ProcessVisitorDefault.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.ProcessVisitor; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Metadata; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/Query.java b/src/main/java/fr/inria/corese/core/kgram/core/Query.java similarity index 99% rename from src/main/java/fr/inria/corese/core/next/kgram/core/Query.java rename to src/main/java/fr/inria/corese/core/kgram/core/Query.java index f536aa586..8151a5e9e 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/Query.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/Query.java @@ -1,16 +1,16 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.*; -import fr.inria.corese.core.next.kgram.api.query.DQPFactory; -import fr.inria.corese.core.next.kgram.api.query.Graphable; -import fr.inria.corese.core.next.kgram.api.query.Matcher; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.filter.Compile; -import fr.inria.corese.core.next.kgram.tool.Message; +import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.kgram.api.query.DQPFactory; +import fr.inria.corese.core.kgram.api.query.Graphable; +import fr.inria.corese.core.kgram.api.query.Matcher; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.filter.Compile; +import fr.inria.corese.core.kgram.tool.Message; import fr.inria.corese.core.sparql.triple.parser.ASTExtension; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Context; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/QuerySorter.java b/src/main/java/fr/inria/corese/core/kgram/core/QuerySorter.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/kgram/core/QuerySorter.java rename to src/main/java/fr/inria/corese/core/kgram/core/QuerySorter.java index 4e925ff16..08ec041df 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/QuerySorter.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/QuerySorter.java @@ -1,12 +1,12 @@ -package fr.inria.corese.core.next.kgram.core; - -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Filter; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.filter.Compile; +package fr.inria.corese.core.kgram.core; + +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Filter; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.filter.Compile; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/Sorter.java b/src/main/java/fr/inria/corese/core/kgram/core/Sorter.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/kgram/core/Sorter.java rename to src/main/java/fr/inria/corese/core/kgram/core/Sorter.java index d0bf0b91a..79c553533 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/Sorter.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/Sorter.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Sort KGRAM edges in connected order before query process diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/SorterNew.java b/src/main/java/fr/inria/corese/core/kgram/core/SorterNew.java similarity index 85% rename from src/main/java/fr/inria/corese/core/next/kgram/core/SorterNew.java rename to src/main/java/fr/inria/corese/core/kgram/core/SorterNew.java index bce21c7eb..34b647c6e 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/SorterNew.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/SorterNew.java @@ -1,17 +1,17 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.sorter.core.IEstimate; -import fr.inria.corese.core.next.kgram.sorter.core.ISort; -import fr.inria.corese.core.next.kgram.sorter.core.QPGNode; -import fr.inria.corese.core.next.kgram.sorter.core.QPGraph; -import fr.inria.corese.core.next.kgram.sorter.impl.qpv1.DepthFirstBestSearch; -import fr.inria.corese.core.next.kgram.sorter.impl.qpv1.HeuristicsBasedEstimation; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.sorter.core.IEstimate; +import fr.inria.corese.core.kgram.sorter.core.ISort; +import fr.inria.corese.core.kgram.sorter.core.QPGNode; +import fr.inria.corese.core.kgram.sorter.core.QPGraph; +import fr.inria.corese.core.kgram.sorter.impl.qpv1.DepthFirstBestSearch; +import fr.inria.corese.core.kgram.sorter.impl.qpv1.HeuristicsBasedEstimation; import java.util.*; import java.util.Map.Entry; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.plannable; +import static fr.inria.corese.core.kgram.sorter.core.Const.plannable; /** * A new sorter for QP diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/SparqlException.java b/src/main/java/fr/inria/corese/core/kgram/core/SparqlException.java similarity index 94% rename from src/main/java/fr/inria/corese/core/next/kgram/core/SparqlException.java rename to src/main/java/fr/inria/corese/core/kgram/core/SparqlException.java index fd4d7fc6a..eaa95116c 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/SparqlException.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/SparqlException.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; /** * diff --git a/src/main/java/fr/inria/corese/core/next/kgram/core/Stack.java b/src/main/java/fr/inria/corese/core/kgram/core/Stack.java similarity index 95% rename from src/main/java/fr/inria/corese/core/next/kgram/core/Stack.java rename to src/main/java/fr/inria/corese/core/kgram/core/Stack.java index a4232216e..826efac36 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/core/Stack.java +++ b/src/main/java/fr/inria/corese/core/kgram/core/Stack.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.next.kgram.core; +package fr.inria.corese.core.kgram.core; import java.util.ArrayList; -import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.core.ExpType; /** * diff --git a/src/main/java/fr/inria/corese/core/next/kgram/event/EvalListener.java b/src/main/java/fr/inria/corese/core/kgram/event/EvalListener.java similarity index 96% rename from src/main/java/fr/inria/corese/core/next/kgram/event/EvalListener.java rename to src/main/java/fr/inria/corese/core/kgram/event/EvalListener.java index 8640fbfa1..5783e2cb9 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/event/EvalListener.java +++ b/src/main/java/fr/inria/corese/core/kgram/event/EvalListener.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.next.kgram.event; +package fr.inria.corese.core.kgram.event; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Exp; import java.util.Hashtable; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/event/Event.java b/src/main/java/fr/inria/corese/core/kgram/event/Event.java similarity index 92% rename from src/main/java/fr/inria/corese/core/next/kgram/event/Event.java rename to src/main/java/fr/inria/corese/core/kgram/event/Event.java index ab5246b0a..ba619ba07 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/event/Event.java +++ b/src/main/java/fr/inria/corese/core/kgram/event/Event.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.next.kgram.event; +package fr.inria.corese.core.kgram.event; -import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Exp; /** * Event to trace KGRAM execution diff --git a/src/main/java/fr/inria/corese/core/next/kgram/event/EventImpl.java b/src/main/java/fr/inria/corese/core/kgram/event/EventImpl.java similarity index 95% rename from src/main/java/fr/inria/corese/core/next/kgram/event/EventImpl.java rename to src/main/java/fr/inria/corese/core/kgram/event/EventImpl.java index 18721f2b3..01f607e78 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/event/EventImpl.java +++ b/src/main/java/fr/inria/corese/core/kgram/event/EventImpl.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.next.kgram.event; +package fr.inria.corese.core.kgram.event; import java.util.Hashtable; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Stack; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Stack; /** diff --git a/src/main/java/fr/inria/corese/core/next/kgram/event/EventListener.java b/src/main/java/fr/inria/corese/core/kgram/event/EventListener.java similarity index 85% rename from src/main/java/fr/inria/corese/core/next/kgram/event/EventListener.java rename to src/main/java/fr/inria/corese/core/kgram/event/EventListener.java index 0ee6d2f09..1accb2a7a 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/event/EventListener.java +++ b/src/main/java/fr/inria/corese/core/kgram/event/EventListener.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.event; +package fr.inria.corese.core.kgram.event; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/event/EventManager.java b/src/main/java/fr/inria/corese/core/kgram/event/EventManager.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/kgram/event/EventManager.java rename to src/main/java/fr/inria/corese/core/kgram/event/EventManager.java index 6b23a9088..7b6c4ce7c 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/event/EventManager.java +++ b/src/main/java/fr/inria/corese/core/kgram/event/EventManager.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.event; +package fr.inria.corese.core.kgram.event; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/event/ResultListener.java b/src/main/java/fr/inria/corese/core/kgram/event/ResultListener.java similarity index 67% rename from src/main/java/fr/inria/corese/core/next/kgram/event/ResultListener.java rename to src/main/java/fr/inria/corese/core/kgram/event/ResultListener.java index 6921d6dad..52d24845b 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/event/ResultListener.java +++ b/src/main/java/fr/inria/corese/core/kgram/event/ResultListener.java @@ -1,11 +1,11 @@ -package fr.inria.corese.core.next.kgram.event; +package fr.inria.corese.core.kgram.event; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.Regex; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.path.Path; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.Regex; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.path.Path; /** * Result Listener to process KGRAM result on the fly diff --git a/src/main/java/fr/inria/corese/core/next/kgram/event/StatListener.java b/src/main/java/fr/inria/corese/core/kgram/event/StatListener.java similarity index 95% rename from src/main/java/fr/inria/corese/core/next/kgram/event/StatListener.java rename to src/main/java/fr/inria/corese/core/kgram/event/StatListener.java index f2b85b449..0e52b1f6b 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/event/StatListener.java +++ b/src/main/java/fr/inria/corese/core/kgram/event/StatListener.java @@ -1,11 +1,11 @@ -package fr.inria.corese.core.next.kgram.event; +package fr.inria.corese.core.kgram.event; import java.text.NumberFormat; import java.util.EnumMap; import java.util.Map; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.ExpType; /** * Event Listener to trace KGRAM execution with statistics diff --git a/src/main/java/fr/inria/corese/core/next/kgram/event/User.java b/src/main/java/fr/inria/corese/core/kgram/event/User.java similarity index 77% rename from src/main/java/fr/inria/corese/core/next/kgram/event/User.java rename to src/main/java/fr/inria/corese/core/kgram/event/User.java index 1faedabd4..73184c10c 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/event/User.java +++ b/src/main/java/fr/inria/corese/core/kgram/event/User.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.event; +package fr.inria.corese.core.kgram.event; /** * Model user interaction with debugger diff --git a/src/main/java/fr/inria/corese/core/next/kgram/event/UserImpl.java b/src/main/java/fr/inria/corese/core/kgram/event/UserImpl.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/kgram/event/UserImpl.java rename to src/main/java/fr/inria/corese/core/kgram/event/UserImpl.java index aae7e6382..79d3daf56 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/event/UserImpl.java +++ b/src/main/java/fr/inria/corese/core/kgram/event/UserImpl.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.event; +package fr.inria.corese.core.kgram.event; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/filter/Checker.java b/src/main/java/fr/inria/corese/core/kgram/filter/Checker.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/kgram/filter/Checker.java rename to src/main/java/fr/inria/corese/core/kgram/filter/Checker.java index 014bd5372..dad930187 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/filter/Checker.java +++ b/src/main/java/fr/inria/corese/core/kgram/filter/Checker.java @@ -1,11 +1,12 @@ -package fr.inria.corese.core.next.kgram.filter; +package fr.inria.corese.core.kgram.filter; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.tool.Message; /** diff --git a/src/main/java/fr/inria/corese/core/next/kgram/filter/Compile.java b/src/main/java/fr/inria/corese/core/kgram/filter/Compile.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/kgram/filter/Compile.java rename to src/main/java/fr/inria/corese/core/kgram/filter/Compile.java index 161a2e543..a4494c486 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/filter/Compile.java +++ b/src/main/java/fr/inria/corese/core/kgram/filter/Compile.java @@ -1,11 +1,11 @@ -package fr.inria.corese.core.next.kgram.filter; +package fr.inria.corese.core.kgram.filter; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.*; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Query; /** * Filter Exp Compiler for Optimizations diff --git a/src/main/java/fr/inria/corese/core/next/kgram/filter/Extension.java b/src/main/java/fr/inria/corese/core/kgram/filter/Extension.java similarity index 82% rename from src/main/java/fr/inria/corese/core/next/kgram/filter/Extension.java rename to src/main/java/fr/inria/corese/core/kgram/filter/Extension.java index 608dcb3db..a67bb349a 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/filter/Extension.java +++ b/src/main/java/fr/inria/corese/core/kgram/filter/Extension.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.next.kgram.filter; +package fr.inria.corese.core.kgram.filter; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.query.Hierarchy; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.query.Hierarchy; import fr.inria.corese.core.sparql.api.IDatatype; /** diff --git a/src/main/java/fr/inria/corese/core/next/kgram/filter/MatchBind.java b/src/main/java/fr/inria/corese/core/kgram/filter/MatchBind.java similarity index 92% rename from src/main/java/fr/inria/corese/core/next/kgram/filter/MatchBind.java rename to src/main/java/fr/inria/corese/core/kgram/filter/MatchBind.java index e6beb49a5..45b48d0b4 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/filter/MatchBind.java +++ b/src/main/java/fr/inria/corese/core/kgram/filter/MatchBind.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.filter; +package fr.inria.corese.core.kgram.filter; import java.util.ArrayList; import java.util.Hashtable; @@ -7,7 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import fr.inria.corese.core.next.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.Expr; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/filter/Matcher.java b/src/main/java/fr/inria/corese/core/kgram/filter/Matcher.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/kgram/filter/Matcher.java rename to src/main/java/fr/inria/corese/core/kgram/filter/Matcher.java index e6106a4ed..12101ab49 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/filter/Matcher.java +++ b/src/main/java/fr/inria/corese/core/kgram/filter/Matcher.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.next.kgram.filter; +package fr.inria.corese.core.kgram.filter; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; /** diff --git a/src/main/java/fr/inria/corese/core/next/kgram/filter/Pattern.java b/src/main/java/fr/inria/corese/core/kgram/filter/Pattern.java similarity index 96% rename from src/main/java/fr/inria/corese/core/next/kgram/filter/Pattern.java rename to src/main/java/fr/inria/corese/core/kgram/filter/Pattern.java index cce513492..6dbf9a989 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/filter/Pattern.java +++ b/src/main/java/fr/inria/corese/core/kgram/filter/Pattern.java @@ -1,14 +1,14 @@ -package fr.inria.corese.core.next.kgram.filter; +package fr.inria.corese.core.kgram.filter; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Filter; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Filter; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Exp; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/path/Automaton.java b/src/main/java/fr/inria/corese/core/kgram/path/Automaton.java similarity index 98% rename from src/main/java/fr/inria/corese/core/next/kgram/path/Automaton.java rename to src/main/java/fr/inria/corese/core/kgram/path/Automaton.java index 0138e4c64..459d745ec 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/path/Automaton.java +++ b/src/main/java/fr/inria/corese/core/kgram/path/Automaton.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.next.kgram.path; +package fr.inria.corese.core.kgram.path; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Regex; +import fr.inria.corese.core.kgram.api.core.Regex; /** * Compile Reg Exp into NDFSA diff --git a/src/main/java/fr/inria/corese/core/next/kgram/path/Buffer.java b/src/main/java/fr/inria/corese/core/kgram/path/Buffer.java similarity index 91% rename from src/main/java/fr/inria/corese/core/next/kgram/path/Buffer.java rename to src/main/java/fr/inria/corese/core/kgram/path/Buffer.java index 304063925..d9949a1e3 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/path/Buffer.java +++ b/src/main/java/fr/inria/corese/core/kgram/path/Buffer.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.next.kgram.path; +package fr.inria.corese.core.kgram.path; import java.util.Iterator; -import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mapping; /** * Synchronized buffer to put/get path edges diff --git a/src/main/java/fr/inria/corese/core/next/kgram/path/GraphPath.java b/src/main/java/fr/inria/corese/core/kgram/path/GraphPath.java similarity index 81% rename from src/main/java/fr/inria/corese/core/next/kgram/path/GraphPath.java rename to src/main/java/fr/inria/corese/core/kgram/path/GraphPath.java index 1ef0edcc6..18139418e 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/path/GraphPath.java +++ b/src/main/java/fr/inria/corese/core/kgram/path/GraphPath.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.next.kgram.path; +package fr.inria.corese.core.kgram.path; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; /** * Draft to compute path in the graph diff --git a/src/main/java/fr/inria/corese/core/next/kgram/path/Path.java b/src/main/java/fr/inria/corese/core/kgram/path/Path.java similarity index 91% rename from src/main/java/fr/inria/corese/core/next/kgram/path/Path.java rename to src/main/java/fr/inria/corese/core/kgram/path/Path.java index 1a2eb920f..1e1dbf571 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/path/Path.java +++ b/src/main/java/fr/inria/corese/core/kgram/path/Path.java @@ -1,18 +1,18 @@ -package fr.inria.corese.core.next.kgram.path; +package fr.inria.corese.core.kgram.path; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.PATH; -import fr.inria.corese.core.next.kgram.api.core.Pointerable; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.tool.EdgeInv; -import fr.inria.corese.core.next.kgram.tool.ProducerDefault; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.PointerType; +import static fr.inria.corese.core.kgram.api.core.PointerType.PATH; +import fr.inria.corese.core.kgram.api.core.Pointerable; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.tool.EdgeInv; +import fr.inria.corese.core.kgram.tool.ProducerDefault; /** * diff --git a/src/main/java/fr/inria/corese/core/next/kgram/path/PathFinder.java b/src/main/java/fr/inria/corese/core/kgram/path/PathFinder.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/kgram/path/PathFinder.java rename to src/main/java/fr/inria/corese/core/kgram/path/PathFinder.java index 14a04d807..5d00dbf7b 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/path/PathFinder.java +++ b/src/main/java/fr/inria/corese/core/kgram/path/PathFinder.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.path; +package fr.inria.corese.core.kgram.path; import java.util.ArrayList; import java.util.Hashtable; @@ -6,23 +6,23 @@ import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Filter; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.Regex; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Evaluator; -import fr.inria.corese.core.next.kgram.api.query.Matcher; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Memory; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.core.SparqlException; -import fr.inria.corese.core.next.kgram.event.EventManager; -import fr.inria.corese.core.next.kgram.event.ResultListener; -import fr.inria.corese.core.next.kgram.tool.EdgeInv; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Filter; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Regex; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Evaluator; +import fr.inria.corese.core.kgram.api.query.Matcher; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Memory; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.core.SparqlException; +import fr.inria.corese.core.kgram.event.EventManager; +import fr.inria.corese.core.kgram.event.ResultListener; +import fr.inria.corese.core.kgram.tool.EdgeInv; import java.util.HashMap; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/path/Record.java b/src/main/java/fr/inria/corese/core/kgram/path/Record.java similarity index 91% rename from src/main/java/fr/inria/corese/core/next/kgram/path/Record.java rename to src/main/java/fr/inria/corese/core/kgram/path/Record.java index 1870bb0f9..a7df1a28d 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/path/Record.java +++ b/src/main/java/fr/inria/corese/core/kgram/path/Record.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.next.kgram.path; +package fr.inria.corese.core.kgram.path; import java.util.ArrayList; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.Regex; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Regex; /** * Stack of Regex + Visit for loop check diff --git a/src/main/java/fr/inria/corese/core/next/kgram/path/Stack.java b/src/main/java/fr/inria/corese/core/kgram/path/Stack.java similarity index 95% rename from src/main/java/fr/inria/corese/core/next/kgram/path/Stack.java rename to src/main/java/fr/inria/corese/core/kgram/path/Stack.java index 830bab979..160e23673 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/path/Stack.java +++ b/src/main/java/fr/inria/corese/core/kgram/path/Stack.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.path; +package fr.inria.corese.core.kgram.path; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/path/State.java b/src/main/java/fr/inria/corese/core/kgram/path/State.java similarity index 95% rename from src/main/java/fr/inria/corese/core/next/kgram/path/State.java rename to src/main/java/fr/inria/corese/core/kgram/path/State.java index 519dd5fbe..2089ec537 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/path/State.java +++ b/src/main/java/fr/inria/corese/core/kgram/path/State.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.next.kgram.path; +package fr.inria.corese.core.kgram.path; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Regex; +import fr.inria.corese.core.kgram.api.core.Regex; /** * Regex Automaton State diff --git a/src/main/java/fr/inria/corese/core/next/kgram/path/Step.java b/src/main/java/fr/inria/corese/core/kgram/path/Step.java similarity index 93% rename from src/main/java/fr/inria/corese/core/next/kgram/path/Step.java rename to src/main/java/fr/inria/corese/core/kgram/path/Step.java index 52f2be88b..468c1a1fd 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/path/Step.java +++ b/src/main/java/fr/inria/corese/core/kgram/path/Step.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.next.kgram.path; +package fr.inria.corese.core.kgram.path; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Regex; +import fr.inria.corese.core.kgram.api.core.Regex; /** * Regex Automaton Transition diff --git a/src/main/java/fr/inria/corese/core/next/kgram/path/Visit.java b/src/main/java/fr/inria/corese/core/kgram/path/Visit.java similarity index 98% rename from src/main/java/fr/inria/corese/core/next/kgram/path/Visit.java rename to src/main/java/fr/inria/corese/core/kgram/path/Visit.java index 621087fcc..b5e8306c8 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/path/Visit.java +++ b/src/main/java/fr/inria/corese/core/kgram/path/Visit.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.path; +package fr.inria.corese.core.kgram.path; import java.util.ArrayList; import java.util.Collection; @@ -7,8 +7,8 @@ import java.util.List; import java.util.TreeMap; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.Regex; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Regex; /** * Record intermediate nodes that are visited by a loop path expression such as diff --git a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/AbstractCostModel.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/AbstractCostModel.java similarity index 93% rename from src/main/java/fr/inria/corese/core/next/kgram/sorter/core/AbstractCostModel.java rename to src/main/java/fr/inria/corese/core/kgram/sorter/core/AbstractCostModel.java index 28404c304..fc6fa3b87 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/AbstractCostModel.java +++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/AbstractCostModel.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.sorter.core; +package fr.inria.corese.core.kgram.sorter.core; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/Const.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/Const.java similarity index 91% rename from src/main/java/fr/inria/corese/core/next/kgram/sorter/core/Const.java rename to src/main/java/fr/inria/corese/core/kgram/sorter/core/Const.java index 40502f81c..6801b5788 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/Const.java +++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/Const.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.next.kgram.sorter.core; +package fr.inria.corese.core.kgram.sorter.core; -import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.core.ExpType; /** * Constants diff --git a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/IEstimate.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/IEstimate.java similarity index 85% rename from src/main/java/fr/inria/corese/core/next/kgram/sorter/core/IEstimate.java rename to src/main/java/fr/inria/corese/core/kgram/sorter/core/IEstimate.java index 65bca0b56..2f16310f1 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/IEstimate.java +++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/IEstimate.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.next.kgram.sorter.core; +package fr.inria.corese.core.kgram.sorter.core; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * Interface for estimating the cost of nodes and edges in QPGraph diff --git a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/IProducerQP.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/IProducerQP.java similarity index 93% rename from src/main/java/fr/inria/corese/core/next/kgram/sorter/core/IProducerQP.java rename to src/main/java/fr/inria/corese/core/kgram/sorter/core/IProducerQP.java index 7ee6668be..23170dc89 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/IProducerQP.java +++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/IProducerQP.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.sorter.core; +package fr.inria.corese.core.kgram.sorter.core; /** * Interface for calling Producer from kgraph, these methods are implemented diff --git a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/ISort.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/ISort.java similarity index 84% rename from src/main/java/fr/inria/corese/core/next/kgram/sorter/core/ISort.java rename to src/main/java/fr/inria/corese/core/kgram/sorter/core/ISort.java index d9f1e58e7..1c9398a4a 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/ISort.java +++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/ISort.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.next.kgram.sorter.core; +package fr.inria.corese.core.kgram.sorter.core; -import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Exp; import java.util.List; /** diff --git a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGEdge.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGEdge.java similarity index 95% rename from src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGEdge.java rename to src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGEdge.java index d180f7f63..a4863ff75 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGEdge.java +++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGEdge.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.next.kgram.sorter.core; +package fr.inria.corese.core.kgram.sorter.core; -import fr.inria.corese.core.next.kgram.sorter.impl.qpv1.QPGEdgeCostModel; +import fr.inria.corese.core.kgram.sorter.impl.qpv1.QPGEdgeCostModel; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGNode.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGNode.java similarity index 93% rename from src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGNode.java rename to src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGNode.java index 733498592..763b19449 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGNode.java +++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGNode.java @@ -1,14 +1,14 @@ -package fr.inria.corese.core.next.kgram.sorter.core; - -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.sorter.impl.qpv1.QPGNodeCostModel; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Filter; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Exp; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.OBJECT; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.PREDICATE; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.SUBJECT; +package fr.inria.corese.core.kgram.sorter.core; + +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.sorter.impl.qpv1.QPGNodeCostModel; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Filter; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Exp; +import static fr.inria.corese.core.kgram.sorter.core.Const.OBJECT; +import static fr.inria.corese.core.kgram.sorter.core.Const.PREDICATE; +import static fr.inria.corese.core.kgram.sorter.core.Const.SUBJECT; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGraph.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGraph.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGraph.java rename to src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGraph.java index fd2c56a73..9f1ffe667 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/sorter/core/QPGraph.java +++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGraph.java @@ -1,7 +1,7 @@ -package fr.inria.corese.core.next.kgram.sorter.core; +package fr.inria.corese.core.kgram.sorter.core; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.core.Exp; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.core.Exp; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/BasicPatternGenerator.java b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/BasicPatternGenerator.java similarity index 86% rename from src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/BasicPatternGenerator.java rename to src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/BasicPatternGenerator.java index 69390d7b5..72f102be3 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/BasicPatternGenerator.java +++ b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/BasicPatternGenerator.java @@ -1,12 +1,12 @@ -package fr.inria.corese.core.next.kgram.sorter.impl.qpv1; - -import static fr.inria.corese.core.next.kgram.sorter.core.Const.BOUND; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.NA; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.OBJECT; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.PREDICATE; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.SUBJECT; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.UNBOUND; -import fr.inria.corese.core.next.kgram.sorter.core.IProducerQP; +package fr.inria.corese.core.kgram.sorter.impl.qpv1; + +import static fr.inria.corese.core.kgram.sorter.core.Const.BOUND; +import static fr.inria.corese.core.kgram.sorter.core.Const.NA; +import static fr.inria.corese.core.kgram.sorter.core.Const.OBJECT; +import static fr.inria.corese.core.kgram.sorter.core.Const.PREDICATE; +import static fr.inria.corese.core.kgram.sorter.core.Const.SUBJECT; +import static fr.inria.corese.core.kgram.sorter.core.Const.UNBOUND; +import fr.inria.corese.core.kgram.sorter.core.IProducerQP; /** * Generate the basic patterns ordering by the selectivity acorrding to the size diff --git a/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java rename to src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java index 88844333c..3c16dc223 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java +++ b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java @@ -1,14 +1,14 @@ -package fr.inria.corese.core.next.kgram.sorter.impl.qpv1; +package fr.inria.corese.core.kgram.sorter.impl.qpv1; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.sorter.core.*; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.sorter.core.*; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import static fr.inria.corese.core.next.kgram.api.core.ExpType.*; +import static fr.inria.corese.core.kgram.api.core.ExpType.*; /** * An implementation for sorting the triple pattern depth-first & best greedy diff --git a/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/DepthFirstSearch.java b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstSearch.java similarity index 96% rename from src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/DepthFirstSearch.java rename to src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstSearch.java index 65df709af..a8f9f7ac5 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/DepthFirstSearch.java +++ b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstSearch.java @@ -1,11 +1,13 @@ -package fr.inria.corese.core.next.kgram.sorter.impl.qpv1; +package fr.inria.corese.core.kgram.sorter.impl.qpv1; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.sorter.core.*; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.sorter.core.*; import java.util.*; +import static fr.inria.corese.core.kgram.api.core.ExpType.*; + /** * An implementation for sorting the triple pattern Pure depth-first greedy * algorithm diff --git a/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java similarity index 92% rename from src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java rename to src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java index 1ba172c7e..e2cd26a90 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java +++ b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.next.kgram.sorter.impl.qpv1; +package fr.inria.corese.core.kgram.sorter.impl.qpv1; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.sorter.core.*; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.sorter.core.*; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java similarity index 90% rename from src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java rename to src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java index 192f1fc84..ba7061eed 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java +++ b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java @@ -1,11 +1,11 @@ -package fr.inria.corese.core.next.kgram.sorter.impl.qpv1; +package fr.inria.corese.core.kgram.sorter.impl.qpv1; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.sorter.core.*; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.sorter.core.*; import java.util.List; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.*; -import static fr.inria.corese.core.next.kgram.sorter.core.IEstimate.MAX_COST; +import static fr.inria.corese.core.kgram.sorter.core.Const.*; +import static fr.inria.corese.core.kgram.sorter.core.IEstimate.MAX_COST; /** * Cost model for QPG edge diff --git a/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/QPGNodeCostModel.java b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGNodeCostModel.java similarity index 88% rename from src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/QPGNodeCostModel.java rename to src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGNodeCostModel.java index f0cec943d..7f099a43b 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/sorter/impl/qpv1/QPGNodeCostModel.java +++ b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGNodeCostModel.java @@ -1,22 +1,22 @@ -package fr.inria.corese.core.next.kgram.sorter.impl.qpv1; - -import fr.inria.corese.core.next.kgram.api.core.Edge; - -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.sorter.core.AbstractCostModel; -import fr.inria.corese.core.next.kgram.sorter.core.Const; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.BOUND; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.LIST; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.NA; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.PREDICATE; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.UNBOUND; -import fr.inria.corese.core.next.kgram.sorter.core.QPGNode; -import fr.inria.corese.core.next.kgram.sorter.core.QPGraph; -import static fr.inria.corese.core.next.kgram.sorter.core.IEstimate.MAX_COST; -import static fr.inria.corese.core.next.kgram.sorter.core.IEstimate.MIN_COST_0; -import fr.inria.corese.core.next.kgram.sorter.core.IProducerQP; +package fr.inria.corese.core.kgram.sorter.impl.qpv1; + +import fr.inria.corese.core.kgram.api.core.Edge; + +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.sorter.core.AbstractCostModel; +import fr.inria.corese.core.kgram.sorter.core.Const; +import static fr.inria.corese.core.kgram.sorter.core.Const.BOUND; +import static fr.inria.corese.core.kgram.sorter.core.Const.LIST; +import static fr.inria.corese.core.kgram.sorter.core.Const.NA; +import static fr.inria.corese.core.kgram.sorter.core.Const.PREDICATE; +import static fr.inria.corese.core.kgram.sorter.core.Const.UNBOUND; +import fr.inria.corese.core.kgram.sorter.core.QPGNode; +import fr.inria.corese.core.kgram.sorter.core.QPGraph; +import static fr.inria.corese.core.kgram.sorter.core.IEstimate.MAX_COST; +import static fr.inria.corese.core.kgram.sorter.core.IEstimate.MIN_COST_0; +import fr.inria.corese.core.kgram.sorter.core.IProducerQP; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/tool/ApproximateSearchEnv.java b/src/main/java/fr/inria/corese/core/kgram/tool/ApproximateSearchEnv.java similarity index 96% rename from src/main/java/fr/inria/corese/core/next/kgram/tool/ApproximateSearchEnv.java rename to src/main/java/fr/inria/corese/core/kgram/tool/ApproximateSearchEnv.java index 45f4a82d9..832f006c9 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/tool/ApproximateSearchEnv.java +++ b/src/main/java/fr/inria/corese/core/kgram/tool/ApproximateSearchEnv.java @@ -1,8 +1,8 @@ -package fr.inria.corese.core.next.kgram.tool; +package fr.inria.corese.core.kgram.tool; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/tool/DistinctNode.java b/src/main/java/fr/inria/corese/core/kgram/tool/DistinctNode.java similarity index 91% rename from src/main/java/fr/inria/corese/core/next/kgram/tool/DistinctNode.java rename to src/main/java/fr/inria/corese/core/kgram/tool/DistinctNode.java index 9b53d1b54..78603de96 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/tool/DistinctNode.java +++ b/src/main/java/fr/inria/corese/core/kgram/tool/DistinctNode.java @@ -1,6 +1,6 @@ -package fr.inria.corese.core.next.kgram.tool; +package fr.inria.corese.core.kgram.tool; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/tool/EdgeInv.java b/src/main/java/fr/inria/corese/core/kgram/tool/EdgeInv.java similarity index 85% rename from src/main/java/fr/inria/corese/core/next/kgram/tool/EdgeInv.java rename to src/main/java/fr/inria/corese/core/kgram/tool/EdgeInv.java index dddbd2777..ce63a406b 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/tool/EdgeInv.java +++ b/src/main/java/fr/inria/corese/core/kgram/tool/EdgeInv.java @@ -1,10 +1,10 @@ -package fr.inria.corese.core.next.kgram.tool; +package fr.inria.corese.core.kgram.tool; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.TRIPLE; -import fr.inria.corese.core.next.kgram.core.PointerObject; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.PointerType; +import static fr.inria.corese.core.kgram.api.core.PointerType.TRIPLE; +import fr.inria.corese.core.kgram.core.PointerObject; public class EdgeInv extends PointerObject implements Edge{ diff --git a/src/main/java/fr/inria/corese/core/next/kgram/tool/EntityImpl.java b/src/main/java/fr/inria/corese/core/kgram/tool/EntityImpl.java similarity index 100% rename from src/main/java/fr/inria/corese/core/next/kgram/tool/EntityImpl.java rename to src/main/java/fr/inria/corese/core/kgram/tool/EntityImpl.java diff --git a/src/main/java/fr/inria/corese/core/next/kgram/tool/EnvironmentImpl.java b/src/main/java/fr/inria/corese/core/kgram/tool/EnvironmentImpl.java similarity index 89% rename from src/main/java/fr/inria/corese/core/next/kgram/tool/EnvironmentImpl.java rename to src/main/java/fr/inria/corese/core/kgram/tool/EnvironmentImpl.java index e79212c55..7bcccd24e 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/tool/EnvironmentImpl.java +++ b/src/main/java/fr/inria/corese/core/kgram/tool/EnvironmentImpl.java @@ -1,19 +1,19 @@ -package fr.inria.corese.core.next.kgram.tool; +package fr.inria.corese.core.kgram.tool; import java.util.Map; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.event.EventManager; -import fr.inria.corese.core.next.kgram.path.Path; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.event.EventManager; +import fr.inria.corese.core.kgram.path.Path; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.kgram.core.Eval; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.parser.ASTExtension; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/tool/MatcherDefault.java b/src/main/java/fr/inria/corese/core/kgram/tool/MatcherDefault.java similarity index 68% rename from src/main/java/fr/inria/corese/core/next/kgram/tool/MatcherDefault.java rename to src/main/java/fr/inria/corese/core/kgram/tool/MatcherDefault.java index c9375b059..af6cf57a9 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/tool/MatcherDefault.java +++ b/src/main/java/fr/inria/corese/core/kgram/tool/MatcherDefault.java @@ -1,9 +1,9 @@ -package fr.inria.corese.core.next.kgram.tool; +package fr.inria.corese.core.kgram.tool; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Matcher; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Matcher; public class MatcherDefault implements Matcher { diff --git a/src/main/java/fr/inria/corese/core/next/kgram/tool/Message.java b/src/main/java/fr/inria/corese/core/kgram/tool/Message.java similarity index 91% rename from src/main/java/fr/inria/corese/core/next/kgram/tool/Message.java rename to src/main/java/fr/inria/corese/core/kgram/tool/Message.java index c665ce8b6..537a0f7d8 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/tool/Message.java +++ b/src/main/java/fr/inria/corese/core/kgram/tool/Message.java @@ -1,4 +1,6 @@ -package fr.inria.corese.core.next.kgram.tool; +package fr.inria.corese.core.kgram.tool; + +import java.util.Hashtable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/tool/MetaIterator.java b/src/main/java/fr/inria/corese/core/kgram/tool/MetaIterator.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/kgram/tool/MetaIterator.java rename to src/main/java/fr/inria/corese/core/kgram/tool/MetaIterator.java index 41a0590dd..31149d9e4 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/tool/MetaIterator.java +++ b/src/main/java/fr/inria/corese/core/kgram/tool/MetaIterator.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.tool; +package fr.inria.corese.core.kgram.tool; import java.util.Iterator; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/tool/MetaIteratorCast.java b/src/main/java/fr/inria/corese/core/kgram/tool/MetaIteratorCast.java similarity index 97% rename from src/main/java/fr/inria/corese/core/next/kgram/tool/MetaIteratorCast.java rename to src/main/java/fr/inria/corese/core/kgram/tool/MetaIteratorCast.java index 13fb793ff..fddec9159 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/tool/MetaIteratorCast.java +++ b/src/main/java/fr/inria/corese/core/kgram/tool/MetaIteratorCast.java @@ -1,4 +1,4 @@ -package fr.inria.corese.core.next.kgram.tool; +package fr.inria.corese.core.kgram.tool; import java.util.Iterator; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/tool/MetaProducer.java b/src/main/java/fr/inria/corese/core/kgram/tool/MetaProducer.java similarity index 90% rename from src/main/java/fr/inria/corese/core/next/kgram/tool/MetaProducer.java rename to src/main/java/fr/inria/corese/core/kgram/tool/MetaProducer.java index 1f0c8cf1f..4fc927b8b 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/tool/MetaProducer.java +++ b/src/main/java/fr/inria/corese/core/kgram/tool/MetaProducer.java @@ -1,20 +1,20 @@ -package fr.inria.corese.core.next.kgram.tool; +package fr.inria.corese.core.kgram.tool; -import fr.inria.corese.core.next.kgram.api.core.DatatypeValueFactory; +import fr.inria.corese.core.kgram.api.core.DatatypeValueFactory; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.Regex; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.core.SparqlException; +import fr.inria.corese.core.kgram.api.core.Graph; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Regex; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.core.SparqlException; import fr.inria.corese.core.sparql.api.IDatatype; /** diff --git a/src/main/java/fr/inria/corese/core/next/kgram/tool/NodeImpl.java b/src/main/java/fr/inria/corese/core/kgram/tool/NodeImpl.java similarity index 94% rename from src/main/java/fr/inria/corese/core/next/kgram/tool/NodeImpl.java rename to src/main/java/fr/inria/corese/core/kgram/tool/NodeImpl.java index a4e27eec1..e60b10b73 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/tool/NodeImpl.java +++ b/src/main/java/fr/inria/corese/core/kgram/tool/NodeImpl.java @@ -1,9 +1,11 @@ -package fr.inria.corese.core.next.kgram.tool; +package fr.inria.corese.core.kgram.tool; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.TripleStore; -import fr.inria.corese.core.next.kgram.path.Path; +import java.util.Objects; + +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.TripleStore; +import fr.inria.corese.core.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.cst.RDFS; import fr.inria.corese.core.sparql.triple.parser.Atom; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/tool/ProducerDefault.java b/src/main/java/fr/inria/corese/core/kgram/tool/ProducerDefault.java similarity index 86% rename from src/main/java/fr/inria/corese/core/next/kgram/tool/ProducerDefault.java rename to src/main/java/fr/inria/corese/core/kgram/tool/ProducerDefault.java index 7102b14ab..23ad7e7f9 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/tool/ProducerDefault.java +++ b/src/main/java/fr/inria/corese/core/kgram/tool/ProducerDefault.java @@ -1,18 +1,18 @@ -package fr.inria.corese.core.next.kgram.tool; +package fr.inria.corese.core.kgram.tool; -import fr.inria.corese.core.next.kgram.api.core.DatatypeValueFactory; +import fr.inria.corese.core.kgram.api.core.DatatypeValueFactory; import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.Regex; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Graph; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Regex; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; import fr.inria.corese.core.sparql.api.IDatatype; /** diff --git a/src/main/java/fr/inria/corese/core/next/kgram/tool/ResultsImpl.java b/src/main/java/fr/inria/corese/core/kgram/tool/ResultsImpl.java similarity index 67% rename from src/main/java/fr/inria/corese/core/next/kgram/tool/ResultsImpl.java rename to src/main/java/fr/inria/corese/core/kgram/tool/ResultsImpl.java index 997df1239..97a5d97a0 100644 --- a/src/main/java/fr/inria/corese/core/next/kgram/tool/ResultsImpl.java +++ b/src/main/java/fr/inria/corese/core/kgram/tool/ResultsImpl.java @@ -1,13 +1,13 @@ -package fr.inria.corese.core.next.kgram.tool; +package fr.inria.corese.core.kgram.tool; import java.util.Iterator; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Result; -import fr.inria.corese.core.next.kgram.api.query.Results; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Result; +import fr.inria.corese.core.kgram.api.query.Results; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; public class ResultsImpl implements Results { diff --git a/src/main/java/fr/inria/corese/core/load/AddTripleHelper.java b/src/main/java/fr/inria/corese/core/load/AddTripleHelper.java index c415d1a96..a450b646a 100644 --- a/src/main/java/fr/inria/corese/core/load/AddTripleHelper.java +++ b/src/main/java/fr/inria/corese/core/load/AddTripleHelper.java @@ -6,8 +6,8 @@ import org.semarglproject.vocab.core.RDF; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.triple.parser.NSManager; import fr.inria.corese.core.util.Property; import fr.inria.corese.core.util.Property.Value; diff --git a/src/main/java/fr/inria/corese/core/load/AddTripleHelperDataManager.java b/src/main/java/fr/inria/corese/core/load/AddTripleHelperDataManager.java index c1168c440..b8a446624 100644 --- a/src/main/java/fr/inria/corese/core/load/AddTripleHelperDataManager.java +++ b/src/main/java/fr/inria/corese/core/load/AddTripleHelperDataManager.java @@ -3,8 +3,8 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/load/ILoadSerialization.java b/src/main/java/fr/inria/corese/core/load/ILoadSerialization.java index 0e23c17b9..126b63199 100644 --- a/src/main/java/fr/inria/corese/core/load/ILoadSerialization.java +++ b/src/main/java/fr/inria/corese/core/load/ILoadSerialization.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.load; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Interface that needs to be implemented when loading serialization(mainly diff --git a/src/main/java/fr/inria/corese/core/load/Load.java b/src/main/java/fr/inria/corese/core/load/Load.java index c73cb02e2..86f4ffcd0 100644 --- a/src/main/java/fr/inria/corese/core/load/Load.java +++ b/src/main/java/fr/inria/corese/core/load/Load.java @@ -30,8 +30,8 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.Loader; import fr.inria.corese.core.api.Log; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.load.jsonld.CoreseJsonTripleCallback; import fr.inria.corese.core.load.jsonld.JsonldLoader; import fr.inria.corese.core.load.rdfa.CoreseRDFaTripleSink; diff --git a/src/main/java/fr/inria/corese/core/load/QueryLoad.java b/src/main/java/fr/inria/corese/core/load/QueryLoad.java index 98585c256..78f4c2e9a 100644 --- a/src/main/java/fr/inria/corese/core/load/QueryLoad.java +++ b/src/main/java/fr/inria/corese/core/load/QueryLoad.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.load; import fr.inria.corese.core.compiler.parser.Pragma; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.query.QueryEngine; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/load/RdfxmlTripleCreator.java b/src/main/java/fr/inria/corese/core/load/RdfxmlTripleCreator.java index 7bb501686..510618ea1 100644 --- a/src/main/java/fr/inria/corese/core/load/RdfxmlTripleCreator.java +++ b/src/main/java/fr/inria/corese/core/load/RdfxmlTripleCreator.java @@ -9,8 +9,8 @@ import fr.com.hp.hpl.jena.rdf.arp.AResource; import fr.com.hp.hpl.jena.rdf.arp.StatementHandler; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.util.Property; import fr.inria.corese.core.util.Property.Value; diff --git a/src/main/java/fr/inria/corese/core/load/Service.java b/src/main/java/fr/inria/corese/core/load/Service.java index 256728d09..3296bd678 100644 --- a/src/main/java/fr/inria/corese/core/load/Service.java +++ b/src/main/java/fr/inria/corese/core/load/Service.java @@ -2,9 +2,9 @@ import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Metadata; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.Graph; import fr.inria.corese.core.print.ResultFormat; import static fr.inria.corese.core.print.ResultFormat.RDF_XML; @@ -24,6 +24,7 @@ import fr.inria.corese.core.sparql.triple.parser.context.ContextLog; import java.io.InputStream; +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.Date; diff --git a/src/main/java/fr/inria/corese/core/load/ServiceParser.java b/src/main/java/fr/inria/corese/core/load/ServiceParser.java index e5f948c48..eb790face 100644 --- a/src/main/java/fr/inria/corese/core/load/ServiceParser.java +++ b/src/main/java/fr/inria/corese/core/load/ServiceParser.java @@ -6,8 +6,8 @@ import fr.inria.corese.core.load.result.SPARQLResult; import fr.inria.corese.core.print.ResultFormat; import fr.inria.corese.core.query.QueryProcess; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/load/ServiceReport.java b/src/main/java/fr/inria/corese/core/load/ServiceReport.java index affe078ae..1fdb099e6 100644 --- a/src/main/java/fr/inria/corese/core/load/ServiceReport.java +++ b/src/main/java/fr/inria/corese/core/load/ServiceReport.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.compiler.parser.NodeImpl; import fr.inria.corese.core.util.Property; import static fr.inria.corese.core.util.Property.Value.SERVICE_REPORT; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/load/TripleCreatorBase.java b/src/main/java/fr/inria/corese/core/load/TripleCreatorBase.java index 6f71d6930..2896151bc 100644 --- a/src/main/java/fr/inria/corese/core/load/TripleCreatorBase.java +++ b/src/main/java/fr/inria/corese/core/load/TripleCreatorBase.java @@ -8,8 +8,8 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/load/TurtleSparqlTripleCreator.java b/src/main/java/fr/inria/corese/core/load/TurtleSparqlTripleCreator.java index 428918cae..2e3aae10a 100644 --- a/src/main/java/fr/inria/corese/core/load/TurtleSparqlTripleCreator.java +++ b/src/main/java/fr/inria/corese/core/load/TurtleSparqlTripleCreator.java @@ -6,8 +6,8 @@ import java.util.Stack; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.triple.api.Creator; import fr.inria.corese.core.sparql.triple.parser.Atom; import fr.inria.corese.core.sparql.triple.parser.Constant; diff --git a/src/main/java/fr/inria/corese/core/load/jsonld/CoreseJsonTripleCallback.java b/src/main/java/fr/inria/corese/core/load/jsonld/CoreseJsonTripleCallback.java index 080f418dd..409eee088 100644 --- a/src/main/java/fr/inria/corese/core/load/jsonld/CoreseJsonTripleCallback.java +++ b/src/main/java/fr/inria/corese/core/load/jsonld/CoreseJsonTripleCallback.java @@ -6,7 +6,7 @@ import com.github.jsonldjava.core.RDFDataset; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.load.AddTripleHelper; import fr.inria.corese.core.load.AddTripleHelperDataManager; import fr.inria.corese.core.load.ILoadSerialization; diff --git a/src/main/java/fr/inria/corese/core/load/rdfa/CoreseRDFaTripleSink.java b/src/main/java/fr/inria/corese/core/load/rdfa/CoreseRDFaTripleSink.java index 6be3937d7..c36a290f3 100644 --- a/src/main/java/fr/inria/corese/core/load/rdfa/CoreseRDFaTripleSink.java +++ b/src/main/java/fr/inria/corese/core/load/rdfa/CoreseRDFaTripleSink.java @@ -4,7 +4,7 @@ import org.semarglproject.sink.TripleSink; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.load.AddTripleHelper; import fr.inria.corese.core.load.AddTripleHelperDataManager; import fr.inria.corese.core.load.ILoadSerialization; diff --git a/src/main/java/fr/inria/corese/core/load/result/SPARQLJSONResult.java b/src/main/java/fr/inria/corese/core/load/result/SPARQLJSONResult.java index de89dca4f..d1778f11c 100644 --- a/src/main/java/fr/inria/corese/core/load/result/SPARQLJSONResult.java +++ b/src/main/java/fr/inria/corese/core/load/result/SPARQLJSONResult.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.NodeImpl; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import java.io.IOException; diff --git a/src/main/java/fr/inria/corese/core/load/result/SPARQLRDFResult.java b/src/main/java/fr/inria/corese/core/load/result/SPARQLRDFResult.java index 5dcfabc0b..81317ef4a 100644 --- a/src/main/java/fr/inria/corese/core/load/result/SPARQLRDFResult.java +++ b/src/main/java/fr/inria/corese/core/load/result/SPARQLRDFResult.java @@ -6,9 +6,9 @@ import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.query.QueryProcess; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.exceptions.EngineException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/load/result/SPARQLResult.java b/src/main/java/fr/inria/corese/core/load/result/SPARQLResult.java index 4114717a0..3835a513e 100644 --- a/src/main/java/fr/inria/corese/core/load/result/SPARQLResult.java +++ b/src/main/java/fr/inria/corese/core/load/result/SPARQLResult.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.EdgeFactory; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; public class SPARQLResult extends XMLResult { diff --git a/src/main/java/fr/inria/corese/core/load/result/SPARQLResultParser.java b/src/main/java/fr/inria/corese/core/load/result/SPARQLResultParser.java index 0a6ae81ea..46e61d9aa 100644 --- a/src/main/java/fr/inria/corese/core/load/result/SPARQLResultParser.java +++ b/src/main/java/fr/inria/corese/core/load/result/SPARQLResultParser.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.api.Loader; import fr.inria.corese.core.load.LoadFormat; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.triple.parser.NSManager; import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; diff --git a/src/main/java/fr/inria/corese/core/load/result/XMLResult.java b/src/main/java/fr/inria/corese/core/load/result/XMLResult.java index 6b171a20f..78185c9fc 100644 --- a/src/main/java/fr/inria/corese/core/load/result/XMLResult.java +++ b/src/main/java/fr/inria/corese/core/load/result/XMLResult.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -29,11 +30,11 @@ import fr.inria.corese.core.compiler.eval.QuerySolver; import fr.inria.corese.core.compiler.parser.CompilerFacKgram; import fr.inria.corese.core.NodeImpl; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.exceptions.EngineException; import java.io.BufferedReader; import java.io.Reader; diff --git a/src/main/java/fr/inria/corese/core/logic/BrokerDistance.java b/src/main/java/fr/inria/corese/core/logic/BrokerDistance.java index 043a062f0..b1aa95aef 100644 --- a/src/main/java/fr/inria/corese/core/logic/BrokerDistance.java +++ b/src/main/java/fr/inria/corese/core/logic/BrokerDistance.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.logic; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.List; /** diff --git a/src/main/java/fr/inria/corese/core/logic/BrokerDistanceDataManager.java b/src/main/java/fr/inria/corese/core/logic/BrokerDistanceDataManager.java index df7bcbce2..d63bb258d 100644 --- a/src/main/java/fr/inria/corese/core/logic/BrokerDistanceDataManager.java +++ b/src/main/java/fr/inria/corese/core/logic/BrokerDistanceDataManager.java @@ -6,9 +6,9 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/logic/Closure.java b/src/main/java/fr/inria/corese/core/logic/Closure.java index 3ea18ce9f..ecbb982a2 100644 --- a/src/main/java/fr/inria/corese/core/logic/Closure.java +++ b/src/main/java/fr/inria/corese/core/logic/Closure.java @@ -1,13 +1,13 @@ package fr.inria.corese.core.logic; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Distinct; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Distinct; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.Graph; import fr.inria.corese.core.util.Property; import static fr.inria.corese.core.util.Property.Value.RULE_DATAMANAGER_FILTER_INDEX; import java.util.ArrayList; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; import java.util.List; /** diff --git a/src/main/java/fr/inria/corese/core/logic/ClosureDataManager.java b/src/main/java/fr/inria/corese/core/logic/ClosureDataManager.java index 884f00a95..340cb1b7a 100644 --- a/src/main/java/fr/inria/corese/core/logic/ClosureDataManager.java +++ b/src/main/java/fr/inria/corese/core/logic/ClosureDataManager.java @@ -2,10 +2,10 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Distinct; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Distinct; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/logic/Distance.java b/src/main/java/fr/inria/corese/core/logic/Distance.java index 03fcc40fb..41152c064 100644 --- a/src/main/java/fr/inria/corese/core/logic/Distance.java +++ b/src/main/java/fr/inria/corese/core/logic/Distance.java @@ -9,7 +9,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Semantic distance & similarity with Corese 2.4 Algorithm Extended to property diff --git a/src/main/java/fr/inria/corese/core/logic/Entailment.java b/src/main/java/fr/inria/corese/core/logic/Entailment.java index 9ad616357..0978f0856 100755 --- a/src/main/java/fr/inria/corese/core/logic/Entailment.java +++ b/src/main/java/fr/inria/corese/core/logic/Entailment.java @@ -10,9 +10,9 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.Engine; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseEdgeAdapter.java b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseEdgeAdapter.java index ca001ca7f..301ebfb3e 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseEdgeAdapter.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseEdgeAdapter.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.next.impl.temp; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; /** * Interface that defines a wrapper for classes that represent Corese edges. diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseIRI.java b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseIRI.java index f86514ffb..1ef7445d1 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseIRI.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseIRI.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.next.impl.temp; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.base.model.AbstractIRI; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseModel.java b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseModel.java index 2f78f2d03..def34c0e7 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseModel.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseModel.java @@ -11,8 +11,8 @@ import fr.inria.corese.core.EdgeFactory; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.Model; import fr.inria.corese.core.next.api.Namespace; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseNodeAdapter.java b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseNodeAdapter.java index 87c978f21..cafd4494a 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseNodeAdapter.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseNodeAdapter.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.next.impl.temp; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Wrapper for objects that are represented as Node in Corese code, e.g. IRI, Literal, etc. diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseStatement.java b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseStatement.java index 5c3acdea9..14752290b 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseStatement.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseStatement.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.next.impl.temp; import fr.inria.corese.core.edge.EdgeImpl; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.Resource; import fr.inria.corese.core.next.api.Value; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseValueConverter.java b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseValueConverter.java index 47c4ed478..9d6ff57a1 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseValueConverter.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/CoreseValueConverter.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.next.impl.temp; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.next.api.BNode; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.Literal; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/AbstractCoreseNumber.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/AbstractCoreseNumber.java index 1af59edde..924daf2a4 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/AbstractCoreseNumber.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/AbstractCoreseNumber.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.next.impl.temp.literal; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.base.model.literal.AbstractNumber; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBNode.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBNode.java index db3d90918..bd0cc8f99 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBNode.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBNode.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.next.impl.temp.literal; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.next.api.base.model.AbstractBNode; import fr.inria.corese.core.next.impl.exception.IncorrectOperationException; import fr.inria.corese.core.next.impl.temp.CoreseNodeAdapter; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBoolean.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBoolean.java index 1248eb8f0..bd36570e8 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBoolean.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBoolean.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.next.impl.temp.literal; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.next.api.base.model.literal.AbstractLiteral; import fr.inria.corese.core.next.api.literal.CoreDatatype; import fr.inria.corese.core.next.impl.common.literal.XSD; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDate.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDate.java index 93bd496c2..85a221e0d 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDate.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDate.java @@ -9,7 +9,7 @@ import javax.xml.datatype.XMLGregorianCalendar; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.base.model.literal.AbstractTemporalPointLiteral; import fr.inria.corese.core.next.api.literal.CoreDatatype; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDatetime.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDatetime.java index 2d13fbf37..b833e44d9 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDatetime.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDatetime.java @@ -7,7 +7,7 @@ import javax.xml.datatype.XMLGregorianCalendar; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.base.model.literal.AbstractTemporalPointLiteral; import fr.inria.corese.core.next.api.literal.CoreDatatype; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDuration.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDuration.java index 4d641bf22..662a6be44 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDuration.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDuration.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.next.impl.temp.literal; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.literal.CoreDatatype; import fr.inria.corese.core.next.impl.common.literal.XSD; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseLanguageTaggedStringLiteral.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseLanguageTaggedStringLiteral.java index f7c94c7ea..a1ac7f753 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseLanguageTaggedStringLiteral.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseLanguageTaggedStringLiteral.java @@ -2,7 +2,7 @@ import java.util.Optional; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.base.model.literal.AbstractStringLiteral; import fr.inria.corese.core.next.api.literal.CoreDatatype; diff --git a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseTyped.java b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseTyped.java index 8028af424..d3408b855 100644 --- a/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseTyped.java +++ b/src/main/java/fr/inria/corese/core/next/impl/temp/literal/CoreseTyped.java @@ -2,7 +2,7 @@ import java.util.Objects; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.base.model.literal.AbstractStringLiteral; import fr.inria.corese.core.next.api.literal.CoreDatatype; diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/DQPFactory.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/DQPFactory.java deleted file mode 100644 index 3d3ba805c..000000000 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/DQPFactory.java +++ /dev/null @@ -1,12 +0,0 @@ -package fr.inria.corese.core.next.kgram.api.query; - -import fr.inria.corese.core.next.kgram.core.BgpGenerator; - -/** - * @author corby - */ -public interface DQPFactory { - - BgpGenerator instance(); - -} diff --git a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Provider.java b/src/main/java/fr/inria/corese/core/next/kgram/api/query/Provider.java deleted file mode 100644 index d039b561f..000000000 --- a/src/main/java/fr/inria/corese/core/next/kgram/api/query/Provider.java +++ /dev/null @@ -1,21 +0,0 @@ -package fr.inria.corese.core.next.kgram.api.query; - -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.SparqlException; - -/** - * Service Provider - * - * @author Olivier Corby, Edelweiss, INRIA 2011 - */ -public interface Provider { - - default Mappings service(Node serv, Exp exp, Mappings map, Eval eval) - throws SparqlException { - return null; - } - -} diff --git a/src/main/java/fr/inria/corese/core/print/AbstractNestedResultFormat.java b/src/main/java/fr/inria/corese/core/print/AbstractNestedResultFormat.java index 56d18c5a6..672011715 100644 --- a/src/main/java/fr/inria/corese/core/print/AbstractNestedResultFormat.java +++ b/src/main/java/fr/inria/corese/core/print/AbstractNestedResultFormat.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.print; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/print/CSVFormat.java b/src/main/java/fr/inria/corese/core/print/CSVFormat.java index f9cf0bc64..7c81e4f69 100644 --- a/src/main/java/fr/inria/corese/core/print/CSVFormat.java +++ b/src/main/java/fr/inria/corese/core/print/CSVFormat.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; public class CSVFormat extends QueryResultFormat { // The end-of-line in CSV is CRLF i.e. Unicode codepoints 13 (0x0D) and 10 diff --git a/src/main/java/fr/inria/corese/core/print/CanonicalRdf10Format.java b/src/main/java/fr/inria/corese/core/print/CanonicalRdf10Format.java index b4b23b3d5..af49f6c5d 100644 --- a/src/main/java/fr/inria/corese/core/print/CanonicalRdf10Format.java +++ b/src/main/java/fr/inria/corese/core/print/CanonicalRdf10Format.java @@ -6,8 +6,8 @@ import fr.inria.corese.core.print.rdfc10.CanonicalRdf10; import fr.inria.corese.core.print.rdfc10.CanonicalizedDataset; import fr.inria.corese.core.print.rdfc10.HashingUtility.HashAlgorithm; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; /** * This class provides functionality to convert a Graph object to a string in diff --git a/src/main/java/fr/inria/corese/core/print/HTMLFormat.java b/src/main/java/fr/inria/corese/core/print/HTMLFormat.java index 62a8759af..30c7939b4 100644 --- a/src/main/java/fr/inria/corese/core/print/HTMLFormat.java +++ b/src/main/java/fr/inria/corese/core/print/HTMLFormat.java @@ -3,7 +3,7 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.Context; import fr.inria.corese.core.sparql.triple.parser.NSManager; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.Graph; import fr.inria.corese.core.transform.Transformer; import fr.inria.corese.core.transform.TransformerUtils; diff --git a/src/main/java/fr/inria/corese/core/print/JSOND3Format.java b/src/main/java/fr/inria/corese/core/print/JSOND3Format.java index 904fbdd06..669e69336 100644 --- a/src/main/java/fr/inria/corese/core/print/JSOND3Format.java +++ b/src/main/java/fr/inria/corese/core/print/JSOND3Format.java @@ -4,10 +4,10 @@ import java.util.Map; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/print/JSONFormat.java b/src/main/java/fr/inria/corese/core/print/JSONFormat.java index 42488f578..e04a224e6 100755 --- a/src/main/java/fr/inria/corese/core/print/JSONFormat.java +++ b/src/main/java/fr/inria/corese/core/print/JSONFormat.java @@ -1,11 +1,13 @@ package fr.inria.corese.core.print; +import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; +import java.util.Locale; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/print/JSONLDFormat.java b/src/main/java/fr/inria/corese/core/print/JSONLDFormat.java index e777df82c..e10a5661a 100644 --- a/src/main/java/fr/inria/corese/core/print/JSONLDFormat.java +++ b/src/main/java/fr/inria/corese/core/print/JSONLDFormat.java @@ -11,10 +11,10 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.logic.RDF; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/print/LogManager.java b/src/main/java/fr/inria/corese/core/print/LogManager.java index 12b6cfecd..724327b57 100644 --- a/src/main/java/fr/inria/corese/core/print/LogManager.java +++ b/src/main/java/fr/inria/corese/core/print/LogManager.java @@ -5,13 +5,14 @@ import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.cst.LogKey; import fr.inria.corese.core.sparql.triple.parser.context.ContextLog; +import fr.inria.corese.core.sparql.triple.parser.URLServer; import java.io.BufferedWriter; import java.io.FileWriter; @@ -19,6 +20,7 @@ import java.util.ArrayList; import java.util.List; import jakarta.ws.rs.client.ResponseProcessingException; +import jakarta.ws.rs.core.Link; import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/print/Mapper.java b/src/main/java/fr/inria/corese/core/print/Mapper.java index 41b306250..ca1001a43 100644 --- a/src/main/java/fr/inria/corese/core/print/Mapper.java +++ b/src/main/java/fr/inria/corese/core/print/Mapper.java @@ -3,9 +3,9 @@ import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.api.core.Edge; public class Mapper { diff --git a/src/main/java/fr/inria/corese/core/print/MarkdownFormat.java b/src/main/java/fr/inria/corese/core/print/MarkdownFormat.java index 9f31a87dc..d871452af 100644 --- a/src/main/java/fr/inria/corese/core/print/MarkdownFormat.java +++ b/src/main/java/fr/inria/corese/core/print/MarkdownFormat.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Map; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; /** * Format the results of a SPARQL query in Markdown. diff --git a/src/main/java/fr/inria/corese/core/print/NQuadsFormat.java b/src/main/java/fr/inria/corese/core/print/NQuadsFormat.java index 032e545b5..0708910bc 100644 --- a/src/main/java/fr/inria/corese/core/print/NQuadsFormat.java +++ b/src/main/java/fr/inria/corese/core/print/NQuadsFormat.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.print; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.core.Mappings; public class NQuadsFormat extends NTriplesFormat { diff --git a/src/main/java/fr/inria/corese/core/print/NTriplesFormat.java b/src/main/java/fr/inria/corese/core/print/NTriplesFormat.java index 5133470e5..9097d5f85 100644 --- a/src/main/java/fr/inria/corese/core/print/NTriplesFormat.java +++ b/src/main/java/fr/inria/corese/core/print/NTriplesFormat.java @@ -4,9 +4,9 @@ import java.io.OutputStream; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.datatype.RDF; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/print/RDFFormat.java b/src/main/java/fr/inria/corese/core/print/RDFFormat.java index 0b5592af1..4a1159a1e 100755 --- a/src/main/java/fr/inria/corese/core/print/RDFFormat.java +++ b/src/main/java/fr/inria/corese/core/print/RDFFormat.java @@ -13,11 +13,11 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.logic.OWL; import fr.inria.corese.core.logic.RDF; import fr.inria.corese.core.logic.RDFS; diff --git a/src/main/java/fr/inria/corese/core/print/RDFResultFormat.java b/src/main/java/fr/inria/corese/core/print/RDFResultFormat.java index 95601efea..641bcce7f 100644 --- a/src/main/java/fr/inria/corese/core/print/RDFResultFormat.java +++ b/src/main/java/fr/inria/corese/core/print/RDFResultFormat.java @@ -2,11 +2,11 @@ import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.NSManager; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Graphable; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Graphable; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.Serializer; import static fr.inria.corese.core.print.RDFFormat.NL; diff --git a/src/main/java/fr/inria/corese/core/print/ResultFormat.java b/src/main/java/fr/inria/corese/core/print/ResultFormat.java index c8b78ef1b..79e46242e 100644 --- a/src/main/java/fr/inria/corese/core/print/ResultFormat.java +++ b/src/main/java/fr/inria/corese/core/print/ResultFormat.java @@ -13,9 +13,9 @@ import fr.inria.corese.core.transform.Transformer; import fr.inria.corese.core.transform.TransformerUtils; import fr.inria.corese.core.util.MappingsGraph; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.api.ResultFormatDef; import fr.inria.corese.core.sparql.triple.function.term.Binding; @@ -24,6 +24,7 @@ import fr.inria.corese.core.sparql.triple.parser.Dataset; import fr.inria.corese.core.sparql.triple.parser.Metadata; import fr.inria.corese.core.sparql.triple.parser.NSManager; +import fr.inria.corese.core.sparql.triple.parser.URLParam; /** * Select Result format according to query form and @display annotation., diff --git a/src/main/java/fr/inria/corese/core/print/TSVFormat.java b/src/main/java/fr/inria/corese/core/print/TSVFormat.java index 5c097fc2a..5b97248b3 100644 --- a/src/main/java/fr/inria/corese/core/print/TSVFormat.java +++ b/src/main/java/fr/inria/corese/core/print/TSVFormat.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.print; import fr.inria.corese.core.sparql.api.IDatatype; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; public class TSVFormat extends CSVFormat { diff --git a/src/main/java/fr/inria/corese/core/print/TemplateFormat.java b/src/main/java/fr/inria/corese/core/print/TemplateFormat.java index bec4d95f0..3d5c4227c 100644 --- a/src/main/java/fr/inria/corese/core/print/TemplateFormat.java +++ b/src/main/java/fr/inria/corese/core/print/TemplateFormat.java @@ -6,12 +6,13 @@ import java.io.FileWriter; import java.io.IOException; +import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.NSManager; import fr.inria.corese.core.compiler.parser.Pragma; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.Graph; /* diff --git a/src/main/java/fr/inria/corese/core/print/TripleFormat.java b/src/main/java/fr/inria/corese/core/print/TripleFormat.java index f7ca3c3d8..2078c317b 100644 --- a/src/main/java/fr/inria/corese/core/print/TripleFormat.java +++ b/src/main/java/fr/inria/corese/core/print/TripleFormat.java @@ -2,10 +2,10 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.logic.RDF; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.NSManager; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/print/XMLFormat.java b/src/main/java/fr/inria/corese/core/print/XMLFormat.java index 512265dba..423435b45 100755 --- a/src/main/java/fr/inria/corese/core/print/XMLFormat.java +++ b/src/main/java/fr/inria/corese/core/print/XMLFormat.java @@ -4,9 +4,9 @@ import org.apache.commons.text.StringEscapeUtils; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/print/XSLTQuery.java b/src/main/java/fr/inria/corese/core/print/XSLTQuery.java index 39a398a69..3f84aa93a 100755 --- a/src/main/java/fr/inria/corese/core/print/XSLTQuery.java +++ b/src/main/java/fr/inria/corese/core/print/XSLTQuery.java @@ -21,8 +21,8 @@ import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.compiler.eval.QuerySolver; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.Graph; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalRdf10.java b/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalRdf10.java index c77204628..2c7a14f96 100644 --- a/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalRdf10.java +++ b/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalRdf10.java @@ -9,10 +9,10 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.print.NTriplesFormat; import fr.inria.corese.core.print.rdfc10.HashingUtility.HashAlgorithm; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; /** * The {@code CanonicalRdf10Format} class extends {@code RDFFormat} to provide diff --git a/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizationState.java b/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizationState.java index 93250cf5c..16f51670e 100644 --- a/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizationState.java +++ b/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizationState.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; /** * This class manages the state of canonicalization, particularly handling diff --git a/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizedDataset.java b/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizedDataset.java index 7efedc93d..b8e24394d 100644 --- a/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizedDataset.java +++ b/src/main/java/fr/inria/corese/core/print/rdfc10/CanonicalizedDataset.java @@ -6,7 +6,7 @@ import java.util.Map; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Represents a dataset that has undergone canonicalization. diff --git a/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructExtern.java b/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructExtern.java index 4267b2ea5..f453e67d7 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructExtern.java +++ b/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructExtern.java @@ -8,9 +8,9 @@ import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.Access; import fr.inria.corese.core.sparql.triple.parser.AccessRight; diff --git a/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructLocal.java b/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructLocal.java index 0b23b9846..22ca9d472 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructLocal.java +++ b/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructLocal.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.api.DataBrokerConstruct; import fr.inria.corese.core.query.update.GraphManager; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.Access; diff --git a/src/main/java/fr/inria/corese/core/producer/DataBrokerLocal.java b/src/main/java/fr/inria/corese/core/producer/DataBrokerLocal.java index cf9d23d2c..2544aee89 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataBrokerLocal.java +++ b/src/main/java/fr/inria/corese/core/producer/DataBrokerLocal.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.DataBroker; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Query; /** * Broker between ProducerImpl and corese graph diff --git a/src/main/java/fr/inria/corese/core/producer/DataFilter.java b/src/main/java/fr/inria/corese/core/producer/DataFilter.java index 4fe631121..024391bf4 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataFilter.java +++ b/src/main/java/fr/inria/corese/core/producer/DataFilter.java @@ -2,11 +2,11 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.Graph; import java.util.ArrayList; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; import fr.inria.corese.core.sparql.triple.parser.AccessRight; /** diff --git a/src/main/java/fr/inria/corese/core/producer/DataFilterAnd.java b/src/main/java/fr/inria/corese/core/producer/DataFilterAnd.java index ddceb2c3b..73312f815 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataFilterAnd.java +++ b/src/main/java/fr/inria/corese/core/producer/DataFilterAnd.java @@ -5,7 +5,7 @@ package fr.inria.corese.core.producer; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; /** * diff --git a/src/main/java/fr/inria/corese/core/producer/DataFilterFactory.java b/src/main/java/fr/inria/corese/core/producer/DataFilterFactory.java index 26c7da14b..311cd152d 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataFilterFactory.java +++ b/src/main/java/fr/inria/corese/core/producer/DataFilterFactory.java @@ -3,7 +3,7 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.Processor; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * ****************************************************** diff --git a/src/main/java/fr/inria/corese/core/producer/DataFilterNot.java b/src/main/java/fr/inria/corese/core/producer/DataFilterNot.java index 8cf1f98a0..7e1b9df34 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataFilterNot.java +++ b/src/main/java/fr/inria/corese/core/producer/DataFilterNot.java @@ -5,7 +5,7 @@ package fr.inria.corese.core.producer; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; /** * diff --git a/src/main/java/fr/inria/corese/core/producer/DataFilterOr.java b/src/main/java/fr/inria/corese/core/producer/DataFilterOr.java index 63f3f3c02..1023dc49c 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataFilterOr.java +++ b/src/main/java/fr/inria/corese/core/producer/DataFilterOr.java @@ -5,7 +5,7 @@ package fr.inria.corese.core.producer; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; /** * diff --git a/src/main/java/fr/inria/corese/core/producer/DataFrom.java b/src/main/java/fr/inria/corese/core/producer/DataFrom.java index d7c8db01e..a103f1618 100644 --- a/src/main/java/fr/inria/corese/core/producer/DataFrom.java +++ b/src/main/java/fr/inria/corese/core/producer/DataFrom.java @@ -6,8 +6,8 @@ import java.util.List; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; /** * from, from named dataset for edge iteration diff --git a/src/main/java/fr/inria/corese/core/producer/DataProducer.java b/src/main/java/fr/inria/corese/core/producer/DataProducer.java index 21e93ce12..746acccb0 100755 --- a/src/main/java/fr/inria/corese/core/producer/DataProducer.java +++ b/src/main/java/fr/inria/corese/core/producer/DataProducer.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.producer; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.PRODUCER; +import static fr.inria.corese.core.kgram.api.core.PointerType.PRODUCER; import java.util.ArrayList; import java.util.Collections; @@ -10,11 +10,11 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.GraphObject; import fr.inria.corese.core.edge.EdgeTop; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import fr.inria.corese.core.next.kgram.tool.MetaIterator; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.tool.MetaIterator; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.AccessRight; diff --git a/src/main/java/fr/inria/corese/core/producer/MetadataManager.java b/src/main/java/fr/inria/corese/core/producer/MetadataManager.java index 1837654ba..d7444650d 100644 --- a/src/main/java/fr/inria/corese/core/producer/MetadataManager.java +++ b/src/main/java/fr/inria/corese/core/producer/MetadataManager.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.producer; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.logic.Distance; import fr.inria.corese.core.storage.api.dataManager.DataManager; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/query/Cache.java b/src/main/java/fr/inria/corese/core/query/Cache.java index 986b465d8..10f001387 100644 --- a/src/main/java/fr/inria/corese/core/query/Cache.java +++ b/src/main/java/fr/inria/corese/core/query/Cache.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.query; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Query; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/query/ClassHierarchy.java b/src/main/java/fr/inria/corese/core/query/ClassHierarchy.java index fe8849d62..e65b9b4da 100644 --- a/src/main/java/fr/inria/corese/core/query/ClassHierarchy.java +++ b/src/main/java/fr/inria/corese/core/query/ClassHierarchy.java @@ -2,9 +2,9 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.compiler.parser.NodeImpl; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeHierarchy; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/query/CompileService.java b/src/main/java/fr/inria/corese/core/query/CompileService.java index 5923d0a20..fe1f57603 100644 --- a/src/main/java/fr/inria/corese/core/query/CompileService.java +++ b/src/main/java/fr/inria/corese/core/query/CompileService.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.query; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.cst.LogKey; diff --git a/src/main/java/fr/inria/corese/core/query/Construct.java b/src/main/java/fr/inria/corese/core/query/Construct.java index 3e128d26a..c36356eb8 100755 --- a/src/main/java/fr/inria/corese/core/query/Construct.java +++ b/src/main/java/fr/inria/corese/core/query/Construct.java @@ -1,14 +1,14 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Event; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.query.update.GraphManager; import fr.inria.corese.core.rule.Rule; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/query/Describe.java b/src/main/java/fr/inria/corese/core/query/Describe.java index 529132026..fe1eae301 100644 --- a/src/main/java/fr/inria/corese/core/query/Describe.java +++ b/src/main/java/fr/inria/corese/core/query/Describe.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.tool.MetaProducer; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.tool.MetaProducer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/query/FederatedQueryProcess.java b/src/main/java/fr/inria/corese/core/query/FederatedQueryProcess.java index 0538ad655..fb93fb4d6 100644 --- a/src/main/java/fr/inria/corese/core/query/FederatedQueryProcess.java +++ b/src/main/java/fr/inria/corese/core/query/FederatedQueryProcess.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.Metadata; diff --git a/src/main/java/fr/inria/corese/core/query/Mapper.java b/src/main/java/fr/inria/corese/core/query/Mapper.java index 79fd6a27e..33374859d 100644 --- a/src/main/java/fr/inria/corese/core/query/Mapper.java +++ b/src/main/java/fr/inria/corese/core/query/Mapper.java @@ -2,14 +2,14 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.compiler.eval.SQLResult; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import fr.inria.corese.core.next.kgram.api.core.Pointerable; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.api.core.Pointerable; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.load.result.SPARQLResultParser; import fr.inria.corese.core.producer.DataProducer; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/query/MapperSQL.java b/src/main/java/fr/inria/corese/core/query/MapperSQL.java index 0f9c31d5f..2cc4e0ea0 100644 --- a/src/main/java/fr/inria/corese/core/query/MapperSQL.java +++ b/src/main/java/fr/inria/corese/core/query/MapperSQL.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.compiler.eval.SQLResult; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/query/MatchBNode.java b/src/main/java/fr/inria/corese/core/query/MatchBNode.java index 804671fc6..01d81db40 100644 --- a/src/main/java/fr/inria/corese/core/query/MatchBNode.java +++ b/src/main/java/fr/inria/corese/core/query/MatchBNode.java @@ -5,9 +5,9 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.Comparator; diff --git a/src/main/java/fr/inria/corese/core/query/MatchIterator.java b/src/main/java/fr/inria/corese/core/query/MatchIterator.java index f4af65579..a09709479 100644 --- a/src/main/java/fr/inria/corese/core/query/MatchIterator.java +++ b/src/main/java/fr/inria/corese/core/query/MatchIterator.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Matcher; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Matcher; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/fr/inria/corese/core/query/MatcherImpl.java b/src/main/java/fr/inria/corese/core/query/MatcherImpl.java index b0b6760aa..2fbfad488 100755 --- a/src/main/java/fr/inria/corese/core/query/MatcherImpl.java +++ b/src/main/java/fr/inria/corese/core/query/MatcherImpl.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Matcher; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Matcher; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/query/PluginImpl.java b/src/main/java/fr/inria/corese/core/query/PluginImpl.java index d9864d868..555d95503 100644 --- a/src/main/java/fr/inria/corese/core/query/PluginImpl.java +++ b/src/main/java/fr/inria/corese/core/query/PluginImpl.java @@ -10,14 +10,14 @@ import fr.inria.corese.core.compiler.eval.QuerySolver; import fr.inria.corese.core.compiler.eval.QuerySolverVisitorBasic; import fr.inria.corese.core.compiler.parser.NodeImpl; -import fr.inria.corese.core.next.kgram.api.core.*; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Evaluator; -import fr.inria.corese.core.next.kgram.api.query.Matcher; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Memory; +import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Evaluator; +import fr.inria.corese.core.kgram.api.query.Matcher; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Memory; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.LoadFormat; @@ -44,6 +44,7 @@ import fr.inria.corese.core.sparql.triple.parser.Access.Level; import fr.inria.corese.core.storage.api.dataManager.DataManager; import fr.inria.corese.core.transform.TemplateVisitor; +import fr.inria.corese.core.transform.Transformer; import fr.inria.corese.core.transform.TransformerUtils; import fr.inria.corese.core.util.GraphListen; import fr.inria.corese.core.util.MappingsGraph; @@ -57,8 +58,8 @@ import java.io.IOException; import java.util.ArrayList; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.GRAPH; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.MAPPINGS; +import static fr.inria.corese.core.kgram.api.core.PointerType.GRAPH; +import static fr.inria.corese.core.kgram.api.core.PointerType.MAPPINGS; /** * Plugin for filter evaluator diff --git a/src/main/java/fr/inria/corese/core/query/PluginTransform.java b/src/main/java/fr/inria/corese/core/query/PluginTransform.java index 4cdd53cd7..45a2b3b88 100644 --- a/src/main/java/fr/inria/corese/core/query/PluginTransform.java +++ b/src/main/java/fr/inria/corese/core/query/PluginTransform.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; import fr.inria.corese.core.sparql.api.ComputerProxy; @@ -13,6 +13,7 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.term.Binding; +import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Context; import fr.inria.corese.core.sparql.triple.parser.NSManager; import fr.inria.corese.core.transform.DefaultVisitor; @@ -24,7 +25,7 @@ import java.io.IOException; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.GRAPH; +import static fr.inria.corese.core.kgram.api.core.PointerType.GRAPH; /** * Transformer LDScript functions. diff --git a/src/main/java/fr/inria/corese/core/query/PragmaImpl.java b/src/main/java/fr/inria/corese/core/query/PragmaImpl.java index 21674b02a..b7f199458 100644 --- a/src/main/java/fr/inria/corese/core/query/PragmaImpl.java +++ b/src/main/java/fr/inria/corese/core/query/PragmaImpl.java @@ -4,7 +4,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.Engine; import fr.inria.corese.core.compiler.parser.Pragma; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.logic.Distance; import fr.inria.corese.core.logic.Entailment; import fr.inria.corese.core.logic.RDFS; diff --git a/src/main/java/fr/inria/corese/core/query/ProducerImpl.java b/src/main/java/fr/inria/corese/core/query/ProducerImpl.java index 231688216..0d5fc4db3 100644 --- a/src/main/java/fr/inria/corese/core/query/ProducerImpl.java +++ b/src/main/java/fr/inria/corese/core/query/ProducerImpl.java @@ -4,14 +4,14 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.Index; import fr.inria.corese.core.api.DataBroker; -import fr.inria.corese.core.next.kgram.api.core.*; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Matcher; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.*; -import fr.inria.corese.core.next.kgram.sorter.core.IProducerQP; -import fr.inria.corese.core.next.kgram.sorter.core.QPGNode; -import fr.inria.corese.core.next.kgram.tool.MetaIterator; +import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Matcher; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.*; +import fr.inria.corese.core.kgram.sorter.core.IProducerQP; +import fr.inria.corese.core.kgram.sorter.core.QPGNode; +import fr.inria.corese.core.kgram.tool.MetaIterator; import fr.inria.corese.core.producer.DataBrokerExtern; import fr.inria.corese.core.producer.DataBrokerLocal; import fr.inria.corese.core.producer.DataProducer; @@ -27,8 +27,7 @@ import java.util.Iterator; import java.util.List; -import static fr.inria.corese.core.next.kgram.sorter.core.Const.*; - +import static fr.inria.corese.core.kgram.sorter.core.Const.*; /** * Producer Implement getEdges() for KGRAM interpreter rely on diff --git a/src/main/java/fr/inria/corese/core/query/ProducerImplNode.java b/src/main/java/fr/inria/corese/core/query/ProducerImplNode.java index ef5fe499d..9ae82983a 100644 --- a/src/main/java/fr/inria/corese/core/query/ProducerImplNode.java +++ b/src/main/java/fr/inria/corese/core/query/ProducerImplNode.java @@ -2,11 +2,11 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.DataBroker; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.Regex; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.tool.MetaIterator; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Regex; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.tool.MetaIterator; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/query/ProviderImpl.java b/src/main/java/fr/inria/corese/core/query/ProviderImpl.java index 541122ffc..b8c8973dd 100644 --- a/src/main/java/fr/inria/corese/core/query/ProviderImpl.java +++ b/src/main/java/fr/inria/corese/core/query/ProviderImpl.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Provider; -import fr.inria.corese.core.next.kgram.core.*; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Provider; +import fr.inria.corese.core.kgram.core.*; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.exceptions.SafetyException; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/query/ProviderService.java b/src/main/java/fr/inria/corese/core/query/ProviderService.java index d2cea73d1..f9e7b2cce 100644 --- a/src/main/java/fr/inria/corese/core/query/ProviderService.java +++ b/src/main/java/fr/inria/corese/core/query/ProviderService.java @@ -4,15 +4,15 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.NodeImpl; import fr.inria.corese.core.compiler.federate.FederateVisitor; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.*; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.core.*; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.Service; import fr.inria.corese.core.load.ServiceReport; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/query/ProviderThread.java b/src/main/java/fr/inria/corese/core/query/ProviderThread.java index bd9ff03bc..20826b5aa 100644 --- a/src/main/java/fr/inria/corese/core/query/ProviderThread.java +++ b/src/main/java/fr/inria/corese/core/query/ProviderThread.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.query; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.URLServer; diff --git a/src/main/java/fr/inria/corese/core/query/QueryCheck.java b/src/main/java/fr/inria/corese/core/query/QueryCheck.java index 69eba5040..5d519106b 100644 --- a/src/main/java/fr/inria/corese/core/query/QueryCheck.java +++ b/src/main/java/fr/inria/corese/core/query/QueryCheck.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Query; /** * Draft check if query may succeed on graph PRAGMA: diff --git a/src/main/java/fr/inria/corese/core/query/QueryEngine.java b/src/main/java/fr/inria/corese/core/query/QueryEngine.java index 9f21c8fc0..ef9cad652 100644 --- a/src/main/java/fr/inria/corese/core/query/QueryEngine.java +++ b/src/main/java/fr/inria/corese/core/query/QueryEngine.java @@ -3,11 +3,11 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.Engine; import fr.inria.corese.core.compiler.api.QueryVisitor; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTExtension; diff --git a/src/main/java/fr/inria/corese/core/query/QueryProcess.java b/src/main/java/fr/inria/corese/core/query/QueryProcess.java index bf02dce37..54bc89fb9 100755 --- a/src/main/java/fr/inria/corese/core/query/QueryProcess.java +++ b/src/main/java/fr/inria/corese/core/query/QueryProcess.java @@ -9,14 +9,14 @@ import fr.inria.corese.core.compiler.eval.QuerySolver; import fr.inria.corese.core.compiler.federate.FederateVisitor; import fr.inria.corese.core.compiler.parser.Transformer; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Evaluator; -import fr.inria.corese.core.next.kgram.api.query.Matcher; -import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.*; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.tool.MetaProducer; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Evaluator; +import fr.inria.corese.core.kgram.api.query.Matcher; +import fr.inria.corese.core.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.core.*; +import fr.inria.corese.core.kgram.tool.MetaProducer; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; diff --git a/src/main/java/fr/inria/corese/core/query/QueryProcessUpdate.java b/src/main/java/fr/inria/corese/core/query/QueryProcessUpdate.java index e65934a3a..72b3a28bf 100644 --- a/src/main/java/fr/inria/corese/core/query/QueryProcessUpdate.java +++ b/src/main/java/fr/inria/corese/core/query/QueryProcessUpdate.java @@ -6,11 +6,11 @@ import fr.inria.corese.core.GraphStore; import fr.inria.corese.core.api.GraphListener; import fr.inria.corese.core.compiler.parser.Pragma; -import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.query.update.GraphManager; import fr.inria.corese.core.query.update.ManagerImpl; import fr.inria.corese.core.query.update.UpdateProcess; diff --git a/src/main/java/fr/inria/corese/core/query/RDFizer.java b/src/main/java/fr/inria/corese/core/query/RDFizer.java index 0b0b9a01b..63085916c 100644 --- a/src/main/java/fr/inria/corese/core/query/RDFizer.java +++ b/src/main/java/fr/inria/corese/core/query/RDFizer.java @@ -7,7 +7,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.Loader; -import fr.inria.corese.core.next.kgram.api.query.Graphable; +import fr.inria.corese.core.kgram.api.query.Graphable; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/query/ResultMessage.java b/src/main/java/fr/inria/corese/core/query/ResultMessage.java index 41b93ba47..cd90ecb76 100644 --- a/src/main/java/fr/inria/corese/core/query/ResultMessage.java +++ b/src/main/java/fr/inria/corese/core/query/ResultMessage.java @@ -4,7 +4,7 @@ import fr.inria.corese.core.GraphDistance; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/query/SorterImpl.java b/src/main/java/fr/inria/corese/core/query/SorterImpl.java index d08004372..0fa2fccb8 100644 --- a/src/main/java/fr/inria/corese/core/query/SorterImpl.java +++ b/src/main/java/fr/inria/corese/core/query/SorterImpl.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.core.Sorter; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Sorter; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/query/TemplateIndex.java b/src/main/java/fr/inria/corese/core/query/TemplateIndex.java index 6e3962f7b..3cfa998ce 100644 --- a/src/main/java/fr/inria/corese/core/query/TemplateIndex.java +++ b/src/main/java/fr/inria/corese/core/query/TemplateIndex.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.query; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.logic.RDF; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/query/update/GraphManager.java b/src/main/java/fr/inria/corese/core/query/update/GraphManager.java index eb96d03b3..15f3bc217 100644 --- a/src/main/java/fr/inria/corese/core/query/update/GraphManager.java +++ b/src/main/java/fr/inria/corese/core/query/update/GraphManager.java @@ -6,9 +6,9 @@ import fr.inria.corese.core.api.DataBrokerConstruct; import fr.inria.corese.core.api.Engine; import fr.inria.corese.core.api.Loader; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.LoadFormat; diff --git a/src/main/java/fr/inria/corese/core/query/update/Manager.java b/src/main/java/fr/inria/corese/core/query/update/Manager.java index 6567c65f9..49cac98dc 100644 --- a/src/main/java/fr/inria/corese/core/query/update/Manager.java +++ b/src/main/java/fr/inria/corese/core/query/update/Manager.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.query.update; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.Access.Level; import fr.inria.corese.core.sparql.triple.parser.AccessRight; diff --git a/src/main/java/fr/inria/corese/core/query/update/ManagerImpl.java b/src/main/java/fr/inria/corese/core/query/update/ManagerImpl.java index a6e7fdc6d..d2a9eb9d8 100644 --- a/src/main/java/fr/inria/corese/core/query/update/ManagerImpl.java +++ b/src/main/java/fr/inria/corese/core/query/update/ManagerImpl.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.query.update; import fr.inria.corese.core.Event; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.query.Construct; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.Access.Level; diff --git a/src/main/java/fr/inria/corese/core/query/update/UpdateProcess.java b/src/main/java/fr/inria/corese/core/query/update/UpdateProcess.java index d954d3f3e..19786eb74 100644 --- a/src/main/java/fr/inria/corese/core/query/update/UpdateProcess.java +++ b/src/main/java/fr/inria/corese/core/query/update/UpdateProcess.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.query.update; import fr.inria.corese.core.Event; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/rule/Cleaner.java b/src/main/java/fr/inria/corese/core/rule/Cleaner.java index c954da1b2..0ad3ad154 100644 --- a/src/main/java/fr/inria/corese/core/rule/Cleaner.java +++ b/src/main/java/fr/inria/corese/core/rule/Cleaner.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.rule; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.query.Evaluator; -import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.query.Evaluator; +import fr.inria.corese.core.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; import fr.inria.corese.core.query.QueryProcess; diff --git a/src/main/java/fr/inria/corese/core/rule/Record.java b/src/main/java/fr/inria/corese/core/rule/Record.java index 122258d9b..e19352e99 100644 --- a/src/main/java/fr/inria/corese/core/rule/Record.java +++ b/src/main/java/fr/inria/corese/core/rule/Record.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.rule; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/fr/inria/corese/core/rule/ResultWatcher.java b/src/main/java/fr/inria/corese/core/rule/ResultWatcher.java index b177e894c..aaaf818f9 100644 --- a/src/main/java/fr/inria/corese/core/rule/ResultWatcher.java +++ b/src/main/java/fr/inria/corese/core/rule/ResultWatcher.java @@ -1,13 +1,13 @@ package fr.inria.corese.core.rule; -import fr.inria.corese.core.next.kgram.api.core.*; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.core.Distinct; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.event.ResultListener; -import fr.inria.corese.core.next.kgram.path.Path; +import fr.inria.corese.core.kgram.api.core.*; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.core.Distinct; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.event.ResultListener; +import fr.inria.corese.core.kgram.path.Path; import fr.inria.corese.core.api.GraphListener; import fr.inria.corese.core.Graph; import fr.inria.corese.core.logic.RDFS; diff --git a/src/main/java/fr/inria/corese/core/rule/Rule.java b/src/main/java/fr/inria/corese/core/rule/Rule.java index 4b8ebae39..9b5e52b08 100755 --- a/src/main/java/fr/inria/corese/core/rule/Rule.java +++ b/src/main/java/fr/inria/corese/core/rule/Rule.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.rule; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; import fr.inria.corese.core.logic.Closure; diff --git a/src/main/java/fr/inria/corese/core/rule/RuleEngine.java b/src/main/java/fr/inria/corese/core/rule/RuleEngine.java index 09a13c6a8..e087ae759 100644 --- a/src/main/java/fr/inria/corese/core/rule/RuleEngine.java +++ b/src/main/java/fr/inria/corese/core/rule/RuleEngine.java @@ -5,18 +5,18 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.Engine; import fr.inria.corese.core.api.Loader; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Graphable; -import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.next.kgram.core.*; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Graphable; +import fr.inria.corese.core.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.core.*; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; import fr.inria.corese.core.logic.Closure; import fr.inria.corese.core.logic.ClosureDataManager; import fr.inria.corese.core.logic.Entailment; -import fr.inria.corese.core.next.kgram.core.Query; import fr.inria.corese.core.query.Construct; import fr.inria.corese.core.query.QueryEngine; import fr.inria.corese.core.query.QueryProcess; diff --git a/src/main/java/fr/inria/corese/core/rule/RuleError.java b/src/main/java/fr/inria/corese/core/rule/RuleError.java index abcd4f2d8..04addf1c3 100644 --- a/src/main/java/fr/inria/corese/core/rule/RuleError.java +++ b/src/main/java/fr/inria/corese/core/rule/RuleError.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.rule; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.core.Mappings; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/shacl/Shacl.java b/src/main/java/fr/inria/corese/core/shacl/Shacl.java index 041706745..7942e865c 100644 --- a/src/main/java/fr/inria/corese/core/shacl/Shacl.java +++ b/src/main/java/fr/inria/corese/core/shacl/Shacl.java @@ -8,7 +8,7 @@ import fr.inria.corese.core.producer.DataProducer; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/sparql/api/Computer.java b/src/main/java/fr/inria/corese/core/sparql/api/Computer.java index ee01ccf4d..31ef1db82 100644 --- a/src/main/java/fr/inria/corese/core/sparql/api/Computer.java +++ b/src/main/java/fr/inria/corese/core/sparql/api/Computer.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.api; -import fr.inria.corese.core.next.kgram.api.query.Evaluator; +import fr.inria.corese.core.kgram.api.query.Evaluator; /** * Interface for Interpreter diff --git a/src/main/java/fr/inria/corese/core/sparql/api/ComputerProxy.java b/src/main/java/fr/inria/corese/core/sparql/api/ComputerProxy.java index 8e276bc1f..a17c04d62 100644 --- a/src/main/java/fr/inria/corese/core/sparql/api/ComputerProxy.java +++ b/src/main/java/fr/inria/corese/core/sparql/api/ComputerProxy.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql.api; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.parser.Context; diff --git a/src/main/java/fr/inria/corese/core/sparql/api/Graph.java b/src/main/java/fr/inria/corese/core/sparql/api/Graph.java index 655ce585b..142de767e 100644 --- a/src/main/java/fr/inria/corese/core/sparql/api/Graph.java +++ b/src/main/java/fr/inria/corese/core/sparql/api/Graph.java @@ -3,7 +3,7 @@ /** * @author corby */ -public interface Graph extends fr.inria.corese.core.next.kgram.api.core.Graph { +public interface Graph extends fr.inria.corese.core.kgram.api.core.Graph { } diff --git a/src/main/java/fr/inria/corese/core/sparql/api/GraphProcessor.java b/src/main/java/fr/inria/corese/core/sparql/api/GraphProcessor.java index c28c016b3..4348b5529 100644 --- a/src/main/java/fr/inria/corese/core/sparql/api/GraphProcessor.java +++ b/src/main/java/fr/inria/corese/core/sparql/api/GraphProcessor.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.sparql.api; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.Access.Level; diff --git a/src/main/java/fr/inria/corese/core/sparql/api/IDatatype.java b/src/main/java/fr/inria/corese/core/sparql/api/IDatatype.java index 44085c499..5fb56f01b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/api/IDatatype.java +++ b/src/main/java/fr/inria/corese/core/sparql/api/IDatatype.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.api; -import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.kgram.api.core.*; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; import fr.inria.corese.core.sparql.storage.api.IStorage; diff --git a/src/main/java/fr/inria/corese/core/sparql/api/QueryVisitor.java b/src/main/java/fr/inria/corese/core/sparql/api/QueryVisitor.java index 049eb5c5f..ee6c33b3c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/api/QueryVisitor.java +++ b/src/main/java/fr/inria/corese/core/sparql/api/QueryVisitor.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.api; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; public interface QueryVisitor { diff --git a/src/main/java/fr/inria/corese/core/sparql/api/TransformProcessor.java b/src/main/java/fr/inria/corese/core/sparql/api/TransformProcessor.java index 28291ed6c..9f83bcc09 100644 --- a/src/main/java/fr/inria/corese/core/sparql/api/TransformProcessor.java +++ b/src/main/java/fr/inria/corese/core/sparql/api/TransformProcessor.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql.api; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.exceptions.EngineException; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/compiler/java/JavaCompiler.java b/src/main/java/fr/inria/corese/core/sparql/compiler/java/JavaCompiler.java index 2d77c18ab..b29abc320 100644 --- a/src/main/java/fr/inria/corese/core/sparql/compiler/java/JavaCompiler.java +++ b/src/main/java/fr/inria/corese/core/sparql/compiler/java/JavaCompiler.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.compiler.java; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.script.ForLoop; @@ -9,6 +9,8 @@ import fr.inria.corese.core.sparql.triple.function.script.Let; import fr.inria.corese.core.sparql.triple.function.script.Statement; import fr.inria.corese.core.sparql.triple.parser.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.BufferedWriter; import java.io.FileWriter; @@ -17,7 +19,7 @@ import java.util.Arrays; import java.util.HashMap; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.*; +import static fr.inria.corese.core.kgram.api.core.ExprType.*; /** * Java Compiler for LDScript Take an AST as input and compile the LDScript @@ -295,7 +297,7 @@ void term(Term term, boolean arg) { case ExprType.NOT: not(term, arg); return; - case AND: + case ExprType.AND: case ExprType.OR: bool(term, arg); return; @@ -348,7 +350,7 @@ void functionCall(Term term, boolean arg) { ifthenelse(term, arg); return; - case RETURN: + case ExprType.RETURN: append("return"); append(SPACE); toJava(term.getArg(0), true); diff --git a/src/main/java/fr/inria/corese/core/sparql/compiler/java/Rewrite.java b/src/main/java/fr/inria/corese/core/sparql/compiler/java/Rewrite.java index 919bca9cc..7be56be61 100644 --- a/src/main/java/fr/inria/corese/core/sparql/compiler/java/Rewrite.java +++ b/src/main/java/fr/inria/corese/core/sparql/compiler/java/Rewrite.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.compiler.java; -import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.script.Let; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/sparql/compiler/java/Stack.java b/src/main/java/fr/inria/corese/core/sparql/compiler/java/Stack.java index 18a147712..2e73173a4 100644 --- a/src/main/java/fr/inria/corese/core/sparql/compiler/java/Stack.java +++ b/src/main/java/fr/inria/corese/core/sparql/compiler/java/Stack.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.compiler.java; -import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.triple.function.script.ForLoop; import fr.inria.corese.core.sparql.triple.function.script.Function; import fr.inria.corese.core.sparql.triple.function.script.Let; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java index 83586683d..c60da9b80 100755 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.sparql.datatype; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import fr.inria.corese.core.next.kgram.api.core.Pointerable; -import fr.inria.corese.core.next.kgram.api.core.TripleStore; -import fr.inria.corese.core.next.kgram.path.Path; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.api.core.Pointerable; +import fr.inria.corese.core.kgram.api.core.TripleStore; +import fr.inria.corese.core.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.api.IDatatypeList; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseTriple.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseTriple.java index 7e0be11c1..1e527cdf5 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseTriple.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseTriple.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.datatype; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseURI.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseURI.java index c75749a6d..4c25638b8 100755 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseURI.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseURI.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.datatype; -import fr.inria.corese.core.next.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.core.ExpType; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseXMLLiteral.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseXMLLiteral.java index 0add3dea9..21aff5323 100755 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseXMLLiteral.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseXMLLiteral.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; -import fr.inria.corese.core.next.kgram.api.core.Loopable; +import fr.inria.corese.core.kgram.api.core.Loopable; /** *

Title: Corese

diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeHierarchy.java b/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeHierarchy.java index c04aad2eb..a856d8e08 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeHierarchy.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeHierarchy.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.NSManager; -import fr.inria.corese.core.next.kgram.api.query.Hierarchy; +import fr.inria.corese.core.kgram.api.query.Hierarchy; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java b/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java index 8a2e67195..6e8af313a 100755 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.datatype; -import fr.inria.corese.core.next.kgram.api.core.*; +import fr.inria.corese.core.kgram.api.core.*; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.extension.*; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/PointerObject.java b/src/main/java/fr/inria/corese/core/sparql/datatype/PointerObject.java index ed0523fb8..bdb34cd07 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/PointerObject.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/PointerObject.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.datatype; -import fr.inria.corese.core.next.kgram.api.core.Pointerable; +import fr.inria.corese.core.kgram.api.core.Pointerable; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoresePointer.java b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoresePointer.java index e801355fb..34701ffaf 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoresePointer.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoresePointer.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.sparql.datatype.extension; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import fr.inria.corese.core.next.kgram.api.core.Pointerable; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.path.Path; +import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.api.core.Pointerable; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.path.Path; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.CoreseUndefLiteral; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/function/VariableResolverImpl.java b/src/main/java/fr/inria/corese/core/sparql/datatype/function/VariableResolverImpl.java index 77e1ba108..86624fe97 100644 --- a/src/main/java/fr/inria/corese/core/sparql/datatype/function/VariableResolverImpl.java +++ b/src/main/java/fr/inria/corese/core/sparql/datatype/function/VariableResolverImpl.java @@ -5,8 +5,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Text; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; /** * Variable resolver for XPath diff --git a/src/main/java/fr/inria/corese/core/sparql/exceptions/EngineException.java b/src/main/java/fr/inria/corese/core/sparql/exceptions/EngineException.java index 1812366b5..90a741b10 100644 --- a/src/main/java/fr/inria/corese/core/sparql/exceptions/EngineException.java +++ b/src/main/java/fr/inria/corese/core/sparql/exceptions/EngineException.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.exceptions; -import fr.inria.corese.core.next.kgram.core.SparqlException; +import fr.inria.corese.core.kgram.core.SparqlException; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.URLServer; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/Aggregate.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/Aggregate.java index 7e8f25def..c884e4b69 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/Aggregate.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/Aggregate.java @@ -5,13 +5,13 @@ import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.aggregate.Distinct.TreeData; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Group; -import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Group; +import fr.inria.corese.core.kgram.core.Mapping; import fr.inria.corese.core.sparql.triple.function.script.LDScript; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateCount.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateCount.java index 436b0183c..cd620a34d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateCount.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateCount.java @@ -3,10 +3,10 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mapping; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateGroupConcat.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateGroupConcat.java index 2be239b0d..f1781312e 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateGroupConcat.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateGroupConcat.java @@ -4,10 +4,11 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.Expression; +import static fr.inria.corese.core.sparql.triple.function.aggregate.Aggregate.NL; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateMinMax.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateMinMax.java index c25cc51c8..9df473773 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateMinMax.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateMinMax.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.MIN; +import static fr.inria.corese.core.kgram.api.core.ExprType.MIN; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateSumAvg.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateSumAvg.java index 4152c4384..4895dbd14 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateSumAvg.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateSumAvg.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; -import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.ExprType; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateTemplate.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateTemplate.java index 2a8ee437d..f13f484e7 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateTemplate.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/aggregate/AggregateTemplate.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.script.Function; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BiTriFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BiTriFunction.java index e609ef421..65ca96915 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BiTriFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BiTriFunction.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BinaryFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BinaryFunction.java index ef43bb50c..69472985b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BinaryFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BinaryFunction.java @@ -7,10 +7,10 @@ import fr.inria.corese.core.sparql.triple.function.script.Function; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import java.util.ArrayList; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BlankNode.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BlankNode.java index d1e341ee2..2a18d12ff 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BlankNode.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/BlankNode.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import java.util.Map; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Bound.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Bound.java index b7b56f8ee..4a97108ad 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Bound.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Bound.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Coalesce.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Coalesce.java index 06598683e..122664768 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Coalesce.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Coalesce.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.Access; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Concat.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Concat.java index 2e4d36ad0..674aa429d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Concat.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Concat.java @@ -1,14 +1,14 @@ package fr.inria.corese.core.sparql.triple.function.core; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.CONCAT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.FORMAT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.STL_CONCAT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.STL_FORMAT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.STL_NUMBER; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.Expr; +import static fr.inria.corese.core.kgram.api.core.ExprType.CONCAT; +import static fr.inria.corese.core.kgram.api.core.ExprType.FORMAT; +import static fr.inria.corese.core.kgram.api.core.ExprType.STL_CONCAT; +import static fr.inria.corese.core.kgram.api.core.ExprType.STL_FORMAT; +import static fr.inria.corese.core.kgram.api.core.ExprType.STL_NUMBER; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/DateFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/DateFunction.java index 7553d18f7..5a4f18e58 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/DateFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/DateFunction.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ExistFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ExistFunction.java index 4eb8c5c1b..7656ff086 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ExistFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ExistFunction.java @@ -1,17 +1,17 @@ package fr.inria.corese.core.sparql.triple.function.core; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Memory; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.core.SparqlException; -import fr.inria.corese.core.next.kgram.core.Stack; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Memory; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.core.SparqlException; +import fr.inria.corese.core.kgram.core.Stack; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Extern.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Extern.java index 8a21d1818..7037ac3a1 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Extern.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/Extern.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.sparql.triple.parser.Processor; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.Access.Feature; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/FunctionEvaluator.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/FunctionEvaluator.java index 4be17d5f9..988387f14 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/FunctionEvaluator.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/FunctionEvaluator.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.triple.function.core; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/HashFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/HashFunction.java index b66f2ed5f..d7653330c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/HashFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/HashFunction.java @@ -10,9 +10,9 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/IfThenElseTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/IfThenElseTerm.java index f73411f1b..507f4d332 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/IfThenElseTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/IfThenElseTerm.java @@ -2,13 +2,15 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; +import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; import fr.inria.corese.core.sparql.triple.parser.Expression; +import fr.inria.corese.core.sparql.triple.parser.Term; import fr.inria.corese.core.sparql.triple.function.script.Function; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import java.util.ArrayList; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/StrPredicate.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/StrPredicate.java index b769de61b..1bd06b5ba 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/StrPredicate.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/StrPredicate.java @@ -3,10 +3,10 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UUIDFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UUIDFunction.java index 1065448ea..596d15014 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UUIDFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UUIDFunction.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import java.util.UUID; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UnaryFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UnaryFunction.java index da3d6bc1b..05c3b590a 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UnaryFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/UnaryFunction.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ZeroaryFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ZeroaryFunction.java index 0d5f19f22..9d4e0e0b5 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ZeroaryFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/core/ZeroaryFunction.java @@ -2,9 +2,9 @@ import java.util.Optional; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.CoreseDouble; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/BinaryExtension.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/BinaryExtension.java index 5a956bb41..b9e104d6d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/BinaryExtension.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/BinaryExtension.java @@ -1,17 +1,17 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.EXTCONT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.EXTEQUAL; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XPATH; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_COMPARE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_DISTANCE; +import static fr.inria.corese.core.kgram.api.core.ExprType.EXTCONT; +import static fr.inria.corese.core.kgram.api.core.ExprType.EXTEQUAL; +import static fr.inria.corese.core.kgram.api.core.ExprType.XPATH; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_COMPARE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_DISTANCE; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.datatype.function.StringHelper; import fr.inria.corese.core.sparql.datatype.function.VariableResolverImpl; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Cast.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Cast.java index 1c677f2c6..15e20d41a 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Cast.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Cast.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.GraphProcessor; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Display.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Display.java index 8bc8d0fdf..5c9a60419 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Display.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Display.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Focus.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Focus.java index 2568c492b..79d2a1e23 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Focus.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Focus.java @@ -4,9 +4,10 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.sparql.triple.parser.Expression; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Get.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Get.java index ea4ba0236..bc62ffda9 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Get.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Get.java @@ -1,15 +1,15 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_HAS; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_PATH; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_HAS; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_PATH; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/GetGen.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/GetGen.java index da5f0710f..2bfbbbb0e 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/GetGen.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/GetGen.java @@ -1,14 +1,14 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/IOFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/IOFunction.java index dab52a7a6..66fa576cc 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/IOFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/IOFunction.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Iterate.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Iterate.java index 450a1e104..eb384579d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Iterate.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Iterate.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/JSONTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/JSONTerm.java index 2090b02cd..2fb2375f5 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/JSONTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/JSONTerm.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListBinary.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListBinary.java index 3095844ba..2b575a706 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListBinary.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListBinary.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListNary.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListNary.java index 328f40ef9..6f1fa85a5 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListNary.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListNary.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListSort.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListSort.java index a1e1c24dc..3c68d4cfb 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListSort.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListSort.java @@ -1,13 +1,15 @@ package fr.inria.corese.core.sparql.triple.function.extension; +import fr.inria.corese.core.kgram.api.core.Pointerable; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.sparql.exceptions.EngineException; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mappings; import fr.inria.corese.core.sparql.triple.function.script.Funcall; import fr.inria.corese.core.sparql.triple.function.script.Function; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListTerm.java index 7db1ee9a8..8a848dcf1 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListTerm.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListUnary.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListUnary.java index 376e1bcc5..b1e7884eb 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListUnary.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ListUnary.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/MapTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/MapTerm.java index b0f7c4f23..07130fd52 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/MapTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/MapTerm.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Namespace.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Namespace.java index 3e24d425f..5d6ea9e2d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Namespace.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Namespace.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/PathLength.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/PathLength.java index c72b8eb33..a6bc825e3 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/PathLength.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/PathLength.java @@ -4,12 +4,13 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; - -import static fr.inria.corese.core.next.kgram.api.core.PointerType.PATH; - -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Node; +import static fr.inria.corese.core.kgram.api.core.PointerType.PATH; +import fr.inria.corese.core.kgram.api.core.Pointerable; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Rest.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Rest.java index ad345b1fd..a72cac11d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Rest.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Rest.java @@ -6,11 +6,11 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.EXPRESSION; -import fr.inria.corese.core.next.kgram.api.core.Pointerable; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import static fr.inria.corese.core.kgram.api.core.PointerType.EXPRESSION; +import fr.inria.corese.core.kgram.api.core.Pointerable; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ResultFormater.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ResultFormater.java index 9ded16b06..771eeaad2 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ResultFormater.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ResultFormater.java @@ -1,13 +1,13 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_JSON; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_RDF; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_XML; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.MAPPINGS; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_JSON; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_RDF; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_XML; +import static fr.inria.corese.core.kgram.api.core.PointerType.MAPPINGS; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.api.ResultFormatDef; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SPINFormater.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SPINFormater.java index 44ef803d5..c3e0e4367 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SPINFormater.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SPINFormater.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Size.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Size.java index d00c38015..8fe59c459 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Size.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Size.java @@ -2,11 +2,12 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; +import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Swap.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Swap.java index 33fbfc11a..a2c0b8490 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Swap.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/Swap.java @@ -5,9 +5,9 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SystemFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SystemFunction.java index faabcfc19..960c81f26 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SystemFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/SystemFunction.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TernaryExtension.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TernaryExtension.java index eb05bf1c2..7129f1abc 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TernaryExtension.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TernaryExtension.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_REPLACE; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_REPLACE; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TripleAccess.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TripleAccess.java index 6435162e1..e71a3adeb 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TripleAccess.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/TripleAccess.java @@ -1,24 +1,24 @@ package fr.inria.corese.core.sparql.triple.function.extension; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.IS_TRIPLE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.OBJECT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.PREDICATE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.SPARQL_COMPARE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.SUBJECT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.TRIPLE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_ASSERTED; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_EDGE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_REFERENCE; -import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.api.core.Edge; +import static fr.inria.corese.core.kgram.api.core.ExprType.IS_TRIPLE; +import static fr.inria.corese.core.kgram.api.core.ExprType.OBJECT; +import static fr.inria.corese.core.kgram.api.core.ExprType.PREDICATE; +import static fr.inria.corese.core.kgram.api.core.ExprType.SPARQL_COMPARE; +import static fr.inria.corese.core.kgram.api.core.ExprType.SUBJECT; +import static fr.inria.corese.core.kgram.api.core.ExprType.TRIPLE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_ASSERTED; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_EDGE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_REFERENCE; +import fr.inria.corese.core.kgram.api.core.PointerType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/UnaryExtension.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/UnaryExtension.java index 7928ce827..eb471a397 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/UnaryExtension.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/UnaryExtension.java @@ -4,12 +4,12 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_LABEL; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_LABEL; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/XML.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/XML.java index 507ba5afe..3d3885392 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/XML.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/XML.java @@ -5,27 +5,27 @@ */ package fr.inria.corese.core.sparql.triple.function.extension; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_ATTRIBUTE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_ATTRIBUTES; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_BASE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_CHILDREN; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_ELEMENTS; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_HAS_ATTRIBUTE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NAMESPACE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_DOCUMENT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_ELEMENT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_FIRST_CHILD; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_LOCAL_NAME; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_NAME; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_PARENT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_PROPERTY; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_TYPE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE_VALUE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_TEXT_CONTENT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_XSLT; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_ATTRIBUTE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_ATTRIBUTES; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_BASE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_CHILDREN; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_ELEMENTS; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_HAS_ATTRIBUTE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NAMESPACE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_DOCUMENT; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_ELEMENT; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_FIRST_CHILD; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_LOCAL_NAME; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_NAME; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_PARENT; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_PROPERTY; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_TYPE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE_VALUE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_TEXT_CONTENT; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_XSLT; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ZeroAry.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ZeroAry.java index e9b638f0e..12e86e22d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ZeroAry.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/extension/ZeroAry.java @@ -4,11 +4,11 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.function.term.TermEval; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphFunction.java index a8c313713..31cdf64f2 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphFunction.java @@ -1,22 +1,22 @@ package fr.inria.corese.core.sparql.triple.function.proxy; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_GRAPH; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_INDEX; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NODE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_OBJECT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_PROPERTY; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_SUBJECT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_VERTEX; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.api.core.Edge; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_GRAPH; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_INDEX; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NODE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_OBJECT; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_PROPERTY; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_SUBJECT; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_VERTEX; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.PointerType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.script.LDScript; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphSpecificFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphSpecificFunction.java index b227a2f35..920777a9c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphSpecificFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/GraphSpecificFunction.java @@ -1,47 +1,49 @@ package fr.inria.corese.core.sparql.triple.function.proxy; -import fr.inria.corese.core.next.kgram.api.core.Edge; - -import static fr.inria.corese.core.next.kgram.api.core.ExprType.DEPTH; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.KGRAM; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.LOAD; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.READ; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.WRITE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_TUNE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.SIM; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.STL_INDEX; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_CREATE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_DEGREE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_DELETE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_ENTAILMENT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_EXISTS; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_JOIN; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_MINUS; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_OPTIONAL; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_UNION; +import fr.inria.corese.core.kgram.api.core.Edge; +import static fr.inria.corese.core.kgram.api.core.ExprType.APPROXIMATE; +import static fr.inria.corese.core.kgram.api.core.ExprType.APP_SIM; +import static fr.inria.corese.core.kgram.api.core.ExprType.DEPTH; +import static fr.inria.corese.core.kgram.api.core.ExprType.KGRAM; +import static fr.inria.corese.core.kgram.api.core.ExprType.LOAD; +import static fr.inria.corese.core.kgram.api.core.ExprType.READ; +import static fr.inria.corese.core.kgram.api.core.ExprType.WRITE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_TUNE; +import static fr.inria.corese.core.kgram.api.core.ExprType.SIM; +import static fr.inria.corese.core.kgram.api.core.ExprType.STL_INDEX; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_CREATE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_DEGREE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_DELETE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_ENTAILMENT; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_EXISTS; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_JOIN; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_MINUS; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_OPTIONAL; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_UNION; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.GraphProcessor; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_SHAPE_GRAPH; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_SHAPE_NODE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_TOGRAPH; -import fr.inria.corese.core.next.kgram.api.core.PointerType; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_SHAPE_GRAPH; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_SHAPE_NODE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_TOGRAPH; +import fr.inria.corese.core.kgram.api.core.PointerType; import fr.inria.corese.core.sparql.triple.function.script.LDScript; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_EDGES; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_HTTP_GET; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_INSERT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_MERGE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_MINDEGREE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_OBJECTS; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_SUBJECTS; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_SYNTAX; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_VALUE; -import fr.inria.corese.core.next.kgram.api.core.Node; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_EDGES; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_HTTP_GET; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_INSERT; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_MERGE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_MINDEGREE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_OBJECTS; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_SUBJECTS; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_SYNTAX; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_VALUE; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.datatype.DatatypeMap; +import fr.inria.corese.core.sparql.exceptions.SafetyException; import fr.inria.corese.core.sparql.triple.function.term.TermEval; import fr.inria.corese.core.sparql.triple.parser.Access; import fr.inria.corese.core.sparql.triple.parser.Access.Feature; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/Introspection.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/Introspection.java index 89f81e19b..37384f62d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/Introspection.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/proxy/Introspection.java @@ -1,19 +1,20 @@ package fr.inria.corese.core.sparql.triple.function.proxy; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_CONTEXT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_FROM; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_METADATA; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NAME; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_NAMED; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_QUERY; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Expr; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_CONTEXT; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_FROM; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_MAPPINGS; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_METADATA; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NAME; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_NAMED; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_QUERY; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.script.LDScript; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ErrorFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ErrorFunction.java index de4dad90b..dcc6c193c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ErrorFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ErrorFunction.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Eval.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Eval.java index 33b6c77fb..0cc6bb472 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Eval.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Eval.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/EventCall.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/EventCall.java index 0fd83e51b..0737ac0df 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/EventCall.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/EventCall.java @@ -5,10 +5,10 @@ */ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Extension.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Extension.java index e669866c7..14112d986 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Extension.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Extension.java @@ -1,15 +1,14 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.next.kgram.core.Eval; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.parser.Term; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import java.util.List; import org.slf4j.LoggerFactory; import org.slf4j.Logger; @@ -138,7 +137,7 @@ public IDatatype eval(Computer eval, Binding b, Environment env, Producer p) thr IDatatype dt = null; if (isSystem) { //fr.inria.corese.core.kgram.core.Eval cc = eval.getComputerEval(env, p, function); - Eval cc = getComputerEval(eval.getEvaluator(), env, p, function); + fr.inria.corese.core.kgram.core.Eval cc = getComputerEval(eval.getEvaluator(), env, p, function); // PRAGMA: b = cc.getEnvironment().getBind() dt = body.eval(cc.getEvaluator(), b, cc.getEnvironment(), p); } else { @@ -190,7 +189,7 @@ public IDatatype eval(Computer eval, Binding b, Environment env, Producer p, IDa b.set(function, fun.getExpList(), param); if (function.isSystem()) { //fr.inria.corese.core.kgram.core.Eval cc = eval.getComputerEval(env, p, function); - Eval cc = getComputerEval(eval.getEvaluator(), env, p, function); + fr.inria.corese.core.kgram.core.Eval cc = getComputerEval(eval.getEvaluator(), env, p, function); // PRAGMA: b = cc.getEnvironment().getBind() dt = function.getBody().eval(cc.getEvaluator(), b, cc.getEnvironment(), p); } else { diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ForLoop.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ForLoop.java index 31866b93f..4c8c2d666 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ForLoop.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/ForLoop.java @@ -7,9 +7,9 @@ import fr.inria.corese.core.sparql.triple.parser.Processor; import fr.inria.corese.core.sparql.triple.parser.Variable; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.ASTBuffer; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Funcall.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Funcall.java index 6e0ce3b13..ff3668cda 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Funcall.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Funcall.java @@ -1,15 +1,14 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.next.kgram.core.Eval; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.SparqlException; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.SparqlException; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.exceptions.UndefinedExpressionException; @@ -89,7 +88,7 @@ public IDatatype call(Computer eval, Binding b, Environment env, Producer p, Fun IDatatype dt = null; if (function.isSystem()) { // fr.inria.corese.core.kgram.core.Eval cc = eval.getComputerEval(env, p, function); - Eval cc = getComputerEval(eval.getEvaluator(), env, p, function); + fr.inria.corese.core.kgram.core.Eval cc = getComputerEval(eval.getEvaluator(), env, p, function); dt = function.getBody().eval(cc.getEvaluator(), b, cc.getEnvironment(), p); } else { dt = function.getBody().eval(eval, b, env, p); diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Function.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Function.java index 1033d9b62..0787ff4d2 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Function.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Function.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; @@ -14,8 +14,8 @@ import fr.inria.corese.core.sparql.triple.parser.Variable; import fr.inria.corese.core.sparql.compiler.java.JavaCompiler; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.GraphProcessor; import fr.inria.corese.core.sparql.datatype.RDF; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/FunctionDefined.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/FunctionDefined.java index d7de0ed9c..12a3ab357 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/FunctionDefined.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/FunctionDefined.java @@ -5,9 +5,9 @@ */ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaCast.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaCast.java index f57b47f60..384f8aa81 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaCast.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaCast.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * cast:node(exp) return eval(exp) diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaDScall.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaDScall.java index 54e97a4c6..d6bbc6d6c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaDScall.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaDScall.java @@ -3,10 +3,11 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; +import fr.inria.corese.core.sparql.exceptions.SafetyException; import fr.inria.corese.core.sparql.triple.parser.Access.Feature; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaFunction.java index ec3af6849..25ac46b90 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/JavaFunction.java @@ -1,5 +1,11 @@ package fr.inria.corese.core.sparql.triple.function.script; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.sparql.api.Computer; +import fr.inria.corese.core.sparql.triple.function.term.Binding; +import fr.inria.corese.core.sparql.triple.parser.Access.Feature; + /** * * @author Olivier Corby, Wimmics INRIA I3S, 2016 diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Javacall.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Javacall.java index 8880fe311..58d61467f 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Javacall.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Javacall.java @@ -1,20 +1,23 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; +import static fr.inria.corese.core.sparql.triple.function.term.TermEval.JAVA_FUNCTION_MESS; +import fr.inria.corese.core.sparql.triple.parser.Access; import fr.inria.corese.core.sparql.triple.parser.Access.Feature; import fr.inria.corese.core.sparql.triple.parser.NSManager; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory;; /** * Call Corese Java function with parameters as getObject() or diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/LDScript.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/LDScript.java index 615114cf7..5419eead9 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/LDScript.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/LDScript.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Evaluator; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Evaluator; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.term.TermEval; @@ -156,10 +156,10 @@ public ASTExtension getExtension() { * public query q1 which may be different from the query q2 where public * function call occur */ - Eval getComputerEval(Evaluator evaluator, Environment env, Producer p, Expr function) { + fr.inria.corese.core.kgram.core.Eval getComputerEval(Evaluator evaluator, Environment env, Producer p, Expr function) { Query q = getQuery(env, function); - Eval currentEval = env.getEval(); - Eval eval = new Eval(p, evaluator, currentEval.getMatcher()); + fr.inria.corese.core.kgram.core.Eval currentEval = env.getEval(); + fr.inria.corese.core.kgram.core.Eval eval = new fr.inria.corese.core.kgram.core.Eval(p, evaluator, currentEval.getMatcher()); eval.setSPARQLEngine(currentEval.getSPARQLEngine()); eval.set(currentEval.getProvider()); eval.init(q); diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Let.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Let.java index 78b1d5fb5..c473d45fa 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Let.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Let.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; @@ -8,9 +8,9 @@ import fr.inria.corese.core.sparql.triple.parser.Processor; import fr.inria.corese.core.sparql.triple.parser.Variable; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.ASTBuffer; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapAnyEvery.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapAnyEvery.java index 5fdd07293..68e2d7715 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapAnyEvery.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapAnyEvery.java @@ -3,14 +3,17 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAPANY; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAPEVERY; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import static fr.inria.corese.core.kgram.api.core.ExprType.MAPANY; +import static fr.inria.corese.core.kgram.api.core.ExprType.MAPEVERY; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.sparql.exceptions.EngineException; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; - import java.util.Iterator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * * @author Olivier Corby, Wimmics INRIA I3S, 2017 diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapFunction.java index eee1c07ea..ed1e8feca 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MapFunction.java @@ -4,15 +4,15 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAPAPPEND; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAPFIND; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAPFINDLIST; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAPLIST; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAPMERGE; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.Expr; +import static fr.inria.corese.core.kgram.api.core.ExprType.MAPAPPEND; +import static fr.inria.corese.core.kgram.api.core.ExprType.MAPFIND; +import static fr.inria.corese.core.kgram.api.core.ExprType.MAPFINDLIST; +import static fr.inria.corese.core.kgram.api.core.ExprType.MAPLIST; +import static fr.inria.corese.core.kgram.api.core.ExprType.MAPMERGE; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodCall.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodCall.java index 032873d1a..e21938d0c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodCall.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodCall.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodTypeCall.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodTypeCall.java index 3ff7bcb0c..eef85c21b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodTypeCall.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/MethodTypeCall.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Reduce.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Reduce.java index fd81fe21c..5db2fd0c5 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Reduce.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Reduce.java @@ -4,23 +4,27 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.function.term.Binding; - -import static fr.inria.corese.core.next.kgram.api.core.ExprType.AND; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.CONCAT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.DIV; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.MINUS; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.MULT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.OR; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.PLUS; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_APPEND; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_MERGE; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.Expr; +import static fr.inria.corese.core.kgram.api.core.ExprType.AND; +import static fr.inria.corese.core.kgram.api.core.ExprType.CONCAT; +import static fr.inria.corese.core.kgram.api.core.ExprType.DIV; +import static fr.inria.corese.core.kgram.api.core.ExprType.MINUS; +import static fr.inria.corese.core.kgram.api.core.ExprType.MULT; +import static fr.inria.corese.core.kgram.api.core.ExprType.OR; +import static fr.inria.corese.core.kgram.api.core.ExprType.PLUS; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_APPEND; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_MERGE; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.sparql.exceptions.EngineException; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.Expression; - +import fr.inria.corese.core.sparql.triple.parser.Processor; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * reduce(rq:plus, list) * get a binary function, apply it on elements two by two diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Return.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Return.java index 668d15ce8..b01c10865 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Return.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Return.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Self.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Self.java index 9bbda96ec..d976e0200 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Self.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Self.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Sequence.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Sequence.java index 57ccb5942..d9ae1d946 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Sequence.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Sequence.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.ASTBuffer; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/SetFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/SetFunction.java index 53dfd139d..743385212 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/SetFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/SetFunction.java @@ -1,15 +1,15 @@ package fr.inria.corese.core.sparql.triple.function.script; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.SET; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.STATIC; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.STATIC_UNSET; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.UNSET; +import static fr.inria.corese.core.kgram.api.core.ExprType.SET; +import static fr.inria.corese.core.kgram.api.core.ExprType.STATIC; +import static fr.inria.corese.core.kgram.api.core.ExprType.STATIC_UNSET; +import static fr.inria.corese.core.kgram.api.core.ExprType.UNSET; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Throw.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Throw.java index c6874c16a..2881ab963 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Throw.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Throw.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql.triple.function.script; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.THROW; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import static fr.inria.corese.core.kgram.api.core.ExprType.THROW; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/TryCatch.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/TryCatch.java index fa55f57b8..6d3314c9b 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/TryCatch.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/TryCatch.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.triple.function.script; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplates.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplates.java index 8f56912bb..e52d3aad6 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplates.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplates.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.api.TransformProcessor; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWith.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWith.java index a590f4ef5..cea4995cb 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWith.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWith.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.TransformProcessor; import fr.inria.corese.core.sparql.triple.parser.Access; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWithGraph.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWithGraph.java index 39634e28a..38aa3c57c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWithGraph.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/ApplyTemplatesWithGraph.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.TransformProcessor; import fr.inria.corese.core.sparql.triple.parser.Access; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CGetSetContext.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CGetSetContext.java index 0ec7dc5fb..732ddea49 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CGetSetContext.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CGetSetContext.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.Context; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplate.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplate.java index 6c453d821..da0fdf797 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplate.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplate.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.TransformProcessor; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplateWith.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplateWith.java index c087c18cd..f96fdfbe5 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplateWith.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/CallTemplateWith.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.TransformProcessor; import fr.inria.corese.core.sparql.triple.parser.Access; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/FocusNode.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/FocusNode.java index c4ab5974b..b5c18203e 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/FocusNode.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/FocusNode.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/GetSetContext.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/GetSetContext.java index 8b9a9aaa6..5a3a96ebc 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/GetSetContext.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/GetSetContext.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.triple.parser.Context; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Prefix.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Prefix.java index 907dc53d2..08be6edce 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Prefix.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Prefix.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateAccess.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateAccess.java index 321d717ef..d4a3d0771 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateAccess.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateAccess.java @@ -1,16 +1,16 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_LOAD_MAPPINGS; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_MAPPINGS; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_PARSE_MAPPINGS; +import fr.inria.corese.core.kgram.api.core.ExprType; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_LOAD_MAPPINGS; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_MAPPINGS; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_PARSE_MAPPINGS; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.TransformProcessor; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFormat.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFormat.java index c81b5ca97..d67253960 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFormat.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFormat.java @@ -1,12 +1,14 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; +import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.term.Binding; +import fr.inria.corese.core.sparql.triple.function.term.TermEval; import fr.inria.corese.core.sparql.triple.parser.Access; import fr.inria.corese.core.sparql.triple.parser.Access.Feature; import fr.inria.corese.core.sparql.triple.parser.Processor; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFunction.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFunction.java index c08d025a9..b5a745af0 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFunction.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFunction.java @@ -1,13 +1,14 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; +import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.script.LDScript; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Constant; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFuture.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFuture.java index 9ca1d7b2e..eba39adf0 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFuture.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateFuture.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateNumber.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateNumber.java index 8f5887ae9..62174feae 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateNumber.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateNumber.java @@ -1,14 +1,14 @@ package fr.inria.corese.core.sparql.triple.function.template; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.NUMBER; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.STL_INDEX; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.STL_NUMBER; +import static fr.inria.corese.core.kgram.api.core.ExprType.NUMBER; +import static fr.inria.corese.core.kgram.api.core.ExprType.STL_INDEX; +import static fr.inria.corese.core.kgram.api.core.ExprType.STL_NUMBER; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateProcess.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateProcess.java index 5a6d4e3f4..947f29b62 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateProcess.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateProcess.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.script.Extension; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * st:process(?x) can be overloaded by diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateVisitor.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateVisitor.java index 58cf42258..746f965d6 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateVisitor.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/TemplateVisitor.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.TransformVisitor; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Turtle.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Turtle.java index 195983bb1..556001fee 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Turtle.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/template/Turtle.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.sparql.triple.function.template; -import fr.inria.corese.core.next.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.ExprType; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/AndTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/AndTerm.java index b0bf3fa38..4f77c26f9 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/AndTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/AndTerm.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Binding.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Binding.java index 98eb2d63e..09b8a2b84 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Binding.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Binding.java @@ -2,13 +2,13 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.script.Function; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Binder; -import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Binder; +import fr.inria.corese.core.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.Access; import fr.inria.corese.core.sparql.triple.parser.AccessRight; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/DivTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/DivTerm.java index 8a10f8db0..68e27c586 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/DivTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/DivTerm.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/EQ.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/EQ.java index 954282b1d..8279006be 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/EQ.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/EQ.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GE.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GE.java index 54b28b5f7..277419609 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GE.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GE.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GT.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GT.java index 9d8fca5a6..2cf9edfd1 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GT.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/GT.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/In.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/In.java index 5579ae35d..ff898092d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/In.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/In.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; import fr.inria.corese.core.sparql.triple.parser.Expression; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LE.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LE.java index 751caa66c..a38e7182d 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LE.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LE.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LT.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LT.java index 67e30cea4..eb14883ab 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LT.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/LT.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MinusTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MinusTerm.java index 06b80322f..a4ed73bd6 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MinusTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MinusTerm.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MultTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MultTerm.java index 06df3e427..1a2a08f52 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MultTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/MultTerm.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NEQ.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NEQ.java index bd9f822d0..d1efde7b4 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NEQ.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NEQ.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NotTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NotTerm.java index 74e33256b..515cff167 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NotTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/NotTerm.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Operation.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Operation.java index 62c2f47c6..cf19040bd 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Operation.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/Operation.java @@ -5,10 +5,10 @@ import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/OrTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/OrTerm.java index bd69bac51..45334c235 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/OrTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/OrTerm.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/PlusTerm.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/PlusTerm.java index 8b2e80ec8..3cb221a54 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/PlusTerm.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/PlusTerm.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.function.core.BinaryFunction; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/TermEval.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/TermEval.java index fc026c748..97ef35f3c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/function/term/TermEval.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/term/TermEval.java @@ -1,16 +1,16 @@ package fr.inria.corese.core.sparql.triple.function.term; -import fr.inria.corese.core.next.kgram.api.core.Node; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.NODE; +import fr.inria.corese.core.kgram.api.core.Node; +import static fr.inria.corese.core.kgram.api.core.PointerType.NODE; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; import fr.inria.corese.core.sparql.triple.parser.Expression; import fr.inria.corese.core.sparql.triple.parser.Term; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.exceptions.SafetyException; import fr.inria.corese.core.sparql.triple.parser.Access; import fr.inria.corese.core.sparql.triple.parser.Access.Feature; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTExtension.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTExtension.java index 6421cfb8a..6ebadaa25 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTExtension.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTExtension.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.query.Hierarchy; -import fr.inria.corese.core.next.kgram.filter.Extension; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.query.Hierarchy; +import fr.inria.corese.core.kgram.filter.Extension; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.script.Function; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTObject.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTObject.java index fa2c6cdda..8eaa3547f 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTObject.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTObject.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; -import fr.inria.corese.core.next.kgram.core.PointerObject; +import fr.inria.corese.core.kgram.core.PointerObject; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java index 089c65bc3..0f9cdf053 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java @@ -20,9 +20,9 @@ import fr.inria.corese.core.sparql.triple.cst.RDFS; import fr.inria.corese.core.sparql.triple.printer.SPIN; import fr.inria.corese.core.sparql.triple.update.ASTUpdate; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.ASTQ; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.ASTQ; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.QueryVisitor; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.api.Walker; @@ -243,7 +243,7 @@ public class ASTQuery // triple without path, triple with path private final List tripleList; private List pathList; - private fr.inria.corese.core.next.kgram.core.Query updateQuery; + private fr.inria.corese.core.kgram.core.Query updateQuery; /* --- dead code removal --- private AccessRight accessRight; */ private ASTSelector astSelector; @@ -3747,11 +3747,11 @@ public Term function(String name, Expression... exp) { return t; } - public fr.inria.corese.core.next.kgram.core.Query getUpdateQuery() { + public fr.inria.corese.core.kgram.core.Query getUpdateQuery() { return updateQuery; } - public void setUpdateQuery(fr.inria.corese.core.next.kgram.core.Query updateQuery) { + public void setUpdateQuery(fr.inria.corese.core.kgram.core.Query updateQuery) { this.updateQuery = updateQuery; } diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Access.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Access.java index caa139ec7..3560f0a82 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Access.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Access.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mapping; import fr.inria.corese.core.sparql.exceptions.SafetyException; import static fr.inria.corese.core.sparql.triple.parser.Access.Feature.*; import static fr.inria.corese.core.sparql.triple.parser.Access.Level.*; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java index 889c5b990..aa1c6c9a7 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRight.java @@ -1,6 +1,7 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.sparql.api.IDatatype; /** * diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java index 03198102b..35f30f5a6 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/AccessRightDefinition.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.HashMap; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Atom.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Atom.java index 4824d0b11..0a665c7b3 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Atom.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Atom.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Constant.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Constant.java index b452c5c43..8940a56af 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Constant.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Constant.java @@ -12,9 +12,9 @@ import fr.inria.corese.core.sparql.triple.cst.RDFS; import fr.inria.corese.core.sparql.compiler.java.JavaCompiler; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.exceptions.EngineException; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Context.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Context.java index ede4d7669..a107d6508 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Context.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Context.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql.triple.parser; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.CONTEXT; +import fr.inria.corese.core.kgram.api.core.PointerType; +import static fr.inria.corese.core.kgram.api.core.PointerType.CONTEXT; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.parser.context.ContextLog; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Dataset.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Dataset.java index 6f81c9b61..9a87243ba 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Dataset.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Dataset.java @@ -8,15 +8,15 @@ import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.DATASET; -import fr.inria.corese.core.next.kgram.api.query.ProcessVisitor; -import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.core.PointerType; +import static fr.inria.corese.core.kgram.api.core.PointerType.DATASET; +import fr.inria.corese.core.kgram.api.query.ProcessVisitor; +import fr.inria.corese.core.kgram.core.Mapping; import fr.inria.corese.core.sparql.triple.parser.Access.Level; import static fr.inria.corese.core.sparql.triple.parser.URLParam.INDEX; import static fr.inria.corese.core.sparql.triple.parser.URLServer.STORE; - +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; /** diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Expression.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Expression.java index 6b1ff2eab..c20fe8f74 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Expression.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Expression.java @@ -13,20 +13,20 @@ import fr.inria.corese.core.sparql.compiler.java.JavaCompiler; import fr.inria.corese.core.sparql.triple.function.script.Function; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Filter; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.EXPRESSION; -import fr.inria.corese.core.next.kgram.api.core.Pointerable; -import fr.inria.corese.core.next.kgram.api.core.Regex; -import fr.inria.corese.core.next.kgram.api.core.TripleStore; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Filter; +import fr.inria.corese.core.kgram.api.core.PointerType; +import static fr.inria.corese.core.kgram.api.core.PointerType.EXPRESSION; +import fr.inria.corese.core.kgram.api.core.Pointerable; +import fr.inria.corese.core.kgram.api.core.Regex; +import fr.inria.corese.core.kgram.api.core.TripleStore; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.api.Walker; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Metadata.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Metadata.java index c632b3d6e..bb0b0587c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Metadata.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Metadata.java @@ -6,7 +6,7 @@ import java.util.Iterator; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.api.core.PointerType; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/NSManager.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/NSManager.java index a2917aa84..e8689a242 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/NSManager.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/NSManager.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.core.PointerType; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.triple.cst.KeywordPP; @@ -19,7 +19,7 @@ import java.util.Set; import java.util.StringTokenizer; -import static fr.inria.corese.core.next.kgram.api.core.PointerType.NSMANAGER; +import static fr.inria.corese.core.kgram.api.core.PointerType.NSMANAGER; /** *

diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Processor.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Processor.java index 34801f57d..c90178691 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Processor.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Processor.java @@ -17,13 +17,14 @@ import fr.inria.corese.core.sparql.datatype.function.XPathFun; import fr.inria.corese.core.sparql.triple.cst.RDFS; import fr.inria.corese.core.sparql.triple.cst.KeywordPP; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.IS_TRIPLE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.OBJECT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.PREDICATE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.SUBJECT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.TRIPLE; +import fr.inria.corese.core.kgram.api.core.ExpPattern; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import static fr.inria.corese.core.kgram.api.core.ExprType.IS_TRIPLE; +import static fr.inria.corese.core.kgram.api.core.ExprType.OBJECT; +import static fr.inria.corese.core.kgram.api.core.ExprType.PREDICATE; +import static fr.inria.corese.core.kgram.api.core.ExprType.SUBJECT; +import static fr.inria.corese.core.kgram.api.core.ExprType.TRIPLE; import fr.inria.corese.core.sparql.exceptions.EngineException; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Term.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Term.java index 698971495..5db3a3436 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Term.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Term.java @@ -16,12 +16,12 @@ import fr.inria.corese.core.sparql.triple.cst.Keyword; import fr.inria.corese.core.sparql.triple.cst.KeywordPP; import fr.inria.corese.core.sparql.compiler.java.JavaCompiler; -import fr.inria.corese.core.next.kgram.api.core.ExpPattern; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_CREATE; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.ExpPattern; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_CREATE; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.exceptions.SafetyException; import fr.inria.corese.core.sparql.triple.parser.Access.Feature; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Triple.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Triple.java index 28fdb35d9..9eb54ee78 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Triple.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Triple.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.next.kgram.api.core.Pointerable; +import fr.inria.corese.core.kgram.api.core.Pointerable; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.RDF; - +import static fr.inria.corese.core.sparql.datatype.RDF.OWL; import static fr.inria.corese.core.sparql.datatype.RDF.OWL_SAME_AS; import fr.inria.corese.core.sparql.triple.api.ExpressionVisitor; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/URLServer.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/URLServer.java index 1d4c4bc24..7c573b3de 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/URLServer.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/URLServer.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.sparql.triple.parser; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.api.Graph; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; - +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Variable.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Variable.java index f574ae2f7..a379f7acd 100755 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Variable.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Variable.java @@ -9,11 +9,11 @@ import fr.inria.corese.core.sparql.triple.cst.KeywordPP; import fr.inria.corese.core.sparql.compiler.java.JavaCompiler; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.query.Producer; /** *

diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/VariableLocal.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/VariableLocal.java index 2439c68a3..1fd9c299c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/VariableLocal.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/VariableLocal.java @@ -3,9 +3,9 @@ import fr.inria.corese.core.sparql.api.Computer; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/ContextLog.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/ContextLog.java index 2666f8a52..a031c4a05 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/ContextLog.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/ContextLog.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.sparql.triple.parser.context; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.cst.LogKey; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/PropertyMap.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/PropertyMap.java index a0d620668..b5fcf01d2 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/PropertyMap.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/context/PropertyMap.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.sparql.triple.parser.context; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTWalker.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTWalker.java index 0f00c9efa..95e59cd82 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTWalker.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTWalker.java @@ -1,23 +1,23 @@ package fr.inria.corese.core.sparql.triple.parser.visitor; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.APPLY; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.APPLY_TEMPLATES; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.APPLY_TEMPLATES_WITH; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.APPLY_TEMPLATES_WITH_GRAPH; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.CALL_TEMPLATE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.CALL_TEMPLATE_WITH; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.DSCALL; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.EXTERN; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.FUNCALL; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.JAVACALL; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.KGRAM; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.LOAD; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.MAP; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.READ; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.REDUCE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.WRITE; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_ENTAILMENT; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.XT_HTTP_GET; +import static fr.inria.corese.core.kgram.api.core.ExprType.APPLY; +import static fr.inria.corese.core.kgram.api.core.ExprType.APPLY_TEMPLATES; +import static fr.inria.corese.core.kgram.api.core.ExprType.APPLY_TEMPLATES_WITH; +import static fr.inria.corese.core.kgram.api.core.ExprType.APPLY_TEMPLATES_WITH_GRAPH; +import static fr.inria.corese.core.kgram.api.core.ExprType.CALL_TEMPLATE; +import static fr.inria.corese.core.kgram.api.core.ExprType.CALL_TEMPLATE_WITH; +import static fr.inria.corese.core.kgram.api.core.ExprType.DSCALL; +import static fr.inria.corese.core.kgram.api.core.ExprType.EXTERN; +import static fr.inria.corese.core.kgram.api.core.ExprType.FUNCALL; +import static fr.inria.corese.core.kgram.api.core.ExprType.JAVACALL; +import static fr.inria.corese.core.kgram.api.core.ExprType.KGRAM; +import static fr.inria.corese.core.kgram.api.core.ExprType.LOAD; +import static fr.inria.corese.core.kgram.api.core.ExprType.MAP; +import static fr.inria.corese.core.kgram.api.core.ExprType.READ; +import static fr.inria.corese.core.kgram.api.core.ExprType.REDUCE; +import static fr.inria.corese.core.kgram.api.core.ExprType.WRITE; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_ENTAILMENT; +import static fr.inria.corese.core.kgram.api.core.ExprType.XT_HTTP_GET; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.api.Walker; import fr.inria.corese.core.sparql.triple.function.script.Function; diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ExpressionVisitorVariable.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ExpressionVisitorVariable.java index a6db1fa61..b79827a6c 100644 --- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ExpressionVisitorVariable.java +++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ExpressionVisitorVariable.java @@ -2,8 +2,8 @@ import fr.inria.corese.core.sparql.triple.function.script.Function; import fr.inria.corese.core.sparql.triple.api.ExpressionVisitor; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import static fr.inria.corese.core.next.kgram.api.core.ExprType.LOCAL; +import fr.inria.corese.core.kgram.api.core.ExprType; +import static fr.inria.corese.core.kgram.api.core.ExprType.LOCAL; import fr.inria.corese.core.sparql.triple.function.script.ForLoop; import fr.inria.corese.core.sparql.triple.function.script.Let; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/stats/IStats.java b/src/main/java/fr/inria/corese/core/stats/IStats.java index e425cec23..25ff01846 100644 --- a/src/main/java/fr/inria/corese/core/stats/IStats.java +++ b/src/main/java/fr/inria/corese/core/stats/IStats.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.stats; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; /** * Interface for calling Producer from kgraph to do statistics diff --git a/src/main/java/fr/inria/corese/core/stats/StatsBasedEstimation.java b/src/main/java/fr/inria/corese/core/stats/StatsBasedEstimation.java index a6a503867..b6c20776a 100644 --- a/src/main/java/fr/inria/corese/core/stats/StatsBasedEstimation.java +++ b/src/main/java/fr/inria/corese/core/stats/StatsBasedEstimation.java @@ -1,16 +1,17 @@ package fr.inria.corese.core.stats; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.sorter.impl.qpv1.QPGNodeCostModel; -import fr.inria.corese.core.next.kgram.sorter.core.QPGraph; -import fr.inria.corese.core.next.kgram.sorter.core.QPGNode; -import fr.inria.corese.core.next.kgram.sorter.core.IEstimate; -import fr.inria.corese.core.next.kgram.api.core.Filter; -import fr.inria.corese.core.next.kgram.api.core.Node; -import static fr.inria.corese.core.next.kgram.api.core.Node.OBJECT; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.sorter.impl.qpv1.BasicPatternGenerator; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.sorter.impl.qpv1.QPGNodeCostModel; +import fr.inria.corese.core.kgram.sorter.core.QPGraph; +import fr.inria.corese.core.kgram.sorter.core.QPGNode; +import fr.inria.corese.core.kgram.sorter.core.IEstimate; +import fr.inria.corese.core.kgram.api.core.Filter; +import fr.inria.corese.core.kgram.api.core.Node; +import static fr.inria.corese.core.kgram.api.core.Node.OBJECT; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.sorter.core.QPGEdge; +import fr.inria.corese.core.kgram.sorter.impl.qpv1.BasicPatternGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/stats/data/BaseMap.java b/src/main/java/fr/inria/corese/core/stats/data/BaseMap.java index f5b4508ad..4d739d7b7 100644 --- a/src/main/java/fr/inria/corese/core/stats/data/BaseMap.java +++ b/src/main/java/fr/inria/corese/core/stats/data/BaseMap.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.stats.data; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/fr/inria/corese/core/stats/data/HashBucket.java b/src/main/java/fr/inria/corese/core/stats/data/HashBucket.java index c5e34cf21..62c6071b9 100644 --- a/src/main/java/fr/inria/corese/core/stats/data/HashBucket.java +++ b/src/main/java/fr/inria/corese/core/stats/data/HashBucket.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.stats.data; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.stats.Options; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/fr/inria/corese/core/stats/data/ReducedMap.java b/src/main/java/fr/inria/corese/core/stats/data/ReducedMap.java index 147a0f207..dffdbd838 100644 --- a/src/main/java/fr/inria/corese/core/stats/data/ReducedMap.java +++ b/src/main/java/fr/inria/corese/core/stats/data/ReducedMap.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.stats.data; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.stats.Options; import java.util.ArrayList; import java.util.Comparator; diff --git a/src/main/java/fr/inria/corese/core/stats/data/SimpleAverage.java b/src/main/java/fr/inria/corese/core/stats/data/SimpleAverage.java index 179b767f8..a8811f40f 100644 --- a/src/main/java/fr/inria/corese/core/stats/data/SimpleAverage.java +++ b/src/main/java/fr/inria/corese/core/stats/data/SimpleAverage.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.stats.data; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * Simple average, number of all triples/number of distinct resources diff --git a/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable.java b/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable.java index a534d560d..d9c27b9b3 100644 --- a/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable.java +++ b/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.stats.data; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import static fr.inria.corese.core.stats.IStats.OBJECT; import static fr.inria.corese.core.stats.IStats.PREDICATE; import static fr.inria.corese.core.stats.IStats.SUBJECT; diff --git a/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable2.java b/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable2.java index f9009a03e..7d00f71df 100644 --- a/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable2.java +++ b/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable2.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.stats.data; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import static fr.inria.corese.core.stats.IStats.OBJECT; import static fr.inria.corese.core.stats.IStats.PREDICATE; import static fr.inria.corese.core.stats.IStats.SUBJECT; diff --git a/src/main/java/fr/inria/corese/core/stats/data/WrappedNode.java b/src/main/java/fr/inria/corese/core/stats/data/WrappedNode.java index 4be719364..53cec5bd0 100644 --- a/src/main/java/fr/inria/corese/core/stats/data/WrappedNode.java +++ b/src/main/java/fr/inria/corese/core/stats/data/WrappedNode.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.stats.data; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Node; /** * mainly for overriding the hashCode and equals methods of Node, same object if diff --git a/src/main/java/fr/inria/corese/core/storage/CoreseGraphDataManager.java b/src/main/java/fr/inria/corese/core/storage/CoreseGraphDataManager.java index 00c375b87..88aac3850 100644 --- a/src/main/java/fr/inria/corese/core/storage/CoreseGraphDataManager.java +++ b/src/main/java/fr/inria/corese/core/storage/CoreseGraphDataManager.java @@ -9,8 +9,8 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.producer.MetadataManager; import fr.inria.corese.core.storage.api.dataManager.DataManager; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.triple.parser.HashMapList; /** diff --git a/src/main/java/fr/inria/corese/core/storage/DataManagerJava.java b/src/main/java/fr/inria/corese/core/storage/DataManagerJava.java index 357a2f006..f678ad643 100644 --- a/src/main/java/fr/inria/corese/core/storage/DataManagerJava.java +++ b/src/main/java/fr/inria/corese/core/storage/DataManagerJava.java @@ -11,14 +11,16 @@ import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; import fr.inria.corese.core.query.QueryProcess; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.function.proxy.GraphSpecificFunction; import fr.inria.corese.core.sparql.triple.parser.Access; +import fr.inria.corese.core.sparql.triple.parser.Access.Feature; +import fr.inria.corese.core.sparql.triple.parser.Access.Level; import fr.inria.corese.core.sparql.triple.parser.HashMapList; import fr.inria.corese.core.sparql.triple.parser.NSManager; import fr.inria.corese.core.sparql.triple.parser.URLServer; diff --git a/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerRead.java b/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerRead.java index 647a697a4..a549ebb6c 100644 --- a/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerRead.java +++ b/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerRead.java @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.List; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; /** * Interface to adapt an external storage system to Corese. diff --git a/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerUpdate.java b/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerUpdate.java index 10cc54dce..3c00f8b70 100644 --- a/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerUpdate.java +++ b/src/main/java/fr/inria/corese/core/storage/api/dataManager/DataManagerUpdate.java @@ -4,8 +4,8 @@ import java.util.List; import fr.inria.corese.core.edge.EdgeImpl; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/transform/ContextBuilder.java b/src/main/java/fr/inria/corese/core/transform/ContextBuilder.java index f37b12dca..b20af3009 100644 --- a/src/main/java/fr/inria/corese/core/transform/ContextBuilder.java +++ b/src/main/java/fr/inria/corese/core/transform/ContextBuilder.java @@ -6,8 +6,8 @@ import org.slf4j.LoggerFactory; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/transform/ContextManager.java b/src/main/java/fr/inria/corese/core/transform/ContextManager.java index 74d3b1b1a..c65d615cb 100644 --- a/src/main/java/fr/inria/corese/core/transform/ContextManager.java +++ b/src/main/java/fr/inria/corese/core/transform/ContextManager.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.transform; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.function.term.Binding; import fr.inria.corese.core.sparql.triple.parser.Context; diff --git a/src/main/java/fr/inria/corese/core/transform/Stack.java b/src/main/java/fr/inria/corese/core/transform/Stack.java index 98d126a3f..0f53292f1 100644 --- a/src/main/java/fr/inria/corese/core/transform/Stack.java +++ b/src/main/java/fr/inria/corese/core/transform/Stack.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.transform; import fr.inria.corese.core.sparql.api.IDatatype; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Query; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/transform/TemplatePrinter.java b/src/main/java/fr/inria/corese/core/transform/TemplatePrinter.java index 644e01d38..25d68aeb1 100644 --- a/src/main/java/fr/inria/corese/core/transform/TemplatePrinter.java +++ b/src/main/java/fr/inria/corese/core/transform/TemplatePrinter.java @@ -5,7 +5,7 @@ import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.NSManager; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.Graph; import fr.inria.corese.core.query.QueryEngine; import fr.inria.corese.core.load.Load; diff --git a/src/main/java/fr/inria/corese/core/transform/Transformer.java b/src/main/java/fr/inria/corese/core/transform/Transformer.java index dab1f44a3..0b2cf3770 100644 --- a/src/main/java/fr/inria/corese/core/transform/Transformer.java +++ b/src/main/java/fr/inria/corese/core/transform/Transformer.java @@ -2,14 +2,14 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.compiler.parser.Pragma; -import fr.inria.corese.core.next.kgram.api.core.Expr; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Environment; -import fr.inria.corese.core.next.kgram.api.query.Producer; -import fr.inria.corese.core.next.kgram.core.*; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.filter.Extension; +import fr.inria.corese.core.kgram.api.core.Expr; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Environment; +import fr.inria.corese.core.kgram.api.query.Producer; +import fr.inria.corese.core.kgram.core.*; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.filter.Extension; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.query.QueryEngine; diff --git a/src/main/java/fr/inria/corese/core/transform/TransformerMapping.java b/src/main/java/fr/inria/corese/core/transform/TransformerMapping.java index d73532dbf..29b5af21e 100644 --- a/src/main/java/fr/inria/corese/core/transform/TransformerMapping.java +++ b/src/main/java/fr/inria/corese/core/transform/TransformerMapping.java @@ -2,9 +2,9 @@ import fr.inria.corese.core.compiler.parser.NodeImpl; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/transform/TransformerVisitor.java b/src/main/java/fr/inria/corese/core/transform/TransformerVisitor.java index 210666bc3..14bea3e72 100644 --- a/src/main/java/fr/inria/corese/core/transform/TransformerVisitor.java +++ b/src/main/java/fr/inria/corese/core/transform/TransformerVisitor.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.transform; -import fr.inria.corese.core.next.kgram.core.Exp; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; +import fr.inria.corese.core.sparql.triple.parser.Exp; import fr.inria.corese.core.compiler.api.QueryVisitor; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.ExpHandler; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.ExpHandler; +import fr.inria.corese.core.kgram.core.Query; /** * QueryVisitor for Transformation templates @@ -69,7 +69,7 @@ void optimize(Query query){ */ void optimize(Query query, String graph, String var) { if (query.getBody().size() > 0) { - Exp exp = query.getBody().get(0); + fr.inria.corese.core.kgram.core.Exp exp = query.getBody().get(0); if (exp.isGraph() && exp.getGraphName().getLabel().equals(graph)) { Node n = query.getNode(var); if (n != null) { diff --git a/src/main/java/fr/inria/corese/core/util/Duplicate.java b/src/main/java/fr/inria/corese/core/util/Duplicate.java index 278d9f2fb..d6120f0ac 100644 --- a/src/main/java/fr/inria/corese/core/util/Duplicate.java +++ b/src/main/java/fr/inria/corese/core/util/Duplicate.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.util; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Distinct; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Distinct; import java.util.HashMap; /** diff --git a/src/main/java/fr/inria/corese/core/util/GraphListen.java b/src/main/java/fr/inria/corese/core/util/GraphListen.java index 6ad3635a6..08cfd0060 100644 --- a/src/main/java/fr/inria/corese/core/util/GraphListen.java +++ b/src/main/java/fr/inria/corese/core/util/GraphListen.java @@ -6,16 +6,16 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.api.GraphListener; import fr.inria.corese.core.Graph; import fr.inria.corese.core.query.QueryProcess; import org.slf4j.LoggerFactory; -import fr.inria.corese.core.next.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Edge; import fr.inria.corese.core.sparql.datatype.DatatypeMap; /** diff --git a/src/main/java/fr/inria/corese/core/util/GraphListenerImpl.java b/src/main/java/fr/inria/corese/core/util/GraphListenerImpl.java index bd32e533f..3875c7192 100644 --- a/src/main/java/fr/inria/corese/core/util/GraphListenerImpl.java +++ b/src/main/java/fr/inria/corese/core/util/GraphListenerImpl.java @@ -7,12 +7,13 @@ import fr.inria.corese.core.sparql.triple.parser.Atom; import fr.inria.corese.core.sparql.triple.parser.Triple; import fr.inria.corese.core.compiler.parser.Pragma; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.api.GraphListener; import fr.inria.corese.core.Graph; +import fr.inria.corese.core.kgram.api.core.Edge; /** diff --git a/src/main/java/fr/inria/corese/core/util/MappingComparator.java b/src/main/java/fr/inria/corese/core/util/MappingComparator.java index 0bc0d3664..166752dad 100644 --- a/src/main/java/fr/inria/corese/core/util/MappingComparator.java +++ b/src/main/java/fr/inria/corese/core/util/MappingComparator.java @@ -4,9 +4,9 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; /** * diff --git a/src/main/java/fr/inria/corese/core/util/MappingsGraph.java b/src/main/java/fr/inria/corese/core/util/MappingsGraph.java index 9f366fdc3..58e9a0d27 100644 --- a/src/main/java/fr/inria/corese/core/util/MappingsGraph.java +++ b/src/main/java/fr/inria/corese/core/util/MappingsGraph.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.util; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.query.Graphable; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.query.Graphable; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.logic.RDF; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.NSManager; diff --git a/src/main/java/fr/inria/corese/core/util/Property.java b/src/main/java/fr/inria/corese/core/util/Property.java index 8b5c54971..06c6a2af3 100644 --- a/src/main/java/fr/inria/corese/core/util/Property.java +++ b/src/main/java/fr/inria/corese/core/util/Property.java @@ -10,9 +10,9 @@ import fr.inria.corese.core.compiler.federate.SelectorFilter; import fr.inria.corese.core.compiler.federate.SelectorIndex; import fr.inria.corese.core.index.EdgeManagerIndexer; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.load.Service; import fr.inria.corese.core.load.*; import fr.inria.corese.core.producer.DataFilter; diff --git a/src/main/java/fr/inria/corese/core/util/QueryGraphVisitorImpl.java b/src/main/java/fr/inria/corese/core/util/QueryGraphVisitorImpl.java index 8e50b229f..c0158200f 100644 --- a/src/main/java/fr/inria/corese/core/util/QueryGraphVisitorImpl.java +++ b/src/main/java/fr/inria/corese/core/util/QueryGraphVisitorImpl.java @@ -4,11 +4,11 @@ import fr.inria.corese.core.api.QueryGraphVisitor; import fr.inria.corese.core.compiler.parser.NodeImpl; import fr.inria.corese.core.edge.EdgeImpl; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.ExpType; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Exp; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.ExpType; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Exp; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Constant; diff --git a/src/main/java/fr/inria/corese/core/util/SPINProcess.java b/src/main/java/fr/inria/corese/core/util/SPINProcess.java index 0de93999c..dc374fda1 100644 --- a/src/main/java/fr/inria/corese/core/util/SPINProcess.java +++ b/src/main/java/fr/inria/corese/core/util/SPINProcess.java @@ -5,13 +5,14 @@ import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.NSManager; import fr.inria.corese.core.sparql.triple.printer.SPIN; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.Graph; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.transform.Transformer; import java.io.ByteArrayInputStream; +import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import fr.inria.corese.core.transform.TransformerUtils; diff --git a/src/main/java/fr/inria/corese/core/visitor/ldpath/LinkedDataPath.java b/src/main/java/fr/inria/corese/core/visitor/ldpath/LinkedDataPath.java index cf1a72f70..e01e2144d 100644 --- a/src/main/java/fr/inria/corese/core/visitor/ldpath/LinkedDataPath.java +++ b/src/main/java/fr/inria/corese/core/visitor/ldpath/LinkedDataPath.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.query.QueryProcess; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.ProcessVisitorDefault; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.ProcessVisitorDefault; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; diff --git a/src/main/java/fr/inria/corese/core/visitor/ldpath/QueryProcessThread.java b/src/main/java/fr/inria/corese/core/visitor/ldpath/QueryProcessThread.java index 351085055..6d6138cce 100644 --- a/src/main/java/fr/inria/corese/core/visitor/ldpath/QueryProcessThread.java +++ b/src/main/java/fr/inria/corese/core/visitor/ldpath/QueryProcessThread.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.query.QueryProcess; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Constant; diff --git a/src/main/java/fr/inria/corese/core/visitor/ldpath/Result.java b/src/main/java/fr/inria/corese/core/visitor/ldpath/Result.java index 151dc3bd8..89fba17bb 100644 --- a/src/main/java/fr/inria/corese/core/visitor/ldpath/Result.java +++ b/src/main/java/fr/inria/corese/core/visitor/ldpath/Result.java @@ -4,13 +4,13 @@ import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.transform.Transformer; -import fr.inria.corese.core.next.kgram.api.core.DatatypeValue; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.DatatypeValue; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Constant; import fr.inria.corese.core.sparql.triple.parser.Exp; -import fr.inria.corese.core.next.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mapping; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRule.java b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRule.java index 781c632c5..eb2b4f97f 100644 --- a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRule.java +++ b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRule.java @@ -1,11 +1,12 @@ package fr.inria.corese.core.visitor.solver; import fr.inria.corese.core.compiler.eval.QuerySolverVisitorBasic; +import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.rule.RuleEngine; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import java.lang.reflect.InvocationTargetException; import java.util.List; diff --git a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRuleUser.java b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRuleUser.java index b5e746fb4..a0622f6a0 100644 --- a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRuleUser.java +++ b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorRuleUser.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.visitor.solver; import fr.inria.corese.core.rule.RuleEngine; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import java.util.HashMap; diff --git a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformer.java b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformer.java index e15a8c71d..29c088e5b 100644 --- a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformer.java +++ b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformer.java @@ -1,9 +1,10 @@ package fr.inria.corese.core.visitor.solver; import fr.inria.corese.core.compiler.eval.QuerySolverVisitorBasic; +import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.transform.Transformer; import fr.inria.corese.core.workflow.Data; -import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Eval; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.triple.parser.Context; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformerUser.java b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformerUser.java index 15af62d8d..c155eb172 100644 --- a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformerUser.java +++ b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorTransformerUser.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.visitor.solver; import fr.inria.corese.core.transform.Transformer; -import fr.inria.corese.core.next.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Eval; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorUser.java b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorUser.java index ae621e181..a0355856e 100644 --- a/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorUser.java +++ b/src/main/java/fr/inria/corese/core/visitor/solver/QuerySolverVisitorUser.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.visitor.solver; import fr.inria.corese.core.compiler.eval.QuerySolverVisitor; -import fr.inria.corese.core.next.kgram.core.Eval; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Eval; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/workflow/Data.java b/src/main/java/fr/inria/corese/core/workflow/Data.java index 49fe3d994..914c6c3a8 100644 --- a/src/main/java/fr/inria/corese/core/workflow/Data.java +++ b/src/main/java/fr/inria/corese/core/workflow/Data.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.EventManager; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; diff --git a/src/main/java/fr/inria/corese/core/workflow/ResultProcess.java b/src/main/java/fr/inria/corese/core/workflow/ResultProcess.java index efd0bb56c..4ed56238f 100644 --- a/src/main/java/fr/inria/corese/core/workflow/ResultProcess.java +++ b/src/main/java/fr/inria/corese/core/workflow/ResultProcess.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.workflow; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.print.ResultFormat; import fr.inria.corese.core.sparql.api.ResultFormatDef; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/workflow/SPARQLProcess.java b/src/main/java/fr/inria/corese/core/workflow/SPARQLProcess.java index 8d6bc37fb..fa5eacb44 100644 --- a/src/main/java/fr/inria/corese/core/workflow/SPARQLProcess.java +++ b/src/main/java/fr/inria/corese/core/workflow/SPARQLProcess.java @@ -8,8 +8,8 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; import fr.inria.corese.core.GraphStore; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.print.ResultFormat; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.sparql.api.IDatatype; diff --git a/src/main/java/fr/inria/corese/core/workflow/ShapeWorkflow.java b/src/main/java/fr/inria/corese/core/workflow/ShapeWorkflow.java index b91fdd0fd..16b9f678a 100644 --- a/src/main/java/fr/inria/corese/core/workflow/ShapeWorkflow.java +++ b/src/main/java/fr/inria/corese/core/workflow/ShapeWorkflow.java @@ -9,7 +9,7 @@ import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.transform.Transformer; -import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.api.core.PointerType; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.transform.TransformerUtils; import org.slf4j.Logger; diff --git a/src/main/java/fr/inria/corese/core/workflow/TestProcess.java b/src/main/java/fr/inria/corese/core/workflow/TestProcess.java index 6e0ba0b4f..2a49e0a12 100644 --- a/src/main/java/fr/inria/corese/core/workflow/TestProcess.java +++ b/src/main/java/fr/inria/corese/core/workflow/TestProcess.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.workflow; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.CoreseDatatypeException; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/main/java/fr/inria/corese/core/workflow/WorkflowParser.java b/src/main/java/fr/inria/corese/core/workflow/WorkflowParser.java index aec1c0f9f..71ce1ee76 100644 --- a/src/main/java/fr/inria/corese/core/workflow/WorkflowParser.java +++ b/src/main/java/fr/inria/corese/core/workflow/WorkflowParser.java @@ -3,8 +3,8 @@ import fr.inria.corese.core.Event; import fr.inria.corese.core.Graph; import fr.inria.corese.core.api.Loader; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; @@ -17,6 +17,7 @@ import fr.inria.corese.core.sparql.triple.parser.Context; import fr.inria.corese.core.sparql.triple.parser.NSManager; import fr.inria.corese.core.transform.ContextBuilder; +import fr.inria.corese.core.transform.Transformer; import fr.inria.corese.core.transform.TransformerUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/fr/inria/corese/core/workflow/WorkflowProcess.java b/src/main/java/fr/inria/corese/core/workflow/WorkflowProcess.java index 62b1e032e..0dd49bc0f 100644 --- a/src/main/java/fr/inria/corese/core/workflow/WorkflowProcess.java +++ b/src/main/java/fr/inria/corese/core/workflow/WorkflowProcess.java @@ -6,7 +6,7 @@ package fr.inria.corese.core.workflow; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.api.core.PointerType; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.DatatypeMap; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/test/java/fr/inria/corese/core/engine/TestQuery1.java b/src/test/java/fr/inria/corese/core/engine/TestQuery1.java index 1c5e625a3..fcdcef2e4 100644 --- a/src/test/java/fr/inria/corese/core/engine/TestQuery1.java +++ b/src/test/java/fr/inria/corese/core/engine/TestQuery1.java @@ -24,15 +24,16 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.GraphStore; import fr.inria.corese.core.compiler.eval.QuerySolver; -import fr.inria.corese.core.next.kgram.api.core.DatatypeValue; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.ExprType; -import fr.inria.corese.core.next.kgram.api.core.Node; -import fr.inria.corese.core.next.kgram.api.core.PointerType; -import fr.inria.corese.core.next.kgram.core.Mapping; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.event.StatListener; +import fr.inria.corese.core.compiler.result.XMLResult; +import fr.inria.corese.core.kgram.api.core.DatatypeValue; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.ExprType; +import fr.inria.corese.core.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.PointerType; +import fr.inria.corese.core.kgram.core.Mapping; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.event.StatListener; import fr.inria.corese.core.load.Load; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.load.QueryLoad; diff --git a/src/test/java/fr/inria/corese/core/engine/TestQuery2.java b/src/test/java/fr/inria/corese/core/engine/TestQuery2.java index f9ba0e1c4..e0d5ebb47 100644 --- a/src/test/java/fr/inria/corese/core/engine/TestQuery2.java +++ b/src/test/java/fr/inria/corese/core/engine/TestQuery2.java @@ -6,9 +6,10 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.query.QueryProcess; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; -import fr.inria.corese.core.next.kgram.core.SparqlException; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; +import fr.inria.corese.core.kgram.core.SparqlException; +import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.NSManager; /** diff --git a/src/test/java/fr/inria/corese/core/engine/TestRuleEngine.java b/src/test/java/fr/inria/corese/core/engine/TestRuleEngine.java index 7cf20ba61..b25b89ba4 100644 --- a/src/test/java/fr/inria/corese/core/engine/TestRuleEngine.java +++ b/src/test/java/fr/inria/corese/core/engine/TestRuleEngine.java @@ -18,8 +18,8 @@ import fr.inria.corese.core.query.QueryEngine; import fr.inria.corese.core.query.QueryProcess; import fr.inria.corese.core.rule.RuleEngine; -import fr.inria.corese.core.next.kgram.core.Mappings; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.storage.api.Parameters; diff --git a/src/test/java/fr/inria/corese/core/load/QueryLoadTest.java b/src/test/java/fr/inria/corese/core/load/QueryLoadTest.java index 7138fcd24..f330d35f2 100644 --- a/src/test/java/fr/inria/corese/core/load/QueryLoadTest.java +++ b/src/test/java/fr/inria/corese/core/load/QueryLoadTest.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.load; import fr.inria.corese.core.compiler.parser.Pragma; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.query.QueryEngine; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; diff --git a/src/test/java/fr/inria/corese/core/load/ServiceTest.java b/src/test/java/fr/inria/corese/core/load/ServiceTest.java index 1edb95b55..afeaf3442 100644 --- a/src/test/java/fr/inria/corese/core/load/ServiceTest.java +++ b/src/test/java/fr/inria/corese/core/load/ServiceTest.java @@ -1,6 +1,6 @@ package fr.inria.corese.core.load; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.exceptions.EngineException; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseModelTest.java b/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseModelTest.java index 7348fbcb8..ebcded5d4 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseModelTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseModelTest.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.next.impl.temp; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.Model; import fr.inria.corese.core.next.api.Namespace; @@ -237,7 +237,7 @@ void testAddStatementWithoutContext() { IRI realPredicateIRI = new CoreseIRI("http://example.org/realPredicate"); IRI realObjectIRI = new CoreseIRI("http://example.org/realObject"); - when(mockCoreseGraph.addEdge(any(Node.class), any(Node.class), any(Node.class))).thenReturn(mock(Edge.class)); + when(mockCoreseGraph.addEdge(any(Node.class), any(Node.class), any(Node.class))).thenReturn(mock(fr.inria.corese.core.kgram.api.core.Edge.class)); boolean added = coreseModel.add(realSubjectIRI, realPredicateIRI, realObjectIRI); @@ -326,8 +326,8 @@ void testAddStatementNoChange() { @Test @DisplayName("Should return true if the model contains an existing statement without context") void testContainsExistingStatementWithoutContext() { - Edge mockReturnedEdge = mock(Edge.class); - List edges = List.of(mockReturnedEdge); + fr.inria.corese.core.kgram.api.core.Edge mockReturnedEdge = mock(fr.inria.corese.core.kgram.api.core.Edge.class); + List edges = List.of(mockReturnedEdge); IRI realSubject = new CoreseIRI("http://example.org/subjectToFind"); IRI realPredicate = new CoreseIRI("http://example.org/predicateToFind"); @@ -336,7 +336,7 @@ void testContainsExistingStatementWithoutContext() { when(mockCoreseGraph.getEdgesRDF4J(any(Node.class), any(Node.class), any(Node.class), any(Node[].class))) .thenReturn(edges); when(mockCoreseGraph.getEdgeFactory()).thenReturn(mock(fr.inria.corese.core.EdgeFactory.class)); - when(mockCoreseGraph.getEdgeFactory().copy(any(Edge.class))).thenReturn(mockReturnedEdge); + when(mockCoreseGraph.getEdgeFactory().copy(any(fr.inria.corese.core.kgram.api.core.Edge.class))).thenReturn(mockReturnedEdge); // Call the contains method boolean contains = coreseModel.contains(realSubject, realPredicate, realObject); @@ -377,8 +377,8 @@ void testContainsStatementNotPresent() { @Test @DisplayName("Should return true if the model contains an existing statement with a specific context") void testContainsExistingStatementWithContext() { - Edge mockReturnedEdge = mock(Edge.class); - List edges = List.of(mockReturnedEdge); + fr.inria.corese.core.kgram.api.core.Edge mockReturnedEdge = mock(fr.inria.corese.core.kgram.api.core.Edge.class); + List edges = List.of(mockReturnedEdge); IRI realSubject = new CoreseIRI("http://example.org/subjectWithSpecificContext"); IRI realPredicate = new CoreseIRI("http://example.org/predicateWithSpecificContext"); @@ -388,7 +388,7 @@ void testContainsExistingStatementWithContext() { when(mockCoreseGraph.getEdgesRDF4J(any(Node.class), any(Node.class), any(Node.class), any(Node.class))) .thenReturn(edges); when(mockCoreseGraph.getEdgeFactory()).thenReturn(mock(fr.inria.corese.core.EdgeFactory.class)); - when(mockCoreseGraph.getEdgeFactory().copy(any(Edge.class))).thenReturn(mockReturnedEdge); + when(mockCoreseGraph.getEdgeFactory().copy(any(fr.inria.corese.core.kgram.api.core.Edge.class))).thenReturn(mockReturnedEdge); boolean contains = coreseModel.contains(realSubject, realPredicate, realObject, realContext); diff --git a/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseStatementTest.java b/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseStatementTest.java index 4d92b0cda..34c78ea11 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseStatementTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseStatementTest.java @@ -2,8 +2,8 @@ import fr.inria.corese.core.NodeImpl; import fr.inria.corese.core.edge.EdgeImpl; -import fr.inria.corese.core.next.kgram.api.core.Edge; -import fr.inria.corese.core.next.kgram.api.core.Node; +import fr.inria.corese.core.kgram.api.core.Edge; +import fr.inria.corese.core.kgram.api.core.Node; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.Resource; import fr.inria.corese.core.next.api.Value; diff --git a/src/test/java/fr/inria/corese/core/query/QueryEngineTest.java b/src/test/java/fr/inria/corese/core/query/QueryEngineTest.java index d64014001..eab91369f 100644 --- a/src/test/java/fr/inria/corese/core/query/QueryEngineTest.java +++ b/src/test/java/fr/inria/corese/core/query/QueryEngineTest.java @@ -1,7 +1,7 @@ package fr.inria.corese.core.query; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.core.Query; +import fr.inria.corese.core.kgram.core.Query; import fr.inria.corese.core.sparql.exceptions.EngineException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.Dataset; diff --git a/src/test/java/fr/inria/corese/core/sparql/EmptyResultFormatTest.java b/src/test/java/fr/inria/corese/core/sparql/EmptyResultFormatTest.java index ff5b94eb6..665d3c407 100644 --- a/src/test/java/fr/inria/corese/core/sparql/EmptyResultFormatTest.java +++ b/src/test/java/fr/inria/corese/core/sparql/EmptyResultFormatTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import fr.inria.corese.core.Graph; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.print.CSVFormat; import fr.inria.corese.core.print.JSONFormat; import fr.inria.corese.core.print.TSVFormat; diff --git a/src/test/java/fr/inria/corese/test/MyTest.java b/src/test/java/fr/inria/corese/test/MyTest.java index 7237a78d9..6d604051f 100644 --- a/src/test/java/fr/inria/corese/test/MyTest.java +++ b/src/test/java/fr/inria/corese/test/MyTest.java @@ -4,7 +4,7 @@ import fr.inria.corese.core.Graph; import fr.inria.corese.core.load.LoadException; import fr.inria.corese.core.query.QueryProcess; -import fr.inria.corese.core.next.kgram.core.Mappings; +import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import java.util.Date;